Merge branch 'master' into refresh-after-switch

app-common/src/main/java/im/angry/openeuicc/util/PreferenceUtils.kt

@@ -26,12 +26,12 @@ internal object PreferenceKeys {
     val NOTIFICATION_SWITCH = booleanPreferencesKey("notification_switch")
 
     // ---- Advanced ----
-    val REFRESH_AFTER_SWITCH = booleanPreferencesKey("refresh_after_switch")
     val DISABLE_SAFEGUARD_REMOVABLE_ESIM = booleanPreferencesKey("disable_safeguard_removable_esim")
     val VERBOSE_LOGGING = booleanPreferencesKey("verbose_logging")
 
     // ---- Developer Options ----
     val DEVELOPER_OPTIONS_ENABLED = booleanPreferencesKey("developer_options_enabled")
+    val REFRESH_AFTER_SWITCH = booleanPreferencesKey("refresh_after_switch")
     val UNFILTERED_PROFILE_LIST = booleanPreferencesKey("unfiltered_profile_list")
     val IGNORE_TLS_CERTIFICATE = booleanPreferencesKey("ignore_tls_certificate")
     val EUICC_MEMORY_RESET = booleanPreferencesKey("euicc_memory_reset")

app-common/src/main/res/values/strings.xml

@@ -172,8 +172,6 @@
     <string name="pref_notifications_switch">Switching</string>
     <string name="pref_notifications_switch_desc">Send notifications for <i>switching</i> profiles\nNote that this type of notification is unreliable.</string>
     <string name="pref_advanced">Advanced</string>
-    <string name="pref_advanced_refresh_after_switch">Refresh status after switching</string>
-    <string name="pref_advanced_refresh_after_switch_desc">If crash after switch, Please trying disable the function</string>
     <string name="pref_advanced_disable_safeguard_removable_esim">Allow Disabling / Deleting Active Profile</string>
     <string name="pref_advanced_disable_safeguard_removable_esim_desc">By default, this app prevents you from disabling the active profile on a removable eSIM inserted in the device, because doing so may <i>sometimes</i> render it inaccessible.\nCheck this box to <i>remove</i> this safeguard.</string>
     <string name="pref_advanced_verbose_logging">Verbose Logging</string>
@@ -183,6 +181,8 @@
     <string name="pref_advanced_logs">Logs</string>
     <string name="pref_advanced_logs_desc">View recent debug logs of the application</string>
     <string name="pref_developer">Developer Options</string>
+    <string name="pref_developer_refresh_after_switch">Refresh status after switching</string>
+    <string name="pref_developer_refresh_after_switch_desc">If crash after switch, Please trying disable the function</string>
     <string name="pref_developer_unfiltered_profile_list">Show unfiltered profile list</string>
     <string name="pref_developer_unfiltered_profile_list_desc">Include non-production profiles in the list</string>
     <string name="pref_developer_ignore_tls_certificate">Ignore SM-DP+ TLS certificate</string>

app-common/src/main/res/xml/pref_settings.xml

@@ -60,8 +60,8 @@
         <CheckBoxPreference
             app:iconSpaceReserved="false"
             app:key="pref_developer_refresh_after_switch"
-            app:summary="@string/pref_advanced_refresh_after_switch_desc"
+            app:summary="@string/pref_developer_refresh_after_switch_desc"
-            app:title="@string/pref_advanced_refresh_after_switch" />
+            app:title="@string/pref_developer_refresh_after_switch" />
 
         <CheckBoxPreference
             app:iconSpaceReserved="false"