awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Creating Backup doesn't work on older phones #208

Browse Source
This commit is contained in:
daniel.boehrs
2019-01-07 13:50:56 +01:00
parent fc736cf612
commit a672aa02dd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/util/ScreenLockUtil.java
+7 -7
View File
@@ -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) {