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 d66f7325d..e4e0d5354 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -171,8 +171,8 @@ public class Newsfeed { return adsstories() ? "null" : "ads"; } - public static String getCommentsSort(String def) { - return CommentsSort() ? "desc" : "asc"; + public static String getCommentsSort(int value) { + return !CommentsSort() && value == 2 || value == 1 ? "desc" : "asc"; } public static long getUpdateNewsfeed(boolean refresh_timeout) { diff --git a/smali/smali/com/vk/wall/post/CommentsListPresenter.smali b/smali/smali/com/vk/wall/post/CommentsListPresenter.smali index 2b731c461..b67de8888 100644 --- a/smali/smali/com/vk/wall/post/CommentsListPresenter.smali +++ b/smali/smali/com/vk/wall/post/CommentsListPresenter.smali @@ -379,7 +379,7 @@ move-result-object v8 - const/4 v9, 0x0 + const/4 v9, 0x2 invoke-virtual {p0}, Lcom/vk/wall/post/CommentsListPresenter;->z()Ljava/lang/String; @@ -389,7 +389,7 @@ move v4, p1 - invoke-direct/range {v1 .. v10}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ZLjava/lang/String;)V + invoke-direct/range {v1 .. v10}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ILjava/lang/String;)V const/4 p1, 0x0 @@ -1084,7 +1084,7 @@ move-object v4, v1 - invoke-direct/range {v4 .. v13}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ZLjava/lang/String;)V + invoke-direct/range {v4 .. v13}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ILjava/lang/String;)V .line 171 invoke-virtual {p1}, Lcom/vtosters/lite/NewsComment;->h()I @@ -1912,7 +1912,7 @@ move v8, p1 - invoke-direct/range {v2 .. v11}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ZLjava/lang/String;)V + invoke-direct/range {v2 .. v11}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ILjava/lang/String;)V const/4 p1, 0x0 @@ -2220,11 +2220,11 @@ const/4 v6, 0x1 - const/4 v8, 0x0 + const/4 v8, 0x2 move-object v0, v10 - invoke-direct/range {v0 .. v9}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ZLjava/lang/String;)V + invoke-direct/range {v0 .. v9}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ILjava/lang/String;)V .line 105 invoke-virtual {p0}, Lcom/vk/wall/post/CommentsListPresenter;->v()I diff --git a/smali/smali/com/vk/wall/thread/CommentThreadPresenter.smali b/smali/smali/com/vk/wall/thread/CommentThreadPresenter.smali index 8deeadd68..189506789 100644 --- a/smali/smali/com/vk/wall/thread/CommentThreadPresenter.smali +++ b/smali/smali/com/vk/wall/thread/CommentThreadPresenter.smali @@ -956,7 +956,7 @@ move v4, p1 - invoke-direct/range {v1 .. v10}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ZLjava/lang/String;)V + invoke-direct/range {v1 .. v10}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ILjava/lang/String;)V .line 211 iget p1, p0, Lcom/vk/wall/thread/CommentThreadPresenter;->c:I @@ -3087,7 +3087,7 @@ move-object v1, p1 - invoke-direct/range {v1 .. v10}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ZLjava/lang/String;)V + invoke-direct/range {v1 .. v10}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ILjava/lang/String;)V .line 235 iget v1, p0, Lcom/vk/wall/thread/CommentThreadPresenter;->c:I @@ -4222,7 +4222,7 @@ move-object v0, v10 - invoke-direct/range {v0 .. v9}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ZLjava/lang/String;)V + invoke-direct/range {v0 .. v9}, Lcom/vk/api/wall/WallGetComments;->(IIIIIZLjava/lang/String;ILjava/lang/String;)V .line 219 iget v0, p0, Lcom/vk/wall/thread/CommentThreadPresenter;->c:I diff --git a/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali b/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali index 233b2dba5..06adb7c1c 100644 --- a/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali +++ b/smali/smali_classes5/com/vk/api/wall/WallGetComments.smali @@ -26,7 +26,7 @@ # direct methods -.method public constructor (IIIIIZLjava/lang/String;ZLjava/lang/String;)V +.method public constructor (IIIIIZLjava/lang/String;ILjava/lang/String;)V .locals 1 const-string v0, "execute.getCommentsNew" @@ -127,18 +127,7 @@ :cond_3 const-string p1, "sort" - if-eqz p8, :cond_4 - - const-string p2, "desc" - - goto :goto_1 - - :cond_4 - const-string p2, "asc" - - .line 64 - :goto_1 - invoke-static {p2}, Lru/vtosters/lite/utils/Newsfeed;->getCommentsSort(Ljava/lang/String;)Ljava/lang/String; + invoke-static {p8}, Lru/vtosters/lite/utils/Newsfeed;->getCommentsSort(I)Ljava/lang/String; move-result-object p2