Fix the unlinking/removing sessions order (#3683)

keianhzo · bluemarvin · commit 7e8fa9e091f5 · 2020-07-15T11:03:47.000-07:00
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java
@@ -442,11 +442,11 @@ public void suspend() {
             return;
         }
 
-        mSessionChangeListeners.forEach(listener -> listener.onSessionRemoved(mState.mId));
-
         Log.d(LOGTAG, "Suspending Session: " + mState.mId);
         closeSession(mState);
         mState.mSession = null;
+
+        mSessionChangeListeners.forEach(listener -> listener.onSessionRemoved(mState.mId));
     }
 
     private boolean shouldLoadDefaultPage(@NonNull SessionState aState) {

Original file line number	Diff line number	Diff line change
`@@ -442,11 +442,11 @@ public void suspend() {`
`442`	`442`	`return;`
`443`	`443`	`}`
`444`	`444`
`445`		`- mSessionChangeListeners.forEach(listener -> listener.onSessionRemoved(mState.mId));`
`446`		`-`
`447`	`445`	`Log.d(LOGTAG, "Suspending Session: " + mState.mId);`
`448`	`446`	`closeSession(mState);`
`449`	`447`	`mState.mSession = null;`
	`448`	`+`
	`449`	`+ mSessionChangeListeners.forEach(listener -> listener.onSessionRemoved(mState.mId));`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`private boolean shouldLoadDefaultPage(@NonNull SessionState aState) {`