Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Use a dedicated summary for 'never lock Briar' for proper English

Browse Source
This commit is contained in:
Torsten Grote
2018-08-14 17:06:41 -03:00
parent 04ffff0953
commit bffd78d404
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -460,7 +460,20 @@ public class SettingsFragment extends PreferenceFragmentCompat
int timeout = settings.getInt(PREF_SCREEN_LOCK_TIMEOUT,
Integer.valueOf(getString(
R.string.pref_lock_timeout_value_default)));
screenLockTimeout.setValue(String.valueOf(timeout));
String newValue = String.valueOf(timeout);
screenLockTimeout.setValue(newValue);
setScreenLockTimeoutSummary(newValue);
}
}
private void setScreenLockTimeoutSummary(String timeout) {
String never = getString(R.string.pref_lock_timeout_value_never);
if (timeout.equals(never)) {
screenLockTimeout
.setSummary(R.string.pref_lock_timeout_never_summary);
} else {
screenLockTimeout
.setSummary(R.string.pref_lock_timeout_summary);
}
}
@@ -525,9 +538,10 @@ public class SettingsFragment extends PreferenceFragmentCompat
storeSettings(s);
} else if (preference == screenLockTimeout) {
Settings s = new Settings();
s.putInt(PREF_SCREEN_LOCK_TIMEOUT,
Integer.valueOf((String) newValue));
String value = (String) newValue;
s.putInt(PREF_SCREEN_LOCK_TIMEOUT, Integer.valueOf(value));
storeSettings(s);
setScreenLockTimeoutSummary(value);
} else if (preference == notifyPrivateMessages) {
Settings s = new Settings();
s.putBoolean(PREF_NOTIFY_PRIVATE, (Boolean) newValue);