diff --git a/app/src/main/java/org/tasks/jobs/WorkManager.java b/app/src/main/java/org/tasks/jobs/WorkManager.java index 19be3ffb2..6085d73be 100644 --- a/app/src/main/java/org/tasks/jobs/WorkManager.java +++ b/app/src/main/java/org/tasks/jobs/WorkManager.java @@ -9,6 +9,7 @@ import static io.reactivex.Single.zip; import static org.tasks.date.DateTimeUtils.midnight; import static org.tasks.date.DateTimeUtils.newDateTime; import static org.tasks.time.DateTimeUtils.currentTimeMillis; +import static org.tasks.time.DateTimeUtils.printDuration; import static org.tasks.time.DateTimeUtils.printTimestamp; import android.annotation.SuppressLint; @@ -231,7 +232,7 @@ public class WorkManager { if (delay > 0) { builder.setInitialDelay(delay, TimeUnit.MILLISECONDS); } - Timber.d("%s: %s (%sms)", key, printTimestamp(time), delay); + Timber.d("%s: %s (%s)", key, printTimestamp(time), printDuration(delay)); workManager.beginUniqueWork(key, ExistingWorkPolicy.REPLACE, builder.build()).enqueue(); } diff --git a/app/src/main/java/org/tasks/time/DateTimeUtils.java b/app/src/main/java/org/tasks/time/DateTimeUtils.java index 6206fbea9..10a66de2a 100644 --- a/app/src/main/java/org/tasks/time/DateTimeUtils.java +++ b/app/src/main/java/org/tasks/time/DateTimeUtils.java @@ -1,5 +1,6 @@ package org.tasks.time; +import android.annotation.SuppressLint; import java.util.Date; import org.tasks.BuildConfig; @@ -23,4 +24,15 @@ public class DateTimeUtils { public static String printTimestamp(long timestamp) { return BuildConfig.DEBUG ? new Date(timestamp).toString() : Long.toString(timestamp); } + + @SuppressLint("DefaultLocale") + public static String printDuration(long millis) { + if (BuildConfig.DEBUG) { + long seconds = millis / 1000; + return String.format( + "%dh %dm %ds", seconds / 3600L, (int) (seconds % 3600L / 60L), (int) (seconds % 60L)); + } else { + return Long.toString(millis); + } + } }