diff options
| author | Igor Olshevskyi <i.olshevskyi@samsung.com> | 2017-08-10 12:30:23 +0300 |
|---|---|---|
| committer | Igor Olshevskyi <i.olshevskyi@samsung.com> | 2017-08-11 17:14:01 +0300 |
| commit | d7a2d4c3eb77f400ab89ee5553599e103442c49c (patch) | |
| tree | bd28e4420b168348891d5e8986a952614ab7cb07 | |
| parent | 22aeb52bc62626705e05b9e13ae8c6aed9a59364 (diff) | |
| download | call-ui-d7a2d4c3eb77f400ab89ee5553599e103442c49c.tar.gz call-ui-d7a2d4c3eb77f400ab89ee5553599e103442c49c.tar.bz2 call-ui-d7a2d4c3eb77f400ab89ee5553599e103442c49c.zip | |
TizenRefApp-9059 Call button displayed on End call screen with Unknown contact
Change-Id: I91f629ec71e41ca0fc25c4d2650cc8eb59570993
| -rw-r--r-- | call-ui/presenters/pages/MainPage.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/call-ui/presenters/pages/MainPage.cpp b/call-ui/presenters/pages/MainPage.cpp index 8a16351..9500909 100644 --- a/call-ui/presenters/pages/MainPage.cpp +++ b/call-ui/presenters/pages/MainPage.cpp @@ -248,11 +248,13 @@ namespace callui { FAIL_RETURN(createAccessoryPresenter(), "createAccessoryPresenter() failed"); - auto end = m_cm->getEndCall(); if (end) { auto info = end->getInfo(); - if (info && info->getConferenceMemberCount() == 1) { + if (info && + info->getConferenceMemberCount() == 1 && + !(info->getPhoneNumber().empty() && + !info->isEmergency())) { FAIL_RETURN(createBottomBtn(impl::STYLE_BB_RECALL, false), "createBottomBtn() failed"); hide(*m_bottomBtn); @@ -394,22 +396,16 @@ namespace callui { Eina_Bool MainPage::onEndCallTimerCb() { if (!m_ecTimerBtnReq) { - if (!m_bottomBtn) { - m_ecTimer = nullptr; - requestExit(); - LOG_RETURN_VALUE(RES_FAIL, ECORE_CALLBACK_CANCEL, "bottom button is NULL!"); + if (m_bottomBtn) { + m_widget->setContent(*m_bottomBtn, impl::PART_SWL_BOTTOM_BTN); + show(*m_bottomBtn); } - m_widget->setContent(*m_bottomBtn, impl::PART_SWL_BOTTOM_BTN); - show(*m_bottomBtn); - ecore_timer_interval_set(m_ecTimer, impl::CU_EXIT_APP_TIMEOUT); m_ecTimerBtnReq = true; - return ECORE_CALLBACK_RENEW; } else { m_ecTimer = nullptr; requestExit(); - return ECORE_CALLBACK_CANCEL; } } |