commit 4d9905e3d67820d0829f517a6dd9b44ca48764f3
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Jan 22 12:01:36 2016 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Jan 22 13:38:12 2016 -0400
tree 0bd1844ff1c4cdbe10c3aaa74ae930507f42dc54
parent 4a1c7406e3816944c224ed1bf2f7470b1147930b

improve call selection

There were corner cases that did not trigger the call view, or with
an invalid selected call.
Improves call switching by properly changing the call selected when
an incoming call arrives and disconnecting the preivous one.

Change-Id: I32db7c9e6bc4a2df45544ddb7fad5e344d8839d7
Tuleap: #70

src/CurrentCallVC.mm

diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index 1c3efdd..2436ab1 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -96,6 +96,7 @@
 @property RendererConnectionsHolder* previewHolder;
 @property RendererConnectionsHolder* videoHolder;
 @property QMetaObject::Connection videoStarted;
+@property QMetaObject::Connection selectedCallChanged;
 @property QMetaObject::Connection messageConnection;
 @property QMetaObject::Connection mediaAddedConnection;
 
@@ -248,7 +249,7 @@
                              return;
                          }
 
-                         CallModel::instance().selectCall(call);
+                         [self changeCallSelection:call];
 
                          if (call->state() == Call::State::HOLD) {
                              call << Call::Action::HOLD;
@@ -281,7 +282,25 @@
                                  [self updateCall];
                              }
                          }
-    });
+                     });
+
+    QObject::connect(&CallModel::instance(),
+                     &CallModel::incomingCall,
+                     [self](Call* c) {
+                         [self changeCallSelection:c];
+                         [self animateIn];
+                     });
+}
+
+- (void) changeCallSelection:(Call* )c
+{
+    QObject::disconnect(self.selectedCallChanged);
+    CallModel::instance().selectCall(c);
+    self.selectedCallChanged = QObject::connect(CallModel::instance().selectedCall(),
+                                                &Call::changed,
+                                                [=]() {
+                                                    [self updateCall];
+                                                });
 }
 
 - (void) monitorIncomingTextMessages:(Media::Text*) media
@@ -424,7 +443,6 @@
 
 -(void) animateIn
 {
-    NSLog(@"animateIn");
     CGRect frame = CGRectOffset(self.view.superview.bounds, -self.view.superview.bounds.size.width, 0);
     [self.view setHidden:NO];
 
@@ -444,11 +462,8 @@
         if(!CallModel::instance().selectedCall())
             return;
 
-        QObject::connect(CallModel::instance().selectedCall(),
-                            &Call::changed,
-                            [=]() {
-                                [self updateCall];
-                            });
+        [self updateCall];
+
         if (CallModel::instance().selectedCall()->hasMedia(Media::Media::Type::TEXT, Media::Media::Direction::IN)) {
             Media::Text *text = CallModel::instance().selectedCall()->firstMedia<Media::Text>(Media::Media::Direction::IN);
             [self monitorIncomingTextMessages:text];