[Backup&reset] Added checking for encryption

- check code moved from privacy and security to common

Change-Id: I929ca47d67957c6068848db860167779e0bd9e1d
Signed-off-by: Radek Kintop <r.kintop@samsung.com>

diff --git a/setting-backup-and-reset/include/setting-backup-and-reset.h b/setting-backup-and-reset/include/setting-backup-and-reset.h
index 90fad77dbb5553addf0e043ea4f18ebb2dc9571f..bb06809d6cbab3baadeba7c0a32e083ff512e6d2 100755 (executable)
--- a/setting-backup-and-reset/include/setting-backup-and-reset.h
+++ b/setting-backup-and-reset/include/setting-backup-and-reset.h
@@ -29,7 +29,6 @@
 
 typedef struct {
        MainData md;
-       bool sd_card_encrypted;
        bool sd_inserted;
        /* Main view: */
        setting_view *main_view;

diff --git a/setting-backup-and-reset/src/setting-backup-and-reset-main-view.c b/setting-backup-and-reset/src/setting-backup-and-reset-main-view.c
index fe54e4123d5bb3ab05e35e51f3083596af1ade74..18ce903d18252323393c427dbad11c57c52ce1cc 100755 (executable)
--- a/setting-backup-and-reset/src/setting-backup-and-reset-main-view.c
+++ b/setting-backup-and-reset/src/setting-backup-and-reset-main-view.c
@@ -37,13 +37,13 @@
 
 setting_view setting_backup_reset_main_view;
 
-static const char *reset_device_without_sim_msg = \
+static const char *reset_device_without_sd_msg =
                                "All settings will be reset and your data. \
                                will be erased. To make sure your data cannot \
                                be recovered after being erased, select Secure \
                                erase. This may mean the data takes longer to erase.";
 
-static const char *reset_device_with_sim_msg = \
+static const char *reset_device_with_sd_msg =
                                "All settings and data will be erased from your \
                                device storage including system and app data and\
                                downloaded apps.<br><br>\
@@ -185,13 +185,17 @@ static void _item_click(void *data, Evas_Object *genlist, void *event_info)
 
        if (event_info == ad->item_factory_reset) {
                if (ad->sd_inserted) {
-                       if (ad->sd_card_encrypted) {
-                               _create_reset_first_warning_popup(ad, reset_device_with_sim_msg, false);
+                       if (setting_sdcard_is_encrypted()) {
+                               _create_reset_first_warning_popup(ad,
+                                                                                       reset_device_with_sd_msg, false);
                        } else {
-                               _create_reset_first_warning_popup(ad, "All settings and data will be erased", false);
+                               _create_reset_first_warning_popup(ad,
+                                                               "All settings and data will be erased", false);
                        }
                } else {
-                       _create_reset_first_warning_popup(ad, reset_device_without_sim_msg, true);
+                       if (!setting_device_is_encrypted())
+                               _create_reset_first_warning_popup(ad,
+                                                                                       reset_device_without_sd_msg, true);
                }
        }
 }

diff --git a/setting-common/include/setting-common-data-slp-setting.h b/setting-common/include/setting-common-data-slp-setting.h
index 1f9a75c8d27bc96bbe1e4c59f9f20fa913b96640..4fafb94afeeb668c30c9690a9c91d929d9ff89ec 100644 (file)
--- a/setting-common/include/setting-common-data-slp-setting.h
+++ b/setting-common/include/setting-common-data-slp-setting.h
@@ -238,4 +238,7 @@ extern int setting_read_password(char *md_result);
 extern Eina_List *setting_get_language_list();
 extern void     setting_get_language_list_destroy();
 
+extern bool setting_device_is_encrypted(void);
+extern bool setting_sdcard_is_encrypted(void);
+
 #endif                         /* __SETTING_COMMON_DATA_SLP_SETTING_H__ */

diff --git a/setting-common/src/setting-common-data-slp-setting.c b/setting-common/src/setting-common-data-slp-setting.c
index c2d60e04fd121559c1deae9ae9509b86c22c6972..27caa16f61f53633e7adcb333f5bc1f027912cc4 100755 (executable)
--- a/setting-common/src/setting-common-data-slp-setting.c
+++ b/setting-common/src/setting-common-data-slp-setting.c
@@ -1085,6 +1085,36 @@ void setting_get_language_list_destroy()
        _langlist_destroy();
 }
 
