Merge branch 'hotfix/5.89.1' into develop

joshliebe · joshliebe · commit d02e65ff2902 · 2021-06-25T12:43:57.000+02:00
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -413,6 +413,11 @@ class BrowserTabFragment :
         super.onPause()
     }
 
+    override fun onStop() {
+        alertDialog?.dismiss()
+        super.onStop()
+    }
+
     private fun dismissAuthenticationDialog() {
         if (isAdded) {
             val fragment = parentFragmentManager.findFragmentByTag(AUTHENTICATION_DIALOG_TAG) as? HttpAuthenticationDialogFragment
@@ -917,22 +922,21 @@ class BrowserTabFragment :
     }
 
     private fun launchAppLinkDialog(context: Context, url: String, headers: Map<String, String>, launchApp: () -> Unit) {
-        val isShowing = alertDialog?.isShowing
-
-        if (isShowing != true) {
-            alertDialog = AlertDialog.Builder(context)
-                .setTitle(R.string.appLinkDialogTitle)
-                .setMessage(getString(R.string.confirmOpenExternalApp))
-                .setPositiveButton(R.string.yes) { _, _ ->
-                    launchApp()
-                    viewModel.resetAppLinkState()
-                }
-                .setNegativeButton(R.string.no) { _, _ ->
-                    viewModel.openAppLinksInBrowser()
-                    navigate(url, headers)
-                }
-                .show()
-        }
+        alertDialog?.dismiss()
+
+        alertDialog = AlertDialog.Builder(context)
+            .setTitle(R.string.appLinkDialogTitle)
+            .setMessage(getString(R.string.confirmOpenExternalApp))
+            .setPositiveButton(R.string.yes) { dialog, _ ->
+                launchApp()
+                viewModel.resetAppLinkState()
+                dialog.dismiss()
+            }
+            .setNegativeButton(R.string.no) { dialog, _ ->
+                viewModel.navigateToAppLinkInBrowser(url, headers)
+                dialog.dismiss()
+            }
+            .show()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -581,7 +581,7 @@ class BrowserTabViewModel(
 
             fireQueryChangedPixel(trimmedInput)
 
-            openAppLinksInBrowser()
+            appLinksHandler.enterBrowserState()
             command.value = Navigate(urlToNavigate, getUrlHeaders())
         }
 
@@ -1766,8 +1766,9 @@ class BrowserTabViewModel(
         appLinksHandler.reset()
     }
 
-    fun openAppLinksInBrowser() {
+    fun navigateToAppLinkInBrowser(url: String, headers: Map<String, String>) {
         appLinksHandler.enterBrowserState()
+        command.value = Navigate(url, headers)
     }
 
     fun appLinkClicked(appLink: AppLink) {
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -1 +1 @@
-VERSION=5.89.0
+VERSION=5.89.1

Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ class BrowserTabViewModel(`
`581`	`581`
`582`	`582`	`fireQueryChangedPixel(trimmedInput)`
`583`	`583`
`584`		`- openAppLinksInBrowser()`
	`584`	`+ appLinksHandler.enterBrowserState()`
`585`	`585`	`command.value = Navigate(urlToNavigate, getUrlHeaders())`
`586`	`586`	`}`
`587`	`587`
`@@ -1766,8 +1766,9 @@ class BrowserTabViewModel(`
`1766`	`1766`	`appLinksHandler.reset()`
`1767`	`1767`	`}`
`1768`	`1768`
`1769`		`- fun openAppLinksInBrowser() {`
	`1769`	`+ fun navigateToAppLinkInBrowser(url: String, headers: Map<String, String>) {`
`1770`	`1770`	`appLinksHandler.enterBrowserState()`
	`1771`	`+ command.value = Navigate(url, headers)`
`1771`	`1772`	`}`
`1772`	`1773`
`1773`	`1774`	`fun appLinkClicked(appLink: AppLink) {`