diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 43a500571f5d4bdd7d619e4c70a472110efbf00e..3f965100d5d4276568b660e9906382c85528ca26 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -244,6 +244,7 @@ android { resValue "string", "app_package", "org.briarproject.briar.android" resValue "string", "app_name", "Briar" buildConfigField "String", "GitHash", "\"${getGitHash()}\"" + buildConfigField "Long", "BuildTimestamp", "${System.currentTimeMillis()}L" } buildTypes { 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 ff9c8398202b9ef7d204138a882a888a5f812e7f..bf78cecfa1b00eed4e17012cb187e123f50e2d63 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,9 +6,5 @@ package org.briarproject.briar.android; */ public interface BriarApplication { - // This build expires on 31 December 2018 - long EXPIRY_DATE = 1546214400 * 1000L; - AndroidComponent getApplicationComponent(); - } 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 748d7345cc47d7565cb8f789ac13fa902c5fdcf2..96f1b5cf254f8f4f02e2d67f1c95768ce6d0e778 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 @@ -33,4 +33,12 @@ public interface TestingConstants { * intentionally. */ boolean PREVENT_SCREENSHOTS = !IS_DEBUG_BUILD; + + /** + * Debug and beta builds expire after 90 days. Final release builds expire + * after 292 million years. + */ + long EXPIRY_DATE = IS_DEBUG_BUILD || IS_BETA_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 a98b3a0658cdec0df0ad858dfde40873689889af..4a8e6d11ed5af8f760392ef994bd46b5a1f7a134 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 @@ -28,7 +28,7 @@ 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.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; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java index 19cdf8d02b8c3499b0c87538b047126466b81f1d..258a2851c09877f8d4e9c9e6583f257d7edcf5df 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java @@ -19,9 +19,7 @@ import java.util.logging.Logger; import javax.inject.Inject; -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.TestingConstants.EXPIRY_DATE; public class SplashScreenActivity extends BaseActivity { @@ -62,8 +60,7 @@ public class SplashScreenActivity extends BaseActivity { } protected void startNextActivity() { - if ((IS_DEBUG_BUILD || IS_BETA_BUILD) - && System.currentTimeMillis() >= EXPIRY_DATE) { + if (System.currentTimeMillis() >= EXPIRY_DATE) { LOG.info("Expired"); startActivity(new Intent(this, ExpiredActivity.class)); } else { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java index 757bb7159df260346b3a8a06ca5e0db0e77c18fc..884264a61d627d647b5fae521211ff42963f947d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java @@ -46,7 +46,7 @@ import static android.text.format.DateUtils.FORMAT_SHOW_DATE; import static android.text.format.DateUtils.MINUTE_IN_MILLIS; import static android.text.format.DateUtils.WEEK_IN_MILLIS; import static org.briarproject.briar.BuildConfig.APPLICATION_ID; -import static org.briarproject.briar.android.BriarApplication.EXPIRY_DATE; +import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE; @MethodsNotNullByDefault @ParametersNotNullByDefault