Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Work around GeckoSession.reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE) bug #3008

Merged
merged 1 commit into from
Mar 20, 2020
Merged

Work around GeckoSession.reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE) bug #3008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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);

}
}

Expand Down
12 changes: 9 additions & 3 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down