Fix swapped autofill forms fields

[Issue]    http://suprem.sec.samsung.net/jira/browse/TWF-2112
[Problem]  Swapped fields
[Solution] Replaced functions
[Verify]   As in the issue

Change-Id: I0f635484f25f7b0868bd6d8291d38d109cda9e05

diff --git a/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp b/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp
index 6b90a91e428f455bcec442ff593570f1e8307900..81e001d83e5cdd086c75bad3bae28e0bceb9f097 100644 (file)
--- a/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp
+++ b/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.cpp
@@ -257,11 +257,11 @@ void AutoFillFormComposeView::addItems()
     elm_entry_prediction_allow_set(m_postCodeItemCallbackData.entry, EINA_FALSE);
 
     // country region
-    m_countyRegionItemCallbackData.type = profile_composer_title_country_region;
-    createInputLayout(m_box, strdup(_("IDS_BR_MBODY_COUNTRY_REGION")), &m_countyRegionItemCallbackData);
-    elm_box_pack_end(m_box, m_countyRegionItemCallbackData.it);
+    m_countryRegionItemCallbackData.type = profile_composer_title_country_region;
+    createInputLayout(m_box, strdup(_("IDS_BR_MBODY_COUNTRY_REGION")), &m_countryRegionItemCallbackData);
+    elm_box_pack_end(m_box, m_countryRegionItemCallbackData.it);
     if (m_itemForCompose->getStateProvince() && strlen(m_itemForCompose->getStateProvince()))
-        elm_object_part_text_set(m_countyRegionItemCallbackData.entry, "elm.text", m_itemForCompose->getStateProvince());
+        elm_object_part_text_set(m_countryRegionItemCallbackData.entry, "elm.text", m_itemForCompose->getStateProvince());
 
     // phone
     m_phoneItemCallbackData.type = profile_composer_title_phone;
@@ -352,12 +352,12 @@ Eina_Bool AutoFillFormComposeView::applyEntryData(void)
     m_itemForCompose->setSecondaryAddress2(secondary_address);
     const char *city_town = elm_entry_entry_get(m_cityTownItemCallbackData.entry);
     m_itemForCompose->setCityTown(city_town);
-    const char *county = elm_entry_entry_get(m_countryItemCallbackData.entry);
-    m_itemForCompose->setStateProvince(county);
+    const char *country = elm_entry_entry_get(m_countryItemCallbackData.entry);
+    m_itemForCompose->setCountry(country);
     const char *post_code = elm_entry_entry_get(m_postCodeItemCallbackData.entry);
     m_itemForCompose->setPostCode(post_code);
-    const char *country = elm_entry_entry_get(m_countyRegionItemCallbackData.entry);
-    m_itemForCompose->setCountry(country);
+    const char *region = elm_entry_entry_get(m_countryRegionItemCallbackData.entry);
+    m_itemForCompose->setStateProvince(region);
     const char *phone = elm_entry_entry_get(m_phoneItemCallbackData.entry);
     m_itemForCompose->setPhoneNumber(phone);
     const char *email = elm_entry_entry_get(m_emailItemCallbackData.entry);
@@ -486,7 +486,7 @@ void AutoFillFormComposeView::__entry_next_key_cb(void* data, Evas_Object* /*obj
     } else if (type == profile_composer_title_country) {
         entry = self->m_postCodeItemCallbackData.entry;
     } else if (type == profile_composer_title_post_code) {
-        entry = self->m_countyRegionItemCallbackData.entry;
+        entry = self->m_countryRegionItemCallbackData.entry;
     } else if (type == profile_composer_title_country_region) {
         entry = self->m_phoneItemCallbackData.entry;
     } else if (type == profile_composer_title_phone) {

diff --git a/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h b/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h
index 4c4a756b2b9825c17f2debfa573b228960c82aad..d47f1aceecb4eadca332ade12364574db010099c 100644 (file)
--- a/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h
+++ b/services/SettingsUI/AutoFillForm/AutoFillFormComposeView.h
@@ -93,7 +93,7 @@ private:
     genlistCallbackData m_cityTownItemCallbackData;
     genlistCallbackData m_countryItemCallbackData;
     genlistCallbackData m_postCodeItemCallbackData;
-    genlistCallbackData m_countyRegionItemCallbackData;
+    genlistCallbackData m_countryRegionItemCallbackData;
     genlistCallbackData m_phoneItemCallbackData;
     genlistCallbackData m_emailItemCallbackData;
     std::string m_edjFilePath;