Fix N_SE-36531, N_SE-36433

Change-Id: I9bcb0878145fd661aa91d40f56736a2243094cf7
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/inc/StDateTimeForm.h b/inc/StDateTimeForm.h
index 0ccf99d..cbbf0a4 100644 (file)
--- a/inc/StDateTimeForm.h
+++ b/inc/StDateTimeForm.h
@@ -65,6 +65,8 @@ public:
        virtual void OnTimeChanged(const Tizen::Ui::Control& source, int hour, int minute);
        virtual void OnTimeChangeCanceled(const Tizen::Ui::Control& source);
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
+
+       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 };
 
 #endif // _ST_DATE_TIME_FORM_H_
\ No newline at end of file

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index d4eaf02..12ff349 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -137,10 +137,12 @@ DateTimeForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
                if (hourFormat == false)
                {
                        __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_12_HOURS, true);
+                       __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_24_HOURS, false);
                }
                else
                {
                        __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_24_HOURS, true);
+                       __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_12_HOURS, false);
                }
 
                AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
@@ -887,7 +889,6 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
 {
        if ((groupIndex == ID_GROUP_DATE_AND_TIME_LOCAL_TIME) && (itemIndex == ID_ITEM_DATE_AND_TIME_DATE_AND_TIME))
        {
-               EditDate* pEditDate = static_cast<EditDate*>(pItem->GetControl(L"EditDate"));
                EditTime* pEditTime = static_cast<EditTime*>(pItem->GetControl(L"EditTime"));
                if (pEditTime == null)
                {
@@ -964,4 +965,38 @@ DateTimeForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::
 {
        BaseForm::OnOrientationChanged(source, orientationStatus);
        __pTableView->RefreshItem(ID_GROUP_DATE_AND_TIME_LOCAL_TIME, ID_ITEM_DATE_AND_TIME_DATE_AND_TIME, TABLE_VIEW_REFRESH_TYPE_ITEM_MODIFY);
+}
+
+void
+DateTimeForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (requestId == FRFRESH_REQUEST_EVENT)
+       {
+               if (__pTableView)
+               {
+                       bool hourFormat = false;
+
+                       if (SettingInfo::GetValue(SETTING_INFO_KEY_LOCALE_TIME_FORMAT_24HOUR, hourFormat) != E_SUCCESS)
+                       {
+                               AppLogDebug("SettingInfo::GetValue() fail(%s)", GetErrorMessage(GetLastResult()));
+                       }
+
+                       if (hourFormat == false)
+                       {
+                               __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_12_HOURS, true);
+                               __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_24_HOURS, false);
+                       }
+                       else
+                       {
+                               __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_24_HOURS, true);
+                               __pTableView->SetItemChecked(ID_GROUP_DATE_AND_TIME_FORMAT_LIST, ID_ITEM_DATE_AND_TIME_FORMAT_12_HOURS, false);
+                       }
+                       __pTableView->RefreshAllItems();
+               }
+               if (pArgs)
+               {
+                       pArgs->RemoveAll(true);
+                       delete pArgs;
+               }
+       }
 }
\ No newline at end of file

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index 7986b8d..7b4fcb9 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -115,9 +115,12 @@ NfcForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, co
        {
                __pNfcPredefinedItemPresentationModelInstance->InitReservedPushCandidatesList();
                __pResevedPushCandidatesAppidList = __pNfcPredefinedItemPresentationModelInstance->GetAllListReservedPushCandidatesAppIdList();
-               if (__pResevedPushCandidatesAppidList->GetCount() > 0)
+               if (__pResevedPushCandidatesAppidList != null)
                {
-                       __isPredefinedItem = true;
+                       if (__pResevedPushCandidatesAppidList->GetCount() > 0)
+                       {
+                               __isPredefinedItem = true;
+                       }
                }
        }
        __pTableView->UpdateTableView();

diff --git a/src/StNfcPresentationModel.cpp b/src/StNfcPresentationModel.cpp
index 71a1815..1efcc41 100644 (file)
--- a/src/StNfcPresentationModel.cpp
+++ b/src/StNfcPresentationModel.cpp
@@ -215,7 +215,7 @@ NfcPredefinedItemPresentationModel::InitReservedPushCandidatesList(void)
        __pReservedPushCandidatesAppIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);\r
        if (__pReservedPushCandidatesAppIdList == null)\r
        {\r
-               AppLogDebug("pArgs is null");\r
+               AppLogDebug("__pReservedPushCandidatesAppIdList is null");\r
                return;\r
        }\r
 \r
@@ -230,7 +230,17 @@ NfcPredefinedItemPresentationModel::InitReservedPushCandidatesList(void)
 \r
        PackageManager* pPackageManager = PackageManager::GetInstance();\r
        ArrayList* pList = static_cast<ArrayList*>(pPackageManager->GetPackageInfoListN());\r
+       if (pList == null)\r
+       {\r
+               AppLogDebug("pPackageManager->GetPackageInfoListN() is null");\r
+               return;\r
+       }\r
        ArrayList* pKeyList = static_cast<ArrayList*>(__pReservedPushCandidatesMap->GetKeysN());\r
+       if (pKeyList == null)\r
+       {\r
+               AppLogDebug("ReservedPushCandidatesMap->GetKeysN() is null");\r
+               return;\r
+       }\r
        for (int i = 0; i < pKeyList->GetCount(); i++)\r
        {\r
                String* keyString = static_cast<String*>(pKeyList->GetAt(i));\r