From 6b56f3768d87a58bb1c3ec667c971fb15ce475cb Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Sat, 15 Feb 2025 15:40:28 +0800 Subject: [PATCH] Revert "fix(source.loginUI): filter null when arrays end with comma" Gson will throw error when json has extra comma in array or object. see 8e66c7ed6691917e9f12da291df002a1e65c8970 This reverts commit 65d4d7fb62a0ccbc773940ab641a39cb3fb355c8. --- app/src/main/java/io/legado/app/data/entities/BaseSource.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/data/entities/BaseSource.kt b/app/src/main/java/io/legado/app/data/entities/BaseSource.kt index 22f8c86d5..18825085c 100644 --- a/app/src/main/java/io/legado/app/data/entities/BaseSource.kt +++ b/app/src/main/java/io/legado/app/data/entities/BaseSource.kt @@ -67,7 +67,7 @@ interface BaseSource : JsExtensions { fun loginUi(): List? { return GSON.fromJsonArray(loginUi).onFailure { it.printOnDebug() - }.getOrNull()?.filterNotNull() // filter null, see https://github.com/gedoor/legado/discussions/4650 + }.getOrNull() } fun getLoginJs(): String? { @@ -253,4 +253,4 @@ interface BaseSource : JsExtensions { fun getShareScope(): Scriptable? { return SharedJsScope.getScope(jsLib) } -} +} \ No newline at end of file