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

Bump GeckoView to 76.0.20200323092419 #3033

Merged
merged 1 commit into from
Mar 23, 2020
Merged

Bump GeckoView to 76.0.20200323092419 #3033

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
8 changes: 5 additions & 3 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 @@ -697,6 +697,10 @@ public void setActive(boolean aActive) {
}
}

public void reload() {
reload(GeckoSession.LOAD_FLAGS_NONE);
}

public void reload(final int flags) {
if (mState.mSession != null) {
mState.mSession.reload(flags);
Expand Down Expand Up @@ -861,9 +865,7 @@ 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.loadUri(mState.mUri, GeckoSession.LOAD_FLAGS_BYPASS_CACHE);

mState.mSession.reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
}
}

Expand Down
16 changes: 5 additions & 11 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 @@ -201,13 +201,8 @@ private void updateUI() {
if (mViewModel.getIsLoading().getValue().get()) {
getSession().stop();
} else {
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);
}
int flags = SettingsStore.getInstance(mAppContext).isBypassCacheOnReloadEnabled() ? GeckoSession.LOAD_FLAGS_BYPASS_CACHE : GeckoSession.LOAD_FLAGS_NONE;
getSession().reload(flags);
}
if (mAudio != null) {
mAudio.playSound(AudioEngine.Sound.CLICK);
Expand All @@ -220,8 +215,7 @@ private void updateUI() {
if (mViewModel.getIsLoading().getValue().get()) {
getSession().stop();
} else {
// getSession().reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
getSession().loadUri(getSession().getCurrentUri(), GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
getSession().reload(GeckoSession.LOAD_FLAGS_BYPASS_CACHE);
}
if (mAudio != null) {
mAudio.playSound(AudioEngine.Sound.CLICK);
Expand Down Expand Up @@ -1181,14 +1175,14 @@ private void showQuickPermission(UIButton target, @SitePermission.Category int a
public void onBlock() {
SessionStore.get().setPermissionAllowed(uri, aCategory, false);
mQuickPermissionWidget.onDismiss();
mAttachedWindow.getSession().reload(GeckoSession.LOAD_FLAGS_NONE);
mAttachedWindow.getSession().reload();
}

@Override
public void onAllow() {
SessionStore.get().setPermissionAllowed(uri, aCategory, true);
mQuickPermissionWidget.onDismiss();
mAttachedWindow.getSession().reload(GeckoSession.LOAD_FLAGS_NONE);
mAttachedWindow.getSession().reload();
}
});
mQuickPermissionWidget.getPlacement().parentHandle = getHandle();
Expand Down
2 changes: 1 addition & 1 deletion versions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ext.deps = [:]
def versions = [:]
// GeckoView versions can be found here:
// https://maven.mozilla.org/?prefix=maven2/org/mozilla/geckoview/
versions.gecko_view = "76.0.20200319094444"
versions.gecko_view = "76.0.20200323092419"
versions.android_components = "28.0.1"
// Note that android-components also depends on application-services,
// and in fact is our main source of appservices-related functionality.
Expand Down