Merge pull request #132 from holochain/fix/open-settings

Fix open settings issue for system_settings build.

Author: mattyg

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Unreleased
 
+- The 'Open Settings' button will first attempt to open the android-service-runtime app via the system settings (i.e. for 'system' builds). If that fails it will fallback to opening the app via the launcher (i.e. for 'user' builds).
+
 # 0.2.1
 - bump to holochain 0.5.4
 - fix infrastructure urls

crates/tauri-plugin-client/android/src/main/java/DisconnectedNotice.kt

@@ -1,6 +1,10 @@
 package org.holochain.androidserviceruntime.plugin.client
 
 import android.app.Activity
+import android.content.ComponentName
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.util.Log
 import android.widget.Button
 import androidx.cardview.widget.CardView
@@ -13,24 +17,67 @@ class DisconnectedNotice(
         R.layout.disconnected_notice,
         "DisconnectedNotice",
     ) {
+    companion object {
+        private const val TAG = "DisconnectedNotice"
+        private const val ASR_SETTINGS_ACTION = "com.android.settings.action.IA_SETTINGS"
+    }
+
     override fun setupNoticeCardView(noticeView: CardView) {
         // Start the app that contains the HolochainService
         noticeView.findViewById<Button>(R.id.openSettingsAction).setOnClickListener {
-            try {
-                val launchIntent = this.activity.packageManager.getLaunchIntentForPackage(servicePackage)
-                if (launchIntent != null) {
-                    this.activity.startActivity(launchIntent)
-                } else {
-                    Log.e(logTag, "Could not find launch intent for package " + servicePackage)
-                }
-            } catch (e: Exception) {
-                Log.e(logTag, "Failed to launch package " + servicePackage, e)
-            }
+            openAsr()
         }
 
         // Restart this app
         noticeView.findViewById<Button>(R.id.restartAction).setOnClickListener {
             super.restartApp()
         }
     }
+
+    private fun openAsr() {
+        if (!trySettings() && !tryLauncher()) {
+            Log.e(TAG, "Failed to open ASR via both settings and launcher")
+        }
+    }
+
+    private fun trySettings(): Boolean =
+        try {
+            val pm = activity.packageManager
+            // Resolve the settings activity dynamically
+            val probe = Intent(ASR_SETTINGS_ACTION).setPackage(servicePackage)
+            val resolve =
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    pm
+                        .queryIntentActivities(
+                            probe,
+                            PackageManager.ResolveInfoFlags.of(0),
+                        ).firstOrNull()
+                } else {
+                    @Suppress("DEPRECATION")
+                    pm.queryIntentActivities(probe, 0).firstOrNull()
+                } ?: return false
+            val target =
+                ComponentName(resolve.activityInfo.packageName, resolve.activityInfo.name)
+            val intent =
+                Intent(ASR_SETTINGS_ACTION).apply {
+                    component = target
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+            Log.i(TAG, "targeting ASR settings: $target")
+            activity.startActivity(intent)
+            true
+        } catch (t: Throwable) {
+            Log.w(TAG, "Settings intent failed", t)
+            false
+        }
+
+    private fun tryLauncher(): Boolean =
+        try {
+            val launch = this.activity.packageManager.getLaunchIntentForPackage(servicePackage) ?: return false
+            activity.startActivity(launch)
+            true
+        } catch (t: Throwable) {
+            Log.w(TAG, "Launcher intent failed", t)
+            false
+        }
 }