Merge branch 'develop' into copilot/add-key-map-constraint

Author: sds100

CHANGELOG.md

@@ -1,3 +1,26 @@
+## [4.0.0 Beta 3](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.03)
+
+#### TO BE RELEASED
+
+## Added
+- #1871 action to modify any system settings
+- #1221 action to show a custom notification
+- #1491 action to toggle/enable/disable hotspot
+
+## [4.0.0 Beta 2](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.02)
+
+#### 08 November 2025
+
+## Added
+
+- #1890 add button to save log to file and share it. The clipboard button now cuts off older entries and keeps newest ones.
+
+## Fixed
+
+- Only autostart PRO mode with Shizuku if Shizuku permission is granted. Otherwise fallback to method with Wireless Debugging and WRITE_SECURE_SETTINGS permission.
+- Starting system bridge for the first time would be janky because granting READ_LOGS kills the app process. Only grant for READ_LOGS when sharing logcat from settings.
+- #1886 mobile data actions work in PRO mode.
+
 ## [4.0.0 Beta 1](https://github.com/sds100/KeyMapper/releases/tag/v4.0.0-beta.01)
 
 #### 01 November 2025

app/proguard-rules.pro

@@ -75,6 +75,11 @@
 -keep class io.github.sds100.keymapper.api.IKeyEventRelayService$Stub { *; }
 -keep class io.github.sds100.keymapper.api.IKeyEventRelayServiceCallback { *; }
 -keep class io.github.sds100.keymapper.api.IKeyEventRelayServiceCallback$Stub { *; }
+-keep class com.android.internal.telephony.ITelephony { *; }
+-keep class com.android.internal.telephony.ITelephony$Stub { *; }
+-keep class android.net.ITetheringConnector { *; }
+-keep class android.net.ITetheringConnector$Stub { *; }
+-keep class android.net.* { *; }
 
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations

app/version.properties

@@ -1,3 +1,3 @@
-VERSION_NAME=4.0.0-beta.2
-VERSION_CODE=186
+VERSION_NAME=4.0.0-beta.3
+VERSION_CODE=191
 VERSION_NUM=01

base/src/main/assets/whats-new.txt

@@ -1,11 +1,14 @@
 ✨ Screen-off remapping
-You can now remap buttons when the screen is off (including the power button) for free with PRO mode.
+You can now remap ALL buttons when the screen is off (including the power button) for free with PRO mode.
 
 🎯 New Actions
 • Run shell commands
 • Send SMS messages
 • Force stop current app or clear from recents
 • Mute/unmute microphone
+• Modify any system setting
+• Show a custom notification
+• Toggle hotspot
 
 🆕 New Features
 • Redesigned Settings screen

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

@@ -29,6 +29,7 @@ import io.github.sds100.keymapper.data.repositories.LogRepository
 import io.github.sds100.keymapper.data.repositories.PreferenceRepositoryImpl
 import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionManagerImpl
 import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionState
+import io.github.sds100.keymapper.sysbridge.manager.isConnected
 import io.github.sds100.keymapper.system.apps.AndroidPackageManagerAdapter
 import io.github.sds100.keymapper.system.devices.AndroidDevicesAdapter
 import io.github.sds100.keymapper.system.inputmethod.KeyEventRelayServiceWrapperImpl
