Don't show other webview errors if HTTP auth is pending

home-assistant · Jan 5, 2025 · fff9bbc · fff9bbc
1 parent fe94d30
commit fff9bbc
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt b/app/src/main/java/io/homeassistant/companion/android/webview/WebViewActivity.kt
@@ -1473,7 +1473,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
 
         if (!httpAuth?.host.isNullOrBlank()) {
             if (!authError) {
-                handler.proceed(httpAuth?.username, httpAuth?.password)
+                handler.proceed(httpAuth.username, httpAuth.password)
                 autoAuth = true
                 firstAuthTime = System.currentTimeMillis()
             }
@@ -1488,6 +1488,7 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
             }
         }
         if (!autoAuth || authError) {
+            isShowingError = true
             AlertDialog.Builder(this, R.style.Authentication_Dialog)
                 .setTitle(commonR.string.auth_request)
                 .setMessage(message)
@@ -1528,6 +1529,10 @@ class WebViewActivity : BaseActivity(), io.homeassistant.companion.android.webvi
                     Toast.makeText(applicationContext, commonR.string.auth_cancel, Toast.LENGTH_SHORT)
                         .show()
                 }
+                .setOnDismissListener {
+                    isShowingError = false
+                    waitForConnection()
+                }
                 .show()
         }
     }