Merge pull request #140 from alexbakker/debug-flag-secure

Disable screen security by default for debug builds
This commit is contained in:
Michael Schättgen 2019-06-25 00:15:15 +02:00 committed by GitHub
commit 550e53f225
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View file

@ -14,12 +14,14 @@ android {
debug { debug {
minifyEnabled false minifyEnabled false
applicationIdSuffix ".debug" applicationIdSuffix ".debug"
manifestPlaceholders = [title:"AegisDev", iconName:"ic_launcher_debug"] manifestPlaceholders = [title: "AegisDev", iconName: "ic_launcher_debug"]
resValue "bool", "pref_secure_screen_default", "false"
} }
release { release {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 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 { compileOptions {

View file

@ -16,7 +16,8 @@ public class Preferences {
} }
public boolean isSecureScreenEnabled() { 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() { public boolean isAccountNameVisible() {

View file

@ -37,7 +37,7 @@
android:title="@string/pref_security_group_title" android:title="@string/pref_security_group_title"
app:iconSpaceReserved="false"> app:iconSpaceReserved="false">
<androidx.preference.SwitchPreferenceCompat <androidx.preference.SwitchPreferenceCompat
android:defaultValue="true" android:defaultValue="@bool/pref_secure_screen_default"
android:key="pref_secure_screen" android:key="pref_secure_screen"
android:title="@string/pref_secure_screen_title" android:title="@string/pref_secure_screen_title"
android:summary="@string/pref_secure_screen_summary" android:summary="@string/pref_secure_screen_summary"