From a672aa02dd45a7aef7b4fa1adce3be4706cb1261 Mon Sep 17 00:00:00 2001 From: "daniel.boehrs" Date: Mon, 7 Jan 2019 13:50:56 +0100 Subject: [PATCH] Creating Backup doesn't work on older phones #208 --- .../securesms/util/ScreenLockUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java b/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java index f08864843..a590fa96d 100644 --- a/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java +++ b/src/org/thoughtcrime/securesms/util/ScreenLockUtil.java @@ -1,6 +1,5 @@ package org.thoughtcrime.securesms.util; -import android.annotation.TargetApi; import android.app.Activity; import android.app.KeyguardManager; import android.content.Context; @@ -21,11 +20,10 @@ public class ScreenLockUtil { applyScreenLock(activity, REQUEST_CODE_CONFIRM_CREDENTIALS); } - @TargetApi(21) public static boolean applyScreenLock(Activity activity, int requestCode) { KeyguardManager keyguardManager = (KeyguardManager) activity.getSystemService(Context.KEYGUARD_SERVICE); Intent intent; - if (keyguardManager != null) { + if (keyguardManager != null && isScreenLockAvailable()) { intent = keyguardManager.createConfirmDeviceCredentialIntent(activity.getString(R.string.screenlock_unlock_title), activity.getString(R.string.screenlock_unlock_description)); if (intent != null) { activity.startActivityForResult(intent, requestCode); @@ -36,13 +34,15 @@ public class ScreenLockUtil { } public static boolean isScreenLockEnabled(Context context) { - return Prefs.isScreenLockEnabled(context) - && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP; + return isScreenLockAvailable() && Prefs.isScreenLockEnabled(context); + } + + private static boolean isScreenLockAvailable() { + return android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP; } public static boolean isScreenLockTimeoutEnabled(Context context) { - return Prefs.isScreenLockTimeoutEnabled(context) - && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP; + return isScreenLockAvailable() && Prefs.isScreenLockTimeoutEnabled(context); } public static Timer scheduleScreenLockTimer(Timer timer, Activity activity) {