From 28a68ff6254caa8d432298e3c838db5708bb85cd Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 3 Aug 2018 12:17:07 +0100 Subject: [PATCH 1/3] Enable sign-in reminder for release builds. --- .../org/briarproject/briar/android/TestingConstants.java | 5 ----- .../briar/android/login/SignInReminderReceiver.java | 3 --- .../briar/android/settings/SettingsFragment.java | 4 ---- 3 files changed, 12 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 bbcab474b..a0c82a82b 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 @@ -36,11 +36,6 @@ public interface TestingConstants { */ boolean FEATURE_FLAG_DARK_THEME = false; - /** - * Feature flag for enabling the sign-in reminder in release builds. - */ - boolean FEATURE_FLAG_SIGN_IN_REMINDER = IS_DEBUG_BUILD; - /** * Feature flag for enabling the PIN lock in release builds. */ diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/SignInReminderReceiver.java b/briar-android/src/main/java/org/briarproject/briar/android/login/SignInReminderReceiver.java index dbdbf1799..994825bdc 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/SignInReminderReceiver.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/SignInReminderReceiver.java @@ -14,7 +14,6 @@ import javax.inject.Inject; import static android.content.Intent.ACTION_BOOT_COMPLETED; import static android.content.Intent.ACTION_MY_PACKAGE_REPLACED; -import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_SIGN_IN_REMINDER; import static org.briarproject.briar.android.settings.SettingsFragment.NOTIFY_SIGN_IN; import static org.briarproject.briar.api.android.AndroidNotificationManager.ACTION_DISMISS_REMINDER; @@ -27,8 +26,6 @@ public class SignInReminderReceiver extends BroadcastReceiver { @Override public void onReceive(Context ctx, Intent intent) { - if (!FEATURE_FLAG_SIGN_IN_REMINDER) return; - BriarApplication app = (BriarApplication) ctx.getApplicationContext(); AndroidComponent applicationComponent = app.getApplicationComponent(); applicationComponent.inject(this); 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 72fe52457..ce9c69c0c 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 @@ -79,7 +79,6 @@ 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_DARK_THEME; import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_PIN_LOCK; -import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_SIGN_IN_REMINDER; 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; @@ -169,8 +168,6 @@ public class SettingsFragment extends PreferenceFragmentCompat enableBluetooth = (ListPreference) findPreference("pref_key_bluetooth"); torNetwork = (ListPreference) findPreference(TOR_NETWORK); torMobile = (SwitchPreference) findPreference(TOR_MOBILE); - SwitchPreference notifySignIn = - (SwitchPreference) findPreference(NOTIFY_SIGN_IN); screenLock = (SwitchPreference) findPreference(PREF_SCREEN_LOCK); screenLockTimeout = (ListPreference) findPreference(PREF_SCREEN_LOCK_TIMEOUT); @@ -231,7 +228,6 @@ public class SettingsFragment extends PreferenceFragmentCompat ); } else { theme.setVisible(FEATURE_FLAG_DARK_THEME); - notifySignIn.setVisible(FEATURE_FLAG_SIGN_IN_REMINDER); screenLock.setVisible(FEATURE_FLAG_PIN_LOCK); screenLockTimeout.setVisible(FEATURE_FLAG_PIN_LOCK); -- GitLab From e32cc3af6d0461fb7892a251883c7e84d5e169d3 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 12 Sep 2018 11:41:54 +0100 Subject: [PATCH 2/3] Enable dark theme for release builds. --- .../org/briarproject/briar/android/TestingConstants.java | 5 ----- .../briar/android/settings/SettingsFragment.java | 2 -- 2 files changed, 7 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 a0c82a82b..189783817 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 @@ -31,11 +31,6 @@ public interface TestingConstants { BuildConfig.BuildTimestamp + 90 * 24 * 60 * 60 * 1000L : Long.MAX_VALUE; - /** - * Feature flag for enabling the dark UI theme in release builds. - */ - boolean FEATURE_FLAG_DARK_THEME = false; - /** * Feature flag for enabling the PIN lock in release builds. */ 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 ce9c69c0c..71ea1b575 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_DARK_THEME; 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; @@ -227,7 +226,6 @@ public class SettingsFragment extends PreferenceFragmentCompat } ); } else { - theme.setVisible(FEATURE_FLAG_DARK_THEME); screenLock.setVisible(FEATURE_FLAG_PIN_LOCK); screenLockTimeout.setVisible(FEATURE_FLAG_PIN_LOCK); -- GitLab From 08005bdf5638d518b6aac4de1e59fe429eea2eeb Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 12 Sep 2018 11:44:27 +0100 Subject: [PATCH 3/3] 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 = -- GitLab