converted time remaininng to human readable format (#574)

Author: aanorbel

app/src/main/java/org/openobservatory/ooniprobe/activity/RunningActivity.java

@@ -1,5 +1,7 @@
 package org.openobservatory.ooniprobe.activity;
 
+import static java.util.Locale.ENGLISH;
+
 import android.app.AlertDialog;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -17,6 +19,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -143,8 +146,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         });
         testProgressRepository.getEta().observe(this,etaValue -> {
             if (etaValue!=null) {
-                eta.setText(getString(R.string.Dashboard_Running_Seconds,
-                        String.valueOf(Math.round(etaValue))));
+                eta.setText(readableTimeRemaining(etaValue));
             }
         });
 
@@ -186,8 +188,7 @@ private void applyUIChanges(RunTestService service) {
 
         Double etaValue = testProgressRepository.getEta().getValue();
         if (etaValue!=null){
-            eta.setText(getString(R.string.Dashboard_Running_Seconds,
-                    String.valueOf(Math.round(etaValue))));
+            eta.setText(readableTimeRemaining(etaValue));
         }else {
             eta.setText(R.string.Dashboard_Running_CalculatingETA);
         }
@@ -270,8 +271,8 @@ public void onRun(String value) {
         public void onProgress(int state, double timeLeft) {
             progress.setIndeterminate(false);
             progress.setProgress(state);
-            eta.setText(getString(R.string.Dashboard_Running_Seconds,
-                    String.valueOf(Math.round(timeLeft))));
+
+            eta.setText(readableTimeRemaining(timeLeft));
         }
 
         @Override
@@ -300,4 +301,10 @@ public void onEnd(Context context) {
             testEnded(context);
         }
     }
+
+    @NonNull
+    private static String readableTimeRemaining(double timeLeft) {
+        long letaValue = Math.round(timeLeft);
+        return String.format(ENGLISH,"%dm %02ds", letaValue/60, letaValue%60);
+    }
 }

app/src/main/java/org/openobservatory/ooniprobe/receiver/TestRunBroadRequestReceiver.java

@@ -58,7 +58,7 @@ public void onReceive(Context context, Intent intent) {
                 break;
             case TestAsyncTask.PRG:
                 try {
-                    if (service != null && service.task.testSuites.indexOf(service.task.currentSuite) > 0) {
+                    if (service != null && service.task.testSuites.contains(service.task.currentSuite)) {
                         List<AbstractSuite> previousTestSuites =
                                 service.task.testSuites.subList(0, service.task.testSuites.indexOf(service.task.currentSuite));
                         int previousTestProgress = ListUtility.sum(Lists.transform(