commit 4f403b68f945591591e9591eeb296bf6f91e379f
author Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Tue Jul 11 16:15:32 2017 -0400
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Wed Jul 12 11:13:58 2017 -0400
tree 44a9a468ddaffc8dd082790ae9c7c0836af28aa3
parent 9dd759cdc92e32429b8853ed12311c1a76245c74

Send request: manage button visibility

Hide Send Request button if contact already trust us

Change-Id: I014b69cb1600abc52addc0a9ef1d1854162aafda
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>

src/ConversationVC.mm

diff --git a/src/ConversationVC.mm b/src/ConversationVC.mm
index f68655b..2461aec 100644
--- a/src/ConversationVC.mm
+++ b/src/ConversationVC.mm
@@ -218,6 +218,32 @@
     return NO;
 }
 
+-(BOOL)shouldHideSendRequestBtn {
+    /*to send contact request we need to meet thre condition:
+     1)contact method has RING protocol
+     2)accound is used to send request is also RING
+     3)contact  have not acceppt request yet*/
+    if(selectedContactMethod->protocolHint() != URI::ProtocolHint::RING) {
+        return YES;
+    }
+    if(selectedContactMethod->isConfirmed()) {
+        return YES;
+    }
+    if(selectedContactMethod->account()) {
+        return selectedContactMethod->account()->protocol() != Account::Protocol::RING;
+    }
+    if([self chosenAccount]) {
+        return [self chosenAccount]->protocol() != Account::Protocol::RING;
+    }
+    return NO;
+}
+
+-(void)updateSendButtonVisibility
+{
+    [sentContactRequestButton setHidden:[self shouldHideSendRequestBtn]];
+    sentContactRequestWidth.priority = [self shouldHideSendRequestBtn] ? 999: 250;
+}
+
 #pragma mark - NSPopUpButton item selection
 
 - (IBAction)itemChanged:(id)sender {
@@ -225,23 +251,7 @@
 
     selectedContactMethod = contactMethods.at(index);
 
-    /*to send contact request we need to meet two condition:
-     1)contact method has RING protocol
-     2)accound is used to send request is also RING*/
-
-    Boolean hideSendTrustRequestButton = NO;
-    if(selectedContactMethod->protocolHint() != URI::ProtocolHint::RING) {
-        hideSendTrustRequestButton = YES;
-    }
-    else if(selectedContactMethod->account()) {
-       hideSendTrustRequestButton = selectedContactMethod->account()->protocol() != Account::Protocol::RING;
-    }
-    else if([self chosenAccount]) {
-        Boolean hideSendTrustRequestButton = [self chosenAccount]->protocol() != Account::Protocol::RING;
-    }
-
-    [sentContactRequestButton setHidden:hideSendTrustRequestButton];
-    sentContactRequestWidth.priority = hideSendTrustRequestButton ? 999: 250;
+    [self updateSendButtonVisibility];
 
     [conversationTitle setStringValue:selectedContactMethod->primaryName().toNSString()];
     QObject::disconnect(contactMethodChanged);
@@ -249,6 +259,7 @@
                                             &ContactMethod::changed,
                                             [self] {
                                                 [conversationTitle setStringValue:selectedContactMethod->primaryName().toNSString()];
+                                                [self updateSendButtonVisibility];
                                             });
 
     if (auto txtRecording = selectedContactMethod->textRecording()) {