#1798 feat: do not autostart PRO mode if device was not shutdown gracefully

Author: sds100

base/src/main/java/io/github/sds100/keymapper/base/BaseKeyMapperApp.kt

@@ -1,7 +1,10 @@
 package io.github.sds100.keymapper.base
 
 import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.os.Build
 import android.os.UserManager
 import android.util.Log
@@ -35,6 +38,7 @@ import io.github.sds100.keymapper.system.permissions.Permission
 import io.github.sds100.keymapper.system.root.SuAdapterImpl
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -100,6 +104,25 @@ abstract class BaseKeyMapperApp : MultiDexApplication() {
     private val initLock: Any = Any()
     private var initialized = false
 
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            context ?: return
+            intent ?: return
+
+            when (intent.action) {
+                Intent.ACTION_SHUTDOWN -> {
+                    Timber.i("Clean shutdown")
+                    settingsRepository.set(Keys.isCleanShutdown, true)
+
+                    // Block until the value is persisted.
+                    runBlocking {
+                        settingsRepository.get(Keys.isCleanShutdown).first { it == true }
+                    }
+                }
+            }
+        }
+    }
+
     override fun onCreate() {
         val priorExceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
 
@@ -123,7 +146,7 @@ abstract class BaseKeyMapperApp : MultiDexApplication() {
 
         super.onCreate()
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && userManager?.isUserUnlocked == false) {
+        if (userManager?.isUserUnlocked == false) {
             Log.i(tag, "KeyMapperApp: Delay init because locked.")
             // If the device is still encrypted and locked do not initialize anything that
             // may potentially need the encrypted app storage like databases.
@@ -137,6 +160,8 @@ abstract class BaseKeyMapperApp : MultiDexApplication() {
     }
 
     fun onBootUnlocked() {
+        Log.i(tag, "KeyMapperApp: onBootUnlocked")
+
         synchronized(initLock) {
             if (!initialized) {
                 init()
@@ -148,6 +173,12 @@ abstract class BaseKeyMapperApp : MultiDexApplication() {
     private fun init() {
         Log.i(tag, "KeyMapperApp: Init")
 
+        val intentFilter = IntentFilter().apply {
+            addAction(Intent.ACTION_SHUTDOWN)
+        }
+
+        registerReceiver(broadcastReceiver, intentFilter)
+
         settingsRepository.get(Keys.darkTheme)
             .map { it?.toIntOrNull() }
             .map {

base/src/main/java/io/github/sds100/keymapper/base/promode/SystemBridgeAutoStarter.kt

@@ -126,9 +126,18 @@ class SystemBridgeAutoStarter @Inject constructor(
     fun init() {
         coroutineScope.launch {
             // The Key Mapper process may not necessarily be started on boot due to the
-            // on boot receiver so assume if it is started within 30 seconds of boot that
+            // on boot receiver so assume if it is started within a minute of boot that
             // it should be auto started.
-            val isBoot = SystemClock.uptimeMillis() < 30000
+            val isBoot = SystemClock.uptimeMillis() < 60000
+
+            // Do not autostart if the device was force rebooted. This may be a sign that PRO mode
+            // was broken and the user was trying to reset it.
+            val isCleanShutdown = preferences.get(Keys.isCleanShutdown).map { it ?: false }.first()
+
+            Timber.i("SystemBridgeAutoStarter init: isBoot=$isBoot, isCleanShutdown=$isCleanShutdown")
+
+            // Reset the value after reading it.
+            preferences.set(Keys.isCleanShutdown, false)
 
             val isBootAutoStartEnabled = preferences.get(Keys.isProModeAutoStartBootEnabled)
                 .map { it ?: PreferenceDefaults.PRO_MODE_AUTOSTART_BOOT }
@@ -140,7 +149,7 @@ class SystemBridgeAutoStarter @Inject constructor(
 
             val connectionState = connectionManager.connectionState.value
 
-            if (isBoot && isBootAutoStartEnabled && connectionState !is SystemBridgeConnectionState.Connected) {
+            if (isBoot && isCleanShutdown && isBootAutoStartEnabled && connectionState !is SystemBridgeConnectionState.Connected) {
                 val autoStartType = autoStartTypeFlow.first()
 
                 if (autoStartType != null) {

base/src/main/java/io/github/sds100/keymapper/base/promode/SystemBridgeSetupAssistantController.kt

@@ -364,6 +364,7 @@ class SystemBridgeSetupAssistantController @AssistedInject constructor(
     private fun getKeyMapperAppTask(): ActivityManager.AppTask? {
         val task = activityManager.appTasks
             .firstOrNull { it.taskInfo.topActivity?.className == keyMapperClassProvider.getMainActivity().name }
+
         return task
     }
 }

data/src/main/java/io/github/sds100/keymapper/data/Keys.kt

@@ -125,4 +125,6 @@ object Keys {
      * Whether the user has started the system bridge before.
      */
     val isSystemBridgeUsed = booleanPreferencesKey("key_is_system_bridge_used")
+
+    val isCleanShutdown = booleanPreferencesKey("key_is_clean_shutdown")
 }