Merge pull request #239 from LandChanning/master

处理 BridgeHelper.shouldOverrideUrlLoading(String url) 方法 URLDecoder.decode 可能的崩溃
uknownothingsnow · Mar 23, 2021 · 9fef0b6 · 9fef0b6
2 parents 3621bd6 + da4e908
commit 9fef0b6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/library/src/main/java/com/github/lzyzsd/jsbridge/BridgeHelper.java b/library/src/main/java/com/github/lzyzsd/jsbridge/BridgeHelper.java
@@ -269,7 +269,9 @@ private void webViewLoadLocalJs() {
 
     public boolean shouldOverrideUrlLoading(String url) {
         try {
-            url = URLDecoder.decode(url, "UTF-8");
+            // decode 之前，处理 % 和 +
+            String replacedUrl = url.replaceAll("%(?![0-9a-fA-F]{2})", "%25").replaceAll("\\+", "%2B");
+            url = URLDecoder.decode(replacedUrl, "UTF-8");
         } catch (UnsupportedEncodingException e) {
             Log.w(TAG, e);
         }