From 9cfba1f80ae7c4104d60898a7055c2429cd2d222 Mon Sep 17 00:00:00 2001 From: "Randall E. Barker" Date: Mon, 16 Mar 2020 04:16:27 -0700 Subject: [PATCH] Only use loadUri when switching to desktop mode if the URL changes. (#2949) --- .../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 574fa1123..58959f163 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 @@ -821,8 +821,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); + } }