Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Use TimeUnit to make durations more readable.

Browse Source
This commit is contained in:
akwizgran
2019-07-01 14:59:03 +01:00
parent 216f0598f9
commit 7ee0febf0c
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-android/src/main/java/org/briarproject/briar/android/TestingConstants.java
View File

@@ -2,6 +2,8 @@ package org.briarproject.briar.android;
import org.briarproject.briar.BuildConfig; import org.briarproject.briar.BuildConfig;
import static java.util.concurrent.TimeUnit.DAYS;
public interface TestingConstants { public interface TestingConstants {
/** /**
@@ -22,6 +24,5 @@ public interface TestingConstants {
* million years. * million years.
*/ */
long EXPIRY_DATE = IS_DEBUG_BUILD ? long EXPIRY_DATE = IS_DEBUG_BUILD ?
BuildConfig.BuildTimestamp + 90 * 24 * 60 * 60 * 1000L : BuildConfig.BuildTimestamp + DAYS.toMillis(90) : Long.MAX_VALUE;
Long.MAX_VALUE;
} }

5
briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerControllerImpl.java
View File

@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
import static org.briarproject.bramble.util.LogUtils.logException; import static org.briarproject.bramble.util.LogUtils.logException;
@@ -122,9 +123,9 @@ public class NavDrawerControllerImpl extends DbControllerImpl
long warningLong = warningInt * 1000L; long warningLong = warningInt * 1000L;
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
long daysSinceLastWarning = long daysSinceLastWarning =
(now - warningLong) / 1000 / 60 / 60 / 24; (now - warningLong) / DAYS.toMillis(1);
long daysBeforeExpiry = long daysBeforeExpiry =
(EXPIRY_DATE - now) / 1000 / 60 / 60 / 24; (EXPIRY_DATE - now) / DAYS.toMillis(1);
if (showUpdate) { if (showUpdate) {
handler.onResult(UPDATE); handler.onResult(UPDATE);

3
briar-android/src/main/java/org/briarproject/briar/android/util/UiUtils.java
View File

@@ -80,6 +80,7 @@ import static android.view.KeyEvent.KEYCODE_ENTER;
import static android.view.inputmethod.EditorInfo.IME_NULL; import static android.view.inputmethod.EditorInfo.IME_NULL;
import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT; import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
import static java.util.Objects.requireNonNull; 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.BuildConfig.APPLICATION_ID;
import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE; import static org.briarproject.briar.android.TestingConstants.EXPIRY_DATE;
@@ -151,7 +152,7 @@ public class UiUtils {
public static int getDaysUntilExpiry() { public static int getDaysUntilExpiry() {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
long daysBeforeExpiry = (EXPIRY_DATE - now) / 1000 / 60 / 60 / 24; long daysBeforeExpiry = (EXPIRY_DATE - now) / DAYS.toMillis(1);
return (int) daysBeforeExpiry; return (int) daysBeforeExpiry;
} }