Use user configuration to initialize session UA and viewport settings (…

…#2069)
MozillaReality · Oct 28, 2019 · dac11c4 · dac11c4
1 parent ea83972
commit dac11c4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 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
@@ -654,7 +654,7 @@ private String checkForMobileSite(String aUri) {
     }
 
     public void setUaMode(int mode) {
-        if (mState.mSession == null) {
+        if (mState.mSession == null || mState.mSettings.getUserAgentMode() == mode) {
             return;
         }
         mState.mSettings.setUserAgentMode(mode);

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionSettings.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionSettings.java
@@ -123,12 +123,16 @@ public Builder withUserAgentOverride(String userAgentOverride) {
         }
 
         public Builder withDefaultSettings(Context context) {
+            int ua = SettingsStore.getInstance(context).getUaMode();
+            int viewport = ua == GeckoSessionSettings.USER_AGENT_MODE_DESKTOP ?
+                    GeckoSessionSettings.VIEWPORT_MODE_DESKTOP : GeckoSessionSettings.VIEWPORT_MODE_MOBILE;
+
             return new SessionSettings.Builder()
                     .withMultiprocess(SettingsStore.getInstance(context).isMultiprocessEnabled())
                     .withTrackingProteccion(SettingsStore.getInstance(context).isTrackingProtectionEnabled())
                     .withSuspendMediaWhenInactive(true)
-                    .withUserAgent(GeckoSessionSettings.USER_AGENT_MODE_VR)
-                    .withViewport(GeckoSessionSettings.VIEWPORT_MODE_MOBILE)
+                    .withUserAgent(ua)
+                    .withViewport(viewport)
                     .withServo(false);
         }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayOptionsView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayOptionsView.java
@@ -250,10 +250,6 @@ private void setUaMode(int checkId, boolean doApply) {
         mBinding.uaRadio.setOnCheckedChangeListener(mUaModeListener);
 
         SettingsStore.getInstance(getContext()).setUaMode(checkId);
-
-        if (doApply) {
-            SessionStore.get().setUaMode((Integer)mBinding.uaRadio.getValueForId(checkId));
-        }
     }
 
     private void setMSAAMode(int checkedId, boolean doApply) {