commit 6097085697462880569161ca337ff9f8d72d0ac6
author Anthony Léonard <anthony.leonard@savoirfairelinux.com> Fri Jul 21 11:33:41 2017 -0400
committer Anthony Léonard <anthony.leonard@savoirfairelinux.com> Thu Jul 27 16:03:20 2017 -0400
tree 0cca59333f4d466e070c8eea6cf04089ef4caabd
parent 66e239bd9a1beb1f15219d3e0dc042f05ef53b1b

remove add contact popover

This panel is removed to improve ease of use and because contacts with
multiple contact methods are not supported very well. With this
simplification, adding a contact is now a single click action.

Change-Id: Id15289a844b0c9c0d467e5e8491fd7713f0d1aab
Reviewed-by: Olivier Soldano <olivier.soldano@savoirfairelinux.com>

src/CurrentCallVC.mm

diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index bc90d07..ba42a20 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -39,6 +39,8 @@
 #import <media/text.h>
 #import <person.h>
 #import <globalinstances.h>
+#import <personmodel.h>
+#import <peerprofilecollection.h>
 
 #import "AppDelegate.h"
 #import "views/ITProgressIndicator.h"
@@ -641,21 +643,40 @@
 - (IBAction)addToContact:(NSButton*) sender {
     auto contactmethod = CallModel::instance().getCall(CallModel::instance().selectionModel()->currentIndex())->peerContactMethod();
 
-    if (self.addToContactPopover != nullptr) {
-        [self.addToContactPopover performClose:self];
-        self.addToContactPopover = NULL;
-    } else if (!contactmethod->contact() || contactmethod->contact()->isPlaceHolder()) {
-        auto* editorVC = [[PersonLinkerVC alloc] initWithNibName:@"PersonLinker" bundle:nil];
-        [editorVC setMethodToLink:contactmethod];
-        [editorVC setContactLinkedDelegate:self];
-        self.addToContactPopover = [[NSPopover alloc] init];
-        [self.addToContactPopover setContentSize:editorVC.view.frame.size];
-        [self.addToContactPopover setContentViewController:editorVC];
-        [self.addToContactPopover setAnimates:YES];
-        [self.addToContactPopover setBehavior:NSPopoverBehaviorTransient];
-        [self.addToContactPopover setDelegate:self];
+    // TODO: Uncomment to reuse contact name editing popover
+//    if (self.addToContactPopover != nullptr) {
+//        [self.addToContactPopover performClose:self];
+//        self.addToContactPopover = NULL;
+//    } else if (!contactmethod->contact() || contactmethod->contact()->isPlaceHolder()) {
+//        auto* editorVC = [[PersonLinkerVC alloc] initWithNibName:@"PersonLinker" bundle:nil];
+//        [editorVC setMethodToLink:contactmethod];
+//        [editorVC setContactLinkedDelegate:self];
+//        self.addToContactPopover = [[NSPopover alloc] init];
+//        [self.addToContactPopover setContentSize:editorVC.view.frame.size];
+//        [self.addToContactPopover setContentViewController:editorVC];
+//        [self.addToContactPopover setAnimates:YES];
+//        [self.addToContactPopover setBehavior:NSPopoverBehaviorTransient];
+//        [self.addToContactPopover setDelegate:self];
+//
+//        [self.addToContactPopover showRelativeToRect:sender.bounds ofView:sender preferredEdge:NSMaxXEdge];
+//    }
 
-        [self.addToContactPopover showRelativeToRect:sender.bounds ofView:sender preferredEdge:NSMaxXEdge];
+    auto* newPerson = new Person();
+    newPerson->setFormattedName(contactmethod->bestName());
+
+    Person::ContactMethods numbers;
+    numbers << contactmethod;
+    newPerson->setContactMethods(numbers);
+    contactmethod->setPerson(newPerson);
+
+    auto personCollections = PersonModel::instance().collections();
+    CollectionInterface *peerProfileCollection = nil;
+    foreach(auto collection, personCollections) {
+        if(dynamic_cast<PeerProfileCollection*>(collection))
+            peerProfileCollection = collection;
+    }
+    if(peerProfileCollection) {
+        PersonModel::instance().addNewPerson(newPerson, peerProfileCollection);
     }
 
     [videoView setCallDelegate:nil];