currentcall: setCurrentCall only on active calls

Change-Id: I9f16e8a3633981d41429343885a3130b0496288d
GitLab: #1007

src/app/calladapter.cpp

@@ -416,8 +416,6 @@ CallAdapter::acceptACall(const QString& accountId, const QString& convUid)
         return;
 
     lrcInstance_->getAccountInfo(accountId).callModel->accept(convInfo.callId);
-    auto& accInfo = lrcInstance_->getAccountInfo(convInfo.accountId);
-    accInfo.callModel->setCurrentCall(convInfo.callId);
 }
 
 void
@@ -518,7 +516,12 @@ CallAdapter::updateCall(const QString& convUid, const QString& accountId, bool f
     if (convInfo.uid == lrcInstance_->get_selectedConvUid()) {
         auto& accInfo = lrcInstance_->accountModel().getAccountInfo(accountId_);
         if (accInfo.profileInfo.type != lrc::api::profile::Type::SIP) {
-            accInfo.callModel->setCurrentCall(call->id);
+            // Only setCurrentCall if call is actually answered
+            try {
+                if (call->status == call::Status::IN_PROGRESS
+                    || call->status == call::Status::PAUSED)
+                    accInfo.callModel->setCurrentCall(call->id);
+            } catch (...) {}
         }
     }
 

src/app/currentcall.cpp

@@ -61,8 +61,15 @@ CurrentCall::updateId(QString callId)
     }
 
     auto& accInfo = lrcInstance_->getCurrentAccountInfo();
-    if (accInfo.profileInfo.type != lrc::api::profile::Type::SIP)
-        accInfo.callModel->setCurrentCall(callId);
+    if (accInfo.profileInfo.type != lrc::api::profile::Type::SIP) {
+        // Only setCurrentCall if call is actually answered
+        try {
+            auto callInfo = accInfo.callModel->getCall(callId);
+            if (callInfo.status == call::Status::IN_PROGRESS
+                || callInfo.status == call::Status::PAUSED)
+                accInfo.callModel->setCurrentCall(callId);
+        } catch (...) {}
+    }
     // Set the current id_ if there is a call.
     set_id((accInfo.callModel->hasCall(callId) ? callId : QString()));
 }