Merge e1744cd36e into fc99b7050e

app/src/main/assets/web/help/md/ruleHelp.md

@@ -119,9 +119,9 @@ http代理
 {
   "proxy":"http://127.0.0.1:1080"
 }
-支持代理服务器验证
+支持http代理服务器验证
 {
-  "proxy":"socks5://127.0.0.1:1080@用户名@密码"
+  "proxy":"http://127.0.0.1:1080@用户名@密码"
 }
 注意:这些请求头是无意义的,会被忽略掉
 ```
@@ -143,9 +143,9 @@ https://www.baidu.com,{"js":"java.url=java.url+'yyyy'"}
     "method":"POST",
     "body":"show=title&tempid=1&keyboard="+key
     });
-    return java.put('surl',String(java.connect(url).raw().request().url()));
+    return source.put('surl',String(java.connect(url).raw().request().url()));
   } else {
-    return java.get('surl')+'&page='+(page-1)
+    return source.get('surl')+'&page='+(page-1)
   }
 })()
 或者
@@ -154,9 +154,9 @@ https://www.baidu.com,{"js":"java.url=java.url+'yyyy'"}
   if(page==1){
     let url=base+'index.php';
     let body='show=title&tempid=1&keyboard='+key;
-    return base+java.put('surl',java.post(url,body,{}).header("Location"));
+    return base+source.put('surl',java.post(url,body,{}).header("Location"));
   } else {
-    return base+java.get('surl')+'&page='+(page-1);
+    return base+source.get('surl')+'&page='+(page-1);
   }
 })()
 ```

app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt

@@ -217,7 +217,7 @@ class BackupConfigFragment : PreferenceFragment(),
                 }
 
             PreferKey.webDavPassword ->
-                if (value.isNullOrBlank()) {
+                if (value.isNullOrEmpty()) {
                     preference.summary = getString(R.string.web_dav_pw_s)
                 } else {
                     preference.summary = "*".repeat(value.toString().length)