Fix broken UI after restoring a Youtube session (#2181)

MozillaReality · Nov 6, 2019 · 700cadc · 700cadc
1 parent a812dce
commit 700cadc
Showing 1 changed file with 5 additions and 2 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
@@ -361,6 +361,8 @@ private void restore() {
         } else if(mState.mSessionState == null || mState.mUri.equals(mContext.getResources().getString(R.string.about_blank)) ||
                 (mState.mSessionState != null && mState.mSessionState.size() == 0)) {
             loadHomePage();
+        } else if (mState.mUri != null && mState.mUri.contains(".youtube.com")) {
+            mState.mSession.loadUri(mState.mUri);
         }
 
         dumpAllState();
@@ -391,6 +393,9 @@ private GeckoSession createGeckoSession(@NonNull SessionSettings aSettings) {
                 .useMultiprocess(aSettings.isMultiprocessEnabled())
                 .usePrivateMode(mUsePrivateMode)
                 .useTrackingProtection(aSettings.isTrackingProtectionEnabled())
+                .userAgentMode(aSettings.getUserAgentMode())
+                .viewportMode(aSettings.getViewportMode())
+                .suspendMediaWhenInactive(aSettings.isSuspendMediaWhenInactiveEnabled())
                 .build();
 
         GeckoSession session;
@@ -400,8 +405,6 @@ private GeckoSession createGeckoSession(@NonNull SessionSettings aSettings) {
             session = new GeckoSession(geckoSettings);
         }
 
-        session.getSettings().setSuspendMediaWhenInactive(aSettings.isSuspendMediaWhenInactiveEnabled());
-        session.getSettings().setUserAgentMode(aSettings.getUserAgentMode());
         session.getSettings().setUserAgentOverride(aSettings.getUserAgentOverride());
 
         return session;