Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Disable screen lock setting instead of hiding it when not available

Browse Source
This commit is contained in:
Torsten Grote
2018-08-01 12:23:20 -03:00
parent fc86319e13
commit 90cb9a2fae
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -205,12 +205,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
enableBluetooth.setOnPreferenceChangeListener(this); enableBluetooth.setOnPreferenceChangeListener(this);
torNetwork.setOnPreferenceChangeListener(this); torNetwork.setOnPreferenceChangeListener(this);
torBlocked.setOnPreferenceChangeListener(this); torBlocked.setOnPreferenceChangeListener(this);
if (getActivity() != null && hasScreenLock(getActivity())) { screenLock.setOnPreferenceChangeListener(this);
screenLock.setVisible(FEATURE_FLAG_PIN_LOCK);
screenLock.setOnPreferenceChangeListener(this);
} else {
screenLock.setVisible(false);
}
if (SDK_INT >= 21) { if (SDK_INT >= 21) {
notifyLockscreen.setVisible(true); notifyLockscreen.setVisible(true);
notifyLockscreen.setOnPreferenceChangeListener(this); notifyLockscreen.setOnPreferenceChangeListener(this);
@@ -231,6 +226,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
} else { } else {
theme.setVisible(FEATURE_FLAG_DARK_THEME); theme.setVisible(FEATURE_FLAG_DARK_THEME);
notifySignIn.setVisible(FEATURE_FLAG_SIGN_IN_REMINDER); notifySignIn.setVisible(FEATURE_FLAG_SIGN_IN_REMINDER);
screenLock.setVisible(FEATURE_FLAG_PIN_LOCK);
findPreference("pref_key_explode").setVisible(false); findPreference("pref_key_explode").setVisible(false);
findPreference("pref_key_test_data").setVisible(false); findPreference("pref_key_test_data").setVisible(false);
@@ -428,7 +424,12 @@ public class SettingsFragment extends PreferenceFragmentCompat
enableBluetooth.setEnabled(enabled); enableBluetooth.setEnabled(enabled);
torNetwork.setEnabled(enabled); torNetwork.setEnabled(enabled);
torBlocked.setEnabled(enabled); torBlocked.setEnabled(enabled);
screenLock.setEnabled(enabled); if (enabled && getActivity() != null && hasScreenLock(getActivity())) {
screenLock.setEnabled(true);
} else {
screenLock.setEnabled(false);
screenLock.setSummary(getString(R.string.lock_disabled));
}
notifyPrivateMessages.setEnabled(enabled); notifyPrivateMessages.setEnabled(enabled);
notifyGroupMessages.setEnabled(enabled); notifyGroupMessages.setEnabled(enabled);
notifyForumPosts.setEnabled(enabled); notifyForumPosts.setEnabled(enabled);

1
briar-android/src/main/res/values/strings.xml
View File

@@ -452,5 +452,6 @@
<string name="lock_unlock">Unlock Briar</string> <string name="lock_unlock">Unlock Briar</string>
<string name="lock_is_locked">Briar is locked</string> <string name="lock_is_locked">Briar is locked</string>
<string name="lock_tap_to_unlock">Tap to unlock</string> <string name="lock_tap_to_unlock">Tap to unlock</string>
<string name="lock_disabled">Only available on Android 5 or newer and when a system screen lock is set</string>
</resources> </resources>

2
briar-android/src/main/res/xml/settings.xml
View File

@@ -61,7 +61,7 @@
android:persistent="false" android:persistent="false"
android:summary="@string/pref_lock_summary" android:summary="@string/pref_lock_summary"
android:title="@string/pref_lock_title" android:title="@string/pref_lock_title"
android:visibility="gone"/> android:enabled="false"/>
<Preference <Preference
android:key="pref_key_change_password" android:key="pref_key_change_password"