onContextUnavailable now correctly called before onDestroy even if the host Activity is still around

conductor/src/main/java/com/bluelinelabs/conductor/Controller.java

@@ -853,17 +853,19 @@ public abstract class Controller {
             destroy(true);
         }
 
-        List<LifecycleListener> listeners = new ArrayList<>(lifecycleListeners);
-        for (LifecycleListener lifecycleListener : listeners) {
-            lifecycleListener.preContextUnavailable(this, activity);
-        }
+        if (isContextAvailable) {
+            List<LifecycleListener> listeners = new ArrayList<>(lifecycleListeners);
+            for (LifecycleListener lifecycleListener : listeners) {
+                lifecycleListener.preContextUnavailable(this, activity);
+            }
 
-        isContextAvailable = false;
-        onContextUnavailable();
+            isContextAvailable = false;
+            onContextUnavailable();
 
-        listeners = new ArrayList<>(lifecycleListeners);
-        for (LifecycleListener lifecycleListener : listeners) {
-            lifecycleListener.postContextUnavailable(this);
+            listeners = new ArrayList<>(lifecycleListeners);
+            for (LifecycleListener lifecycleListener : listeners) {
+                lifecycleListener.postContextUnavailable(this);
+            }
         }
     }
 
@@ -1036,6 +1038,21 @@ public abstract class Controller {
     }
 
     private void performDestroy() {
+        if (isContextAvailable) {
+            List<LifecycleListener> listeners = new ArrayList<>(lifecycleListeners);
+            for (LifecycleListener lifecycleListener : listeners) {
+                lifecycleListener.preContextUnavailable(this, getActivity());
+            }
+
+            isContextAvailable = false;
+            onContextUnavailable();
+
+            listeners = new ArrayList<>(lifecycleListeners);
+            for (LifecycleListener lifecycleListener : listeners) {
+                lifecycleListener.postContextUnavailable(this);
+            }
+        }
+
         if (!destroyed) {
             List<LifecycleListener> listeners = new ArrayList<>(lifecycleListeners);
             for (LifecycleListener lifecycleListener : listeners) {

conductor/src/test/java/com/bluelinelabs/conductor/ControllerLifecycleCallbacksTests.java

@@ -493,6 +493,7 @@ public class ControllerLifecycleCallbacksTests {
 
         expectedCallState.detachCalls++;
         expectedCallState.destroyViewCalls++;
+        expectedCallState.contextUnavailableCalls++;
         expectedCallState.destroyCalls++;
 
         assertCalls(expectedCallState, child);
@@ -534,6 +535,7 @@ public class ControllerLifecycleCallbacksTests {
             public void didAttachOrDetach() {
                 expectedCallState.destroyViewCalls++;
                 expectedCallState.detachCalls++;
+                expectedCallState.contextUnavailableCalls++;
                 expectedCallState.destroyCalls++;
                 assertCalls(expectedCallState, controller);
             }