From 21df6cb8096505a3381786fca0e3451040ebc919 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 1 Dec 2017 15:59:04 +0000 Subject: [PATCH 1/4] Change package name, version number for release branch. --- bramble-android/build.gradle | 4 ++-- briar-android/build.gradle | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bramble-android/build.gradle b/bramble-android/build.gradle index e96a3a712..1a4036e00 100644 --- a/bramble-android/build.gradle +++ b/bramble-android/build.gradle @@ -12,8 +12,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 26 - versionCode 1612 - versionName "0.16.12" + versionCode 1700 + versionName "0.17.0" consumerProguardFiles 'proguard-rules.txt' } diff --git a/briar-android/build.gradle b/briar-android/build.gradle index e3cb1ca4b..889f4b06d 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -186,18 +186,18 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 26 - versionCode 1612 - versionName "0.16.12" - applicationId "org.briarproject.briar.beta" - resValue "string", "app_package", "org.briarproject.briar.beta" - resValue "string", "app_name", "Briar Beta" + versionCode 1700 + versionName "0.17.0" + applicationId "org.briarproject.briar.android" + resValue "string", "app_package", "org.briarproject.briar.android" + resValue "string", "app_name", "Briar" buildConfigField "String", "GitHash", "\"${getGitHash()}\"" } buildTypes { debug { applicationIdSuffix ".debug" - resValue "string", "app_package", "org.briarproject.briar.beta.debug" + resValue "string", "app_package", "org.briarproject.briar.android.debug" resValue "string", "app_name", "Briar Debug" shrinkResources false minifyEnabled true From 71fe6f3148edad03e77b487d717d49fc39b23c4c Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 1 Dec 2017 16:11:06 +0000 Subject: [PATCH 2/4] Bump expiry date to 31 December 2018. --- .../java/org/briarproject/briar/android/BriarApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplication.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplication.java index c2e2595f3..ff9c83982 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplication.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplication.java @@ -6,8 +6,8 @@ package org.briarproject.briar.android; */ public interface BriarApplication { - // This build expires on 31 December 2017 - long EXPIRY_DATE = 1514761200 * 1000L; + // This build expires on 31 December 2018 + long EXPIRY_DATE = 1546214400 * 1000L; AndroidComponent getApplicationComponent(); From 87b2624aa8f8fed4f0a68fc38666f27b62acb3db Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 1 Dec 2017 16:13:21 +0000 Subject: [PATCH 3/4] Set IS_BETA_BUILD to false. --- .../java/org/briarproject/briar/android/TestingConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e2972784c..748d7345c 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 @@ -18,7 +18,7 @@ public interface TestingConstants { * Whether this is a beta build. This should be set to false for final * release builds. */ - boolean IS_BETA_BUILD = true; + boolean IS_BETA_BUILD = false; /** * Default log level. Disable logging for final release builds. From 116419f505d661b6a05e3a867f5ae3d1cb8d2fbd Mon Sep 17 00:00:00 2001 From: akwizgran Date: Fri, 1 Dec 2017 16:16:05 +0000 Subject: [PATCH 4/4] Don't show expiry warning for release builds. --- .../briar/android/navdrawer/NavDrawerControllerImpl.java | 6 ++++++ briar-android/src/main/res/values/strings.xml | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) 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 ba5a22f2c..a98b3a065 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 @@ -29,6 +29,8 @@ import javax.inject.Inject; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static org.briarproject.briar.android.BriarApplication.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; import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.SHOW; @@ -106,6 +108,10 @@ public class NavDrawerControllerImpl extends DbControllerImpl @Override public void showExpiryWarning(ResultHandler handler) { + if (!IS_DEBUG_BUILD && !IS_BETA_BUILD) { + handler.onResult(NO); + return; + } runOnDbThread(() -> { try { Settings settings = diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index fa95e33a8..3393d6889 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -34,10 +34,10 @@ For some reason, your Briar database is corrupted beyond repair. Your account, your data and all your contacts are lost. Unfortunately, you need to reinstall Briar and set up a new account. Briar was unable to start a required plugin. Reinstalling Briar usually solves this problem. However, please note that you will then lose your account and all data associated with it since Briar is not using central servers to store your data on. - This is a beta version of Briar. Your account will expire in %d day and cannot be renewed. - This is a beta version of Briar. Your account will expire in %d days and cannot be renewed. + This is a test version of Briar. Your account will expire in %d day and cannot be renewed. + This is a test version of Briar. Your account will expire in %d days and cannot be renewed. - The beta expiry date has been extended. Your account will now expire in %d days. + The testing expiry date has been extended. Your account will now expire in %d days. This software has expired.\nThank you for testing!