From 19e13e0469da604d2934a7543412aa79b0c00562 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
Date: Fri, 8 Sep 2023 17:16:58 +0100
Subject: [PATCH] Hide phone number and explanation if homeserver doesn't have
 3pid capability enabled (#7670)

---
 .../Modules/Settings/SettingsViewController.m | 35 ++++++++++---------
 changelog.d/7670.bugfix                       |  1 +
 2 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 changelog.d/7670.bugfix

diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 4bc45f827..32871e008 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -371,23 +371,24 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
     {
         [sectionUserSettings addRowWithTag: USER_SETTINGS_PHONENUMBERS_OFFSET + index];
     }
-    if (BuildSettings.settingsScreenAllowAddingEmailThreepids &&
-        // If the threePidChanges is nil we assume the capability to be true
-        (!self.mainSession.homeserverCapabilities.threePidChanges ||
-         self.mainSession.homeserverCapabilities.threePidChanges.enabled))
-    {
-        [sectionUserSettings addRowWithTag:USER_SETTINGS_ADD_EMAIL_INDEX];
-    }
-    if (BuildSettings.settingsScreenAllowAddingPhoneThreepids)
-    {
-        [sectionUserSettings addRowWithTag:USER_SETTINGS_ADD_PHONENUMBER_INDEX];
-    }
-    if (BuildSettings.settingsScreenShowThreepidExplanatory)
-    {
-        NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart1] attributes:@{}];
-        [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart2] attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.tintColor}]];
-        [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart3] attributes:@{}]];
-        sectionUserSettings.attributedFooterTitle = attributedString;
+    // If the threePidChanges is nil we assume the capability to be true
+    if (!self.mainSession.homeserverCapabilities.threePidChanges ||
+        self.mainSession.homeserverCapabilities.threePidChanges.enabled) {
+        if (BuildSettings.settingsScreenAllowAddingEmailThreepids)
+        {
+            [sectionUserSettings addRowWithTag:USER_SETTINGS_ADD_EMAIL_INDEX];
+        }
+        if (BuildSettings.settingsScreenAllowAddingPhoneThreepids)
+        {
+            [sectionUserSettings addRowWithTag:USER_SETTINGS_ADD_PHONENUMBER_INDEX];
+        }
+        if (BuildSettings.settingsScreenShowThreepidExplanatory)
+        {
+            NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart1] attributes:@{}];
+            [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart2] attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.tintColor}]];
+            [attributedString appendAttributedString:[[NSAttributedString alloc] initWithString:[VectorL10n settingsThreePidsManagementInformationPart3] attributes:@{}]];
+            sectionUserSettings.attributedFooterTitle = attributedString;
+        }
     }
     
     sectionUserSettings.headerTitle = [VectorL10n settingsUserSettings];
diff --git a/changelog.d/7670.bugfix b/changelog.d/7670.bugfix
new file mode 100644
index 000000000..7f975ec95
--- /dev/null
+++ b/changelog.d/7670.bugfix
@@ -0,0 +1 @@
+Add phone number UI and explanatory text is hidden if the 3 pid changes capability is disabled.