Supported cancelation of sim contacts import

Change-Id: I153f893009ffeaae21508fb67cfc53750c39515c
Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>

diff --git a/lib-contacts/inc/Contacts/Settings/ImportFromSimController.h b/lib-contacts/inc/Contacts/Settings/ImportFromSimController.h
index 99924bd..99a5011 100644 (file)
--- a/lib-contacts/inc/Contacts/Settings/ImportFromSimController.h
+++ b/lib-contacts/inc/Contacts/Settings/ImportFromSimController.h
@@ -44,7 +44,8 @@ namespace Contacts
 
                private:
                        virtual void onStart() override;
-                       void onSimContactImport(int totalCount, int importedCount);
+                       virtual void onCanceled() override;
+                       bool onSimContactImport(int totalCount, int importedCount);
 
                        size_t m_TotalCount;
                };

diff --git a/lib-contacts/src/Contacts/Settings/ImportFromSimController.cpp b/lib-contacts/src/Contacts/Settings/ImportFromSimController.cpp
index f6df7e7..5637920 100644 (file)
--- a/lib-contacts/src/Contacts/Settings/ImportFromSimController.cpp
+++ b/lib-contacts/src/Contacts/Settings/ImportFromSimController.cpp
@@ -20,6 +20,7 @@
 #include "Utils/Logger.h"
 
 #include <contacts.h>
+#include <notification.h>
 
 using namespace Contacts::Settings;
 
@@ -45,12 +46,18 @@ void ImportFromSimController::onStart()
        contacts_disconnect_on_thread();
 }
 
+void ImportFromSimController::onCanceled()
+{
+       int err = notification_status_message_post(_("IDS_PB_SBODY_IMPORTING_CANCELLED_M_STATUS_ABB"));
+       WARN_IF_ERR(err, "notification_status_message_post() failed.");
+}
 
-void ImportFromSimController::onSimContactImport(int totalCount, int importedCount)
+bool ImportFromSimController::onSimContactImport(int totalCount, int importedCount)
 {
        if (!m_TotalCount) {
                m_TotalCount = totalCount;
                setTotalCount(totalCount);
        }
-       onProgress(importedCount);
+
+       return onProgress(importedCount);
 }