From 7ee0febf0cacdd455ed95af5d060166e9fd7ac71 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Mon, 1 Jul 2019 14:59:03 +0100 Subject: [PATCH] Use TimeUnit to make durations more readable. --- .../org/briarproject/briar/android/TestingConstants.java | 5 +++-- .../briar/android/navdrawer/NavDrawerControllerImpl.java | 5 +++-- .../java/org/briarproject/briar/android/util/UiUtils.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) 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 5b96a0c02..12620dffc 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 @@ -2,6 +2,8 @@ package org.briarproject.briar.android; import org.briarproject.briar.BuildConfig; +import static java.util.concurrent.TimeUnit.DAYS; + public interface TestingConstants { /** @@ -22,6 +24,5 @@ public interface TestingConstants { * million years. */ long EXPIRY_DATE = IS_DEBUG_BUILD ? - BuildConfig.BuildTimestamp + 90 * 24 * 60 * 60 * 1000L : - Long.MAX_VALUE; + BuildConfig.BuildTimestamp + DAYS.toMillis(90) : 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 a20d03a3d..8cb365dd5 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 @@ -26,6 +26,7 @@ import java.util.logging.Logger; 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 org.briarproject.bramble.util.LogUtils.logException; @@ -122,9 +123,9 @@ public class NavDrawerControllerImpl extends DbControllerImpl long warningLong = warningInt * 1000L; long now = System.currentTimeMillis(); long daysSinceLastWarning = - (now - warningLong) / 1000 / 60 / 60 / 24; + (now - warningLong) / DAYS.toMillis(1); long daysBeforeExpiry = - (EXPIRY_DATE - now) / 1000 / 60 / 60 / 24; + (EXPIRY_DATE - now) / DAYS.toMillis(1); if (showUpdate) { handler.onResult(UPDATE); 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 ae9b8e090..0e6856615 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 @@ -80,6 +80,7 @@ import static android.view.KeyEvent.KEYCODE_ENTER; import static android.view.inputmethod.EditorInfo.IME_NULL; import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT; import static java.util.Objects.requireNonNull; +import static java.util.concurrent.TimeUnit.DAYS; import static org.briarproject.briar.BuildConfig.APPLICATION_ID; import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE; @@ -151,7 +152,7 @@ public class UiUtils { public static int getDaysUntilExpiry() { long now = System.currentTimeMillis(); - long daysBeforeExpiry = (EXPIRY_DATE - now) / 1000 / 60 / 60 / 24; + long daysBeforeExpiry = (EXPIRY_DATE - now) / DAYS.toMillis(1); return (int) daysBeforeExpiry; }