From bc5a1ce3960a7956501dd3fa849cc68a4dacc896 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Thu, 25 Feb 2021 09:35:57 +1100 Subject: [PATCH 1/2] fix screen lock --- .../thoughtcrime/securesms/service/KeyCachingService.java | 5 +++-- 1 file changed, 3 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 046004aa46..e1c2350ef1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -69,7 +69,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 = new Object(); + private static Object masterSecret = null; /** * A temporal utility method to quickly call {@link KeyCachingService#setMasterSecret(Object)} @@ -97,7 +97,8 @@ public class KeyCachingService extends Service { public KeyCachingService() {} 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) { From 6c328152668e2ea64212c788e4f685f5390f6976 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO Date: Thu, 25 Feb 2021 09:45:36 +1100 Subject: [PATCH 2/2] clean --- .../utilities/TextSecurePreferences.kt | 133 ------------------ 1 file changed, 133 deletions(-) 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 ca87ad4c74..79f7a1af90 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt @@ -19,19 +19,8 @@ object TextSecurePreferences { const val DISABLE_PASSPHRASE_PREF = "pref_disable_passphrase" const val THEME_PREF = "pref_theme" const val LANGUAGE_PREF = "pref_language" - private const val MMSC_CUSTOM_HOST_PREF = "pref_apn_mmsc_custom_host" - const val MMSC_HOST_PREF = "pref_apn_mmsc_host" - private const val MMSC_CUSTOM_PROXY_PREF = "pref_apn_mms_custom_proxy" - const val MMSC_PROXY_HOST_PREF = "pref_apn_mms_proxy" - private const val MMSC_CUSTOM_PROXY_PORT_PREF = "pref_apn_mms_custom_proxy_port" - const val MMSC_PROXY_PORT_PREF = "pref_apn_mms_proxy_port" - private const val MMSC_CUSTOM_USERNAME_PREF = "pref_apn_mmsc_custom_username" - const val MMSC_USERNAME_PREF = "pref_apn_mmsc_username" - private const val MMSC_CUSTOM_PASSWORD_PREF = "pref_apn_mmsc_custom_password" - const val MMSC_PASSWORD_PREF = "pref_apn_mmsc_password" const val THREAD_TRIM_LENGTH = "pref_trim_length" const val THREAD_TRIM_NOW = "pref_trim_now" - const val ENABLE_MANUAL_MMS_PREF = "pref_enable_manual_mms" private const val LAST_VERSION_CODE_PREF = "last_version_code" private const val LAST_EXPERIENCE_VERSION_PREF = "last_experience_version_code" @@ -45,16 +34,10 @@ object TextSecurePreferences { const val PASSPHRASE_TIMEOUT_PREF = "pref_timeout_passphrase" const val SCREEN_SECURITY_PREF = "pref_screen_security" private const val ENTER_SENDS_PREF = "pref_enter_sends" - private const val SMS_DELIVERY_REPORT_PREF = "pref_delivery_report_sms" - const val MMS_USER_AGENT = "pref_mms_user_agent" - private const val MMS_CUSTOM_USER_AGENT = "pref_custom_mms_user_agent" private const val THREAD_TRIM_ENABLED = "pref_trim_threads" const val LOCAL_NUMBER_PREF = "pref_local_number" - private const val VERIFYING_STATE_PREF = "pref_verifying" const val REGISTERED_GCM_PREF = "pref_gcm_registered" - private const val GCM_PASSWORD_PREF = "pref_gcm_password" private const val SEEN_WELCOME_SCREEN_PREF = "pref_seen_welcome_screen" - private const val SIGNALING_KEY_PREF = "pref_signaling_key" private const val UPDATE_APK_REFRESH_TIME_PREF = "pref_update_apk_refresh_time" private const val UPDATE_APK_DOWNLOAD_ID = "pref_update_apk_download_id" private const val UPDATE_APK_DIGEST = "pref_update_apk_digest" @@ -63,10 +46,6 @@ object TextSecurePreferences { const val MESSAGE_BODY_TEXT_SIZE_PREF = "pref_message_body_text_size" const val LOCAL_REGISTRATION_ID_PREF = "pref_local_registration_id" - private const val WIFI_SMS_PREF = "pref_wifi_sms" - - private const val GCM_DISABLED_PREF = "pref_gcm_disabled" - private const val WEBSOCKET_REGISTERED_PREF = "pref_websocket_registered" const val REPEAT_ALERTS_PREF = "pref_repeat_alerts" const val NOTIFICATION_PRIVACY_PREF = "pref_notification_privacy" @@ -84,7 +63,6 @@ object TextSecurePreferences { const val PROFILE_AVATAR_URL_PREF = "pref_profile_avatar_url" const val READ_RECEIPTS_PREF = "pref_read_receipts" const val INCOGNITO_KEYBORAD_PREF = "pref_incognito_keyboard" - private const val UNAUTHORIZED_RECEIVED = "pref_unauthorized_received" private const val DATABASE_ENCRYPTED_SECRET = "pref_database_encrypted_secret" private const val DATABASE_UNENCRYPTED_SECRET = "pref_database_unencrypted_secret" @@ -286,11 +264,6 @@ object TextSecurePreferences { return getStringPreference(context, DATABASE_ENCRYPTED_SECRET, null) } - @JvmStatic - fun setUnauthorizedReceived(context: Context, value: Boolean) { - setBooleanPreference(context, UNAUTHORIZED_RECEIVED, value) - } - @JvmStatic fun isIncognitoKeyboardEnabled(context: Context): Boolean { return getBooleanPreference(context, INCOGNITO_KEYBORAD_PREF, true) @@ -384,11 +357,6 @@ object TextSecurePreferences { return getStringPreference(context, MESSAGE_BODY_TEXT_SIZE_PREF, "16")!!.toInt() } - @JvmStatic - fun isFcmDisabled(context: Context): Boolean { - return getBooleanPreference(context, GCM_DISABLED_PREF, false) - } - @JvmStatic fun setDirectCaptureCameraId(context: Context, value: Int) { setIntegerPrefrence(context, DIRECT_CAPTURE_CAMERA_ID, value) @@ -404,16 +372,6 @@ object TextSecurePreferences { return NotificationPrivacyPreference(getStringPreference(context, NOTIFICATION_PRIVACY_PREF, "all")) } - @JvmStatic - fun isWebsocketRegistered(context: Context): Boolean { - return getBooleanPreference(context, WEBSOCKET_REGISTERED_PREF, false) - } - - @JvmStatic - fun isWifiSmsEnabled(context: Context): Boolean { - return getBooleanPreference(context, WIFI_SMS_PREF, false) - } - @JvmStatic fun getRepeatAlertsCount(context: Context): Int { return try { @@ -485,16 +443,6 @@ object TextSecurePreferences { removePreference(context, LOCAL_NUMBER_PREF) } - @JvmStatic - fun getPushServerPassword(context: Context): String? { - return getStringPreference(context, GCM_PASSWORD_PREF, null) - } - - @JvmStatic - fun getSignalingKey(context: Context): String? { - return getStringPreference(context, SIGNALING_KEY_PREF, null) - } - @JvmStatic fun isEnterSendsEnabled(context: Context): Boolean { return getBooleanPreference(context, ENTER_SENDS_PREF, false) @@ -509,76 +457,11 @@ object TextSecurePreferences { setBooleanPreference(context, DISABLE_PASSPHRASE_PREF, disabled) } - @JvmStatic - fun getUseCustomMmsc(context: Context): Boolean { - val legacy: Boolean = isLegacyUseLocalApnsEnabled(context) - return getBooleanPreference(context, MMSC_CUSTOM_HOST_PREF, legacy) - } - - @JvmStatic - fun getMmscUrl(context: Context): String? { - return getStringPreference(context, MMSC_HOST_PREF, "") - } - - @JvmStatic - fun getUseCustomMmscProxy(context: Context): Boolean { - val legacy: Boolean = isLegacyUseLocalApnsEnabled(context) - return getBooleanPreference(context, MMSC_CUSTOM_PROXY_PREF, legacy) - } - - @JvmStatic - fun getMmscProxy(context: Context): String? { - return getStringPreference(context, MMSC_PROXY_HOST_PREF, "") - } - - @JvmStatic - fun getUseCustomMmscProxyPort(context: Context): Boolean { - val legacy: Boolean = isLegacyUseLocalApnsEnabled(context) - return getBooleanPreference(context, MMSC_CUSTOM_PROXY_PORT_PREF, legacy) - } - - @JvmStatic - fun getMmscProxyPort(context: Context): String? { - return getStringPreference(context, MMSC_PROXY_PORT_PREF, "") - } - - @JvmStatic - fun getUseCustomMmscUsername(context: Context): Boolean { - val legacy: Boolean = isLegacyUseLocalApnsEnabled(context) - return getBooleanPreference(context, MMSC_CUSTOM_USERNAME_PREF, legacy) - } - - @JvmStatic - fun getMmscUsername(context: Context): String? { - return getStringPreference(context, MMSC_USERNAME_PREF, "") - } - - @JvmStatic - fun getUseCustomMmscPassword(context: Context): Boolean { - val legacy: Boolean = isLegacyUseLocalApnsEnabled(context) - return getBooleanPreference(context, MMSC_CUSTOM_PASSWORD_PREF, legacy) - } - - @JvmStatic - fun getMmscPassword(context: Context): String? { - return getStringPreference(context, MMSC_PASSWORD_PREF, "") - } - - @JvmStatic - fun getMmsUserAgent(context: Context, defaultUserAgent: String): String { - val useCustom: Boolean = getBooleanPreference(context, MMS_CUSTOM_USER_AGENT, false) - return if (useCustom) getStringPreference(context, MMS_USER_AGENT, defaultUserAgent)!! else defaultUserAgent - } - @JvmStatic fun isScreenSecurityEnabled(context: Context): Boolean { return getBooleanPreference(context, SCREEN_SECURITY_PREF, true) } - fun isLegacyUseLocalApnsEnabled(context: Context): Boolean { - return getBooleanPreference(context, ENABLE_MANUAL_MMS_PREF, false) - } - fun getLastVersionCode(context: Context): Int { return getIntegerPreference(context, LAST_VERSION_CODE_PREF, 0) } @@ -598,11 +481,6 @@ object TextSecurePreferences { return getStringPreference(context, THEME_PREF, "light") } - @JvmStatic - fun isVerifying(context: Context): Boolean { - return getBooleanPreference(context, VERIFYING_STATE_PREF, false) - } - @JvmStatic fun isPushRegistered(context: Context): Boolean { return getBooleanPreference(context, REGISTERED_GCM_PREF, false) @@ -623,11 +501,6 @@ object TextSecurePreferences { return getStringPreference(context, LANGUAGE_PREF, "zz") } - @JvmStatic - fun isSmsDeliveryReportsEnabled(context: Context): Boolean { - return getBooleanPreference(context, SMS_DELIVERY_REPORT_PREF, false) - } - @JvmStatic fun hasSeenWelcomeScreen(context: Context): Boolean { return getBooleanPreference(context, SEEN_WELCOME_SCREEN_PREF, false) @@ -874,10 +747,4 @@ object TextSecurePreferences { setBooleanPreference(context!!, "is_migrating_key_pair", newValue) } // endregion - - - // NEVER rename these -- they're persisted by name - enum class MediaKeyboardMode { - EMOJI, STICKER - } } \ No newline at end of file