Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove immediate screen lock option.

Browse Source
This commit is contained in:
Michelle Tang
2024-08-13 11:24:08 -07:00
committed by GitHub
parent 1a5ce9b4b9
commit ae923c9221
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt
View File

@@ -355,7 +355,8 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac
return if (!enabledScreenLock) { return if (!enabledScreenLock) {
getString(R.string.ScreenLockSettingsFragment__off) getString(R.string.ScreenLockSettingsFragment__off)
} else if (timeoutSeconds == 0L) { } else if (timeoutSeconds == 0L) {
getString(R.string.ScreenLockSettingsFragment__immediately) Log.i(TAG, "Default immediate screen lock to one minute")
ExpirationUtil.getExpirationDisplayValue(requireContext(), 60)
} else { } else {
ExpirationUtil.getExpirationDisplayValue(requireContext(), timeoutSeconds.toInt()) ExpirationUtil.getExpirationDisplayValue(requireContext(), timeoutSeconds.toInt())
} }

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

@@ -239,6 +239,12 @@ public class KeyCachingService extends Service {
boolean screenLockActive = SignalStore.settings().getScreenLockEnabled(); boolean screenLockActive = SignalStore.settings().getScreenLockEnabled();
boolean immediateScreenLock = screenTimeout == 0 && screenLockActive; boolean immediateScreenLock = screenTimeout == 0 && screenLockActive;
if (immediateScreenLock) {
Log.i(TAG, "Default immediate screen lock to one minute");
SignalStore.settings().setScreenLockTimeout(60);
immediateScreenLock = false;
}
if (!appVisible && secretSet && (passLockActive || screenLockActive)) { if (!appVisible && secretSet && (passLockActive || screenLockActive)) {
if (immediateScreenLock) { if (immediateScreenLock) {
Log.i(TAG, "Starting immediate screen lock"); Log.i(TAG, "Starting immediate screen lock");

2
app/src/main/res/values/arrays.xml
View File

@@ -363,14 +363,12 @@
</string-array> </string-array>
<string-array name="ScreenLockSettingsFragment__labels"> <string-array name="ScreenLockSettingsFragment__labels">
<item>@string/ScreenLockSettingsFragment__immediately</item>
<item>@string/ScreenLockSettingsFragment__after_1_min</item> <item>@string/ScreenLockSettingsFragment__after_1_min</item>
<item>@string/ScreenLockSettingsFragment__after_5_min</item> <item>@string/ScreenLockSettingsFragment__after_5_min</item>
<item>@string/ScreenLockSettingsFragment__after_30_min</item> <item>@string/ScreenLockSettingsFragment__after_30_min</item>
</string-array> </string-array>
<integer-array name="ScreenLockSettingsFragment__values"> <integer-array name="ScreenLockSettingsFragment__values">
<item>0</item>
<item>60</item> <item>60</item>
<item>300</item> <item>300</item>
<item>1800</item> <item>1800</item>