From c668f3bf9a23fdf420830d2228524b1c3ed126e2 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Tue, 31 May 2022 16:55:19 +0300
Subject: [PATCH] Refactoring

---
 app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java | 10 ++--------
 .../main/java/ru/vtosters/lite/utils/Preferences.java  |  2 +-
 .../com/vk/api/wall/WallGetComments.smali              |  4 ++++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
index 12f8e502b..b9df03345 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
@@ -6,6 +6,7 @@ import static ru.vtosters.lite.utils.Globals.getContext;
 import static ru.vtosters.lite.utils.Globals.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.BooleanFalse;
 import static ru.vtosters.lite.utils.Preferences.BooleanTrue;
+import static ru.vtosters.lite.utils.Preferences.CommentsSort;
 import static ru.vtosters.lite.utils.Preferences.adsgroup;
 import static ru.vtosters.lite.utils.Preferences.adsstories;
 import static ru.vtosters.lite.utils.Preferences.authorsrecomm;
@@ -172,14 +173,7 @@ public class Newsfeed {
     }
 
     public static String getCommentsSort(String def) {
-        switch (getPrefsValue("commentssort")) {
-            case "new":
-                return "desc";
-            case "old":
-                return "asc";
-            default:
-                return def;
-        }
+        return CommentsSort() ? "desc" : "asc";
     }
 
     public static long getUpdateNewsfeed(boolean refresh_timeout) {
diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
index 085f88cf0..ee4eb0577 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -170,7 +170,7 @@ public class Preferences {
         return BooleanTrue("feedcache");
     }
 
-    public static boolean getCommentsSort() {
+    public static boolean CommentsSort() {
         return BooleanFalse("commentssorting");
     }
 
diff --git a/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali b/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali
index a57ae6903..233b2dba5 100644
--- a/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali
+++ b/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali
@@ -138,6 +138,10 @@
 
     .line 64
     :goto_1
+    invoke-static {p2}, Lru/vtosters/lite/utils/Newsfeed;->getCommentsSort(Ljava/lang/String;)Ljava/lang/String;
+
+    move-result-object p2
+
     invoke-virtual {p0, p1, p2}, Lcom/vk/api/wall/WallGetComments;->a(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest;
 
     .line 66