#1961 fix: disabling setup assistant shows a notification asking for pairing code immediately

Author: sds100

CHANGELOG.md

@@ -15,6 +15,7 @@
 - [#1972](https://github.com/keymapperorg/KeyMapper/issues/1972) Expert Mode works on Android 10.
 - [#1976](https://github.com/keymapperorg/KeyMapper/issues/1976) Panic in Rust system bridge code on some devices.
 - [#1971](https://github.com/keymapperorg/KeyMapper/issues/1971) Media actions work again in some apps, like YouTube.
+- [#1961](https://github.com/keymapperorg/KeyMapper/issues/1961) Disabling setup assistant shows a notification asking for pairing code immediately.
 - Bugs with expert mode auto starting time.
 
 ## [4.0.0 Beta 6](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.06)

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

@@ -315,18 +315,37 @@ class SystemBridgeSetupAssistantController @AssistedInject constructor(
             }
 
             SystemBridgeSetupStep.ADB_PAIRING -> {
-                showNotification(
-                    getString(R.string.expert_mode_setup_notification_pairing_title),
-                    getString(R.string.expert_mode_setup_notification_pairing_text),
-                )
+                if (isInteractive.value) {
+                    showNotification(
+                        getString(R.string.expert_mode_setup_notification_pairing_title),
+                        getString(R.string.expert_mode_setup_notification_pairing_text),
+                    )
+                    interactionStep = InteractionStep.PAIR_DEVICE
+                    startInteractionTimeoutJob()
+                } else {
+                    // Show a notification asking for pairing code straight away if interaction
+                    // is disabled.
+                    showNotification(
+                        title = getString(
+                            R.string.expert_mode_setup_notification_pairing_code_not_interactive_title,
+                        ),
+                        text = getString(
+                            R.string.expert_mode_setup_notification_pairing_code_not_interactive_text,
+                        ),
+                        actions = listOf(
+                            KMNotificationAction.RemoteInput.PairingCode to
+                                getString(
+                                    R.string.expert_mode_setup_notification_action_input_pairing_code,
+                                ),
+                        ),
+                    )
 
-                interactionStep = InteractionStep.PAIR_DEVICE
+                    interactionStep = null
+                }
             }
 
-            else -> return // Do not start interaction timeout job
+            else -> return
         }
-
-        startInteractionTimeoutJob()
     }
 
     private fun startInteractionTimeoutJob() {

base/src/main/res/values/strings.xml

@@ -1757,6 +1757,9 @@
     <string name="expert_mode_setup_notification_pairing_button_not_found_title">Unable to find pairing port and code</string>
     <string name="expert_mode_setup_notification_pairing_button_not_found_text">Tap on the button to pair with pairing code and type the code in here</string>
 
+    <string name="expert_mode_setup_notification_pairing_code_not_interactive_title">Type in the pairing code</string>
+    <string name="expert_mode_setup_notification_pairing_code_not_interactive_text">Tap \"Pair device with pairing code\"</string>
+
     <string name="expert_mode_setup_notification_start_system_bridge_failed_title">Starting Expert Mode failed</string>
     <string name="expert_mode_setup_notification_start_system_bridge_failed_text">Tap to set up again. Try ADB pairing and rebooting your phone if it repeatedly fails.</string>