commit 994971f162786fb463d7ba152138f5eee4505903
author Olivier Soldano <olivier.soldano@savoirfairelinux.com> Tue Dec 05 16:30:12 2017 -0500
committer Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Fri Dec 22 17:54:03 2017 -0400
tree fd00feec25b5851c26ef40fa0ed13dfa30e9a8d8
parent d431155b2d0476bfb00821c027d63b0d76ee8fd4

reimplement CurrentCallVC with new call model

This patch reimplements CurrentCallVC using the call model introduced
recently in LRC.

As of this patch, some minor features are missing such as conversation
time or contact picture display when receiving or starting a call.
Call panel may also appear and disappear many times during connection
establishment. All of that is meant to be fixed very soon and doesn't
prevent starting or receiving a call.

Change-Id: Ie51f75ffc267e955679a4cc75663f92e03c36eef
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>

src/RingWindowController.mm

diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index 8838fff..1d51d5a 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -26,7 +26,6 @@
 #import <QItemSelection>
 
 //LRC
-#import <accountmodel.h>
 #import <callmodel.h>
 #import <account.h>
 #import <call.h>
@@ -34,6 +33,11 @@
 #import <AvailableAccountModel.h>
 #import <api/lrc.h>
 #import <api/account.h>
+#import <api/newaccountmodel.h>
+#import <api/newcallmodel.h>
+#import <api/behaviorcontroller.h>
+#import <api/conversation.h>
+
 
 // Ring
 #import "AppDelegate.h"
@@ -109,6 +113,7 @@
     // Fresh run, we need to make sure RingID appears
     [shareButton sendActionOn:NSLeftMouseDownMask];
 
+    [self connect];
     [self updateRingID];
     // display accounts to select
     NSToolbar *toolbar = self.window.toolbar;
@@ -117,55 +122,29 @@
     [toolbar insertItemWithItemIdentifier:kTrustRequestMenuItemIdentifier atIndex:2];
 }
 
-// TODO: Reimplement with new LRC signals
 - (void) connect
 {
-    // Update Ring ID label based on account model changes
-    QObject::connect(RecentModel::instance().selectionModel(),
-                     &QItemSelectionModel::currentChanged,
-                     [=](const QModelIndex &current, const QModelIndex &previous) {
-                         auto call = RecentModel::instance().getActiveCall(current);
-
-                         if(!current.isValid()) {
-                             [offlineVC animateOut];
-                             [currentCallVC animateOut];
-                             [chooseAccountVC enable];
-                             return;
-                         }
-
-                         if (!call) {
-                             [currentCallVC animateOut];
-                             [offlineVC animateIn];
-                             [chooseAccountVC enable];
-                         } else {
-                             [currentCallVC animateIn];
-                             [offlineVC animateOut];
-                             [chooseAccountVC disable];
-                         }
+    QObject::connect(&lrc_->getBehaviorController(),
+                     &lrc::api::BehaviorController::showCallView,
+                     [self](const std::string accountId,
+                            const lrc::api::conversation::Info convInfo){
+                         auto* accInfo = &lrc_->getAccountModel().getAccountInfo(accountId);
+                         [currentCallVC setCurrentCall:convInfo.callId
+                                          conversation:convInfo.uid
+                                               account:accInfo];
+                         [currentCallVC animateIn];
+                         [offlineVC animateOut];
                      });
 
-    QObject::connect(CallModel::instance().selectionModel(),
-                     &QItemSelectionModel::currentChanged,
-                     [=](const QModelIndex &current, const QModelIndex &previous) {
-                         if(!current.isValid()) {
-                             return;
-                         }
-
-                         if (previous.isValid()) {
-                             // We were already on a call
-                             [currentCallVC animateOut];
-                             [chooseAccountVC enable];
-                         } else {
-                             // Make sure Conversation view hides when selecting a valid call
-                             [currentCallVC animateIn];
-                             [offlineVC animateOut];
-                             [chooseAccountVC disable];
-                         }
-                     });
-    QObject::connect(AvailableAccountModel::instance().selectionModel(),
-                     &QItemSelectionModel::currentChanged,
-                     [self](const QModelIndex& idx){
-                         [self updateRingID];
+    QObject::connect(&lrc_->getBehaviorController(),
+                     &lrc::api::BehaviorController::showIncomingCallView,
+                     [self](const std::string accountId,
+                            const lrc::api::conversation::Info convInfo){
+                         auto* accInfo = &lrc_->getAccountModel().getAccountInfo(accountId);
+                         [currentCallVC setCurrentCall:convInfo.callId
+                                          conversation:convInfo.uid
+                                               account:accInfo];
+                         [currentCallVC animateIn];
                          [offlineVC animateOut];
                      });
 }