From 66c55efe861a64da252091bcef024805a81d2fc0 Mon Sep 17 00:00:00 2001 From: leerang song Date: Mon, 15 Jul 2013 15:59:02 +0900 Subject: [PATCH] Remove the WAC code [Issue#] LINUXWRT-629 [Problem] N/A [Cause] Not support WAC [Solution] Remove the WAC code [SCMRequest] N/A Change-Id: I87005f5d981221bba49de475ca69589bde6f8e96 --- webapp-common/listview.cpp | 308 --------------------------------------------- webapp-common/listview.h | 39 +----- webapp-detail/permview.cpp | 7 -- 3 files changed, 2 insertions(+), 352 deletions(-) diff --git a/webapp-common/listview.cpp b/webapp-common/listview.cpp index e895f74..06e39a2 100755 --- a/webapp-common/listview.cpp +++ b/webapp-common/listview.cpp @@ -211,128 +211,6 @@ void ListView::delRoamingExpandData(void *data, Evas_Object */*obj*/) delete roamingExpandData; } -char *ListView::getComplianceModeTitle(void */*data*/, - Evas_Object */*obj*/, - const char *part) -{ - const char *str; - - if (!strcmp(part, "elm.text.1")) - str = "Compliance mode"; - else if (!strcmp(part, "elm.text.2")) - str = "Enable compliance mode"; - else - str = NULL; - - if (!str) - return NULL; - - return strdup(str); -} - -Evas_Object *ListView::getComplianceModeIcon(void *data, - Evas_Object *obj, - const char */*part*/) -{ - Evas_Object *chk; - ComplianceModeData *compModeData; - bool val; - - compModeData = static_cast(data); - Assert(compModeData); - - chk = elm_check_add(obj); - if (!chk) - return NULL; - evas_object_propagate_events_set(chk, EINA_FALSE); - elm_object_style_set(chk, "on&off"); - val = WrtDB::GlobalDAOReadOnly::getComplianceMode(); - elm_check_state_set(chk, static_cast(val)); - compModeData->m_chk = chk; - evas_object_smart_callback_add(chk, - "changed", - onComplianceModeChanged, - data); - - return chk; -} - -void ListView::delComlianceModeData(void *data, Evas_Object */*obj*/) -{ - ComplianceModeData *compModeData; - - compModeData = static_cast(data); - delete compModeData; -} - -Evas_Object *ListView::getComplianceModeOptEntry(void *data, - Evas_Object *obj, - const char */*part*/) -{ - int opt; - Evas_Object *ef; - Evas_Object *entry; - std::string val; - - opt = reinterpret_cast(data); - - ef = elm_layout_add(obj); - if (!ef) - return NULL; - elm_layout_theme_set(ef, "layout", "editfield", "title"); - - entry = elm_entry_add(ef); - if (!entry) { - evas_object_del(ef); - return NULL; - } - evas_object_data_set(entry, "editfield", static_cast(ef)); - elm_entry_single_line_set(entry, EINA_TRUE); - elm_object_part_content_set(ef, "elm.swallow.content", entry); - - switch (opt) { - case COMPLIANCE_OPT_IMEI: - elm_object_part_text_set(ef, "elm.text", "IMEI"); - elm_object_part_text_set(ef, "elm.guidetext", "Put fake IMEI"); - val = WrtDB::GlobalDAOReadOnly::getComplianceFakeImei(); - break; - case COMPLIANCE_OPT_MEID: - elm_object_part_text_set(ef, "elm.text", "MEID"); - elm_object_part_text_set(ef, "elm.guidetext", "Put fake MEID"); - val = WrtDB::GlobalDAOReadOnly::getComplianceFakeMeid(); - break; - default: - evas_object_del(ef); - return NULL; - } - - if (!val.empty()) { - elm_entry_entry_set(entry, val.c_str()); - elm_object_signal_emit(ef, "elm,state,guidetext,hide", "elm"); - } - - elm_object_signal_callback_add(ef, - "elm,eraser,clicked", - "elm", - onComplianceModeOptErase, - static_cast(entry)); - evas_object_smart_callback_add(entry, - "focused", - onComplianceModeOptFocused, - static_cast(ef)); - evas_object_smart_callback_add(entry, - "unfocused", - onComplianceModeOptUnfocused, - static_cast(ef)); - /* FIXME: The callback is invoked unexpectedly. Why? DO report to EFL team */ - evas_object_smart_callback_add(entry, - "changed", - onComplianceModeOptChanged, - data); - - return ef; -} - void ListView::onBackBtnClicked(void *data, Evas_Object */*obj*/, void */*event_info*/) @@ -527,120 +405,6 @@ void ListView::onWhiteListClicked(void *data, } -void ListView::onComplianceModeClicked(void *data, - Evas_Object */*obj*/, - void *event_info) -{ - Elm_Object_Item *it; - ComplianceModeData *compModeData; - - it = static_cast(event_info); - Assert(it); - elm_genlist_item_selected_set(it, EINA_FALSE); - compModeData = static_cast(data); - evas_object_smart_callback_call(compModeData->m_chk, "changed", NULL); -} - -void ListView::onComplianceModeChanged(void *data, - Evas_Object */*obj*/, - void */*event_info*/) -{ - ComplianceModeData *compModeData; - ListView *listView; - Eina_Bool state; - - compModeData = static_cast(data); - listView = compModeData->m_listView; - Assert(compModeData && compModeData->m_chk && listView); - - state = WrtDB::GlobalDAOReadOnly::getComplianceMode(); - WrtDB::GlobalDAO::setComplianceMode(!state); - if (!state) - listView->addComplianceModeOpts(compModeData->m_gl, compModeData->m_it); - else - elm_genlist_item_subitems_clear(compModeData->m_it); - elm_check_state_set(compModeData->m_chk, !state); -} - -void ListView::onComplianceModeOptErase(void *data, - Evas_Object */*obj*/, - const char */*emission*/, - const char */*source*/) -{ - Evas_Object *entry; - - entry = static_cast(data); - Assert(entry); - elm_entry_entry_set(entry, ""); -} - -void ListView::onComplianceModeOptFocused(void *data, - Evas_Object *obj, - void */*event_info*/) -{ - Evas_Object *ef; - - Assert(obj); - ef = static_cast(data); - Assert(ef); - - if (!elm_entry_is_empty(obj)) - elm_object_signal_emit(ef, "elm,state,eraser,show", "elm"); - elm_object_signal_emit(ef, "elm,state,guidetext,hide", "elm"); -} - -void ListView::onComplianceModeOptUnfocused(void *data, - Evas_Object *obj, - void */*event_info*/) -{ - Evas_Object *ef; - - Assert(obj); - ef = static_cast(data); - Assert(ef); - - if (elm_entry_is_empty(obj)) - elm_object_signal_emit(ef, "elm,state,guidetext,show", "elm"); - elm_object_signal_emit(ef, "elm,state,eraser,hide", "elm"); -} - -void ListView::onComplianceModeOptChanged(void *data, - Evas_Object *obj, - void */*event_info*/) -{ - int opt; - std::string val; - const char *str; - Evas_Object *ef; - - Assert(obj); - opt = reinterpret_cast(data); - if (!elm_object_focus_get(obj)) - return; - - ef = static_cast(evas_object_data_get(obj, "editfield")); - Assert(ef); - - str = elm_entry_entry_get(obj); - if (str) { - elm_object_signal_emit(ef, "elm,state,eraser,show", "elm"); - val.assign(str); - } else { - elm_object_signal_emit(ef, "elm,state,eraser,hide", "elm"); - } - - switch (opt) { - case COMPLIANCE_OPT_IMEI: - WrtDB::GlobalDAO::setComplianceFakeImei(val); - break; - case COMPLIANCE_OPT_MEID: - WrtDB::GlobalDAO::setComplianceFakeMeid(val); - break; - default: - return; - } -} - void ListView::onWhiteListViewUnload(void *data) { ListView *listView; @@ -661,11 +425,6 @@ bool ListView::getUntrustedAppApprovalVal(void) return WrtDB::GlobalDAOReadOnly::GetSecureByDefault(); } -bool ListView::getComplianceModeVal(void) -{ - return WrtDB::GlobalDAOReadOnly::getComplianceMode(); -} - void ListView::addWacTitle(Evas_Object *gl) { static Elm_Genlist_Item_Class itc; @@ -864,73 +623,6 @@ void ListView::addRoamingOpts(Evas_Object *obj, Elm_Object_Item *it) } } -void ListView::addComplianceModeItem(Evas_Object *gl) -{ - Elm_Object_Item *it; - ComplianceModeData *compModeData; - static Elm_Genlist_Item_Class itc; - - Assert(gl); - - try { - compModeData = new ComplianceModeData(this, gl); - itc.item_style = "dialogue/2text.1icon.6"; - itc.func.text_get = getComplianceModeTitle; - itc.func.content_get = getComplianceModeIcon; - itc.func.state_get = NULL; - itc.func.del = delComlianceModeData; - it = elm_genlist_item_append(gl, - &itc, - static_cast(compModeData), - NULL, - ELM_GENLIST_ITEM_NONE, - onComplianceModeClicked, - static_cast(compModeData)); - if (!it) { - delete compModeData; - return; - } - - if (WrtDB::GlobalDAOReadOnly::getComplianceMode()) - addComplianceModeOpts(gl, it); - - compModeData->m_it = it; - } catch (const std::bad_alloc &) { - } -} - -void ListView::addComplianceModeOpts(Evas_Object *obj, Elm_Object_Item *it) -{ - static Elm_Genlist_Item_Class itc; - Elm_Object_Item *optIt; - unsigned int i; - ComplianceOpt opt[] = { - COMPLIANCE_OPT_IMEI, - COMPLIANCE_OPT_MEID, - }; - - Assert(obj && it); - - itc.item_style = "dialogue/1icon"; - itc.func.text_get = NULL; - itc.func.content_get = getComplianceModeOptEntry; - itc.func.state_get = NULL; - itc.func.del = NULL; - - for (i = 0; i < sizeof(opt) / sizeof(*opt); i++) { - optIt = elm_genlist_item_append(obj, - &itc, - reinterpret_cast(opt[i]), - it, - ELM_GENLIST_ITEM_NONE, - NULL, - NULL); - if (optIt) - elm_genlist_item_select_mode_set(optIt, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - } - -} - bool ListView::loadView(void) { Evas_Object *win; diff --git a/webapp-common/listview.h b/webapp-common/listview.h index 4f96e03..421dc56 100755 --- a/webapp-common/listview.h +++ b/webapp-common/listview.h @@ -63,16 +63,6 @@ class ListView : public View Evas_Object *obj, const char *part); static void delRoamingExpandData(void *data, Evas_Object *obj); - static char *getComplianceModeTitle(void *data, - Evas_Object *obj, - const char *part); - static Evas_Object *getComplianceModeIcon(void *data, - Evas_Object *obj, - const char *part); - static void delComlianceModeData(void *data, Evas_Object *obj); - static Evas_Object *getComplianceModeOptEntry(void *data, - Evas_Object *obj, - const char *part); /* Smart Callbacks */ static void onBackBtnClicked(void *data, @@ -108,33 +98,14 @@ class ListView : public View static void onWhiteListClicked(void *data, Evas_Object *obj, void *event_info); - static void onComplianceModeClicked(void *data, - Evas_Object *obj, - void *event_info); - static void onComplianceModeChanged(void *data, - Evas_Object *obj, - void *event_info); - static void onComplianceModeOptErase(void *data, - Evas_Object *obj, - const char *emission, - const char *source); - static void onComplianceModeOptFocused(void *data, - Evas_Object *obj, - void *event_info); - static void onComplianceModeOptUnfocused(void *data, - Evas_Object *obj, - void *event_info); - static void onComplianceModeOptChanged(void *data, - Evas_Object *obj, - void *event_info); - /* Subview Unload callback */ + /* Subview Unload callback */ static void onWhiteListViewUnload(void *data); /* Utility methods */ static bool getCookieSharingVal(void); static bool getUntrustedAppApprovalVal(void); - static bool getComplianceModeVal(void); + void addWacTitle(Evas_Object *gl); void addWhiteList(Evas_Object *gl); void addOnOffItem(Evas_Object *gl, @@ -145,12 +116,6 @@ class ListView : public View void addDepth(Evas_Object *gl); void addRoamingItem(Evas_Object *gl); void addRoamingOpts(Evas_Object *obj, Elm_Object_Item *it); - enum ComplianceOpt { - COMPLIANCE_OPT_IMEI = 0x00, - COMPLIANCE_OPT_MEID, - }; - void addComplianceModeItem(Evas_Object *gl); - void addComplianceModeOpts(Evas_Object *obj, Elm_Object_Item *it); public: ListView(Evas_Object *naviFrame); diff --git a/webapp-detail/permview.cpp b/webapp-detail/permview.cpp index ff77a8f..baec34d 100755 --- a/webapp-detail/permview.cpp +++ b/webapp-detail/permview.cpp @@ -398,10 +398,6 @@ void PermView::addFeatureList(Evas_Object *gl) addFeatureTitle(gl); switch (m_appType) { - case WrtDB::APP_TYPE_WAC20: - for (it = m_featureMap.begin(); it != m_featureMap.end(); it++) - addFeatureWithPerm(gl, it->first); - break; case WrtDB::APP_TYPE_TIZENWEBAPP: for (it = m_featureMap.begin(); it != m_featureMap.end(); it++) addFeature(gl, it->first); @@ -510,9 +506,6 @@ Evas_Object *PermView::loadView(void) features = m_dao->getFeaturesList(); m_appType = m_dao->getWidgetType().appType; switch (m_appType) { - case WrtDB::APP_TYPE_WAC20: - m_featureMap = WacFeature::getFeatureMap(features, m_appID); - break; case WrtDB::APP_TYPE_TIZENWEBAPP: m_featureMap = TizenFeature::getFeatureMap(features); break; -- 2.7.4