Strict-mode bug fix.

Author: Rolf-Smit

library/src/main/java/org/neotech/library/retainabletasks/internal/BaseTaskManager.java

@@ -1,5 +1,6 @@
 package org.neotech.library.retainabletasks.internal;
 
+import android.os.Looper;
 import android.support.annotation.MainThread;
 import android.support.annotation.NonNull;
 import android.util.Log;
@@ -30,6 +31,9 @@ public final class BaseTaskManager extends TaskManager {
     }
 
     public void attach(TaskManagerProvider taskManagerProvider){
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
         /*
          * If this loop would directly set new Callback listeners it could cause a task to deliver
          * its result. Meaning that the removeFinishedTask method can be called causing the 'tasks'
@@ -77,6 +81,9 @@ public void attach(TaskManagerProvider taskManagerProvider){
 
     @Override
     public Task<?, ?> attach(@NonNull Task<?, ?> task, @NonNull Task.Callback callback) {
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
         task.setCallback(new CallbackShadow(callback));
         return task;
     }
@@ -97,6 +104,9 @@ public void attachAll(@NonNull TaskAttachListener attachListener, @NonNull Strin
 
     @Override
     public Task<?, ?> detach(@NonNull String tag) {
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
         final Task<?, ?> task = tasks.get(tag);
         if(task != null){
             task.removeCallback();
@@ -119,6 +129,9 @@ public <Progress, Result> void execute(@NonNull Task<Progress, Result> task, @No
 
     @Override
     public <Progress, Result> void execute(@NonNull Task<Progress, Result> task, @NonNull Task.Callback callback, @NonNull Executor executor) {
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
         final Task currentTask = tasks.get(task.getTag());
         if(currentTask != null && currentTask.isRunning()){
             throw new IllegalStateException("Task with an equal tag: '" + task.getTag() + "' has already been added and is currently running or finishing.");
@@ -131,27 +144,43 @@ public <Progress, Result> void execute(@NonNull Task<Progress, Result> task, @No
     @Override
     @MainThread
     public boolean isResultDelivered(@NonNull String tag) {
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
         Task task = tasks.get(tag);
         return task != null && task.isResultDelivered();
     }
 
     @Override
     @MainThread
     public boolean isRunning(@NonNull String tag) {
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
         Task task = tasks.get(tag);
         return task != null && task.isRunning();
     }
 
     @Override
     @MainThread
     public Task<?, ?> cancel(@NonNull String tag){
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
         final Task<?, ?> task = tasks.remove(tag);
         if(task != null){
             task.cancel(false);
         }
         return task;
     }
 
+
+    public void assertMainThread() throws IllegalStateException {
+        if(Looper.getMainLooper() != Looper.myLooper()){
+            throw new IllegalStateException("Method not called on the UI-thread!");
+        }
+    }
+
     @Override
     @MainThread
     public void assertAllTasksDetached() throws IllegalStateException {
@@ -165,13 +194,24 @@ public void assertAllTasksDetached() throws IllegalStateException {
 
     @MainThread
     public void cancelAll(){
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
         for(Map.Entry<String, Task<?, ?>> task: tasks.entrySet()){
             task.getValue().cancel(true);
         }
     }
 
     @MainThread
     public void detach(){
+        if(TaskManager.isStrictDebugModeEnabled()){
+            assertMainThread();
+        }
+        /**
+         * The problem described in the attach(TaskManagerProvider) doesn't apply to this method
+         * as all TaskManager methods should be executed on the UI-thread, meaning that no other
+         * method can be called while inside this method.
+         */
         for(Map.Entry<String, Task<?, ?>> task: tasks.entrySet()){
             task.getValue().removeCallback();
         }

library/src/main/java/org/neotech/library/retainabletasks/internal/TaskRetainingFragment.java

@@ -64,7 +64,7 @@ public BaseTaskManager getActivityTaskManager(){
         return taskManager;
     }
 
-    public void assertAllRemoved(){
+    public void assertFragmentTasksAreDetached(){
         if(!TaskManager.isStrictDebugModeEnabled()){
             return;
         }
@@ -76,4 +76,11 @@ public void assertAllRemoved(){
             }
         }
     }
+
+    public void assertActivityTasksAreDetached(){
+        if(!TaskManager.isStrictDebugModeEnabled()){
+            return;
+        }
+        taskManager.assertAllTasksDetached();
+    }
 }

library/src/main/java/org/neotech/library/retainabletasks/internal/TaskRetainingFragmentCompat.java

@@ -21,7 +21,7 @@ public void onStop() {
         super.onStop();
         //As soon as the activity is stopped the UI should not be touched.
         logic.getActivityTaskManager().detach();
-        logic.assertAllRemoved();
+        logic.assertActivityTasksAreDetached();
     }
 
     @Override
@@ -34,7 +34,8 @@ public void onDestroy() {
          * The references to the tasks are lost at this point.
          */
 
-        logic.getActivityTaskManager().detach();
+        //logic.getActivityTaskManager().detach();
+        logic.assertFragmentTasksAreDetached();
         super.onDestroy();
     }
 }

library/src/main/java/org/neotech/library/retainabletasks/internal/TaskRetainingFragmentV11.java

@@ -24,7 +24,7 @@ public void onStop() {
         super.onStop();
         //As soon as the activity is stopped the UI should not be touched.
         logic.getActivityTaskManager().detach();
-        logic.assertAllRemoved();
+        logic.assertActivityTasksAreDetached();
     }
 
     @Override
@@ -37,7 +37,8 @@ public void onDestroy() {
          * The references to the tasks are lost at this point.
          */
 
-        logic.getActivityTaskManager().detach();
+        //logic.getActivityTaskManager().detach();
+        logic.assertFragmentTasksAreDetached();
         super.onDestroy();
     }
 }