From 976e7ea359834ead9434bb93c65e8b404f86813d Mon Sep 17 00:00:00 2001
From: lucky <>
Date: Thu, 27 Jan 2022 16:50:46 +0300
Subject: [PATCH] ref

---
 app/src/main/java/me/lucky/wasted/MainActivity.kt           | 6 +++---
 .../main/java/me/lucky/wasted/PanicConnectionActivity.kt    | 2 +-
 app/src/main/res/values-ru/strings.xml                      | 2 --
 app/src/main/res/values/strings.xml                         | 2 --
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/me/lucky/wasted/MainActivity.kt b/app/src/main/java/me/lucky/wasted/MainActivity.kt
index b758d19..a732bda 100644
--- a/app/src/main/java/me/lucky/wasted/MainActivity.kt
+++ b/app/src/main/java/me/lucky/wasted/MainActivity.kt
@@ -146,7 +146,7 @@ open class MainActivity : AppCompatActivity() {
                     if (prefs.isWipeData) admin.wipeData()
                 } catch (exc: SecurityException) {}
             }
-            .setNegativeButton(R.string.cancel, null)
+            .setNegativeButton(android.R.string.cancel, null)
             .show()
     }
 
@@ -169,7 +169,7 @@ open class MainActivity : AppCompatActivity() {
                     false -> launchers.and(value.flag.inv())
                 }
             }
-            .setPositiveButton(R.string.ok) { _, _ ->
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 prefs.launchers = launchers
                 setLaunchersState(prefs.isServiceEnabled)
             }
@@ -187,7 +187,7 @@ open class MainActivity : AppCompatActivity() {
             .setSingleChoiceItems(items, checked) { _, which ->
                 days = items[which].toInt()
             }
-            .setPositiveButton(R.string.ok) { _, _ ->
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 prefs.wipeOnInactivityDays = days
                 if (prefs.isServiceEnabled && job.schedule() == JobScheduler.RESULT_FAILURE)
                     showWipeJobScheduleFailedPopup()
diff --git a/app/src/main/java/me/lucky/wasted/PanicConnectionActivity.kt b/app/src/main/java/me/lucky/wasted/PanicConnectionActivity.kt
index 9e5f738..cb66f26 100644
--- a/app/src/main/java/me/lucky/wasted/PanicConnectionActivity.kt
+++ b/app/src/main/java/me/lucky/wasted/PanicConnectionActivity.kt
@@ -36,7 +36,7 @@ class PanicConnectionActivity : MainActivity() {
                 PanicResponder.setTriggerPackageName(this@PanicConnectionActivity)
                 setResult(RESULT_OK)
             }
-            .setPositiveButton(R.string.cancel) { _, _ ->
+            .setPositiveButton(android.R.string.cancel) { _, _ ->
                 setResult(RESULT_CANCELED)
                 finish()
             }
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e8a4df0..f7602f3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -11,7 +11,6 @@
     <string name="panic_app_dialog_message">Вы уверены, что хотите разрешить %1$s запускать действия тревожной кнопки\?</string>
     <string name="panic_app_unknown_app">неизвестное приложение</string>
     <string name="allow">Разрешить</string>
-    <string name="cancel">Отменить</string>
     <string name="tile_label">Разблокировать устройство</string>
     <string name="shortcut_label">Тревога</string>
     <string name="max_failed_password_attempts_description">Максимальное количество неудачных попыток ввода пароля.</string>
@@ -20,7 +19,6 @@
     <string name="wipe_on_inactivity_description">Стереть данные когда устройство не разблокируется N дней.</string>
     <string name="wipe_on_inactivity_days">Дней</string>
     <string name="notification_channel_default_name">Дефолт</string>
-    <string name="ok">OK</string>
     <string name="wipe_job_description">Стереть данные при неактивности</string>
     <string name="wipe_job_schedule_failed_popup">Не удалось запланировать сервис стирания данных</string>
     <string name="foreground_service_description">Получать события разблокировки</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bde7c2e..b4e1dad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,7 +11,6 @@
     <string name="panic_app_dialog_message">Are you sure that you want to allow %1$s to trigger destructive panic actions\?</string>
     <string name="panic_app_unknown_app">an unknown app</string>
     <string name="allow">Allow</string>
-    <string name="cancel">Cancel</string>
     <string name="tile_label">Unlock device</string>
     <string name="shortcut_label">Panic</string>
     <string name="max_failed_password_attempts_description">Maximum number of failed password attempts.</string>
@@ -20,7 +19,6 @@
     <string name="wipe_on_inactivity_description">Wipe a device when it was not unlocked for N days.</string>
     <string name="wipe_on_inactivity_days">Days</string>
     <string name="notification_channel_default_name">Default</string>
-    <string name="ok">OK</string>
     <string name="wipe_job_description">Wipe a device on inactivity</string>
     <string name="wipe_job_schedule_failed_popup">Failed to schedule a wipe job</string>
     <string name="foreground_service_description">Receive unlock events</string>