From 41a5df31002954242cf97c035b0edc62c0da04cc Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Mon, 23 Mar 2020 10:31:31 -0700
Subject: [PATCH] Bump GeckoView to 76.0.20200323092419 (#3033)

---
 .../vrbrowser/browser/engine/Session.java        |  8 +++++---
 .../ui/widgets/NavigationBarWidget.java          | 16 +++++-----------
 versions.gradle                                  |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

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 08927376b..dda9ef4cd 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
@@ -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);
@@ -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);
         }
     }
 
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 a86b296d2..ec4ca9613 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
@@ -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);
@@ -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);
@@ -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();
diff --git a/versions.gradle b/versions.gradle
index d36685776..ea7cbe14d 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -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.