+EXPORT_PUBLIC
+bool setting_device_is_encrypted(void)
+{
+       bool is_encrypted = false;
+
+       char *encrypted_value = NULL;
+       encrypted_value = vconf_get_str(VCONFKEY_ODE_CRYPTO_STATE);
+
+       if (!safeStrCmp(encrypted_value, "encrypted"))
+               is_encrypted = true;
+       FREE(encrypted_value);
+
+       return is_encrypted;
+}
+
+EXPORT_PUBLIC
+bool setting_sdcard_is_encrypted(void)
+{
+       bool is_encrypted = false;
+
+       char *encrypted_value = NULL;
+       encrypted_value = vconf_get_str(VCONFKEY_SDE_CRYPTO_STATE);
+
+       if (!safeStrCmp(encrypted_value, "encrypted"))
+               is_encrypted = true;
+       FREE(encrypted_value);
+
+       return is_encrypted;
+}
+
 static void _parseLangListXML(char *docname)
 {
        SETTING_TRACE_BEGIN;

diff --git a/setting-privacy/include/setting-privacy.h b/setting-privacy/include/setting-privacy.h
index ab2abb79ac951eca9adbc3c9d6a4b067b1961761..0a02236d7d85804a94839bc85dbe282372774c7a 100755 (executable)
--- a/setting-privacy/include/setting-privacy.h
+++ b/setting-privacy/include/setting-privacy.h
@@ -83,7 +83,5 @@ struct _SettingPrivacy {
 
 extern setting_view setting_view_privacy_main;
 char *setting_location_is_enabled(void *data);
-bool setting_device_is_encrypted();
-bool setting_sdcard_is_encrypted();
 
 #endif                         /* __SETTING_MORECONNECTIONS_H__ */

diff --git a/setting-privacy/src/setting-privacy-main.c b/setting-privacy/src/setting-privacy-main.c
index 84c10957695c287a8906529b536cca8688dcd79b..c00e0c8d28bddba5853d331b79b79694567d2f57 100755 (executable)
--- a/setting-privacy/src/setting-privacy-main.c
+++ b/setting-privacy/src/setting-privacy-main.c
@@ -20,6 +20,7 @@
  */
 
 #include "setting-privacy-main.h"
+#include "setting-common-data-slp-setting.h"
 
 static int _view_create(void *cb);
 static int _view_destroy(void *cb);
@@ -164,34 +165,6 @@ char *setting_location_is_enabled(void *data)
         * KeyStr_OffSETTING_VCONF_ERR_RETURN_STR_NULL */
 }
 
-bool setting_device_is_encrypted()
-{
-       bool is_encrypted = false;
-
-       char *encrypted_value = NULL;
-       encrypted_value = vconf_get_str(VCONFKEY_ODE_CRYPTO_STATE);
-
-       if (!safeStrCmp(encrypted_value, "encrypted"))
-               is_encrypted = true;
-       FREE(encrypted_value);
-
-       return is_encrypted;
-}
-
-bool setting_sdcard_is_encrypted()
-{
-       bool is_encrypted = false;
-
-       char *encrypted_value = NULL;
-       encrypted_value = vconf_get_str(VCONFKEY_SDE_CRYPTO_STATE);
-
-       if (!safeStrCmp(encrypted_value, "encrypted"))
-               is_encrypted = true;
-       FREE(encrypted_value);
-
-       return is_encrypted;
-}
-
 /**************************************************
  * @brief create main view genlist items
  * @param data application data

diff --git a/setting-privacy/src/setting-privacy.c b/setting-privacy/src/setting-privacy.c
index 6447373a96c57b79c0c546713ec702cc78b83211..be3cfb0e3ef08ed191bab736bfc9a094d1e050bf 100755 (executable)
--- a/setting-privacy/src/setting-privacy.c
+++ b/setting-privacy/src/setting-privacy.c
@@ -20,6 +20,7 @@
  */
 
 #include "setting-privacy.h"
+#include "setting-common-data-slp-setting.h"
 
 #define SETTING_PRIVACY_PACKAGE_NAME "org.tizen.setting-privacy"