From 0123b98e471c10313d972ea61a982f5259045374 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Wed, 19 Jun 2019 14:19:49 +0200
Subject: [PATCH] Disable screen security by default for debug builds

I've lost count of how many times I've tried to record a demo video with
screen security enabled.
---
 app/build.gradle                                            | 6 ++++--
 .../main/java/com/beemdevelopment/aegis/Preferences.java    | 3 ++-
 app/src/main/res/xml/preferences.xml                        | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c5282761..2d29b752 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,12 +14,14 @@ android {
         debug {
             minifyEnabled false
             applicationIdSuffix ".debug"
-            manifestPlaceholders = [title:"AegisDev", iconName:"ic_launcher_debug"]
+            manifestPlaceholders = [title: "AegisDev", iconName: "ic_launcher_debug"]
+            resValue "bool", "pref_secure_screen_default", "false"
         }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            manifestPlaceholders = [title:"Aegis", iconName:"ic_launcher"]
+            manifestPlaceholders = [title: "Aegis", iconName: "ic_launcher"]
+            resValue "bool", "pref_secure_screen_default", "true"
         }
     }
     compileOptions {
diff --git a/app/src/main/java/com/beemdevelopment/aegis/Preferences.java b/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
index 55b145d8..0d3b6fd6 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/Preferences.java
@@ -16,7 +16,8 @@ public class Preferences {
     }
 
     public boolean isSecureScreenEnabled() {
-        return _prefs.getBoolean("pref_secure_screen", true);
+        // screen security should be enabled by default, but not for debug builds
+        return _prefs.getBoolean("pref_secure_screen", !BuildConfig.DEBUG);
     }
 
     public boolean isAccountNameVisible() {
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4c31dc90..9d21f063 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -37,7 +37,7 @@
         android:title="@string/pref_security_group_title"
         app:iconSpaceReserved="false">
         <androidx.preference.SwitchPreferenceCompat
-            android:defaultValue="true"
+            android:defaultValue="@bool/pref_secure_screen_default"
             android:key="pref_secure_screen"
             android:title="@string/pref_secure_screen_title"
             android:summary="@string/pref_secure_screen_summary"