Merge pull request #1891 from keymapperorg/develop

Version 4.0.0 Beta 2

Author: sds100

CHANGELOG.md

@@ -1,6 +1,20 @@
+## [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)
 
-#### TO BE RELEASED
+#### 01 November 2025
 
 ## Added
 

app/proguard-rules.pro

@@ -75,6 +75,8 @@
 -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 { *; }
 
 -keepattributes *Annotation*, InnerClasses
 -dontnote kotlinx.serialization.AnnotationsKt # core serialization annotations

app/version.properties

@@ -1,3 +1,3 @@
-VERSION_NAME=4.0.0-beta.1
-VERSION_CODE=185
+VERSION_NAME=4.0.0-beta.2
+VERSION_CODE=187
 VERSION_NUM=01

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

@@ -1,5 +1,5 @@
 ✨ 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

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

@@ -201,9 +201,10 @@ 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 onDestroy() {

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

@@ -3,7 +3,6 @@ package io.github.sds100.keymapper.base.actions.swipescreen
 import android.accessibilityservice.GestureDescription
 import android.graphics.Bitmap
 import android.graphics.Point
-import android.os.Build
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -96,9 +95,7 @@ class SwipePickDisplayCoordinateViewModel @Inject constructor(
 
         var maxFingerCount = 10
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            maxFingerCount = GestureDescription.getMaxStrokeCount()
-        }
+        maxFingerCount = GestureDescription.getMaxStrokeCount()
 
         if (count > maxFingerCount) {
             return@map resourceProvider.getString(

base/src/main/java/io/github/sds100/keymapper/base/home/KeyMapListScreen.kt

@@ -506,6 +506,9 @@ private fun getTriggerErrorMessage(error: TriggerError): String {
         TriggerError.EVDEV_DEVICE_NOT_FOUND -> stringResource(
             R.string.trigger_error_evdev_device_not_found,
         )
+        TriggerError.MIGRATE_SCREEN_OFF_TRIGGER -> stringResource(
+            R.string.trigger_error_migrate_screen_off_key_map,
+        )
     }
 }
 

base/src/main/java/io/github/sds100/keymapper/base/input/EvdevHandleCache.kt

@@ -55,10 +55,10 @@ class EvdevHandleCache @Inject constructor(
                 devicesAdapter.connectedInputDevices,
                 systemBridgeConnectionManager.connectionState,
             ) { _, connectionState ->
-                if (connectionState !is SystemBridgeConnectionState.Connected) {
-                    devicesByPath.value = emptyMap()
-                } else {
+                if (connectionState is SystemBridgeConnectionState.Connected) {
                     invalidate()
+                } else {
+                    devicesByPath.value = emptyMap()
                 }
             }.collect()
         }

base/src/main/java/io/github/sds100/keymapper/base/input/InputEventHub.kt

@@ -21,6 +21,7 @@ import io.github.sds100.keymapper.sysbridge.IEvdevCallback
 import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionManager
 import io.github.sds100.keymapper.sysbridge.manager.SystemBridgeConnectionState
 import io.github.sds100.keymapper.sysbridge.manager.isConnected
+import io.github.sds100.keymapper.sysbridge.utils.SystemBridgeError
 import io.github.sds100.keymapper.system.inputevents.KMEvdevEvent
 import io.github.sds100.keymapper.system.inputevents.KMGamePadEvent
 import io.github.sds100.keymapper.system.inputevents.KMInputEvent
@@ -304,8 +305,11 @@ class InputEventHubImpl @Inject constructor(
             .onSuccess { result ->
                 Timber.i("Grabbed evdev devices [${evdevDevices.joinToString { it.name }}]")
             }
-            .onFailure {
-                Timber.e("Failed to grab evdev devices.")
+            .onFailure { error ->
+                // Do not log if it is expected to prevent log spam.
+                if (error !is SystemBridgeError.Disconnected) {
+                    Timber.e("Failed to grab evdev devices.")
+                }
             }
     }