Use the FxR canGoBack() logic instead of the GeckoSession.canGoBack()…

… logic when dispatching onCanGoBack event (#2387)
MozillaReality · Nov 27, 2019 · d6f46c4 · d6f46c4
1 parent e862905
commit d6f46c4
Showing 1 changed file with 5 additions and 5 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
@@ -189,7 +189,7 @@ private void dumpAllState() {
 
     private void dumpState(GeckoSession.NavigationDelegate aListener) {
         if (mState.mSession != null) {
-            aListener.onCanGoBack(mState.mSession, mState.mCanGoBack);
+            aListener.onCanGoBack(mState.mSession, canGoBack());
             aListener.onCanGoForward(mState.mSession, mState.mCanGoForward);
             aListener.onLocationChange(mState.mSession, mState.mUri);
         }
@@ -840,15 +840,15 @@ public void onLocationChange(@NonNull GeckoSession aSession, String aUri) {
     }
 
     @Override
-    public void onCanGoBack(@NonNull GeckoSession aSession, boolean aCanGoBack) {
+    public void onCanGoBack(@NonNull GeckoSession aSession, boolean aGeckoSessionCanGoBack) {
         if (mState.mSession != aSession) {
             return;
         }
-        Log.d(LOGTAG, "Session onCanGoBack: " + (aCanGoBack ? "true" : "false"));
-        mState.mCanGoBack = aCanGoBack;
+        Log.d(LOGTAG, "Session onCanGoBack: " + (aGeckoSessionCanGoBack ? "true" : "false"));
+        mState.mCanGoBack = aGeckoSessionCanGoBack;
 
         for (GeckoSession.NavigationDelegate listener : mNavigationListeners) {
-            listener.onCanGoBack(aSession, aCanGoBack);
+            listener.onCanGoBack(aSession, canGoBack());
         }
     }