Fixes #617 #738 - Do not refresh URL bar on load request (#765)

MozillaReality · Nov 16, 2018 · 6c5e28e · 6c5e28e
1 parent 803f618
commit 6c5e28e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 21 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/SessionStore.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/SessionStore.java
@@ -491,18 +491,6 @@ public String getCurrentUri() {
         return result;
     }
 
-    public String getPreviousUri() {
-        String result = "";
-        if (mCurrentSession != null) {
-            State state = mSessions.get(mCurrentSession.hashCode());
-            if (state == null) {
-                return result;
-            }
-            result = state.mPreviousUri;
-        }
-        return result;
-    }
-
     public Media getFullScreenVideo() {
         Media result = null;
         if (mCurrentSession != null) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
@@ -161,10 +161,6 @@ else if (aURL.startsWith("resource:") || SessionStore.get().isHomeUri(aURL))
                 aURL = "";
             else if (aURL.startsWith("data:") && SessionStore.get().isCurrentSessionPrivate())
                 aURL = "";
-            else if (aURL.startsWith("javascript:") &&
-                    aURL.contains(SessionStore.get().getHomeUri()) &&
-                    SessionStore.get().getPreviousUri().equals(SessionStore.get().getHomeUri()))
-                aURL = "";
             else
                 index = aURL.indexOf("://");
 

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
@@ -600,11 +600,6 @@ public void onCanGoForward(GeckoSession aSession, boolean canGoForward) {
 
     @Override
     public @Nullable GeckoResult<AllowOrDeny> onLoadRequest(GeckoSession aSession, @NonNull LoadRequest aRequest) {
-        if (mURLBar != null) {
-            Log.d(LOGTAG, "Got onLoadUri");
-            mURLBar.setURL(aRequest.uri);
-        }
-
         final GeckoResult<AllowOrDeny> result = new GeckoResult<>();
 
         Uri uri = Uri.parse(aRequest.uri);