From 78db8194dc411c4151790868b1ed3855dc367bd5 Mon Sep 17 00:00:00 2001
From: Administrator <1760316362@qq.com>
Date: Thu, 4 Jul 2019 11:53:22 +0800
Subject: [PATCH] StringExtensions

---
 .../app/model/analyzeRule/AnalyzeByJSoup.kt   |  2 +-
 .../io/legado/app/utils/StringExtensions.kt   | 35 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt
index 119ae12ce..8b4bcc811 100644
--- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt
+++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeByJSoup.kt
@@ -414,7 +414,7 @@ class AnalyzeByJSoup {
         var replacement = ""
 
         init {
-            if (startWithIgnoreCase(ruleStr, "@CSS:")) {
+            if (ruleStr.startWithIgnoreCase("@CSS:")) {
                 isCss = true
                 elementsRule = ruleStr.substring(5).trim { it <= ' ' }
             } else {
diff --git a/app/src/main/java/io/legado/app/utils/StringExtensions.kt b/app/src/main/java/io/legado/app/utils/StringExtensions.kt
index 2abbf078d..0ec34e16e 100644
--- a/app/src/main/java/io/legado/app/utils/StringExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/StringExtensions.kt
@@ -1,38 +1,33 @@
 package io.legado.app.utils
 
-import android.text.TextUtils
-
 // import org.apache.commons.text.StringEscapeUtils
 
 fun String?.safeTrim() = if (this.isNullOrBlank()) null else this.trim()
 
-fun String.isAbsUrl() = this.startsWith("http://", true)
+fun String?.isAbsUrl() = if (this.isNullOrBlank()) false else this.startsWith("http://", true)
         || this.startsWith("https://", true)
 
-fun String.isJson(): Boolean = kotlin.run {
-    var result = false
-    if (!TextUtils.isEmpty(this)) {
-        val str = this.trim()
-        if (str.startsWith("{") && str.endsWith("}")) {
-            result = true
-        } else if (str.startsWith("[") && str.endsWith("]")) {
-            result = true
-        }
+fun String?.isJson(): Boolean = this?.run {
+    val str = this.trim()
+    when {
+        str.startsWith("{") && str.endsWith("}") -> true
+        str.startsWith("[") && str.endsWith("]") -> true
+        else -> false
     }
-    return result
-}
+} ?: false
 
-fun String.htmlFormat(): String = if (TextUtils.isEmpty(this)) "" else
+fun String?.htmlFormat(): String = if (this.isNullOrBlank()) "" else
     this.replace("(?i)<(br[\\s/]*|/*p.*?|/*div.*?)>".toRegex(), "\n")// 替换特定标签为换行符
         .replace("<[script>]*.*?>|&nbsp;".toRegex(), "")// 删除script标签对和空格转义符
         .replace("\\s*\\n+\\s*".toRegex(), "\n　　")// 移除空行,并增加段前缩进2个汉字
         .replace("^[\\n\\s]+".toRegex(), "　　")//移除开头空行,并增加段前缩进2个汉字
         .replace("[\\n\\s]+$".toRegex(), "") //移除尾部空行
 
-fun String.splitNotBlank(delim: String) = if (!this.contains(delim)) sequenceOf(this) else
-    this.split(delim).asSequence().map { it.trim() }.filterNot { it.isBlank() }
+fun String?.splitNotBlank(delim: String) = this?.run {
+    if (!this.contains(delim)) sequenceOf(this) else
+        this.split(delim).asSequence().map { it.trim() }.filterNot { it.isBlank() }
+}
 
-fun startWithIgnoreCase(src: String?, obj: String?): Boolean {
-    if (src == null || obj == null) return false
-    return if (obj.length > src.length) false else src.substring(0, obj.length).equals(obj, ignoreCase = true)
+fun String?.startWithIgnoreCase(start: String): Boolean {
+    return if (this.isNullOrBlank()) false else startsWith(start, true)
 }
\ No newline at end of file