TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix screen lock

Browse Source
This commit is contained in:
Ryan ZHAO 2021-02-25 09:35:57 +11:00
parent 6f76f0046a
commit bc5a1ce396
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java
View File

@ -69,7 +69,7 @@ public class KeyCachingService extends Service {
// AC: This is a temporal drop off replacement for the refactoring time being. // AC: This is a temporal drop off replacement for the refactoring time being.
// This field only indicates if the app was unlocked or not (null means locked). // This field only indicates if the app was unlocked or not (null means locked).
private static Object masterSecret = new Object(); private static Object masterSecret = null;
/** /**
* A temporal utility method to quickly call {@link KeyCachingService#setMasterSecret(Object)} * A temporal utility method to quickly call {@link KeyCachingService#setMasterSecret(Object)}
@ -97,7 +97,8 @@ public class KeyCachingService extends Service {
public KeyCachingService() {} public KeyCachingService() {}
public static synchronized boolean isLocked(Context context) { public static synchronized boolean isLocked(Context context) {
return getMasterSecret(context) == null; boolean enabled = !TextSecurePreferences.isPasswordDisabled(context) || TextSecurePreferences.isScreenLockEnabled(context);
return getMasterSecret(context) == null && enabled;
} }
public static void onAppForegrounded(@NonNull Context context) { public static void onAppForegrounded(@NonNull Context context) {