From 116419f505d661b6a05e3a867f5ae3d1cb8d2fbd Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 1 Dec 2017 16:16:05 +0000
Subject: [PATCH] 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 ba5a22f2c7..a98b3a0658 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<ExpiryWarning> 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 fa95e33a85..3393d6889d 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -34,10 +34,10 @@
<string name="startup_failed_db_error">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.</string>
<string name="startup_failed_service_error">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.</string>
<plurals name="expiry_warning">
- <item quantity="one">This is a beta version of Briar. Your account will expire in %d day and cannot be renewed.</item>
- <item quantity="other">This is a beta version of Briar. Your account will expire in %d days and cannot be renewed.</item>
+ <item quantity="one">This is a test version of Briar. Your account will expire in %d day and cannot be renewed.</item>
+ <item quantity="other">This is a test version of Briar. Your account will expire in %d days and cannot be renewed.</item>
</plurals>
- <string name="expiry_update">The beta expiry date has been extended. Your account will now expire in %d days.</string>
+ <string name="expiry_update">The testing expiry date has been extended. Your account will now expire in %d days.</string>
<string name="expiry_date_reached">This software has expired.\nThank you for testing!</string>
<!-- Navigation Drawer -->
--
GitLab