diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5113594..2da5542 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -101,7 +101,7 @@ diff --git a/app/src/main/java/me/lucky/wasted/MainActivity.kt b/app/src/main/java/me/lucky/wasted/MainActivity.kt index 54002e4..2541da4 100644 --- a/app/src/main/java/me/lucky/wasted/MainActivity.kt +++ b/app/src/main/java/me/lucky/wasted/MainActivity.kt @@ -1,5 +1,6 @@ package me.lucky.wasted +import android.app.job.JobScheduler import android.content.ComponentName import android.content.Intent import android.content.pm.PackageManager @@ -109,7 +110,7 @@ open class MainActivity : AppCompatActivity() { wipeOnInactivitySwitch.setOnCheckedChangeListener { _, isChecked -> if (!setWipeOnInactivityComponentsState(prefs.isServiceEnabled && isChecked)) { wipeOnInactivitySwitch.isChecked = false - showWipeJobServiceStartFailedPopup() + showWipeJobScheduleFailedPopup() return@setOnCheckedChangeListener } prefs.isWipeOnInactivity = isChecked @@ -184,6 +185,8 @@ open class MainActivity : AppCompatActivity() { } .setPositiveButton(R.string.ok) { _, _ -> prefs.wipeOnInactivityDays = days + if (prefs.isServiceEnabled && job.schedule() == JobScheduler.RESULT_FAILURE) + showWipeJobScheduleFailedPopup() } .show() } @@ -197,7 +200,7 @@ open class MainActivity : AppCompatActivity() { private fun setOn() { if (!setWipeOnInactivityComponentsState(prefs.isWipeOnInactivity)) { binding.toggle.isChecked = false - showWipeJobServiceStartFailedPopup() + showWipeJobScheduleFailedPopup() return } prefs.isServiceEnabled = true @@ -220,10 +223,10 @@ open class MainActivity : AppCompatActivity() { updateCodeColorState() } - private fun showWipeJobServiceStartFailedPopup() { + private fun showWipeJobScheduleFailedPopup() { Snackbar.make( binding.toggle, - R.string.wipe_job_service_start_failed_popup, + R.string.wipe_job_schedule_failed_popup, Snackbar.LENGTH_LONG, ).show() } diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index df8e94f..7afb1be 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -20,8 +20,8 @@ Дней Дефолт OK - Стереть данные при неактивности - Не удалось запустить сервис стирания данных + Стереть данные при неактивности + Не удалось запланировать сервис стирания данных Получать события разблокировки Служба Разблокировки Подтвердите diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3e71f3d..e2dcecf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,8 +20,8 @@ Days Default OK - Wipe a device on inactivity - Failed to start a wipe service + Wipe a device on inactivity + Failed to schedule a wipe service Receive unlock events Unlock Service Confirm