diff --git a/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java index 254b050db..f1c14b159 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java +++ b/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(); - } - } } diff --git a/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java index adcae2b9e..2e37d1c10 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java +++ b/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); } diff --git a/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java index a4e4c8860..0a9d69291 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java +++ b/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); } diff --git a/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java index 25bfc950f..0e54b7adf 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java +++ b/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); } diff --git a/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java b/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java index 8b229d7f5..c93d0b1bd 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java +++ b/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); } diff --git a/app/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java b/app/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java index 058143ae5..86860f006 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java +++ b/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(); } } diff --git a/app/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java b/app/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java index 62a3849ea..ac3dce2ba 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java +++ b/app/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java @@ -55,6 +55,5 @@ public class ExportDBTaskTest extends BaseAndroidTest }); taskRunner.execute(task); - waitForAsyncTasks(); } } diff --git a/app/src/androidTest/java/org/isoron/uhabits/tasks/ImportDataTaskTest.java b/app/src/androidTest/java/org/isoron/uhabits/tasks/ImportDataTaskTest.java index 7456a4a57..8170ee7e1 100644 --- a/app/src/androidTest/java/org/isoron/uhabits/tasks/ImportDataTaskTest.java +++ b/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 diff --git a/app/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java b/app/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java index 0e3473a3d..ed7189967 100644 --- a/app/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.java +++ b/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 { private final Task task; diff --git a/app/src/main/java/org/isoron/uhabits/tasks/SingleThreadTaskRunner.java b/app/src/main/java/org/isoron/uhabits/tasks/SingleThreadTaskRunner.java index ef0685ecd..5b2c1da42 100644 --- a/app/src/main/java/org/isoron/uhabits/tasks/SingleThreadTaskRunner.java +++ b/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 - } } diff --git a/app/src/main/java/org/isoron/uhabits/tasks/TaskRunner.java b/app/src/main/java/org/isoron/uhabits/tasks/TaskRunner.java index 31c59299f..898d196f6 100644 --- a/app/src/main/java/org/isoron/uhabits/tasks/TaskRunner.java +++ b/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; }