From 216f0598f9a79b63fe5ceb9ecffedfe7c206f07c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 1 Jul 2019 14:51:43 +0100 Subject: [PATCH] Remove ancient flag for beta builds. --- .../briar/android/BriarApplicationImpl.java | 5 ++--- .../briarproject/briar/android/TestingConstants.java | 12 +++--------- .../android/navdrawer/NavDrawerControllerImpl.java | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java index c48ca9ffe..a1e058034 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java @@ -54,7 +54,6 @@ import static org.acra.ReportField.REPORT_ID; import static org.acra.ReportField.STACK_TRACE; import static org.acra.ReportField.USER_APP_START_DATE; import static org.acra.ReportField.USER_CRASH_DATE; -import static org.briarproject.briar.android.TestingConstants.IS_BETA_BUILD; import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD; @ReportsCrashes( @@ -111,7 +110,7 @@ public class BriarApplicationImpl extends Application Handler[] handlers = rootLogger.getHandlers(); // Disable the Android logger for release builds for (Handler handler : handlers) rootLogger.removeHandler(handler); - if (IS_DEBUG_BUILD || IS_BETA_BUILD) { + if (IS_DEBUG_BUILD) { // We can't set the level of the Android logger at runtime, so // raise records to the logger's default level rootLogger.addHandler(new LevelRaisingHandler(FINE, INFO)); @@ -119,7 +118,7 @@ public class BriarApplicationImpl extends Application for (Handler handler : handlers) rootLogger.addHandler(handler); } rootLogger.addHandler(logHandler); - rootLogger.setLevel(IS_DEBUG_BUILD || IS_BETA_BUILD ? FINE : INFO); + rootLogger.setLevel(IS_DEBUG_BUILD ? FINE : INFO); LOG.info("Created"); 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 e3b970dc9..5b96a0c02 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 @@ -9,12 +9,6 @@ public interface TestingConstants { */ boolean IS_DEBUG_BUILD = BuildConfig.DEBUG; - /** - * Whether this is a beta build. This should be set to false for final - * release builds. - */ - boolean IS_BETA_BUILD = false; - /** * Whether to prevent screenshots from being taken. Setting this to true * prevents Recent Apps from storing screenshots of private information. @@ -24,10 +18,10 @@ public interface TestingConstants { boolean PREVENT_SCREENSHOTS = !IS_DEBUG_BUILD; /** - * Debug and beta builds expire after 90 days. Final release builds expire - * after 292 million years. + * Debug builds expire after 90 days. Release builds expire after 292 + * million years. */ - long EXPIRY_DATE = IS_DEBUG_BUILD || IS_BETA_BUILD ? + long EXPIRY_DATE = IS_DEBUG_BUILD ? BuildConfig.BuildTimestamp + 90 * 24 * 60 * 60 * 1000L : Long.MAX_VALUE; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java index 489be9db3..a20d03a3d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java @@ -30,7 +30,6 @@ import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE; -import static org.briarproject.briar.android.TestingConstants.IS_BETA_BUILD; import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD; import static org.briarproject.briar.android.controller.BriarControllerImpl.DOZE_ASK_AGAIN; import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.NO; @@ -104,7 +103,7 @@ public class NavDrawerControllerImpl extends DbControllerImpl @Override public void showExpiryWarning(ResultHandler handler) { - if (!IS_DEBUG_BUILD && !IS_BETA_BUILD) { + if (!IS_DEBUG_BUILD) { handler.onResult(NO); return; }