Fixes Bugzilla issue 1681103

mozilla-mobile · Apr 6, 2021 · 18bfd62 · 18bfd62
1 parent a428021
commit 18bfd62
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.kt b/app/src/main/java/org/mozilla/focus/fragment/BrowserFragment.kt
@@ -26,6 +26,7 @@ import android.util.DisplayMetrics
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
+import android.view.View.GONE
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
 import android.view.ViewStub
@@ -946,7 +947,7 @@ class BrowserFragment : LocaleAwareFragment(), BrowserScreen, LifecycleOwner, Ba
         isFromExternal: Boolean,
         onViewReadyCallback: Runnable?
     ) {
-        updateURL(url)
+        loadedUrl = url
         if (SupportUtils.isUrl(url)) {
             if (openNewTab) {
                 sessionManager.addTab(url, TabUtil.argument(null, isFromExternal, true))
@@ -1150,7 +1151,13 @@ class BrowserFragment : LocaleAwareFragment(), BrowserScreen, LifecycleOwner, Ba
             if (!isForegroundSession(session)) {
                 return
             }
-            updateURL(url)
+            // Prevent updateURL when directly entering URL in the address bar.
+            if (chromeViewModel.openUrl.value?.url ?: "" != url) {
+                updateURL(url)
+            } else if (chromeViewModel.openUrl.value?.url ?: "" != "") {
+                chromeViewModel.openUrl.value!!.url = ""
+            }
+
             shoppingSearchPromptMessageViewModel.checkShoppingSearchPromptVisibility(url)
         }
 
@@ -1231,12 +1238,6 @@ class BrowserFragment : LocaleAwareFragment(), BrowserScreen, LifecycleOwner, Ba
 
         override fun onTitleChanged(session: Session, title: String?) {
             chromeViewModel.onFocusedTitleChanged(title)
-            if (!isForegroundSession(session)) {
-                return
-            }
-            if (url != session.url) {
-                updateURL(session.url)
-            }
         }
 
         override fun onReceivedIcon(icon: Bitmap?) {}
@@ -1433,7 +1434,13 @@ class BrowserFragment : LocaleAwareFragment(), BrowserScreen, LifecycleOwner, Ba
             dismissGeoDialog()
             updateURL(tab.url)
             shoppingSearchPromptMessageViewModel.checkShoppingSearchPromptVisibility(tab.url)
-            progress_bar.progress = 0
+
+            if (tab.progress == 0 || tab.progress == 100) {
+                progress_bar.visibility = GONE
+            } else {
+                progress_bar.progress = tab.progress
+            }
+
             val identity = if (tab.securityInfo.secure) SITE_LOCK else SITE_GLOBE
             site_identity.setImageLevel(identity)
             hideFindInPage()

diff --git a/app/src/main/java/org/mozilla/rocket/chrome/ChromeViewModel.kt b/app/src/main/java/org/mozilla/rocket/chrome/ChromeViewModel.kt
@@ -326,9 +326,9 @@ class ChromeViewModel(
     )
 
     data class OpenUrlAction(
-        val url: String,
-        val withNewTab: Boolean,
-        val isFromExternal: Boolean
+        var url: String,
+        var withNewTab: Boolean,
+        var isFromExternal: Boolean
     )
 
     data class ScreenCaptureTelemetryData(val mode: String, val position: Int) : Parcelable {

diff --git a/app/src/webkit/java/org/mozilla/focus/webkit/WebkitView.java b/app/src/webkit/java/org/mozilla/focus/webkit/WebkitView.java
@@ -279,8 +279,6 @@ public void loadUrl(String url) {
         if (!webViewClient.shouldOverrideUrlLoading(this, url)) {
             super.loadUrl(url);
         }
-
-        webViewClient.notifyCurrentURL(url);
     }
 
     public void reload() {

diff --git a/components/feature/tabs/src/main/java/org/mozilla/rocket/tabs/TabViewEngineSession.kt b/components/feature/tabs/src/main/java/org/mozilla/rocket/tabs/TabViewEngineSession.kt
@@ -125,8 +125,8 @@ class TabViewEngineSession constructor(
 
     class ViewClient(private val es: TabViewEngineSession) : TabViewClient() {
         override fun onPageStarted(url: String?) {
-            es.notifyObservers { onLoadingStateChange(true) }
             url?.let { es.notifyObservers { onLocationChange(it) } }
+            es.notifyObservers { onLoadingStateChange(true) }
 
             es.tabView?.let {
                 es.notifyObservers {
@@ -196,7 +196,6 @@ class TabViewEngineSession constructor(
             }
             // This is a hack, Webview often doesn't give us the latest url even in OnPageLoaded
             // We utilize this callback which usually returns later as the last chance.
-            view.url?.let { es.notifyObservers { onLocationChange(it) } }
             es.notifyObservers {
                 onNavigationStateChange(view.canGoBack(), view.canGoForward())
             }