Clear private browsing tabs when private browsing is cleared. Fixes #…

…2161

app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStore.java

@@ -23,8 +23,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
+
 
 public class SessionStore implements GeckoSession.PermissionDelegate {
 
@@ -133,15 +132,29 @@ public Session createSession(SessionState aRestoreState) {
         return session;
     }
 
+    private void shutdownSession(@NonNull Session aSession) {
+        aSession.setPermissionDelegate(null);
+        aSession.removeNavigationListener(mServices);
+        aSession.shutdown();
+    }
+
     public void destroySession(Session aSession) {
         mSessions.remove(aSession);
         if (aSession != null) {
-            aSession.setPermissionDelegate(null);
-            aSession.removeNavigationListener(mServices);
-            aSession.shutdown();
+            shutdownSession(aSession);
         }
     }
 
+    public void destroyPrivateSessions() {
+        mSessions.removeIf(session -> {
+            if (!session.isPrivateMode()) {
+                return false;
+            }
+            shutdownSession(session);
+            return true;
+        });
+    }
+
     public @Nullable Session getSession(String aId) {
         return mSessions.stream().filter(session -> session.getId().equals(aId)).findFirst().orElse(null);
     }

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java

@@ -301,6 +301,8 @@ public void closeWindow(@NonNull WindowWidget aWindow) {
 
         boolean empty = getCurrentWindows().isEmpty();
         if (empty && isInPrivateMode()) {
+            // Clear private tabs
+            SessionStore.get().destroyPrivateSessions();
             // Exit private mode if the only window is closed.
             exitPrivateMode();
         } else if (empty) {