From 30bdde10efba8effa6e82ddf4820909b5fa511b7 Mon Sep 17 00:00:00 2001 From: "Randall E. Barker" Date: Thu, 5 Mar 2020 19:27:20 -0800 Subject: [PATCH] Only use loadUri when switching to desktop mode if the URL changes. --- .../org/mozilla/vrbrowser/browser/engine/Session.java | 7 +++++-- 1 file changed, 5 insertions(+), 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 index f11709da8..adc5bf7e6 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java @@ -817,8 +817,11 @@ public void setUaMode(int mode) { mState.mSettings.setViewportMode(GeckoSessionSettings.VIEWPORT_MODE_MOBILE); } mState.mSession.getSettings().setViewportMode(mState.mSettings.getViewportMode()); - // FIXME The GeckoSession.LOAD_FLAGS_REPLACE_HISTORY flag fails due to https://bugzilla.mozilla.org/show_bug.cgi?id=1618664 - mState.mSession.loadUri(overrideUri != null ? overrideUri : mState.mUri, GeckoSession.LOAD_FLAGS_BYPASS_CACHE); // | GeckoSession.LOAD_FLAGS_REPLACE_HISTORY); + if (overrideUri != null) { + mState.mSession.loadUri(overrideUri, GeckoSession.LOAD_FLAGS_BYPASS_CACHE | GeckoSession.LOAD_FLAGS_REPLACE_HISTORY); + } else { + mState.mSession.reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE); + } }