From 3d472f15509409e8b0857874415496232458a7a3 Mon Sep 17 00:00:00 2001 From: lucky <> Date: Mon, 10 Jan 2022 13:59:46 +0300 Subject: [PATCH] ref --- app/src/main/java/me/lucky/wasted/DeviceAdminManager.kt | 6 ++---- app/src/main/java/me/lucky/wasted/DeviceAdminReceiver.kt | 9 --------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/me/lucky/wasted/DeviceAdminManager.kt b/app/src/main/java/me/lucky/wasted/DeviceAdminManager.kt index fa1385f..de5cd22 100644 --- a/app/src/main/java/me/lucky/wasted/DeviceAdminManager.kt +++ b/app/src/main/java/me/lucky/wasted/DeviceAdminManager.kt @@ -20,12 +20,10 @@ class DeviceAdminManager(private val ctx: Context) { fun wipeData() { var flags = 0 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) flags = flags.or(DevicePolicyManager.WIPE_SILENTLY) - } - if (prefs.isWipeESIM && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + if (prefs.isWipeESIM && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) flags = flags.or(DevicePolicyManager.WIPE_EUICC) - } dpm.wipeData(flags) } diff --git a/app/src/main/java/me/lucky/wasted/DeviceAdminReceiver.kt b/app/src/main/java/me/lucky/wasted/DeviceAdminReceiver.kt index 0d40971..2146b37 100644 --- a/app/src/main/java/me/lucky/wasted/DeviceAdminReceiver.kt +++ b/app/src/main/java/me/lucky/wasted/DeviceAdminReceiver.kt @@ -3,24 +3,15 @@ package me.lucky.wasted import android.app.admin.DeviceAdminReceiver import android.content.Context import android.content.Intent -import android.os.Build import android.os.UserHandle import android.widget.Toast -import androidx.annotation.RequiresApi class DeviceAdminReceiver : DeviceAdminReceiver() { - - @RequiresApi(Build.VERSION_CODES.O) override fun onPasswordFailed(context: Context, intent: Intent, user: UserHandle) { super.onPasswordFailed(context, intent, user) onPasswordFailedInternal(context) } - override fun onPasswordFailed(context: Context, intent: Intent) { - super.onPasswordFailed(context, intent) - onPasswordFailedInternal(context) - } - override fun onDisabled(context: Context, intent: Intent) { super.onDisabled(context, intent) if (Preferences(context).isServiceEnabled) {