Fix to send a mount event after encryption is completed

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I636c479a63109c8a339003d4b2fdbab8d6fcc572

diff --git a/server/external-encryption.cpp b/server/external-encryption.cpp
index 6185a21..350ef2b 100644 (file)
--- a/server/external-encryption.cpp
+++ b/server/external-encryption.cpp
@@ -261,14 +261,15 @@ int ExternalEncryption::encrypt(const std::string &password, unsigned int option
                        INFO("Close all applications using external storage...");
                        killDependedApplications();
                        INFO("Encryption started...");
-                       ::vconf_set_str(EXTERNAL_STATE_VCONF_KEY, "error_partially_encrypted");
                        engine->encrypt(MasterKey, options);
                        setOptions(options & getSupportedOptions());
                        INFO("Sync disk...");
                        sync();
                        INFO("Encryption completed");
                        ::vconf_set_str(EXTERNAL_STATE_VCONF_KEY, "encrypted");
+                       context.notify("ExternalEncryption::mount");
                } catch (runtime::Exception &e) {
+                       ::vconf_set_str(EXTERNAL_STATE_VCONF_KEY, "error_partially_encrypted");
                        ERROR("Encryption failed - " + std::string(e.what()));
                }
        };

diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp
index e29ddda..5c48016 100644 (file)
--- a/server/internal-encryption.cpp
+++ b/server/internal-encryption.cpp
@@ -316,6 +316,7 @@ int InternalEncryption::encrypt(const std::string& password, unsigned int option
                        INFO("Encryption completed");
 
                        ::vconf_set_str(INTERNAL_STATE_VCONF_KEY, "encrypted");
+                       context.notify("InternalEncryption::mount");
                        ::reboot(RB_AUTOBOOT);
                } catch (runtime::Exception &e) {
                        ::vconf_set_str(INTERNAL_STATE_VCONF_KEY, "error_partially_encrypted");