Corrected shortcut rename issue

Change-Id: I3cb8a1b7b272b73cbd809965dcfaf3cb7aa77604
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>

diff --git a/inc/mf-util.h b/inc/mf-util.h
index b64953d..77017d4 100755 (executable)
--- a/inc/mf-util.h
+++ b/inc/mf-util.h
@@ -190,7 +190,8 @@ enum _MORE_TYPE {                   /* softkey / contextual popup */
        MORE_EDIT_DETAIL,
 
        MORE_DOING_UNINSTALL,
-       MORE_TYPE_MAX
+       MORE_TYPE_MAX,
+       MORE_EDIT_RENAME_SHORTCUT
 };
 
 typedef enum __mf_view_type_e mf_view_type_e;

diff --git a/inc/mf-view.h b/inc/mf-view.h
index 5c42324..99d3a6d 100755 (executable)
--- a/inc/mf-view.h
+++ b/inc/mf-view.h
@@ -94,4 +94,6 @@ void mf_root_view_append_mmc_item_after_phone(Evas_Object *parent, fsNodeInfo *p
 void mf_detail_data_destroy(void *data);
 void mf_mw_root_category_item_update(void *data);
 Eina_Bool mf_view_is_item_exists_by_name(void *data, char *name);
+void mf_view_state_set_with_pre_shortcut_rename(void *data, MORE_TYPE state);
+void mf_view_extra_reset_state_with_pre(void *data);
 #endif

diff --git a/src/common/mf-callback.c b/src/common/mf-callback.c
index f12f9f5..09105ce 100755 (executable)
--- a/src/common/mf-callback.c
+++ b/src/common/mf-callback.c
@@ -770,6 +770,8 @@ void mf_callback_cancel_cb(void *data, Evas_Object *obj, void *event_info)
                        SAFE_FREE_OBJ(ap->mf_MainWindow.pNewFolderPopup);
                        ap->mf_Status.more = MORE_SEARCH;
                        mf_search_view_create(ap);
+               } else if (ap->mf_Status.extra == MORE_EDIT_RENAME_SHORTCUT) {
+                       mf_view_state_reset_state_with_pre(ap);
                } else {
                        ap->mf_Status.more = MORE_DEFAULT;
                        newContent = mf_navi_bar_content_create(ap);
@@ -1822,7 +1824,9 @@ void mf_callback_edit_rename_shortcut_cb(void *data, Evas_Object *obj, void *eve
        mf_retm_if(data == NULL, "data is NULL");
        struct appdata *ap = (struct appdata *)data;
        SAFE_FREE_OBJ(ap->mf_MainWindow.pContextPopup);
+       mf_view_state_set_with_pre_shortcut_rename(ap, ap->mf_Status.more);
        ap->mf_Status.more = MORE_EDIT_RENAME;
+       ap->mf_Status.extra = MORE_EDIT_RENAME_SHORTCUT;
        if (ap->mf_Status.view_type == mf_view_root) {
                //__mf_callback_edit_share_view(ap);
                elm_naviframe_item_title_enabled_set(ap->mf_MainWindow.pNaviItem, EINA_TRUE, EINA_FALSE);

diff --git a/src/widget/mf-view.c b/src/widget/mf-view.c
index 8058a7f..9e91b4d 100755 (executable)
--- a/src/widget/mf-view.c
+++ b/src/widget/mf-view.c
@@ -41,8 +41,24 @@ static MORE_TYPE pre_decompress_here = MORE_DEFAULT;
 static MORE_TYPE pre_decompress = MORE_DEFAULT;
 static MORE_TYPE pre_compress = MORE_DEFAULT;
 static MORE_TYPE pre_delete = MORE_DEFAULT;
+static MORE_TYPE extra_rename = MORE_DEFAULT;
 // static MORE_TYPE pre_launch = MORE_DEFAULT;
 
+void mf_view_extra_reset_state_with_pre(void *data)
+{
+       mf_retm_if(data == NULL, "data is NULL");
+       struct appdata *ap = (struct appdata *)data;
+       ap->mf_Status.extra = extra_rename;
+}
+
+void mf_view_state_set_with_pre_shortcut_rename(void *data, MORE_TYPE state)
+{
+       mf_retm_if(data == NULL, "data is NULL");
+       struct appdata *ap = (struct appdata *)data;
+       extra_rename = ap->mf_Status.extra;
+       pre_rename = MORE_DEFAULT;
+}
+
 void mf_view_state_set_with_pre(void *data, MORE_TYPE state)
 {
        mf_retm_if(data == NULL, "data is NULL");