Avoid setting state and uri to null when restoring a session (#3629)

MozillaReality · Jul 6, 2020 · cc3f73d · cc3f73d
1 parent b751725
commit cc3f73d
Showing 1 changed file with 5 additions and 6 deletions.
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
@@ -431,6 +431,11 @@ public void suspend() {
     }
 
     private boolean shouldLoadDefaultPage(@NonNull SessionState aState) {
+        // data:text URLs can not be restored.
+        if (mState.mSessionState != null && ((mState.mUri == null) || mState.mUri.startsWith("data:text"))) {
+            return true;
+        }
+
         if (aState.mUri != null && aState.mUri.length() != 0 && !aState.mUri.equals(mContext.getString(R.string.about_blank))) {
             return false;
         }
@@ -468,12 +473,6 @@ private void restore() {
 
         openSession();
 
-        // data:text URLs can not be restored.
-        if (mState.mSessionState != null && ((mState.mUri == null) || mState.mUri.startsWith("data:text"))) {
-            mState.mSessionState = null;
-            mState.mUri = null;
-        }
-
         if (shouldLoadDefaultPage(mState)) {
             loadDefaultPage();
         } else if (mState.mSessionState != null) {