From ee180defceb1d4e1ee02832b18b525268b09c3c2 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 1 Jul 2019 15:06:42 +0100 Subject: [PATCH] Remove expiry update code, fix references to Briar 1.0. --- .../android/navdrawer/NavDrawerActivity.java | 29 +++++-------------- .../navdrawer/NavDrawerController.java | 4 +-- .../navdrawer/NavDrawerControllerImpl.java | 27 +++++++---------- briar-android/src/main/res/values/strings.xml | 5 ++-- 4 files changed, 20 insertions(+), 45 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java index 78f5fbb17..ae6b6ac15 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java @@ -45,7 +45,6 @@ import org.briarproject.briar.android.forum.ForumListFragment; import org.briarproject.briar.android.fragment.BaseFragment; import org.briarproject.briar.android.fragment.BaseFragment.BaseFragmentListener; import org.briarproject.briar.android.logout.SignOutFragment; -import org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning; import org.briarproject.briar.android.privategroup.list.GroupListFragment; import org.briarproject.briar.android.settings.SettingsActivity; @@ -66,8 +65,6 @@ import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleS import static org.briarproject.briar.android.BriarService.EXTRA_STARTUP_FAILED; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PASSWORD; import static org.briarproject.briar.android.navdrawer.IntentRouter.handleExternalIntent; -import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.NO; -import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.UPDATE; import static org.briarproject.briar.android.util.UiUtils.getDaysUntilExpiry; @MethodsNotNullByDefault @@ -155,10 +152,10 @@ public class NavDrawerActivity extends BriarActivity implements super.onStart(); updateTransports(); lockManager.checkIfLockable(); - controller.showExpiryWarning(new UiResultHandler(this) { + controller.showExpiryWarning(new UiResultHandler(this) { @Override - public void onResultUi(ExpiryWarning expiry) { - if (expiry != NO) showExpiryWarning(expiry); + public void onResultUi(Boolean expiry) { + if (expiry) showExpiryWarning(); } }); } @@ -347,7 +344,7 @@ public class NavDrawerActivity extends BriarActivity implements if (item != null) item.setVisible(visible); } - private void showExpiryWarning(ExpiryWarning expiry) { + private void showExpiryWarning() { int daysUntilExpiry = getDaysUntilExpiry(); if (daysUntilExpiry < 0) signOut(); @@ -359,21 +356,9 @@ public class NavDrawerActivity extends BriarActivity implements ImageView expiryWarningClose = expiryWarning.findViewById(R.id.expiryWarningClose); - // show a different snackbar in green if this is an update - if (expiry == UPDATE) { - expiryWarning.setBackgroundColor( - ContextCompat.getColor(this, R.color.briar_green_light)); - expiryWarningText.setText( - getString(R.string.expiry_update, daysUntilExpiry)); - expiryWarningText.setTextColor( - ContextCompat.getColor(this, android.R.color.black)); - expiryWarningClose.setColorFilter( - ContextCompat.getColor(this, android.R.color.black)); - } else { - expiryWarningText.setText(getResources() - .getQuantityString(R.plurals.expiry_warning, - daysUntilExpiry, daysUntilExpiry)); - } + expiryWarningText.setText(getResources() + .getQuantityString(R.plurals.expiry_warning, + daysUntilExpiry, daysUntilExpiry)); expiryWarningClose.setOnClickListener(v -> { controller.expiryWarningDismissed(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerController.java b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerController.java index d2d883e90..44c8c8dfd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerController.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerController.java @@ -10,11 +10,9 @@ import org.briarproject.briar.android.controller.handler.ResultHandler; @NotNullByDefault public interface NavDrawerController extends ActivityLifecycleController { - enum ExpiryWarning { SHOW, NO, UPDATE } - boolean isTransportRunning(TransportId transportId); - void showExpiryWarning(ResultHandler handler); + void showExpiryWarning(ResultHandler handler); void expiryWarningDismissed(); 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 8cb365dd5..4af7eded3 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,13 +29,11 @@ import javax.inject.Inject; import static java.util.concurrent.TimeUnit.DAYS; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; +import static java.util.logging.Logger.getLogger; 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_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; -import static org.briarproject.briar.android.navdrawer.NavDrawerController.ExpiryWarning.UPDATE; import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE; import static org.briarproject.briar.android.util.UiUtils.needsDozeWhitelisting; @@ -45,9 +43,9 @@ public class NavDrawerControllerImpl extends DbControllerImpl implements NavDrawerController, EventListener { private static final Logger LOG = - Logger.getLogger(NavDrawerControllerImpl.class.getName()); + getLogger(NavDrawerControllerImpl.class.getName()); + private static final String EXPIRY_DATE_WARNING = "expiryDateWarning"; - private static final String EXPIRY_SHOW_UPDATE = "expiryShowUpdate"; private final PluginManager pluginManager; private final SettingsManager settingsManager; @@ -103,9 +101,9 @@ public class NavDrawerControllerImpl extends DbControllerImpl } @Override - public void showExpiryWarning(ResultHandler handler) { + public void showExpiryWarning(ResultHandler handler) { if (!IS_DEBUG_BUILD) { - handler.onResult(NO); + handler.onResult(false); return; } runOnDbThread(() -> { @@ -113,12 +111,10 @@ public class NavDrawerControllerImpl extends DbControllerImpl Settings settings = settingsManager.getSettings(SETTINGS_NAMESPACE); int warningInt = settings.getInt(EXPIRY_DATE_WARNING, 0); - boolean showUpdate = - settings.getBoolean(EXPIRY_SHOW_UPDATE, true); if (warningInt == 0) { // we have not warned before - handler.onResult(SHOW); + handler.onResult(true); } else { long warningLong = warningInt * 1000L; long now = System.currentTimeMillis(); @@ -127,15 +123,13 @@ public class NavDrawerControllerImpl extends DbControllerImpl long daysBeforeExpiry = (EXPIRY_DATE - now) / DAYS.toMillis(1); - if (showUpdate) { - handler.onResult(UPDATE); - } else if (daysSinceLastWarning >= 30) { - handler.onResult(SHOW); + if (daysSinceLastWarning >= 30) { + handler.onResult(true); } else if (daysBeforeExpiry <= 3 && daysSinceLastWarning > 0) { - handler.onResult(SHOW); + handler.onResult(true); } else { - handler.onResult(NO); + handler.onResult(false); } } } catch (DbException e) { @@ -151,7 +145,6 @@ public class NavDrawerControllerImpl extends DbControllerImpl Settings settings = new Settings(); int date = (int) (System.currentTimeMillis() / 1000L); settings.putInt(EXPIRY_DATE_WARNING, date); - settings.putBoolean(EXPIRY_SHOW_UPDATE, false); settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE); } catch (DbException e) { logException(LOG, WARNING, e); diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index 6f6584795..5e32aaa6c 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -47,11 +47,10 @@ 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 testing expiry date has been extended. Your account will now expire in %d days. This software has expired.\nThank you for testing! - To continue using Briar, please download version 1.0. + To continue using Briar, please download the latest release. You will need to create a new account, but you can use the same nickname. - Download Briar 1.0 + Download Latest Release Decrypting Database… Upgrading Database… Compacting Database…