From a9c59fa79d7a36fac56660b6551a91b5df5dfda9 Mon Sep 17 00:00:00 2001
From: Ivan K <attoscape@gmail.com>
Date: Sun, 17 Apr 2022 17:27:43 +0300
Subject: [PATCH] Fix "Hide phone number"

---
 .../preferences/AppearancePreferencesEntry.java          | 6 ++++--
 .../src/main/java/org/telegram/ui/ProfileActivity.java   | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/TMessagesProj/src/main/java/com/exteragram/messenger/preferences/AppearancePreferencesEntry.java b/TMessagesProj/src/main/java/com/exteragram/messenger/preferences/AppearancePreferencesEntry.java
index 376641d5c..4a3feb06e 100644
--- a/TMessagesProj/src/main/java/com/exteragram/messenger/preferences/AppearancePreferencesEntry.java
+++ b/TMessagesProj/src/main/java/com/exteragram/messenger/preferences/AppearancePreferencesEntry.java
@@ -16,6 +16,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import org.telegram.messenger.AndroidUtilities;
 import org.telegram.messenger.LocaleController;
+import org.telegram.messenger.NotificationCenter;
 import org.telegram.messenger.R;
 import org.telegram.messenger.SharedConfig;
 import org.telegram.ui.ActionBar.ActionBar;
@@ -142,6 +143,8 @@ public class AppearancePreferencesEntry extends BaseFragment {
                 if (view instanceof TextCheckCell) {
                     ((TextCheckCell) view).setChecked(ExteraConfig.hidePhoneNumber);
                 }
+                parentLayout.rebuildAllFragmentViews(false, false);
+                getNotificationCenter().postNotificationName(NotificationCenter.mainUserInfoChanged);
             } else if (position == showIDRow) {
                 ExteraConfig.toggleShowID();
                 if (view instanceof TextCheckCell) {
@@ -296,8 +299,7 @@ public class AppearancePreferencesEntry extends BaseFragment {
                 return 2;
             } else if (position == useSystemFontsRow || position == useSystemEmojiRow || position == transparentStatusBarRow ||
                        position == blurForAllThemesRow || position == hideAllChatsRow || position == hidePhoneNumberRow ||
-                       position == showIDRow || position == chatsOnTitleRow || position == disableVibrationRow ||
-                       position == disableVibrationRow) {
+                       position == showIDRow || position == chatsOnTitleRow || position == disableVibrationRow) {
                 return 3;
             }
             return 1;
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
index 7ca157b1b..c6bf102ef 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
@@ -5863,7 +5863,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     setAvatarSectionRow = rowCount++;
                 }
                 numberSectionRow = rowCount++;
-                numberRow = ExteraConfig.hidePhoneNumber ? -1 : rowCount++;
+                numberRow = rowCount++;
                 setUsernameRow = rowCount++;
                 bioRow = rowCount++;
 
@@ -7430,8 +7430,7 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     if (position == phoneRow) {
                         String text;
                         final TLRPC.User user = getMessagesController().getUser(userId);
-                        if (!TextUtils.isEmpty(user.phone)
-                                && !(ExteraConfig.hidePhoneNumber && user.id == UserConfig.getInstance(currentAccount).getClientUserId())) {
+                        if (!TextUtils.isEmpty(user.phone) && !(ExteraConfig.hidePhoneNumber && user.id == UserConfig.getInstance(currentAccount).getClientUserId())) {
                             text = PhoneFormat.getInstance().format("+" + user.phone);
                         } else {
                             text = LocaleController.getString("PhoneHidden", R.string.PhoneHidden);
@@ -7469,7 +7468,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
                     } else if (position == numberRow) {
                         TLRPC.User user = UserConfig.getInstance(currentAccount).getCurrentUser();
                         String value;
-                        if (user != null && user.phone != null && user.phone.length() != 0) {
+                        if (ExteraConfig.hidePhoneNumber) {
+                            value = LocaleController.getString("MobileHidden", R.string.MobileHidden);
+                        } else if (user != null && user.phone != null && user.phone.length() != 0) {
                             value = PhoneFormat.getInstance().format("+" + user.phone);
                         } else {
                             value = LocaleController.getString("NumberUnknown", R.string.NumberUnknown);