Remove waitForTasks

app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java

@@ -127,23 +127,4 @@ public class BaseAndroidTest
             fail();
         }
     }
-
-    @Deprecated
-    protected void waitForAsyncTasks()
-    {
-        try
-        {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
-            {
-                Thread.sleep(1000);
-                return;
-            }
-
-            taskRunner.waitForTasks(10000);
-        }
-        catch (Exception e)
-        {
-            fail();
-        }
-    }
 }

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java

@@ -52,7 +52,6 @@ public class FrequencyCardTest extends BaseViewTest
 
         view.setHabit(habit);
         view.refreshData();
-        waitForAsyncTasks();
 
         measureView(view, 800, 600);
     }

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java

@@ -52,7 +52,6 @@ public class HistoryCardTest extends BaseViewTest
 
         view.setHabit(habit);
         view.refreshData();
-        waitForAsyncTasks();
 
         measureView(view, 800, 600);
     }

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java

@@ -52,8 +52,6 @@ public class OverviewCardTest extends BaseViewTest
 
         view.setHabit(habit);
         view.refreshData();
-        waitForAsyncTasks();
-
         measureView(view, 800, 300);
     }
 

app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java

@@ -52,8 +52,6 @@ public class ScoreCardTest extends BaseViewTest
 
         view.setHabit(habit);
         view.refreshData();
-        waitForAsyncTasks();
-
         measureView(view, 800, 600);
     }
 

app/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java

@@ -62,7 +62,5 @@ public class ExportCSVTaskTest extends BaseAndroidTest
                 assertTrue(f.exists());
                 assertTrue(f.canRead());
             }));
-
-        waitForAsyncTasks();
     }
 }

app/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java

@@ -55,6 +55,5 @@ public class ExportDBTaskTest extends BaseAndroidTest
         });
 
         taskRunner.execute(task);
-        waitForAsyncTasks();
     }
 }

app/src/androidTest/java/org/isoron/uhabits/tasks/ImportDataTaskTest.java

@@ -67,8 +67,6 @@ public class ImportDataTaskTest extends BaseAndroidTest
 
         taskRunner.execute(new ImportDataTask(habitList, file,
             (result) -> assertThat(result, equalTo(expectedResult))));
-
-        waitForAsyncTasks();
     }
 
     private void copyAssetToFile(String assetPath, File dst) throws IOException

app/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java

@@ -22,7 +22,6 @@ package org.isoron.uhabits.tasks;
 import android.os.*;
 
 import java.util.*;
-import java.util.concurrent.*;
 
 import javax.inject.*;
 
@@ -59,27 +58,6 @@ public class AndroidTaskRunner implements TaskRunner
             if (asyncTask.getTask() == task) asyncTask.publish(progress);
     }
 
-    @Override
-    public void waitForTasks(long timeout)
-        throws TimeoutException, InterruptedException
-    {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
-            throw new UnsupportedOperationException(
-                "waitForTasks requires API 16+");
-
-        int poolInterval = 100;
-
-        while (timeout > 0)
-        {
-            if (activeTasks.isEmpty()) return;
-
-            timeout -= poolInterval;
-            Thread.sleep(poolInterval);
-        }
-
-        throw new TimeoutException();
-    }
-
     private class CustomAsyncTask extends AsyncTask<Void, Integer, Void>
     {
         private final Task task;

app/src/main/java/org/isoron/uhabits/tasks/SingleThreadTaskRunner.java

@@ -19,8 +19,6 @@
 
 package org.isoron.uhabits.tasks;
 
-import java.util.concurrent.*;
-
 import javax.inject.*;
 
 import dagger.*;
@@ -50,10 +48,4 @@ public class SingleThreadTaskRunner implements TaskRunner
         task.onProgressUpdate(progress);
     }
 
-    @Override
-    public void waitForTasks(long timeout)
-        throws TimeoutException, InterruptedException
-    {
-        // NOP
-    }
 }

app/src/main/java/org/isoron/uhabits/tasks/TaskRunner.java

@@ -19,14 +19,9 @@
 
 package org.isoron.uhabits.tasks;
 
-import java.util.concurrent.*;
-
 public interface TaskRunner
 {
     void execute(Task task);
 
     void publishProgress(Task task, int progress);
-
-    void waitForTasks(long timeout)
-        throws TimeoutException, InterruptedException;
 }