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

Commit 41a5df3

Browse files
authored
Bump GeckoView to 76.0.20200323092419 (#3033)
1 parent d50fa7d commit 41a5df3

File tree

3 files changed

+11
-15
lines changed

3 files changed

+11
-15
lines changed

app/src/common/shared/org/mozilla/vrbrowser/browser/engine/Session.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,10 @@ public void setActive(boolean aActive) {
697697
}
698698
}
699699

700+
public void reload() {
701+
reload(GeckoSession.LOAD_FLAGS_NONE);
702+
}
703+
700704
public void reload(final int flags) {
701705
if (mState.mSession != null) {
702706
mState.mSession.reload(flags);
@@ -861,9 +865,7 @@ public void setUaMode(int mode) {
861865
if (overrideUri != null) {
862866
mState.mSession.loadUri(overrideUri, GeckoSession.LOAD_FLAGS_BYPASS_CACHE | GeckoSession.LOAD_FLAGS_REPLACE_HISTORY);
863867
} else {
864-
// mState.mSession.reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
865-
mState.mSession.loadUri(mState.mUri, GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
866-
868+
mState.mSession.reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
867869
}
868870
}
869871

app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,8 @@ private void updateUI() {
201201
if (mViewModel.getIsLoading().getValue().get()) {
202202
getSession().stop();
203203
} else {
204-
if (SettingsStore.getInstance(mAppContext).isBypassCacheOnReloadEnabled()) {
205-
getSession().loadUri(getSession().getCurrentUri(), GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
206-
} else {
207-
// int flags = SettingsStore.getInstance(mAppContext).isBypassCacheOnReloadEnabled() ? GeckoSession.LOAD_FLAGS_BYPASS_CACHE : GeckoSession.LOAD_FLAGS_NONE;
208-
// getSession().reload(flags);
209-
getSession().reload(GeckoSession.LOAD_FLAGS_NONE);
210-
}
204+
int flags = SettingsStore.getInstance(mAppContext).isBypassCacheOnReloadEnabled() ? GeckoSession.LOAD_FLAGS_BYPASS_CACHE : GeckoSession.LOAD_FLAGS_NONE;
205+
getSession().reload(flags);
211206
}
212207
if (mAudio != null) {
213208
mAudio.playSound(AudioEngine.Sound.CLICK);
@@ -220,8 +215,7 @@ private void updateUI() {
220215
if (mViewModel.getIsLoading().getValue().get()) {
221216
getSession().stop();
222217
} else {
223-
// getSession().reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
224-
getSession().loadUri(getSession().getCurrentUri(), GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
218+
getSession().reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
225219
}
226220
if (mAudio != null) {
227221
mAudio.playSound(AudioEngine.Sound.CLICK);
@@ -1181,14 +1175,14 @@ private void showQuickPermission(UIButton target, @SitePermission.Category int a
11811175
public void onBlock() {
11821176
SessionStore.get().setPermissionAllowed(uri, aCategory, false);
11831177
mQuickPermissionWidget.onDismiss();
1184-
mAttachedWindow.getSession().reload(GeckoSession.LOAD_FLAGS_NONE);
1178+
mAttachedWindow.getSession().reload();
11851179
}
11861180

11871181
@Override
11881182
public void onAllow() {
11891183
SessionStore.get().setPermissionAllowed(uri, aCategory, true);
11901184
mQuickPermissionWidget.onDismiss();
1191-
mAttachedWindow.getSession().reload(GeckoSession.LOAD_FLAGS_NONE);
1185+
mAttachedWindow.getSession().reload();
11921186
}
11931187
});
11941188
mQuickPermissionWidget.getPlacement().parentHandle = getHandle();

versions.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ext.deps = [:]
2424
def versions = [:]
2525
// GeckoView versions can be found here:
2626
// https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
27-
versions.gecko_view = "76.0.20200319094444"
27+
versions.gecko_view = "76.0.20200323092419"
2828
versions.android_components = "28.0.1"
2929
// Note that android-components also depends on application-services,
3030
// and in fact is our main source of appservices-related functionality.

0 commit comments

Comments
 (0)