Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Pick up screen lock changes when returning to SecurityFragment

Browse Source
This commit is contained in:
Torsten Grote
2021-03-26 14:33:58 -03:00
parent aaaf8aa66f
commit 95ef061a34
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java
View File

@@ -75,19 +75,8 @@ public class SecurityFragment extends PreferenceFragmentCompat {
screenLock.setVisible(false); screenLock.setVisible(false);
screenLockTimeout.setVisible(false); screenLockTimeout.setVisible(false);
} else { } else {
LifecycleOwner lifecycleOwner = getViewLifecycleOwner();
if (getActivity() != null && hasScreenLock(getActivity())) {
viewModel.getScreenLockEnabled().observe(lifecycleOwner, on -> {
screenLock.setChecked(on);
enableAndPersist(screenLock);
});
screenLock.setSummary(R.string.pref_lock_summary);
} else {
screenLock.setEnabled(false);
screenLock.setChecked(false);
screenLock.setSummary(R.string.pref_lock_disabled_summary);
}
// timeout depends on screenLock and gets disabled automatically // timeout depends on screenLock and gets disabled automatically
LifecycleOwner lifecycleOwner = getViewLifecycleOwner();
viewModel.getScreenLockTimeout().observe(lifecycleOwner, value -> { viewModel.getScreenLockTimeout().observe(lifecycleOwner, value -> {
screenLockTimeout.setValue(value); screenLockTimeout.setValue(value);
enableAndPersist(screenLockTimeout); enableAndPersist(screenLockTimeout);
@@ -99,6 +88,25 @@ public class SecurityFragment extends PreferenceFragmentCompat {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
requireActivity().setTitle(R.string.security_settings_title); requireActivity().setTitle(R.string.security_settings_title);
checkScreenLock();
}
private void checkScreenLock() {
if (SDK_INT < 21) return;
LifecycleOwner lifecycleOwner = getViewLifecycleOwner();
viewModel.getScreenLockEnabled().removeObservers(lifecycleOwner);
if (hasScreenLock(requireActivity())) {
viewModel.getScreenLockEnabled().observe(lifecycleOwner, on -> {
screenLock.setChecked(on);
enableAndPersist(screenLock);
});
screenLock.setSummary(R.string.pref_lock_summary);
} else {
screenLock.setEnabled(false);
screenLock.setPersistent(false);
screenLock.setChecked(false);
screenLock.setSummary(R.string.pref_lock_disabled_summary);
}
} }
} }