From 73c790290cd1a060fe3a0f48d2201bfff552d332 Mon Sep 17 00:00:00 2001
From: James Rich <2199651+jamesarich@users.noreply.github.com>
Date: Thu, 29 Jan 2026 17:56:41 -0600
Subject: [PATCH] chore(ci): Remove GitHub Packages publishing workflow (#4368)

---
 .github/workflows/publish-packages.yml        | 36 -------------------
 gradle/publishing.gradle.kts                  | 22 ++++++------
 mesh_service_example/build.gradle.kts         |  8 ++---
 .../src/main/AndroidManifest.xml              |  2 ++
 .../meshserviceexample/MainActivity.kt        | 24 +++++++++++--
 5 files changed, 38 insertions(+), 54 deletions(-)
 delete mode 100644 .github/workflows/publish-packages.yml

diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml
deleted file mode 100644
index 3d20ec9e2..000000000
--- a/.github/workflows/publish-packages.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: Publish Packages
-
-on:
-  release:
-    types: [created]
-  workflow_dispatch:
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-        with:
-          submodules: 'recursive'
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v5
-        with:
-          java-version: '21'
-          distribution: 'jetbrains'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
-      - name: Publish to GitHub Packages
-        run: ./gradlew :core:api:publish :core:model:publish :core:proto:publish
-        env:
-          GITHUB_ACTOR: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/gradle/publishing.gradle.kts b/gradle/publishing.gradle.kts
index 6fe834ee8..d9a52f93e 100644
--- a/gradle/publishing.gradle.kts
+++ b/gradle/publishing.gradle.kts
@@ -14,19 +14,19 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import java.io.FileInputStream
 import java.util.Properties
 
 project.pluginManager.apply("maven-publish")
 
-val configProperties = Properties()
-val configFile = rootProject.file("config.properties")
-if (configFile.exists()) {
-    FileInputStream(configFile).use { configProperties.load(it) }
-}
-
-val versionBase = configProperties.getProperty("VERSION_NAME_BASE") ?: "0.0.0-SNAPSHOT"
-val appVersion = System.getenv("VERSION_NAME") ?: versionBase
-
-project.version = appVersion
 project.group = "org.meshtastic"
+
+if (project.version == "unspecified") {
+    val props = Properties().apply {
+        rootProject.file("config.properties").takeIf { it.exists() }?.inputStream()?.use { load(it) }
+    }
+    
+    project.version = System.getenv("VERSION")
+        ?: System.getenv("VERSION_NAME")
+        ?: props.getProperty("VERSION_NAME_BASE")
+        ?: "0.0.0-SNAPSHOT"
+}
diff --git a/mesh_service_example/build.gradle.kts b/mesh_service_example/build.gradle.kts
index af2a04641..8b083656a 100644
--- a/mesh_service_example/build.gradle.kts
+++ b/mesh_service_example/build.gradle.kts
@@ -36,12 +36,10 @@ configure<ApplicationExtension> {
     testOptions { unitTests.isReturnDefaultValues = true }
 }
 
-val meshtasticVersion = "main-SNAPSHOT"
-
 dependencies {
-    implementation("com.github.meshtastic.Meshtastic-Android:core-api:$meshtasticVersion")
-    implementation("com.github.meshtastic.Meshtastic-Android:core-model:$meshtasticVersion")
-    implementation("com.github.meshtastic.Meshtastic-Android:core-proto:$meshtasticVersion")
+    implementation(projects.core.api)
+    implementation(projects.core.model)
+    implementation(projects.core.proto)
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
diff --git a/mesh_service_example/src/main/AndroidManifest.xml b/mesh_service_example/src/main/AndroidManifest.xml
index cfa4623bc..b8ffa4cae 100644
--- a/mesh_service_example/src/main/AndroidManifest.xml
+++ b/mesh_service_example/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
     <uses-permission android:name="com.geeksville.mesh.permission.BIND_MESH_SERVICE" />
     <queries>
         <package android:name="com.geeksville.mesh" />
+        <package android:name="com.geeksville.mesh.google.debug" />
+        <package android:name="com.geeksville.mesh.fdroid.debug" />
     </queries>
 
     <application
diff --git a/mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt b/mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt
index 08766a9c0..aeff88546 100644
--- a/mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt
+++ b/mesh_service_example/src/main/kotlin/com/meshtastic/android/meshserviceexample/MainActivity.kt
@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.ServiceConnection
+import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
@@ -102,13 +103,32 @@ class MainActivity : ComponentActivity() {
         try {
             Log.i(TAG, "Attempting to bind to Mesh Service...")
             val intent = Intent("com.geeksville.mesh.Service")
-            intent.setClassName("com.geeksville.mesh", "com.geeksville.mesh.service.MeshService")
+
+            // Query the package manager to find an app that handles this service action.
+            // This is more resilient than hardcoding a package name, which might change with flavors.
+            val resolveInfo =
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    packageManager.queryIntentServices(intent, PackageManager.ResolveInfoFlags.of(0))
+                } else {
+                    @Suppress("DEPRECATION")
+                    packageManager.queryIntentServices(intent, 0)
+                }
+
+            if (resolveInfo.isNotEmpty()) {
+                val serviceInfo = resolveInfo[0].serviceInfo
+                intent.setClassName(serviceInfo.packageName, serviceInfo.name)
+                Log.i(TAG, "Found service in package: ${serviceInfo.packageName}")
+            } else {
+                Log.w(TAG, "No service found for action com.geeksville.mesh.Service. Falling back to default.")
+                intent.setClassName("com.geeksville.mesh", "com.geeksville.mesh.service.MeshService")
+            }
+
             val success = bindService(intent, serviceConnection, BIND_AUTO_CREATE)
             if (!success) {
                 Log.e(TAG, "bindService returned false")
             }
         } catch (e: SecurityException) {
-            Log.e(TAG, "SecurityException while binding", e)
+            Log.e(TAG, "SecurityException while binding: ${e.message}")
         }
     }