From c77479642296af25005994a1ae611137f3892869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Sch=C3=A4ttgen?= <michael@schattgen.me>
Date: Wed, 28 Aug 2019 23:38:12 +0200
Subject: [PATCH] Change auto lock preference visibility behaviour

---
 .../aegis/ui/PreferencesFragment.java              |  4 ++++
 app/src/main/res/xml/preferences.xml               | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
index 363bfd39..07a3d293 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/PreferencesFragment.java
@@ -81,6 +81,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
 
     private SwitchPreference _encryptionPreference;
     private SwitchPreference _fingerprintPreference;
+    private Preference _autoLockPreference;
     private Preference _setPasswordPreference;
     private Preference _slotsPreference;
     private Preference _groupsPreference;
@@ -333,6 +334,8 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
                 return true;
             }
         });
+
+        _autoLockPreference = findPreference("pref_auto_lock");
     }
 
     @Override
@@ -659,6 +662,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat {
         _setPasswordPreference.setVisible(encrypted);
         _fingerprintPreference.setVisible(encrypted);
         _slotsPreference.setEnabled(encrypted);
+        _autoLockPreference.setVisible(encrypted);
 
         if (encrypted) {
             SlotList slots = _db.getCredentials().getSlots();
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index da30f876..99872f7e 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -51,12 +51,6 @@
             android:title="@string/pref_secure_screen_title"
             android:summary="@string/pref_secure_screen_summary"
             app:iconSpaceReserved="false"/>
-        <androidx.preference.SwitchPreferenceCompat
-            android:defaultValue="true"
-            android:key="pref_auto_lock"
-            android:title="@string/pref_auto_lock_title"
-            android:summary="@string/pref_auto_lock_summary"
-            app:iconSpaceReserved="false"/>
         <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_tap_to_reveal"
@@ -98,6 +92,14 @@
             android:persistent="false"
             app:iconSpaceReserved="false"/>
 
+        <androidx.preference.SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="pref_auto_lock"
+            android:dependency="pref_encryption"
+            android:title="@string/pref_auto_lock_title"
+            android:summary="@string/pref_auto_lock_summary"
+            app:iconSpaceReserved="false"/>
+
         <Preference
             android:key="pref_slots"
             android:title="@string/pref_slots_title"