@@ -224,6 +225,12 @@ abstract class BaseKeyMapperApp : MultiDexApplication() {
         autoGrantPermissionController.start()
         keyEventRelayServiceWrapper.bind()
 
+        if (systemBridgeConnectionManager.isConnected()) {
+            Timber.i("KeyMapperApp: System bridge is connected")
+        } else {
+            Timber.i("KeyMapperApp: System bridge is disconnected")
+        }
+
         if (Build.VERSION.SDK_INT >= Constants.SYSTEM_BRIDGE_MIN_API) {
             systemBridgeAutoStarter.init()
 

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

@@ -21,17 +21,17 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.withStateAtLeast
-import androidx.navigation.findNavController
 import com.anggrayudi.storage.extension.openInputStream
 import com.anggrayudi.storage.extension.openOutputStream
 import com.anggrayudi.storage.extension.toDocumentFile
 import io.github.sds100.keymapper.base.compose.ComposeColors
 import io.github.sds100.keymapper.base.input.InputEventDetectionSource
 import io.github.sds100.keymapper.base.input.InputEventHubImpl
+import io.github.sds100.keymapper.base.keymaps.ConfigKeyMapStateImpl
 import io.github.sds100.keymapper.base.onboarding.OnboardingUseCase
 import io.github.sds100.keymapper.base.system.accessibility.AccessibilityServiceAdapterImpl
 import io.github.sds100.keymapper.base.system.permissions.RequestPermissionDelegate
-import io.github.sds100.keymapper.base.trigger.RecordTriggerControllerImpl
+import io.github.sds100.keymapper.base.utils.navigation.NavigationProvider
 import io.github.sds100.keymapper.base.utils.ui.ResourceProviderImpl
 import io.github.sds100.keymapper.common.BuildConfigProvider
 import io.github.sds100.keymapper.sysbridge.service.SystemBridgeSetupControllerImpl
@@ -56,9 +56,6 @@ abstract class BaseMainActivity : AppCompatActivity() {
         const val ACTION_SHOW_ACCESSIBILITY_SETTINGS_NOT_FOUND_DIALOG =
             "${BuildConfig.LIBRARY_PACKAGE_NAME}.ACTION_SHOW_ACCESSIBILITY_SETTINGS_NOT_FOUND_DIALOG"
 
-        const val ACTION_USE_FLOATING_BUTTONS =
-            "${BuildConfig.LIBRARY_PACKAGE_NAME}.ACTION_USE_FLOATING_BUTTONS"
-
         const val ACTION_SAVE_FILE = "${BuildConfig.LIBRARY_PACKAGE_NAME}.ACTION_SAVE_FILE"
         const val EXTRA_FILE_URI = "${BuildConfig.LIBRARY_PACKAGE_NAME}.EXTRA_FILE_URI"
 
@@ -78,9 +75,6 @@ abstract class BaseMainActivity : AppCompatActivity() {
     @Inject
     lateinit var onboardingUseCase: OnboardingUseCase
 
-    @Inject
-    lateinit var recordTriggerController: RecordTriggerControllerImpl
-
     @Inject
     lateinit var notificationReceiverAdapter: NotificationReceiverAdapterImpl
 
@@ -105,6 +99,12 @@ abstract class BaseMainActivity : AppCompatActivity() {
     @Inject
     lateinit var inputEventHub: InputEventHubImpl
 
+    @Inject
+    lateinit var navigationProvider: NavigationProvider
+
+    @Inject
+    lateinit var configKeyMapState: ConfigKeyMapStateImpl
+
     private lateinit var requestPermissionDelegate: RequestPermissionDelegate
 
     private val currentNightMode: Int
@@ -155,22 +155,23 @@ abstract class BaseMainActivity : AppCompatActivity() {
         )
         super.onCreate(savedInstanceState)
 
+        savedInstanceState?.let { configKeyMapState.restoreState(it) }
+
         requestPermissionDelegate = RequestPermissionDelegate(
             this,
             showDialogs = true,
             permissionAdapter,
             notificationReceiverAdapter = notificationReceiverAdapter,
             buildConfigProvider = buildConfigProvider,
             shizukuAdapter = shizukuAdapter,
+            navigationProvider = navigationProvider,
+            coroutineScope = lifecycleScope,
         )
 
         permissionAdapter.request
             .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
             .onEach { permission ->
-                requestPermissionDelegate.requestPermission(
-                    permission,
-                    findNavController(R.id.container),
-                )
+                requestPermissionDelegate.requestPermission(permission)
             }
             .launchIn(lifecycleScope)
 
@@ -201,9 +202,16 @@ abstract class BaseMainActivity : AppCompatActivity() {
         // the activities have not necessarily resumed at that point.
         permissionAdapter.onPermissionsChanged()
         serviceAdapter.invalidateState()
-        suAdapter.invalidateIsRooted()
+        suAdapter.requestPermission()
         systemBridgeSetupController.invalidateSettings()
         networkAdapter.invalidateState()
+        onboardingUseCase.handledMigrateScreenOffKeyMapsNotification()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        configKeyMapState.saveState(outState)
+
+        super.onSaveInstanceState(outState)
     }
 
     override fun onDestroy() {

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

@@ -18,6 +18,7 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import io.github.sds100.keymapper.base.actions.ChooseActionScreen
 import io.github.sds100.keymapper.base.actions.ChooseActionViewModel
+import io.github.sds100.keymapper.base.actions.ChooseSettingScreen
 import io.github.sds100.keymapper.base.actions.ConfigShellCommandViewModel
 import io.github.sds100.keymapper.base.actions.ShellCommandActionScreen
 import io.github.sds100.keymapper.base.actions.uielement.InteractUiElementScreen
@@ -164,6 +165,13 @@ fun BaseMainNavHost(
             )
         }
 
+        composable<NavDestination.ChooseSetting> {
+            ChooseSettingScreen(
+                modifier = Modifier.fillMaxSize(),
+                viewModel = hiltViewModel(),
+            )
+        }
+
         composableDestinations()
     }
 }

base/src/main/java/io/github/sds100/keymapper/base/actions/ActionData.kt

@@ -667,6 +667,24 @@ sealed class ActionData : Comparable<ActionData> {
         }
     }
 
+    @Serializable
+    sealed class Hotspot : ActionData() {
+        @Serializable
+        data object Enable : Hotspot() {
+            override val id = ActionId.ENABLE_HOTSPOT
+        }
+
+        @Serializable
+        data object Disable : Hotspot() {
+            override val id = ActionId.DISABLE_HOTSPOT
+        }
+
+        @Serializable
+        data object Toggle : Hotspot() {
+            override val id = ActionId.TOGGLE_HOTSPOT
+        }
+    }
+
     @Serializable
     sealed class Brightness : ActionData() {
         @Serializable
@@ -871,6 +889,17 @@ sealed class ActionData : Comparable<ActionData> {
         override val id: ActionId = ActionId.DISMISS_ALL_NOTIFICATIONS
     }
 
+    @Serializable
+    data class CreateNotification(val title: String, val text: String, val timeoutMs: Long?) :
+        ActionData() {
+        override val id: ActionId = ActionId.CREATE_NOTIFICATION
+
+        override fun compareTo(other: ActionData) = when (other) {
+            is CreateNotification -> title.compareTo(other.title)
+            else -> super.compareTo(other)
+        }
+    }
+
     @Serializable
     data object AnswerCall : ActionData() {
         override val id: ActionId = ActionId.ANSWER_PHONE_CALL
@@ -949,4 +978,24 @@ sealed class ActionData : Comparable<ActionData> {
     data object ClearRecentApp : ActionData() {
         override val id: ActionId = ActionId.CLEAR_RECENT_APP
     }
+
+    @Serializable
+    data class ModifySetting(
+        val settingType: io.github.sds100.keymapper.system.settings.SettingType,
+        val settingKey: String,
+        val value: String,
+    ) : ActionData() {
+        override val id: ActionId = ActionId.MODIFY_SETTING
+
+        override fun compareTo(other: ActionData) = when (other) {
+            is ModifySetting -> compareValuesBy(
+                this,
+                other,
+                { it.settingType },
+                { it.settingKey },
+                { it.value },
+            )
+            else -> super.compareTo(other)
+        }
+    }
 }