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 4f39130a9..3d7db812d 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 @@ -686,12 +686,16 @@ public void stop() { } public void loadUri(String aUri) { + loadUri(aUri, GeckoSession.LOAD_FLAGS_NONE); + } + + public void loadUri(String aUri, int flags) { if (aUri == null) { aUri = getHomeUri(); } if (mState.mSession != null) { Log.d(LOGTAG, "Loading URI: " + aUri); - mState.mSession.loadUri(aUri); + mState.mSession.loadUri(aUri, flags); } } @@ -824,7 +828,9 @@ public void setUaMode(int mode) { 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); + // mState.mSession.reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE); + mState.mSession.loadUri(mState.mUri, GeckoSession.LOAD_FLAGS_BYPASS_CACHE); + } } diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java index 54715523a..0d897342f 100644 --- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java +++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java @@ -195,8 +195,13 @@ private void updateUI() { if (mViewModel.getIsLoading().getValue().get()) { getSession().stop(); } else { - int flags = SettingsStore.getInstance(mAppContext).isBypassCacheOnReloadEnabled() ? GeckoSession.LOAD_FLAGS_BYPASS_CACHE : GeckoSession.LOAD_FLAGS_NONE; - getSession().reload(flags); + if (SettingsStore.getInstance(mAppContext).isBypassCacheOnReloadEnabled()) { + getSession().loadUri(getSession().getCurrentUri(), GeckoSession.LOAD_FLAGS_BYPASS_CACHE); + } else { + // int flags = SettingsStore.getInstance(mAppContext).isBypassCacheOnReloadEnabled() ? GeckoSession.LOAD_FLAGS_BYPASS_CACHE : GeckoSession.LOAD_FLAGS_NONE; + // getSession().reload(flags); + getSession().reload(GeckoSession.LOAD_FLAGS_NONE); + } } if (mAudio != null) { mAudio.playSound(AudioEngine.Sound.CLICK); @@ -209,7 +214,8 @@ private void updateUI() { if (mViewModel.getIsLoading().getValue().get()) { getSession().stop(); } else { - getSession().reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE); + // getSession().reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE); + getSession().loadUri(getSession().getCurrentUri(), GeckoSession.LOAD_FLAGS_BYPASS_CACHE); } if (mAudio != null) { mAudio.playSound(AudioEngine.Sound.CLICK);