From 08005bdf5638d518b6aac4de1e59fe429eea2eeb Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 12 Sep 2018 11:44:27 +0100 Subject: [PATCH] Enable PIN lock for release builds. --- .../org/briarproject/briar/android/TestingConstants.java | 5 ----- .../briar/android/settings/SettingsFragment.java | 4 ---- 2 files changed, 9 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java b/briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java index 189783817..e3b970dc9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java @@ -30,9 +30,4 @@ public interface TestingConstants { long EXPIRY_DATE = IS_DEBUG_BUILD || IS_BETA_BUILD ? BuildConfig.BuildTimestamp + 90 * 24 * 60 * 60 * 1000L : Long.MAX_VALUE; - - /** - * Feature flag for enabling the PIN lock in release builds. - */ - boolean FEATURE_FLAG_PIN_LOCK = IS_DEBUG_BUILD; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index 71ea1b575..9d6075959 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -77,7 +77,6 @@ import static org.briarproject.bramble.api.plugin.TorConstants.PREF_TOR_NETWORK_ import static org.briarproject.bramble.util.LogUtils.logDuration; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.now; -import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_PIN_LOCK; import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_RINGTONE; import static org.briarproject.briar.android.navdrawer.NavDrawerActivity.INTENT_SIGN_OUT; @@ -226,9 +225,6 @@ public class SettingsFragment extends PreferenceFragmentCompat } ); } else { - screenLock.setVisible(FEATURE_FLAG_PIN_LOCK); - screenLockTimeout.setVisible(FEATURE_FLAG_PIN_LOCK); - findPreference("pref_key_explode").setVisible(false); findPreference("pref_key_test_data").setVisible(false); PreferenceGroup testing =