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

Only use loadUri when switching to desktop mode if the URL changes. #2949

Merged
merged 1 commit into from
Mar 16, 2020
Merged

Only use loadUri when switching to desktop mode if the URL changes. #2949

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
7 changes: 5 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 @@ -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);
}
}


Expand Down