Develop - shut up bug fix, translations

app/build.gradle.kts

@@ -29,8 +29,8 @@ android {
         applicationId = "com.sameerasw.essentials"
         minSdk = 26
         targetSdk = 37
-        versionCode = 45
-        versionName = "15.1"
+        versionCode = 46
+        versionName = "15.2"
 
         val whatsNewCounter = 2
         buildConfigField("int", "WHATS_NEW_COUNTER", whatsNewCounter.toString())

app/src/main/java/com/sameerasw/essentials/ShutUpShortcutActivity.kt

@@ -1,8 +1,10 @@
 package com.sameerasw.essentials
 
+import android.content.ContentResolver
 import android.content.Intent
 import android.os.Bundle
 import android.provider.Settings
+import android.util.Log
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -139,15 +141,15 @@ class ShutUpShortcutActivity : ComponentActivity() {
                 )
 
                 secureSettings.forEach { key ->
-                    Settings.Secure.getString(contentResolver, key)
+                    safeReadSetting(contentResolver, SettingsTable.SECURE, key)
                         ?.let { originalSettings["secure:$key"] = it }
                 }
                 systemSettings.forEach { key ->
-                    Settings.System.getString(contentResolver, key)
+                    safeReadSetting(contentResolver, SettingsTable.SYSTEM, key)
                         ?.let { originalSettings["system:$key"] = it }
                 }
                 globalSettings.forEach { key ->
-                    Settings.Global.getString(contentResolver, key)
+                    safeReadSetting(contentResolver, SettingsTable.GLOBAL, key)
                         ?.let { originalSettings["global:$key"] = it }
                 }
 
@@ -163,7 +165,8 @@ class ShutUpShortcutActivity : ComponentActivity() {
             // as some apps check this specific setting directly.
             if (config.disableUsbDebugging) {
                 val current =
-                    Settings.Global.getString(contentResolver, Settings.Global.ADB_ENABLED) ?: "0"
+                    safeReadSetting(contentResolver, SettingsTable.GLOBAL, Settings.Global.ADB_ENABLED)
+                        ?: "0"
                 if (current == "1") {
                     if (!originalSettings.containsKey("global:${Settings.Global.ADB_ENABLED}")) {
                         originalSettings["global:${Settings.Global.ADB_ENABLED}"] = "1"
@@ -173,7 +176,8 @@ class ShutUpShortcutActivity : ComponentActivity() {
             }
 
             if (config.disableWirelessDebugging) {
-                val current = Settings.Global.getString(contentResolver, "adb_wifi_enabled") ?: "0"
+                val current =
+                    safeReadSetting(contentResolver, SettingsTable.GLOBAL, "adb_wifi_enabled") ?: "0"
                 if (current == "1") {
                     if (!originalSettings.containsKey("global:adb_wifi_enabled")) {
                         originalSettings["global:adb_wifi_enabled"] = "1"
@@ -183,8 +187,9 @@ class ShutUpShortcutActivity : ComponentActivity() {
             }
 
             if (config.disableAccessibility) {
-                val current = Settings.Secure.getString(
+                val current = safeReadSetting(
                     contentResolver,
+                    SettingsTable.SECURE,
                     Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES
                 )
                 if (!current.isNullOrEmpty()) {
@@ -204,6 +209,25 @@ class ShutUpShortcutActivity : ComponentActivity() {
         }
     }
 
+    private enum class SettingsTable { SYSTEM, SECURE, GLOBAL }
+
+    // Android 12+ throws SecurityException reading @hide settings that aren't
+    // @Readable (e.g. show_key_presses). WRITE_SECURE_SETTINGS doesn't cover reads.
+    private fun safeReadSetting(
+        resolver: ContentResolver,
+        table: SettingsTable,
+        key: String
+    ): String? = try {
+        when (table) {
+            SettingsTable.SYSTEM -> Settings.System.getString(resolver, key)
+            SettingsTable.SECURE -> Settings.Secure.getString(resolver, key)
+            SettingsTable.GLOBAL -> Settings.Global.getString(resolver, key)
+        }
+    } catch (e: SecurityException) {
+        Log.w("ShutUpShortcut", "Skipping unreadable setting $table:$key", e)
+        null
+    }
+
     private fun launchApp(packageName: String) {
         val intent = packageManager.getLaunchIntentForPackage(packageName)
         if (intent != null) {

app/src/main/res/values-ach-rUG/strings.xml

@@ -389,6 +389,12 @@
     <!-- Features -->
     <string name="feat_screen_off_widget_title">Gin ma ki lwongo ni screen off widget</string>
     <string name="feat_screen_off_widget_desc">Gin ma pe nen me juku gin ma ki neno ni</string>
+    <string name="screen_off_method_title">Screen Off Method</string>
+    <string name="screen_off_method_accessibility">Accessibility</string>
+    <string name="screen_off_method_input">Input</string>
+    <string name="screen_off_widget_input_permission_id">Screen off widget - Input</string>
+    <string name="require_double_tap_title">Require double tap</string>
+    <string name="require_double_tap_desc">To screen off</string>
     <string name="feat_statusbar_icons_title">cal me Statusbar</string>
     <string name="feat_statusbar_icons_desc">Gwoko kit ma lanyut me statusbar nen kwede</string>
     <string name="feat_caffeinate_title">Caffeinete</string>

app/src/main/res/values-af-rZA/strings.xml

@@ -389,6 +389,12 @@
     <!-- Features -->
     <string name="feat_screen_off_widget_title">Skerm af widget</string>
     <string name="feat_screen_off_widget_desc">Onsigbare legstuk om die skerm af te skakel</string>
+    <string name="screen_off_method_title">Screen Off Method</string>
+    <string name="screen_off_method_accessibility">Accessibility</string>
+    <string name="screen_off_method_input">Input</string>
+    <string name="screen_off_widget_input_permission_id">Screen off widget - Input</string>
+    <string name="require_double_tap_title">Require double tap</string>
+    <string name="require_double_tap_desc">To screen off</string>
     <string name="feat_statusbar_icons_title">Statusbalk ikone</string>
     <string name="feat_statusbar_icons_desc">Beheer statusbalk ikone sigbaarheid</string>
     <string name="feat_caffeinate_title">Kafeïen</string>

app/src/main/res/values-ar-rSA/strings.xml

@@ -389,6 +389,12 @@
     <!-- Features -->
     <string name="feat_screen_off_widget_title">القطعة خارج الشاشة</string>
     <string name="feat_screen_off_widget_desc">القطعة غير مرئية لإيقاف الشاشة</string>
+    <string name="screen_off_method_title">Screen Off Method</string>
+    <string name="screen_off_method_accessibility">Accessibility</string>
+    <string name="screen_off_method_input">Input</string>
+    <string name="screen_off_widget_input_permission_id">Screen off widget - Input</string>
+    <string name="require_double_tap_title">Require double tap</string>
+    <string name="require_double_tap_desc">To screen off</string>
     <string name="feat_statusbar_icons_title">أيقونات شريط الحالة</string>
     <string name="feat_statusbar_icons_desc">التحكم في رؤية أيقونات شريط الحالة</string>
     <string name="feat_caffeinate_title">الكافيين</string>

app/src/main/res/values-ca-rES/strings.xml

@@ -389,6 +389,12 @@
     <!-- Features -->
     <string name="feat_screen_off_widget_title">Giny apagat de la pantalla</string>
     <string name="feat_screen_off_widget_desc">Giny invisible per apagar la pantalla</string>
+    <string name="screen_off_method_title">Screen Off Method</string>
+    <string name="screen_off_method_accessibility">Accessibility</string>
+    <string name="screen_off_method_input">Input</string>
+    <string name="screen_off_widget_input_permission_id">Screen off widget - Input</string>
+    <string name="require_double_tap_title">Require double tap</string>
+    <string name="require_double_tap_desc">To screen off</string>
     <string name="feat_statusbar_icons_title">Icones de la barra d\'estat</string>
     <string name="feat_statusbar_icons_desc">Controla la visibilitat de les icones de la barra d\'estat</string>
     <string name="feat_caffeinate_title">Cafeïna</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -389,6 +389,12 @@
     <!-- Features -->
     <string name="feat_screen_off_widget_title">Widget pro vypnutí obrazovky</string>
     <string name="feat_screen_off_widget_desc">Neviditelný widget pro vypnutí obrazovky</string>
+    <string name="screen_off_method_title">Screen Off Method</string>
+    <string name="screen_off_method_accessibility">Accessibility</string>
+    <string name="screen_off_method_input">Input</string>
+    <string name="screen_off_widget_input_permission_id">Screen off widget - Input</string>
+    <string name="require_double_tap_title">Require double tap</string>
+    <string name="require_double_tap_desc">To screen off</string>
     <string name="feat_statusbar_icons_title">Ikony stavového řádku</string>
     <string name="feat_statusbar_icons_desc">Ovládejte viditelnost ikon stavového řádku</string>
     <string name="feat_caffeinate_title">kofeinát</string>

app/src/main/res/values-da-rDK/strings.xml

@@ -389,6 +389,12 @@
     <!-- Features -->
     <string name="feat_screen_off_widget_title">Skærm off widget</string>
     <string name="feat_screen_off_widget_desc">Usynlig widget til at slukke for skærmen</string>
+    <string name="screen_off_method_title">Screen Off Method</string>
+    <string name="screen_off_method_accessibility">Accessibility</string>
+    <string name="screen_off_method_input">Input</string>
+    <string name="screen_off_widget_input_permission_id">Screen off widget - Input</string>
+    <string name="require_double_tap_title">Require double tap</string>
+    <string name="require_double_tap_desc">To screen off</string>
     <string name="feat_statusbar_icons_title">Statuslinjeikoner</string>
     <string name="feat_statusbar_icons_desc">Styr statuslinjeikoners synlighed</string>
     <string name="feat_caffeinate_title">Koffeinat</string>