Skip to content

Commit 1e38f70

Browse files
committed
fix: do not check for FEATURE_TELEPHONY_SMS or FEATURE_TELEPHONY_DATA because a emulator (and other devices?) may report it being unavailable even though it is
1 parent e1d3582 commit 1e38f70

1 file changed

Lines changed: 7 additions & 21 deletions

File tree

  • base/src/main/java/io/github/sds100/keymapper/base/actions

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

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -554,32 +554,18 @@ object ActionUtils {
554554
ActionId.END_PHONE_CALL,
555555
ActionId.ANSWER_PHONE_CALL,
556556
ActionId.PHONE_CALL,
557-
-> listOf(PackageManager.FEATURE_TELEPHONY)
558-
559557
ActionId.SEND_SMS,
560558
ActionId.COMPOSE_SMS,
561-
-> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
562-
listOf(PackageManager.FEATURE_TELEPHONY_MESSAGING)
563-
} else {
564-
listOf(PackageManager.FEATURE_TELEPHONY)
565-
}
566-
567-
ActionId.SECURE_LOCK_DEVICE,
568-
-> listOf(PackageManager.FEATURE_DEVICE_ADMIN)
569-
570-
ActionId.TOGGLE_WIFI,
571-
ActionId.ENABLE_WIFI,
572-
ActionId.DISABLE_WIFI,
573-
-> listOf(PackageManager.FEATURE_WIFI)
574-
575559
ActionId.TOGGLE_MOBILE_DATA,
576560
ActionId.ENABLE_MOBILE_DATA,
577561
ActionId.DISABLE_MOBILE_DATA,
578-
-> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
579-
listOf(PackageManager.FEATURE_TELEPHONY_DATA)
580-
} else {
581-
listOf(PackageManager.FEATURE_TELEPHONY)
582-
}
562+
// For some reason on API 34 emulator the system says it does not have
563+
// FEATURE_TELEPHONY_SMS even tho SMS works. So to prevent false negatives
564+
// check that the generic TELEPHONY feature exists.
565+
-> listOf(PackageManager.FEATURE_TELEPHONY)
566+
567+
ActionId.SECURE_LOCK_DEVICE,
568+
-> listOf(PackageManager.FEATURE_DEVICE_ADMIN)
583569

584570
ActionId.TOGGLE_NFC,
585571
ActionId.ENABLE_NFC,

0 commit comments

Comments
 (0)