Fix a problem of Lock screen now

Remove unused string resource
BinTianqi · Aug 14, 2024 · 8c40a5a · 8c40a5a
1 parent 32f43ce
commit 8c40a5a
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 64 deletions.
diff --git a/app/src/main/java/com/bintianqi/owndroid/Receiver.kt b/app/src/main/java/com/bintianqi/owndroid/Receiver.kt
@@ -40,7 +40,6 @@ class Receiver : DeviceAdminReceiver() {
     override fun onDisabled(context: Context, intent: Intent) {
         super.onDisabled(context, intent)
         context.toggleInstallAppActivity()
-        backToHomeStateFlow.value = true
         Toast.makeText(context, R.string.onDisabled, Toast.LENGTH_SHORT).show()
     }
 

diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/ManagedProfile.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/ManagedProfile.kt
@@ -300,7 +300,7 @@ private fun DeleteWorkProfile() {
         Spacer(Modifier.padding(vertical = 5.dp))
         CheckBoxItem(R.string.wipe_external_storage, externalStorage, { externalStorage = it })
         if(VERSION.SDK_INT >= 28) { CheckBoxItem(R.string.wipe_euicc, euicc, { euicc = it }) }
-        if(VERSION.SDK_INT >= 29) { CheckBoxItem(R.string.wipe_silently, silent, { silent = it }) }
+        CheckBoxItem(R.string.wipe_silently, silent, { silent = it })
         AnimatedVisibility(!silent && VERSION.SDK_INT >= 28) {
             OutlinedTextField(
                 value = reason, onValueChange = { reason = it },
@@ -312,6 +312,7 @@ private fun DeleteWorkProfile() {
         Button(
             onClick = {
                 focusMgr.clearFocus()
+                silent = reason == ""
                 warning = true
             },
             colors = ButtonDefaults.buttonColors(containerColor = colorScheme.error, contentColor = colorScheme.onError),
@@ -337,7 +338,6 @@ private fun DeleteWorkProfile() {
                         var flag = 0
                         if(externalStorage) { flag += WIPE_EXTERNAL_STORAGE }
                         if(euicc && VERSION.SDK_INT >= 28) { flag += WIPE_EUICC }
-                        if(silent && VERSION.SDK_INT >= 29) { flag += WIPE_SILENTLY }
                         if(VERSION.SDK_INT >= 28 && !silent) {
                             dpm.wipeData(flag, reason)
                         } else {

diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt
@@ -289,15 +289,13 @@ private fun ProfileOwner() {
         Text(text = stringResource(R.string.profile_owner), style = typography.headlineLarge)
         Text(stringResource(if(profileOwner) R.string.activated else R.string.deactivated), style = typography.titleLarge)
         Spacer(Modifier.padding(vertical = 5.dp))
-        if(VERSION.SDK_INT >= 24) {
-            if(profileOwner) {
-                Button(
-                    onClick = { deactivateDialog = true },
-                    enabled = !dpm.isManagedProfile(receiver),
-                    colors = ButtonDefaults.buttonColors(containerColor = colorScheme.error, contentColor = colorScheme.onError)
-                ) {
-                    Text(stringResource(R.string.deactivate))
-                }
+        if(VERSION.SDK_INT >= 24 && profileOwner) {
+            Button(
+                onClick = { deactivateDialog = true },
+                enabled = !dpm.isManagedProfile(receiver),
+                colors = ButtonDefaults.buttonColors(containerColor = colorScheme.error, contentColor = colorScheme.onError)
+            ) {
+                Text(stringResource(R.string.deactivate))
             }
         }
     }

diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
@@ -246,6 +246,7 @@ private fun Switches() {
     val receiver = context.getReceiver()
     val deviceOwner = context.isDeviceOwner
     val profileOwner = context.isProfileOwner
+    val um = context.getSystemService(Context.USER_SERVICE) as UserManager
     Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(start = 20.dp, end = 16.dp)) {
         Spacer(Modifier.padding(vertical = 10.dp))
         if(deviceOwner || profileOwner) {
@@ -263,7 +264,7 @@ private fun Switches() {
                 { dpm.isStatusBarDisabled}, { dpm.setStatusBarDisabled(receiver,it) }, padding = false
             )
         }
-        if(deviceOwner || dpm.isOrgProfile(receiver)) {
+        if(deviceOwner || (VERSION.SDK_INT >= 23 && profileOwner && um.isSystemUser) || dpm.isOrgProfile(receiver)) {
             if(VERSION.SDK_INT >= 30) {
                 SwitchItem(R.string.auto_time, "", R.drawable.schedule_fill0,
                     { dpm.getAutoTimeEnabled(receiver) }, { dpm.setAutoTimeEnabled(receiver,it) }, padding = false
@@ -285,7 +286,7 @@ private fun Switches() {
                 { dpm.isBackupServiceEnabled(receiver) }, { dpm.setBackupServiceEnabled(receiver,it) }, padding = false
             )
         }
-        if(VERSION.SDK_INT >= 23 && (deviceOwner || profileOwner)) {
+        if(VERSION.SDK_INT >= 24 && profileOwner && dpm.isManagedProfile(receiver)) {
             SwitchItem(R.string.disable_bt_contact_share, "", R.drawable.account_circle_fill0,
                 { dpm.getBluetoothContactSharingDisabled(receiver) }, { dpm.setBluetoothContactSharingDisabled(receiver,it) }, padding = false
             )
@@ -323,42 +324,50 @@ private fun Keyguard() {
         Text(text = stringResource(R.string.keyguard), style = typography.headlineLarge)
         Spacer(Modifier.padding(vertical = 5.dp))
         if(VERSION.SDK_INT >= 23) {
-            Button(
-                onClick = {
-                    Toast.makeText(context, if(dpm.setKeyguardDisabled(receiver,true)) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
-                },
-                enabled = deviceOwner || (VERSION.SDK_INT >= 28 && profileOwner && dpm.isAffiliatedUser),
-                modifier = Modifier.fillMaxWidth()
-            ) {
-                Text(stringResource(R.string.disable))
-            }
-            Button(
-                onClick = {
-                    Toast.makeText(context, if(dpm.setKeyguardDisabled(receiver,false)) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
-                },
-                enabled = deviceOwner || (VERSION.SDK_INT >= 28 && profileOwner && dpm.isAffiliatedUser),
+            Row(
+                horizontalArrangement = Arrangement.SpaceBetween,
                 modifier = Modifier.fillMaxWidth()
             ) {
-                Text(stringResource(R.string.enable))
+                Button(
+                    onClick = {
+                        Toast.makeText(context, if(dpm.setKeyguardDisabled(receiver,true)) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
+                    },
+                    enabled = deviceOwner || (VERSION.SDK_INT >= 28 && profileOwner && dpm.isAffiliatedUser),
+                    modifier = Modifier.fillMaxWidth(0.49F)
+                ) {
+                    Text(stringResource(R.string.disable))
+                }
+                Button(
+                    onClick = {
+                        Toast.makeText(context, if(dpm.setKeyguardDisabled(receiver,false)) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
+                    },
+                    enabled = deviceOwner || (VERSION.SDK_INT >= 28 && profileOwner && dpm.isAffiliatedUser),
+                    modifier = Modifier.fillMaxWidth(0.96F)
+                ) {
+                    Text(stringResource(R.string.enable))
+                }
             }
-            Spacer(Modifier.padding(vertical = 3.dp))
-            Information{ Text(text = stringResource(R.string.require_no_password_to_disable)) }
-            Spacer(Modifier.padding(vertical = 8.dp))
+            Spacer(Modifier.padding(vertical = 15.dp))
         }
+        Text(text = stringResource(R.string.lock_now), style = typography.headlineLarge)
+        Spacer(Modifier.padding(vertical = 2.dp))
         var flag by remember { mutableIntStateOf(0) }
-        Button(
-            onClick = { dpm.lockNow() },
-            enabled = context.isDeviceAdmin,
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            Text(stringResource(R.string.lock_now))
-        }
-        if(VERSION.SDK_INT >= 26) {
+        if(VERSION.SDK_INT >= 26 && profileOwner && dpm.isManagedProfile(receiver)) {
             CheckBoxItem(
                 R.string.evict_credential_encryptoon_key,
                 flag == FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY,
                 { flag = if(flag==0) {1}else{0} }
             )
+            Spacer(Modifier.padding(vertical = 2.dp))
+        }
+        Button(
+            onClick = {
+                if(VERSION.SDK_INT >= 26) dpm.lockNow(flag) else dpm.lockNow()
+            },
+            enabled = context.isDeviceAdmin,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text(stringResource(R.string.lock_now))
         }
         Spacer(Modifier.padding(vertical = 30.dp))
     }
@@ -919,7 +928,7 @@ private fun CaCert() {
             Text(text = uriPath)
         }
         Text(
-            text = if(uriPath == "") { stringResource(R.string.please_select_ca_cert) } else { stringResource(R.string.cacert_installed, exist) },
+            text = if(uriPath == "") { stringResource(R.string.please_select_ca_cert) } else { stringResource(R.string.cert_installed, exist) },
             modifier = Modifier.animateContentSize()
         )
         Spacer(Modifier.padding(vertical = 5.dp))

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -48,7 +48,6 @@
     <string name="copy">Kopyala</string>
     <string name="file_not_exist">Dosya Mevcut Değil</string>
     <string name="io_exception">G/Ç Hatası</string>
-    <string name="current_status_is">Mevcut Durum: </string>
     <string name="start">Başlat</string>
     <string name="stop">Stop</string> <!--TODO-->
     <string name="allow_all">Tümünü İzin Ver</string>
@@ -135,7 +134,6 @@
     <string name="common_criteria_mode">Ortak kriter modu</string>
     <string name="usb_signal">USB sinyali</string>
     <string name="keyguard">Ekran kilidi</string>
-    <string name="require_no_password_to_disable">Ekran kilidini devre dışı bırakmak için parola ayarlanmamış olmalıdır</string>
     <string name="lock_now">Ekranı şimdi kilitle</string>
     <string name="evict_credential_encryptoon_key">Kimlik doğrulama şifreleme anahtarını çıkar</string>
     <string name="bug_report">Hata raporu</string>
@@ -175,11 +173,11 @@
     <string name="ltf_global_actions">Küresel eylemlere izin ver</string>
     <string name="ltf_keyguard">Ekran kilidine izin ver</string>
     <string name="ltf_block_activity_start_in_task">Görevde etkinlik başlatmayı engelle</string>
-    <string name="ca_cert">CA sertifikası</string>
-    <string name="please_select_ca_cert">Lütfen bir sertifika seçin</string>
-    <string name="cacert_installed">Yüklenen sertifika: %1$s</string>
-    <string name="select_ca_cert" tools:ignore="TypographyEllipsis">Sertifika seç...</string>
-    <string name="uninstall_all_user_ca_cert">Tüm kullanıcı sertifikalarını kaldır</string>
+    <string name="ca_cert">CA sertifikası</string> <!--TODO-->
+    <string name="please_select_ca_cert">Lütfen bir sertifika seçin</string> <!--TODO-->
+    <string name="cert_installed">Yüklenen sertifika: %1$s</string> <!--TODO-->
+    <string name="select_ca_cert" tools:ignore="TypographyEllipsis">Sertifika seç...</string> <!--TODO-->
+    <string name="uninstall_all_user_ca_cert">Tüm kullanıcı sertifikalarını kaldır</string> <!--TODO-->
     <string name="security_logs">Güvenlik kayıtları</string>
     <string name="pre_reboot_security_logs">Yeniden başlatmadan önce güvenlik kayıtları</string>
     <string name="wipe_data">Verileri sil</string>
@@ -303,7 +301,6 @@
     <string name="isapphidden_desc">Mevcut olmayan uygulamalar gizlidir</string>
     <string name="always_on_vpn">Her zaman açık VPN</string>
     <string name="enable_lockdown">Enable lockdown</string> <!--TODO-->
-    <string name="current_app_is">Current app: </string> <!--TODO-->
     <string name="clear_current_config">Clear current config</string> <!--TODO-->
     <string name="permission">İzin</string>
     <string name="scope_is_work_profile">Kapsam: iş profili</string>
@@ -468,7 +465,7 @@
     <string name="change_user_icon">Kullanıcı simgesini değiştir</string>
     <string name="pick_a_square_image">Kare bir resim seçmelisiniz</string>
     <string name="file_picker_instead_gallery">Galeri yerine dosya seçici kullan</string>
-    <string name="select_picture">Resim seç...</string>
+    <string name="select_picture" tools:ignore="TypographyEllipsis">Resim seç...</string>
     <string name="unknown_result">Bilinmeyen sonuç (başarısız olabilir)</string>
     <string name="fail_managed_profile">Başarısız: yönetilen profil</string>
     <string name="fail_current_user">Başarısız: mevcut kullanıcı</string>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -45,7 +45,6 @@
     <string name="copy">复制</string>
     <string name="file_not_exist">文件不存在</string>
     <string name="io_exception">IO异常</string>
-    <string name="current_status_is">当前状态：</string>
     <string name="start">开始</string>
     <string name="stop">停止</string>
     <string name="allow_all">允许全部</string>
@@ -130,7 +129,6 @@
     <string name="common_criteria_mode">通用标准模式</string>
     <string name="usb_signal">USB信号</string>
     <string name="keyguard">锁屏</string>
-    <string name="require_no_password_to_disable">禁用需要无密码</string>
     <string name="lock_now">立即锁屏</string>
     <string name="evict_credential_encryptoon_key">移除凭证加密密钥</string>
     <string name="bug_report">错误报告</string>
@@ -170,9 +168,9 @@
     <string name="ltf_block_activity_start_in_task">阻止启动未允许的应用</string>
     <string name="package_name">包名</string>
     <string name="not_exist">不存在</string>
-    <string name="ca_cert">Ca证书</string>
-    <string name="please_select_ca_cert">请选择Ca证书</string>
-    <string name="cacert_installed">证书已安装：%1$s</string>
+    <string name="ca_cert">CA证书</string>
+    <string name="please_select_ca_cert">请选择CA证书</string>
+    <string name="cert_installed">证书已安装：%1$s</string>
     <string name="select_ca_cert" tools:ignore="TypographyEllipsis">选择证书...</string>
     <string name="uninstall_all_user_ca_cert">卸载所有用户证书</string>
     <string name="security_logs">安全日志</string>
@@ -298,7 +296,6 @@
     <string name="isapphidden_desc">如果隐藏，有可能是没安装</string>
     <string name="always_on_vpn">VPN保持打开</string>
     <string name="enable_lockdown">启用锁定</string>
-    <string name="current_app_is">当前应用：</string>
     <string name="clear_current_config">清除当前配置</string>
     <string name="permission">权限</string>
     <string name="scope_is_work_profile">作用域: 工作资料</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -48,7 +48,6 @@
     <string name="copy">Copy</string>
     <string name="file_not_exist">File not exist</string>
     <string name="io_exception">IO Exception</string>
-    <string name="current_status_is">Current status: </string>
     <string name="start">Start</string>
     <string name="stop">Stop</string>
     <string name="allow_all">Allow all</string>
@@ -139,7 +138,6 @@
     <string name="common_criteria_mode">Common criteria mode</string>
     <string name="usb_signal">USB signal</string>
     <string name="keyguard">Keyguard</string>
-    <string name="require_no_password_to_disable">Disable keyguard require no password is set. </string>
     <string name="lock_now">Lock screen now</string>
     <string name="evict_credential_encryptoon_key">Evict credential encryption key</string>
     <string name="bug_report">Bug report</string>
@@ -178,11 +176,11 @@
     <string name="ltf_global_actions">Allow global actions</string>
     <string name="ltf_keyguard">Allow keyguard</string>
     <string name="ltf_block_activity_start_in_task">Block activity start in task</string>
-    <string name="ca_cert">Ca certification</string>
-    <string name="please_select_ca_cert">Please select a certification</string>
-    <string name="cacert_installed">Cert installed: %1$s</string>
-    <string name="select_ca_cert" tools:ignore="TypographyEllipsis">Select cert...</string>
-    <string name="uninstall_all_user_ca_cert">Uninstall all user cert</string>
+    <string name="ca_cert">CA certificate</string>
+    <string name="please_select_ca_cert">Please select a certificate</string>
+    <string name="cert_installed">Certificate installed: %1$s</string>
+    <string name="select_ca_cert" tools:ignore="TypographyEllipsis">Select certificate...</string>
+    <string name="uninstall_all_user_ca_cert">Uninstall all user CA certificate</string>
     <string name="security_logs">Security logs</string>
     <string name="pre_reboot_security_logs">Pre-reboot security logs</string>
     <string name="wipe_data">Wipe data</string>
@@ -310,7 +308,6 @@
     <string name="isapphidden_desc">Non-existent apps is hidden</string>
     <string name="always_on_vpn">Always-on VPN</string>
     <string name="enable_lockdown">Enable lockdown</string>
-    <string name="current_app_is">Current app: </string>
     <string name="clear_current_config">Clear current config</string>
     <string name="permission">Permission</string>
     <string name="scope_is_work_profile">Scope: work profile</string>