优化 CompatWebView 中链接拦截的逻辑

Goooler · Jan 17, 2022 · f0e3540 · f0e3540
1 parent 3cc2000
commit f0e3540
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/web/src/main/kotlin/io/goooler/demoapp/web/CompatWebView.kt b/web/src/main/kotlin/io/goooler/demoapp/web/CompatWebView.kt
@@ -6,7 +6,6 @@ import android.net.http.SslError
 import android.util.AttributeSet
 import android.view.ViewGroup
 import android.webkit.SslErrorHandler
-import android.webkit.URLUtil
 import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
 import android.webkit.WebSettings
@@ -70,14 +69,7 @@ open class CompatWebView(context: Context, attrs: AttributeSet? = null) : WebVie
       }
 
       override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
-        return if (URLUtil.isValidUrl(url)) {
-          if (URLUtil.isNetworkUrl(url)) {
-            false
-          } else {
-            onEventListener?.onInterceptUri(Uri.parse(url))
-            true
-          }
-        } else false
+        return onEventListener?.onInterceptUrl(url) ?: false
       }
 
       override fun onPageFinished(view: WebView, url: String) {
@@ -119,7 +111,7 @@ open class CompatWebView(context: Context, attrs: AttributeSet? = null) : WebVie
   }
 
   interface OnEventListener {
-    fun onInterceptUri(uri: Uri)
+    fun onInterceptUrl(url: String): Boolean
 
     fun onReceivedTitle(title: String)
 

diff --git a/web/src/main/kotlin/io/goooler/demoapp/web/WebFragment.kt b/web/src/main/kotlin/io/goooler/demoapp/web/WebFragment.kt
@@ -8,6 +8,8 @@ import android.webkit.WebChromeClient
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.IntRange
+import androidx.core.net.toUri
+import io.goooler.demoapp.base.util.isNetworkUrl
 import io.goooler.demoapp.base.util.putArguments
 import io.goooler.demoapp.base.util.toMimeType
 import io.goooler.demoapp.common.base.binding.BaseBindingFragment
@@ -51,8 +53,11 @@ class WebFragment : BaseBindingFragment<WebFragmentBinding>() {
   }
 
   private val listener = object : CompatWebView.OnEventListener, JsInterface {
-    override fun onInterceptUri(uri: Uri) {
-      startActivity(Intent(Intent.ACTION_VIEW, uri))
+    override fun onInterceptUrl(url: String): Boolean {
+      return if (url.isNetworkUrl()) false else {
+        startActivity(Intent(Intent.ACTION_VIEW, url.toUri()))
+        true
+      }
     }
 
     override fun onReceivedTitle(title: String) {