From 18018360d3f46aa7bd0f6096fc3fcd014e65280a Mon Sep 17 00:00:00 2001 From: wesaphzt Date: Wed, 11 Sep 2019 22:45:25 +0100 Subject: [PATCH] check for admin --- .../com/wesaphzt/privatelock/service/LockService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/wesaphzt/privatelock/service/LockService.java b/app/src/main/java/com/wesaphzt/privatelock/service/LockService.java index 0543cfa..5ae9c43 100644 --- a/app/src/main/java/com/wesaphzt/privatelock/service/LockService.java +++ b/app/src/main/java/com/wesaphzt/privatelock/service/LockService.java @@ -229,13 +229,20 @@ public class LockService extends JobIntentService { if (total > SENSITIVITY) { try { - mDPM.lockNow(); + if (isActiveAdmin()) { + mDPM.lockNow(); + } else { + Toast.makeText(context, "Device admin not enabled", Toast.LENGTH_LONG).show(); + } } catch (Exception e) { - Toast.makeText(context, "Error locking, does app have device admin permissions?", Toast.LENGTH_SHORT).show(); + Toast.makeText(context, "Unknown locking error", Toast.LENGTH_SHORT).show(); } } } } + private boolean isActiveAdmin() { + return mDPM.isAdminActive(mDeviceAdmin); + } private void setNotification() { //notification