TizenRefApp-9059 Call button displayed on End call screen with Unknown contact

Change-Id: I91f629ec71e41ca0fc25c4d2650cc8eb59570993

diff --git a/call-ui/presenters/pages/MainPage.cpp b/call-ui/presenters/pages/MainPage.cpp
index 8a16351b992a5f541e79ac01b9af3b5be19dea22..95009095d236dc227ccb893098a90de0a7447284 100644 (file)
--- 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;
                }
        }