Commit 61a726d4 authored by atraczyk's avatar atraczyk Committed by Andreas Traczyk

fix: removes the video settings button when accepting a call

- When the user clicks the call accept button, the video settings
  button on the smartpanel will be hidden.

Change-Id: I6c023c484f01a0a9b7d78a98189707232b4e8f5c
Tuleap: #790
parent a677161a
......@@ -289,8 +289,6 @@ MainPage::Application_VisibilityChanged(Object^ sender, VisibilityChangedEventAr
}
}
if (isInCall) {
/*if (RingD::instance->currentCallId)
RingD::instance->unPauseCall(RingD::instance->currentCallId);*/
vcm->InitializeCameraAsync(false);
vcm->videoFrameCopyInvoker->Start();
}
......@@ -322,11 +320,6 @@ MainPage::Application_VisibilityChanged(Object^ sender, VisibilityChangedEventAr
}
}
if (isInCall) {
// TODO
/*if (RingD::instance->currentCallId) {
MSG_("Pausing call: " + RingD::instance->currentCallId);
RingD::instance->pauseCall(RingD::instance->currentCallId);
}*/
if (vcm->isPreviewing) {
vcm->StopPreviewAsync();
if (vcm->captureTaskTokenSource)
......
......@@ -22,6 +22,7 @@
#include "SmartPanel.xaml.h"
#include "qrencode.h"
#include <MemoryBuffer.h> // IMemoryBufferByteAccess
#include "callmanager_interface.h"
using namespace Platform;
......@@ -127,15 +128,8 @@ SmartPanel::SmartPanel()
case CallStatus::NONE:
case CallStatus::ENDED:
{
bool isInCall = false;
for (auto item : SmartPanelItemsViewModel::instance->itemsList) { // WTF!!! item instead of it!!!! (XXX)
if (item->_callId && item->_callStatus == CallStatus::IN_PROGRESS) {
isInCall = true;
RingD::instance->currentCallId = item->_callId;
break;
}
}
if (!isInCall)
auto callsList = DRing::getCallList();
if (callsList.empty())
_settingsMenuButton_->Visibility = VIS::Visible;
break;
}
......@@ -347,6 +341,7 @@ RingClientUWP::Views::SmartPanel::_acceptIncomingCallBtn__Click(Platform::Object
if (it->_callStatus != CallStatus::IN_PROGRESS)
RingD::instance->pauseCall(Utils::toString(it->_callId));
_settingsMenuButton_->Visibility = VIS::Collapsed;
RingD::instance->acceptIncommingCall(callId);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment