From 3e4f14678e4af84505f1abbb0568f1c9e18ff500 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 30 Dec 2022 16:35:20 +0300 Subject: [PATCH] fixed nonmilk profile hide --- .../ru/vtosters/lite/ssfs/ProfileHider.java | 9 ++++-- .../user/AdministratorProfileFragment.smali | 28 ++++--------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/ssfs/ProfileHider.java b/app/src/main/java/ru/vtosters/lite/ssfs/ProfileHider.java index 46d20b911..7d273c907 100644 --- a/app/src/main/java/ru/vtosters/lite/ssfs/ProfileHider.java +++ b/app/src/main/java/ru/vtosters/lite/ssfs/ProfileHider.java @@ -30,8 +30,13 @@ public class ProfileHider { public static String getInfo(ExtendedUserProfile extendedUserProfile) { int userID = getUserID(extendedUserProfile); - if (UsersList.hasDescription(userID) && !TextUtils.isEmpty(extendedUserProfile.z2)) - return extendedUserProfile.z2; + if (UsersList.hasDescription(userID)) { + if (!TextUtils.isEmpty(extendedUserProfile.z2)) { + return extendedUserProfile.z2; + } else { + return Handler.getDescription(userID); + } + } return getGlobalContext().getString(UserPresenter.q0.a(userID)); } } \ No newline at end of file diff --git a/smali/smali_classes4/com/vk/profile/ui/user/AdministratorProfileFragment.smali b/smali/smali_classes4/com/vk/profile/ui/user/AdministratorProfileFragment.smali index 95945e655..eda39d07a 100644 --- a/smali/smali_classes4/com/vk/profile/ui/user/AdministratorProfileFragment.smali +++ b/smali/smali_classes4/com/vk/profile/ui/user/AdministratorProfileFragment.smali @@ -439,36 +439,18 @@ .line 14 :cond_7 - sget-object v1, Lcom/vk/profile/presenter/UserPresenter;->q0:Lcom/vk/profile/presenter/UserPresenter$a; - - invoke-virtual {v1}, Lcom/vk/profile/presenter/UserPresenter$a;->a()Ljava/util/HashMap; - - move-result-object v1 - - iget v3, p0, Lcom/vk/profile/ui/BaseProfileFragment;->q0:I - - invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v3 - - invoke-virtual {v1, v3}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object; - - move-result-object v1 - - check-cast v1, Lcom/vk/profile/presenter/UserPresenter$a$a; - - if-eqz v1, :cond_8 - .line 15 iget-object v3, p0, Lcom/vk/profile/ui/user/AdministratorProfileFragment;->k1:Lcom/vk/core/view/links/LinkedTextView; if-eqz v3, :cond_8 - invoke-virtual {v1}, Lcom/vk/profile/presenter/UserPresenter$a$a;->c()I + invoke-static {p0}, Lcom/vk/profile/ui/user/AdministratorProfileFragment;->a(Lcom/vk/profile/ui/user/AdministratorProfileFragment;)Lcom/vtosters/lite/api/ExtendedUserProfile; - move-result v1 + move-result-object v1 - invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String; + if-eqz v1, :cond_8 + + invoke-static {v1}, Lru/vtosters/lite/ssfs/ProfileHider;->getInfo(Lcom/vtosters/lite/api/ExtendedUserProfile;)Ljava/lang/String; move-result-object v1