block: Launch popup when extended internal storage is inserted

- Popup launchs ode ui for password

Change-Id: I872c3f52993022d23f1e35670f45c9a9946d7bdd
Signed-off-by: pr.jung <pr.jung@samsung.com>

diff --git a/apps/extended-sd/include/extended-sd-main.h b/apps/extended-sd/include/extended-sd-main.h
index f3f772f..3cdbd2b 100644 (file)
--- a/apps/extended-sd/include/extended-sd-main.h
+++ b/apps/extended-sd/include/extended-sd-main.h
@@ -21,10 +21,7 @@
 
 #define MYFILES_APP_ID "org.tizen.myfile"
 #define SECURITY_APP_ID        "org.tizen.ode"
-#define VIEWTYPE_KEY   "viewtype"
-#define DEVPATH_KEY    "dev_path"
 #define ENCRYPT_EXTENSION "ENCRYPT_EXTENSION"
-#define MAPPING_NODE_KEY "mapping_node"
 
 typedef enum {
        USE_AS_PORTABLE_STORAGE = 0,

diff --git a/src/block/block.c b/src/block/block.c
index 8884307..fcbb236 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -2196,14 +2196,15 @@ static int add_block_device(struct udev_device *dev, const char *devnode, bool m
                free_block_device(bdev);
                return -EPERM;
        } else if (!strncmp(bdev->data->fs_type, LUKS_NAME, strlen(LUKS_NAME))) {
-               /* ---- ODE UI launch ----
-               snprintf(id_string, PATH_LEN, "%d", bdev->data->id);
-               ret = launch_system_app(POPUP_DEFAULT, 4, POPUP_KEY_CONTENT, "sdcardsetup", POPUP_SDCARD_ID, id_string);
+               bdev->data->block_type = BLOCK_EXTENDEDSD_DEV;
+               _D("Need to unlock encrypted sdcard");
+               // ---- ODE UI launch ----
+               ret = launch_system_app(POPUP_DEFAULT, 8, POPUP_KEY_CONTENT, "unlockextendedsd", VIEWTYPE_KEY, INSERT_SD_CARD, DEVPATH_KEY, bdev->data->devnode, MAPPING_NODE_KEY, EXTENDEDSD);
                if (ret < 0)
                        _E("Failed to launch popup");
 
-               ode_luks_set_event_cb(CALLBACK)
-               */
+               //ode_luks_set_event_cb(CALLBACK)
+
                return 0;
        } else if (mapper && !strncmp(bdev->data->fs_type, EXT4_NAME, strlen(EXT4_NAME))) {
                bdev->data->block_type = BLOCK_EXTENDEDSD_DEV;

diff --git a/src/shared/dbus_macro.h b/src/shared/dbus_macro.h
index 76f54a8..edaf1e4 100755 (executable)
--- a/src/shared/dbus_macro.h
+++ b/src/shared/dbus_macro.h
@@ -90,6 +90,10 @@
 #define POPUP_METHOD_LAUNCH                 "PopupLaunch"
 #define POPUP_KEY_CONTENT                   "_SYSPOPUP_CONTENT_"
 #define POPUP_SDCARD_ID                     "_SDCARD_NUM_"
+#define VIEWTYPE_KEY                        "viewtype"
+#define DEVPATH_KEY                         "dev_path"
+#define MAPPING_NODE_KEY                    "mapping_node"
 #define SDCARD_SETUP_TYPE                   "_SDCARD_SETUP_TYPE_"
+#define INSERT_SD_CARD                      "INSERT_SD_CARD"
 
 #endif /* __STORAGED_DBUS_MACRO_H__ */