TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-27 01:37:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into libsession-integration

Browse Source
This commit is contained in:
0x330a 2023-06-30 10:58:17 +10:00
commit f45554a6df
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/xml/preferences_app_protection.xml
View File

@ -13,7 +13,7 @@
android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint" /> android:summary="@string/preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="@bool/screen_security_default"
android:key="pref_screen_security" android:key="pref_screen_security"
android:title="@string/preferences__screen_security" android:title="@string/preferences__screen_security"
android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" /> android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />

4
libsession/src/debug/res/values/values.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="screen_security_default">false</bool>
</resources>

2
libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
View File

@ -668,7 +668,7 @@ interface TextSecurePreferences {
@JvmStatic @JvmStatic
fun isScreenSecurityEnabled(context: Context): Boolean { fun isScreenSecurityEnabled(context: Context): Boolean {
return getBooleanPreference(context, SCREEN_SECURITY_PREF, !BuildConfig.DEBUG) return getBooleanPreference(context, SCREEN_SECURITY_PREF, context.resources.getBoolean(R.bool.screen_security_default))
} }
fun getLastVersionCode(context: Context): Int { fun getLastVersionCode(context: Context): Int {

1
libsession/src/main/res/values/values.xml
View File

@ -2,4 +2,5 @@
<resources> <resources>
<bool name="enable_alarm_manager">true</bool> <bool name="enable_alarm_manager">true</bool>
<bool name="enable_job_service">false</bool> <bool name="enable_job_service">false</bool>
<bool name="screen_security_default">true</bool>
</resources> </resources>