From 59ae46b3004e742a80c510044c3c618174f21fe2 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Fri, 29 Jan 2021 17:03:58 +1100 Subject: [PATCH] recover pn --- .../org/thoughtcrime/securesms/service/KeyCachingService.java | 2 +- .../org/session/libsession/utilities/TextSecurePreferences.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java index 5bbaff281a..52cf8f7d0b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -71,7 +71,7 @@ public class KeyCachingService extends Service { // 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). - private static Object masterSecret; + private static Object masterSecret = new Object(); /** * A temporal utility method to quickly call {@link KeyCachingService#setMasterSecret(Object)} diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt index 1a42407cee..adfae0b573 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt @@ -499,7 +499,7 @@ object TextSecurePreferences { @JvmStatic fun isPasswordDisabled(context: Context): Boolean { - return getBooleanPreference(context, DISABLE_PASSPHRASE_PREF, false) + return getBooleanPreference(context, DISABLE_PASSPHRASE_PREF, true) } fun setPasswordDisabled(context: Context, disabled: Boolean) {