From ab7fd929d3e08f75525b6c53e1068cb447a4df8a Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Fri, 16 Jun 2023 07:54:18 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BC=98=E5=8C=96"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ecdc955f810b53f7d94d5b30fe36363579c8ccc3.
---
 .../book/source/manage/BookSourceActivity.kt  | 81 ++++++++-----------
 .../com/script/rhino/RhinoClassShutter.kt     |  5 ++
 2 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
index 951c13a5e..eb7dda13d 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
@@ -276,46 +276,43 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
                     appDb.bookSourceDao.flowSearch(searchKey)
                 }
             }.conflate().map { data ->
-                if (sortAscending) {
-                    when (sort) {
-                        Sort.Weight -> data.sortedBy { it.weight }
-                        Sort.Name -> data.sortedWith { o1, o2 ->
-                            o1.bookSourceName.cnCompare(o2.bookSourceName)
-                        }
-
-                        Sort.Url -> data.sortedBy { it.bookSourceUrl }
-                        Sort.Update -> data.sortedByDescending { it.lastUpdateTime }
-                        Sort.Respond -> data.sortedBy { it.respondTime }
-                        Sort.Enable -> data.sortedWith { o1, o2 ->
-                            var sort = -o1.enabled.compareTo(o2.enabled)
-                            if (sort == 0) {
-                                sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
-                            }
-                            sort
-                        }
-
-                        else -> data
+                if (sortAscending) when (sort) {
+                    Sort.Weight -> data.sortedBy { it.weight }
+                    Sort.Name -> data.sortedWith { o1, o2 ->
+                        o1.bookSourceName.cnCompare(o2.bookSourceName)
                     }
-                } else {
-                    when (sort) {
-                        Sort.Weight -> data.sortedByDescending { it.weight }
-                        Sort.Name -> data.sortedWith { o1, o2 ->
-                            o2.bookSourceName.cnCompare(o1.bookSourceName)
-                        }
 
-                        Sort.Url -> data.sortedByDescending { it.bookSourceUrl }
-                        Sort.Update -> data.sortedBy { it.lastUpdateTime }
-                        Sort.Respond -> data.sortedByDescending { it.respondTime }
-                        Sort.Enable -> data.sortedWith { o1, o2 ->
-                            var sort = o1.enabled.compareTo(o2.enabled)
-                            if (sort == 0) {
-                                sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
-                            }
-                            sort
+                    Sort.Url -> data.sortedBy { it.bookSourceUrl }
+                    Sort.Update -> data.sortedByDescending { it.lastUpdateTime }
+                    Sort.Respond -> data.sortedBy { it.respondTime }
+                    Sort.Enable -> data.sortedWith { o1, o2 ->
+                        var sort = -o1.enabled.compareTo(o2.enabled)
+                        if (sort == 0) {
+                            sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
                         }
-
-                        else -> data.reversed()
+                        sort
                     }
+
+                    else -> data
+                }
+                else when (sort) {
+                    Sort.Weight -> data.sortedByDescending { it.weight }
+                    Sort.Name -> data.sortedWith { o1, o2 ->
+                        o2.bookSourceName.cnCompare(o1.bookSourceName)
+                    }
+
+                    Sort.Url -> data.sortedByDescending { it.bookSourceUrl }
+                    Sort.Update -> data.sortedBy { it.lastUpdateTime }
+                    Sort.Respond -> data.sortedByDescending { it.respondTime }
+                    Sort.Enable -> data.sortedWith { o1, o2 ->
+                        var sort = o1.enabled.compareTo(o2.enabled)
+                        if (sort == 0) {
+                            sort = o1.bookSourceName.cnCompare(o2.bookSourceName)
+                        }
+                        sort
+                    }
+
+                    else -> data.reversed()
                 }
             }.catch {
                 AppLog.put("书源界面更新书源出错", it)
@@ -656,19 +653,11 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
     }
 
     override fun toTop(bookSource: BookSourcePart) {
-        if (sortAscending) {
-            viewModel.topSource(bookSource)
-        } else {
-            viewModel.bottomSource(bookSource)
-        }
+        viewModel.topSource(bookSource)
     }
 
     override fun toBottom(bookSource: BookSourcePart) {
-        if (sortAscending) {
-            viewModel.bottomSource(bookSource)
-        } else {
-            viewModel.topSource(bookSource)
-        }
+        viewModel.bottomSource(bookSource)
     }
 
     override fun searchBook(bookSource: BookSourcePart) {
diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoClassShutter.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoClassShutter.kt
index 3e4d5f8b6..cf5dcaf8d 100644
--- a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoClassShutter.kt
+++ b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoClassShutter.kt
@@ -39,6 +39,11 @@ object RhinoClassShutter : ClassShutter {
     private val protectedClasses by lazy {
         hashSetOf(
             "dalvik.system",
+            "java.lang.Class",
+            "java.lang.ClassLoader",
+            "java.net.URLClassLoader",
+            "cn.hutool.core.lang.JarClassLoader",
+            "org.mozilla.javascript.DefiningClassLoader",
             "java.lang.Runtime",
             "java.io.File",
             "java.security.AccessController",