From d8d8236d544ad71723bb17b2dea338ab3a9e056e Mon Sep 17 00:00:00 2001
From: Benjamin Verdier <benjamin.verdier@belledonne-communications.com>
Date: Tue, 24 Jul 2018 10:31:49 +0200
Subject: [PATCH] Remove button when sip address already exists. Add toggle for
 button in xcode project.

---
 Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib | 5 +++--
 Classes/LinphoneUI/UIContactDetailsCell.m              | 6 ++++--
 linphone.xcodeproj/project.pbxproj                     | 4 ++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib b/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib
index 6781f1e63..598a57545 100644
--- a/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIContactDetailsCell.xib
@@ -97,9 +97,10 @@
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="lgb-5W-T0c">
-                            <rect key="frame" x="288" y="48" width="46" height="30"/>
+                            <rect key="frame" x="293" y="48" width="37" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <state key="normal" title="Button"/>
+                            <accessibility key="accessibilityConfiguration" label="Invite"/>
+                            <state key="normal" title="Invite"/>
                             <connections>
                                 <action selector="onSMSInviteClick:" destination="-1" eventType="touchUpInside" id="E8o-h2-mml"/>
                             </connections>
diff --git a/Classes/LinphoneUI/UIContactDetailsCell.m b/Classes/LinphoneUI/UIContactDetailsCell.m
index b03fb9d15..b5c3fe56b 100644
--- a/Classes/LinphoneUI/UIContactDetailsCell.m
+++ b/Classes/LinphoneUI/UIContactDetailsCell.m
@@ -61,13 +61,15 @@
 
 	_linphoneImage.hidden = TRUE;
 	if (contact) {
-		self.inviteButton.hidden = !(self.linphoneImage.hidden =
+		self.linphoneImage.hidden =
 			!((contact.friend &&
 			   linphone_presence_model_get_basic_status(linphone_friend_get_presence_model_for_uri_or_tel(
 				   contact.friend, _addressLabel.text.UTF8String)) == LinphonePresenceBasicStatusOpen) ||
 			  (!linphone_proxy_config_is_phone_number(linphone_core_get_default_proxy_config(LC),
 													  _addressLabel.text.UTF8String) &&
-			   [FastAddressBook isSipURIValid:_addressLabel.text])));
+			   [FastAddressBook isSipURIValid:_addressLabel.text]));
+        ContactDetailsView *contactDetailsView = VIEW(ContactDetailsView);
+        self.inviteButton.hidden = !ENABLE_SMS_INVITE || [[contactDetailsView.contact sipAddresses] count] > 0 || !self.linphoneImage.hidden;
 	}
 
 	if (addr) {
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index bbf8c373e..fb8b126ed 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -5169,6 +5169,7 @@
 					"-DBCTBX_LOG_DOMAIN=\\\"ios\\\"",
 					"-DCHECK_VERSION_UPDATE=FALSE",
 					"-DENABLE_QRCODE=FALSE",
+					"-DENABLE_SMS_INVITE=TRUE",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
@@ -5271,6 +5272,7 @@
 					"-DBCTBX_LOG_DOMAIN=\\\"ios\\\"",
 					"-DCHECK_VERSION_UPDATE=FALSE",
 					"-DENABLE_QRCODE=FALSE",
+					"-DENABLE_SMS_INVITE=TRUE",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
@@ -5373,6 +5375,7 @@
 					"-DBCTBX_LOG_DOMAIN=\\\"ios\\\"",
 					"-DCHECK_VERSION_UPDATE=FALSE",
 					"-DENABLE_QRCODE=FALSE",
+					"-DENABLE_SMS_INVITE=TRUE",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;
@@ -5475,6 +5478,7 @@
 					"-DBCTBX_LOG_DOMAIN=\\\"ios\\\"",
 					"-DCHECK_VERSION_UPDATE=FALSE",
 					"-DENABLE_QRCODE=FALSE",
+					"-DENABLE_SMS_INVITE=TRUE",
 				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = org.linphone.phone;