Merge branch 'copilot/add-toggle-hotspot-action' into develop

Author: sds100

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## 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)
 

app/proguard-rules.pro

@@ -77,6 +77,9 @@
 -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

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

@@ -8,6 +8,7 @@ You can now remap ALL buttons when the screen is off (including the power button
 • 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/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

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

@@ -488,6 +488,10 @@ object ActionDataEntityMapper {
             ActionId.ENABLE_MOBILE_DATA -> ActionData.MobileData.Enable
             ActionId.DISABLE_MOBILE_DATA -> ActionData.MobileData.Disable
 
+            ActionId.TOGGLE_HOTSPOT -> ActionData.Hotspot.Toggle
+            ActionId.ENABLE_HOTSPOT -> ActionData.Hotspot.Enable
+            ActionId.DISABLE_HOTSPOT -> ActionData.Hotspot.Disable
+
             ActionId.TOGGLE_AUTO_BRIGHTNESS -> ActionData.Brightness.ToggleAuto
             ActionId.DISABLE_AUTO_BRIGHTNESS -> ActionData.Brightness.DisableAuto
             ActionId.ENABLE_AUTO_BRIGHTNESS -> ActionData.Brightness.EnableAuto
@@ -1224,6 +1228,10 @@ object ActionDataEntityMapper {
         ActionId.ENABLE_MOBILE_DATA to "enable_mobile_data",
         ActionId.DISABLE_MOBILE_DATA to "disable_mobile_data",
 
+        ActionId.TOGGLE_HOTSPOT to "toggle_hotspot",
+        ActionId.ENABLE_HOTSPOT to "enable_hotspot",
+        ActionId.DISABLE_HOTSPOT to "disable_hotspot",
+
         ActionId.TOGGLE_AUTO_BRIGHTNESS to "toggle_auto_brightness",
         ActionId.DISABLE_AUTO_BRIGHTNESS to "disable_auto_brightness",
         ActionId.ENABLE_AUTO_BRIGHTNESS to "enable_auto_brightness",

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

@@ -28,6 +28,10 @@ enum class ActionId {
     ENABLE_MOBILE_DATA,
     DISABLE_MOBILE_DATA,
 
+    TOGGLE_HOTSPOT,
+    ENABLE_HOTSPOT,
+    DISABLE_HOTSPOT,
+
     TOGGLE_AUTO_BRIGHTNESS,
     DISABLE_AUTO_BRIGHTNESS,
     ENABLE_AUTO_BRIGHTNESS,

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

@@ -507,6 +507,10 @@ class ActionUiHelper(
         ActionData.MobileData.Enable -> getString(R.string.action_enable_mobile_data)
         ActionData.MobileData.Toggle -> getString(R.string.action_toggle_mobile_data)
 
+        ActionData.Hotspot.Disable -> getString(R.string.action_disable_hotspot)
+        ActionData.Hotspot.Enable -> getString(R.string.action_enable_hotspot)
+        ActionData.Hotspot.Toggle -> getString(R.string.action_toggle_hotspot)
+
         is ActionData.MoveCursor -> {
             when (action.direction) {
                 ActionData.MoveCursor.Direction.START -> {

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

@@ -67,6 +67,8 @@ import androidx.compose.material.icons.outlined.Swipe
 import androidx.compose.material.icons.outlined.TouchApp
 import androidx.compose.material.icons.outlined.VerticalSplit
 import androidx.compose.material.icons.outlined.ViewArray
+import androidx.compose.material.icons.outlined.WifiTethering
+import androidx.compose.material.icons.outlined.WifiTetheringOff
 import androidx.compose.material.icons.rounded.Abc
 import androidx.compose.material.icons.rounded.Android
 import androidx.compose.material.icons.rounded.Bluetooth
@@ -143,6 +145,10 @@ object ActionUtils {
         ActionId.ENABLE_MOBILE_DATA -> ActionCategory.CONNECTIVITY
         ActionId.DISABLE_MOBILE_DATA -> ActionCategory.CONNECTIVITY
 
+        ActionId.TOGGLE_HOTSPOT -> ActionCategory.CONNECTIVITY
+        ActionId.ENABLE_HOTSPOT -> ActionCategory.CONNECTIVITY
+        ActionId.DISABLE_HOTSPOT -> ActionCategory.CONNECTIVITY
+
         ActionId.TOGGLE_AUTO_BRIGHTNESS -> ActionCategory.DISPLAY
         ActionId.DISABLE_AUTO_BRIGHTNESS -> ActionCategory.DISPLAY
         ActionId.ENABLE_AUTO_BRIGHTNESS -> ActionCategory.DISPLAY
@@ -388,6 +394,9 @@ object ActionUtils {
         ActionId.CLEAR_RECENT_APP -> R.string.action_clear_recent_app
 
         ActionId.MODIFY_SETTING -> R.string.action_modify_setting
+        ActionId.TOGGLE_HOTSPOT -> R.string.action_toggle_hotspot
+        ActionId.ENABLE_HOTSPOT -> R.string.action_enable_hotspot
+        ActionId.DISABLE_HOTSPOT -> R.string.action_disable_hotspot
     }
 
     @DrawableRes
@@ -555,6 +564,13 @@ object ActionUtils {
         ActionId.SHOW_POWER_MENU -> Build.VERSION_CODES.LOLLIPOP
         ActionId.DEVICE_CONTROLS -> Build.VERSION_CODES.S
 
+        // It could be supported on older versions but system bridge min API is Q and its extra
+        // maintenance effort to support the older tethering system API.
+        ActionId.TOGGLE_HOTSPOT,
+        ActionId.ENABLE_HOTSPOT,
+        ActionId.DISABLE_HOTSPOT,
+            -> Build.VERSION_CODES.R
+
         else -> Constants.MIN_API
     }
 
@@ -620,6 +636,11 @@ object ActionUtils {
             ActionId.DISABLE_MOBILE_DATA,
                 -> true
 
+            ActionId.TOGGLE_HOTSPOT,
+            ActionId.ENABLE_HOTSPOT,
+            ActionId.DISABLE_HOTSPOT,
+                -> true
+
             ActionId.ENABLE_NFC,
             ActionId.DISABLE_NFC,
             ActionId.TOGGLE_NFC,
@@ -904,6 +925,9 @@ object ActionUtils {
         ActionId.CLEAR_RECENT_APP -> Icons.Outlined.VerticalSplit
 
         ActionId.MODIFY_SETTING -> Icons.Outlined.Settings
+        ActionId.TOGGLE_HOTSPOT -> Icons.Outlined.WifiTethering
+        ActionId.ENABLE_HOTSPOT -> Icons.Outlined.WifiTethering
+        ActionId.DISABLE_HOTSPOT -> Icons.Outlined.WifiTetheringOff
     }
 }
 

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

@@ -975,6 +975,10 @@ class CreateActionDelegate(
             ActionId.ENABLE_MOBILE_DATA -> return ActionData.MobileData.Enable
             ActionId.DISABLE_MOBILE_DATA -> return ActionData.MobileData.Disable
 
+            ActionId.TOGGLE_HOTSPOT -> return ActionData.Hotspot.Toggle
+            ActionId.ENABLE_HOTSPOT -> return ActionData.Hotspot.Enable
+            ActionId.DISABLE_HOTSPOT -> return ActionData.Hotspot.Disable
+
             ActionId.TOGGLE_AUTO_BRIGHTNESS -> return ActionData.Brightness.ToggleAuto
             ActionId.DISABLE_AUTO_BRIGHTNESS -> return ActionData.Brightness.DisableAuto
             ActionId.ENABLE_AUTO_BRIGHTNESS -> return ActionData.Brightness.EnableAuto

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

@@ -483,6 +483,28 @@ class PerformActionsUseCaseImpl @AssistedInject constructor(
                 result = networkAdapter.disableMobileData()
             }
 
+            is ActionData.Hotspot.Toggle -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    result = networkAdapter.isHotspotEnabled().then { isEnabled ->
+                        if (isEnabled) {
+                            networkAdapter.disableHotspot()
+                        } else {
+                            networkAdapter.enableHotspot()
+                        }
+                    }
+                } else {
+                    result = SdkVersionTooLow(minSdk = Build.VERSION_CODES.R)
+                }
+            }
+
+            is ActionData.Hotspot.Enable -> {
+                result = networkAdapter.enableHotspot()
+            }
+
+            is ActionData.Hotspot.Disable -> {
+                result = networkAdapter.disableHotspot()
+            }
+
             is ActionData.Brightness.ToggleAuto -> {
                 result = if (displayAdapter.isAutoBrightnessEnabled()) {
                     displayAdapter.disableAutoBrightness()