commit 286643575280c3c152f652830389cf932a25464a
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Wed Jul 29 14:47:42 2015 -0400
committer Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Wed Jul 29 17:44:08 2015 -0400
tree 0d96b749dcdfaf906f1c90083b7f620f433e632b
parent a1f07bf79101464538572ca73dc2616950c31d69

ring account: add incoming call permissions

This commit adds the three options for dht calls.
If "Allow Unknown" is checked then Allow Contacts and History are greyed out,
since their value won't be used anyway.

I've simplified a bit the loadAccount method in AccRingVC.mm

Issue: #78241
Change-Id: Ie95b54d11bb979bb369db2344158f37a3320ec88

src/AccRingVC.mm

diff --git a/src/AccRingVC.mm b/src/AccRingVC.mm
index 30418fa..448a500 100644
--- a/src/AccRingVC.mm
+++ b/src/AccRingVC.mm
@@ -49,6 +49,9 @@
 @property (assign) IBOutlet NSButton *autoAnswerButton;
 @property (assign) IBOutlet NSButton *userAgentButton;
 @property (assign) IBOutlet NSTextField *userAgentTextField;
+@property (unsafe_unretained) IBOutlet NSButton *allowUnknown;
+@property (unsafe_unretained) IBOutlet NSButton *allowHistory;
+@property (unsafe_unretained) IBOutlet NSButton *allowContacts;
 
 @end
 
@@ -61,6 +64,7 @@
 @synthesize autoAnswerButton;
 @synthesize userAgentButton;
 @synthesize userAgentTextField;
+@synthesize allowContacts, allowHistory, allowUnknown;
 
 - (void)awakeFromNib
 {
@@ -90,34 +94,28 @@
 
     [self.aliasTextField setStringValue:account->alias().toNSString()];
 
-    switch (account->protocol()) {
-        case Account::Protocol::SIP:
-            [typeLabel setStringValue:@"SIP"];
-            break;
-        case Account::Protocol::IAX:
-            [typeLabel setStringValue:@"IAX"];
-            break;
-        case Account::Protocol::RING:
-            [typeLabel setStringValue:@"RING"];
-            break;
+    [typeLabel setStringValue:@"RING"];
 
-        default:
-            break;
-    }
+    [allowUnknown setState:account->allowIncomingFromUnknown()];
+    [allowHistory setState:account->allowIncomingFromHistory()];
+    [allowContacts setState:account->allowIncomingFromContact()];
 
-    [upnpButton setState:[self currentAccount]->isUpnpEnabled()];
-    [userAgentButton setState:[self currentAccount]->hasCustomUserAgent()];
-    [userAgentTextField setEnabled:[self currentAccount]->hasCustomUserAgent()];
+    [allowHistory setEnabled:!account->allowIncomingFromUnknown()];
+    [allowContacts setEnabled:!account->allowIncomingFromUnknown()];
 
-    [autoAnswerButton setState:[self currentAccount]->isAutoAnswer()];
+    [upnpButton setState:account->isUpnpEnabled()];
+    [userAgentButton setState:account->hasCustomUserAgent()];
+    [userAgentTextField setEnabled:account->hasCustomUserAgent()];
+
+    [autoAnswerButton setState:account->isAutoAnswer()];
     [userAgentTextField setStringValue:account->userAgent().toNSString()];
 
     [bootstrapField setStringValue:account->hostname().toNSString()];
 
-    if([[self currentAccount]->username().toNSString() isEqualToString:@""])
+    if([account->username().toNSString() isEqualToString:@""])
         [hashField setStringValue:@"Reopen account to see your hash"];
     else
-        [hashField setStringValue:[self currentAccount]->username().toNSString()];
+        [hashField setStringValue:account->username().toNSString()];
 
 }
 
@@ -134,6 +132,18 @@
     [self currentAccount]->setHasCustomUserAgent([sender state] == NSOnState);
 }
 
+- (IBAction)toggleAllowFromUnknown:(id)sender {
+    [self currentAccount]->setAllowIncomingFromUnknown([sender state] == NSOnState);
+    [allowHistory setEnabled:![sender state] == NSOnState];
+    [allowContacts setEnabled:![sender state] == NSOnState];
+}
+- (IBAction)toggleAllowFromHistory:(id)sender {
+    [self currentAccount]->setAllowIncomingFromHistory([sender state] == NSOnState);
+}
+- (IBAction)toggleAllowFromContacts:(id)sender {
+    [self currentAccount]->setAllowIncomingFromContact([sender state] == NSOnState);
+}
+
 #pragma mark - NSTextFieldDelegate methods
 
 - (BOOL)control:(NSControl *)control textShouldBeginEditing:(NSText *)fieldEditor