Fix N_SE-36447 issue

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

diff --git a/inc/StNfcForm.h b/inc/StNfcForm.h
index abe2c79..c7dcd59 100644 (file)
--- a/inc/StNfcForm.h
+++ b/inc/StNfcForm.h
@@ -28,6 +28,7 @@
 
 class NfcForm
        : public BaseForm
+       , public INfcPresentationModelEventListener
 {
 public:
        NfcForm(void);
@@ -59,12 +60,17 @@ public:
        virtual void OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableView& tableView, int groupIndex, int itemIndex, Tizen::Ui::Controls::TableViewItem* pItem, Tizen::Ui::Controls::TableViewItemStatus status);
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
+       virtual void OnNfcPresentationModelEventCompleted(NfcPresentationModelEvent requestEvent, result r);
+
+private:
+       result ToggleNfcActivateStatus(Tizen::Ui::Controls::TableViewItemStatus itemStatus);
 
 private:
        NfcPresentationModel* __pNfcPresentationModelInstance;
        NfcPredefinedItemPresentationModel* __pNfcPredefinedItemPresentationModelInstance;
        Tizen::Base::Collection::ArrayList* __pResevedPushCandidatesAppidList;
        bool __isPredefinedItem;
+       bool __isNfcBusy;
 //     Tizen::Net::Nfc::NfcManager* __pNfcManager;
 };
 

diff --git a/inc/StNfcPresentationModel.h b/inc/StNfcPresentationModel.h
index 5db3b6a..26470e3 100644 (file)
--- a/inc/StNfcPresentationModel.h
+++ b/inc/StNfcPresentationModel.h
@@ -25,6 +25,23 @@
 #include <FNet.h>\r
 #include <FNetNfcNdefPushManager.h>\r
 \r
+enum NfcPresentationModelEvent\r
+{\r
+       NFC_PRESENTATION_MODEL_EVENT_BASE,\r
+       NFC_PRESENTATION_MODEL_EVENT_NONE = NFC_PRESENTATION_MODEL_EVENT_BASE,\r
+       NFC_PRESENTATION_MODEL_EVENT_ACTIVATED,\r
+       NFC_PRESENTATION_MODEL_EVENT_DEACTIVATED,\r
+       NFC_PRESENTATION_MODEL_EVENT_MAX\r
+};\r
+\r
+class INfcPresentationModelEventListener\r
+       : public Tizen::Base::Runtime::IEventListener\r
+{\r
+public:\r
+       virtual ~INfcPresentationModelEventListener(void){}\r
+       virtual void OnNfcPresentationModelEventCompleted(NfcPresentationModelEvent requestEvent, result r) = 0;\r
+};\r
+\r
 class NfcPresentationModel\r
        : public Tizen::Net::Nfc::INfcManagerEventListener\r
 {\r
@@ -41,13 +58,17 @@ public:
        virtual void OnNfcActivated(result r);\r
        virtual void OnNfcDeactivated(result r);\r
 \r
+       void SetNfcEventListener(const INfcPresentationModelEventListener* pNfcEventListener);\r
+\r
 private:\r
        result Construct(void);\r
        static void CreateInstance(void);\r
        static void DestroyInstance(void);\r
+       result FireNfcEvnet(NfcPresentationModelEvent nfcEvent, result r = E_SUCCESS);\r
 \r
 private:\r
        Tizen::Net::Nfc::NfcManager* __pNfcManager;\r
+       const INfcPresentationModelEventListener* __pINfcPresentationModelEventListener;\r
        static NfcPresentationModel* __pNfcPresentationModelInstance;\r
 };\r
 \r

diff --git a/src/StDateTimeForm.cpp b/src/StDateTimeForm.cpp
index 7c04a56..d4eaf02 100644 (file)
--- a/src/StDateTimeForm.cpp
+++ b/src/StDateTimeForm.cpp
@@ -70,6 +70,8 @@ static const int SECOND_CONTROL_ITEM = 1;
 static const int SECOND_TEXT_ITEM = 2;
 static const int MIN_YEAR = 1970;
 static const int MAX_YEAR = 2037;
+static const float RESIZE_RATE = 5.5;
+static const int DIVIDE_BY_TEN = 10;
 
 DateTimeForm::DateTimeForm(void)
 {
@@ -898,7 +900,10 @@ DateTimeForm::UpdateItem(int groupIndex, int itemIndex, Tizen::Ui::Controls::Tab
                        pEditTime->Set24HourNotationEnabled(hourFormat);
                }
 
-               int pos = pEditDate->GetWidth();
+               Rectangle editTimeRectangle = pEditTime->GetBounds();
+               Rectangle itemRectangle = pItem->GetBounds();
+               int pos = ((itemRectangle.width * RESIZE_RATE) / DIVIDE_BY_TEN);
+               pEditTime->SetSize(pos, editTimeRectangle.height);
                pEditTime->SetPosition(pos, 0);
                pItem->Invalidate(true);
        }

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index 6169035..7986b8d 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -57,6 +57,7 @@ NfcForm::NfcForm(void)
        : __pNfcPresentationModelInstance(null)
        , __pNfcPredefinedItemPresentationModelInstance(null)
        , __isPredefinedItem(false)
+       , __isNfcBusy(false)
 {
 }
 
@@ -97,6 +98,7 @@ NfcForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, co
        if (__pNfcPresentationModelInstance == null)
        {
                __pNfcPresentationModelInstance = NfcPresentationModel::GetInstance();
+               __pNfcPresentationModelInstance->SetNfcEventListener(this);
        }
        if (__pNfcPredefinedItemPresentationModelInstance == null)
        {
@@ -419,41 +421,20 @@ NfcForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTableVie
        {
        case ID_GROUP_NFC:
                {
-                       result r = E_FAILURE;
-                       if (__pTableView->IsItemChecked(groupIndex, itemIndex) == true)
+                       if (__isNfcBusy)
                        {
-                               if (__pNfcPresentationModelInstance->IsNfcActivated() == false)
-                               {
-                                       r = __pNfcPresentationModelInstance->ActivateNfc();
-                                       if (r != E_SUCCESS)
-                                       {
-                                               AppLogDebug("NFC Activate is filed [%s]", GetErrorMessage(r));
-                                               return;
-                                       }
-                               }
-                               if (__isPredefinedItem)
-                               {
-                                       r = __pTableView->SetItemEnabled(ID_GROUP_NFC_PREDEFINED_ITEM, 0, true);
-                                       AppLogDebug("r = %s", GetErrorMessage(r));
-                               }
+                               AppLogDebug("nfc turn on or off");
+                               __pTableView->SetItemChecked(groupIndex, itemIndex, !__pTableView->IsItemChecked(groupIndex, itemIndex));
+                               return;
                        }
-                       else
+                       result r = E_FAILURE;
+                       __isNfcBusy = true;
+                       r = ToggleNfcActivateStatus(status);
+                       if (IsFailed(r))
                        {
-                               if (__pNfcPresentationModelInstance->IsNfcActivated() == true)
-                               {
-                                       r = __pNfcPresentationModelInstance->DeactivateNfc();
-                                       if (r != E_SUCCESS)
-                                       {
-                                               AppLogDebug("NFC Activate is filed [%s]", GetErrorMessage(r));
-                                               return;
-                                       }
-                               }
-                               if (__isPredefinedItem)
-                               {
-                                       r = __pTableView->SetItemEnabled(ID_GROUP_NFC_PREDEFINED_ITEM, 0, false);
-                                       AppLogDebug("r = %s", GetErrorMessage(r));
-                               }
+                               AppLogDebug("ToggleWifiActivateStatus is Fail");
                        }
+
                        __pTableView->UpdateTableView();
                }
                break;
@@ -575,4 +556,60 @@ NfcForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::ILis
                        delete pArgs;
                }
        }
+}
+
+result
+NfcForm::ToggleNfcActivateStatus(Tizen::Ui::Controls::TableViewItemStatus itemStatus)
+{
+       if (__pNfcPresentationModelInstance == null)
+       {
+               AppLogDebug("__pNfcPresentationModelInstance is null");
+               return E_FAILURE;
+       }
+
+       switch (itemStatus)
+       {
+       case TABLE_VIEW_ITEM_STATUS_CHECKED:
+               {
+                       if (!__pNfcPresentationModelInstance->IsNfcActivated())
+                       {
+                               __pNfcPresentationModelInstance->ActivateNfc();
+                       }
+
+                       if (__isPredefinedItem)
+                       {
+                               __pTableView->SetItemEnabled(ID_GROUP_NFC_PREDEFINED_ITEM, 0, true);
+                       }
+               }
+               break;
+
+       case TABLE_VIEW_ITEM_STATUS_UNCHECKED:
+               {
+                       if (__pNfcPresentationModelInstance->IsNfcActivated())
+                       {
+                               __pNfcPresentationModelInstance->DeactivateNfc();
+                       }
+
+                       if (__isPredefinedItem)
+                       {
+                               __pTableView->SetItemEnabled(ID_GROUP_NFC_PREDEFINED_ITEM, 0, false);
+                       }
+               }
+               break;
+
+       default:
+               break;
+       }
+
+       return E_SUCCESS;
+}
+
+void
+NfcForm::OnNfcPresentationModelEventCompleted(NfcPresentationModelEvent requestEvent, result r)
+{
+       if ((requestEvent == NFC_PRESENTATION_MODEL_EVENT_ACTIVATED)
+               || (requestEvent == NFC_PRESENTATION_MODEL_EVENT_DEACTIVATED))
+       {
+               __isNfcBusy = false;
+       }
 }
\ No newline at end of file

diff --git a/src/StNfcPresentationModel.cpp b/src/StNfcPresentationModel.cpp
index 888ac4a..71a1815 100644 (file)
--- a/src/StNfcPresentationModel.cpp
+++ b/src/StNfcPresentationModel.cpp
@@ -32,6 +32,7 @@ NfcPresentationModel* NfcPresentationModel::__pNfcPresentationModelInstance = nu
 \r
 NfcPresentationModel::NfcPresentationModel(void)\r
        : __pNfcManager(null)\r
+       , __pINfcPresentationModelEventListener(null)\r
 {\r
 }\r
 \r
@@ -47,12 +48,22 @@ NfcPresentationModel::~NfcPresentationModel(void)
 result\r
 NfcPresentationModel::ActivateNfc(void)\r
 {\r
+       if (IsNfcActivated() == true)\r
+       {\r
+               return E_FAILURE;\r
+       }\r
+\r
        return __pNfcManager->Activate();\r
 }\r
 \r
 result\r
 NfcPresentationModel::DeactivateNfc(void)\r
 {\r
+       if (IsNfcActivated() == false)\r
+       {\r
+               return E_FAILURE;\r
+       }\r
+\r
        return __pNfcManager->Deactivate();\r
 }\r
 \r
@@ -65,11 +76,19 @@ NfcPresentationModel::IsNfcActivated(void)
 void\r
 NfcPresentationModel::OnNfcActivated(result r)\r
 {\r
+       FireNfcEvnet(NFC_PRESENTATION_MODEL_EVENT_ACTIVATED, r);\r
 }\r
 \r
 void\r
 NfcPresentationModel::OnNfcDeactivated(result r)\r
 {\r
+       FireNfcEvnet(NFC_PRESENTATION_MODEL_EVENT_DEACTIVATED, r);\r
+}\r
+\r
+void\r
+NfcPresentationModel::SetNfcEventListener(const INfcPresentationModelEventListener* pNfcEventListener)\r
+{\r
+       __pINfcPresentationModelEventListener = pNfcEventListener;\r
 }\r
 \r
 NfcPresentationModel*\r
@@ -125,6 +144,20 @@ NfcPresentationModel::DestroyInstance(void)
        }\r
 }\r
 \r
+result\r
+NfcPresentationModel::FireNfcEvnet(NfcPresentationModelEvent nfcEvent, result r)\r
+{\r
+       if (__pINfcPresentationModelEventListener == null)\r
+       {\r
+               AppLogDebug("__pINfcPresentationModelEventListener is null");\r
+               return E_FAILURE;\r
+       }\r
+\r
+       (const_cast <INfcPresentationModelEventListener*>(__pINfcPresentationModelEventListener))->OnNfcPresentationModelEventCompleted(nfcEvent, r);\r
+\r
+       return E_SUCCESS;\r
+}\r
+\r
 NfcPredefinedItemPresentationModel* NfcPredefinedItemPresentationModel::__pNfcPredefinedItemPresentationModelInstance = null;\r
 \r
 NfcPredefinedItemPresentationModel::NfcPredefinedItemPresentationModel(void)\r

diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp
index 62307cf..704d275 100644 (file)
--- a/src/StWallpaperAlbumListDetailForm.cpp
+++ b/src/StWallpaperAlbumListDetailForm.cpp
@@ -19,8 +19,8 @@
  * @brief              This is the implementation file for WallpaperAlbumListDetailForm class.
  */
 
-#include <FSystem.h>
 #include <FIo.h>
+#include <FSystem.h>
 #include "StSettingScenesList.h"
 #include "StTypes.h"
 #include "StWallpaperAlbumListDetailForm.h"
@@ -51,10 +51,10 @@ static const String IMAGE_VIEWER_CROP_OPERATION_ID = L"http://tizen.org/appcontr
 
 WallpaperAlbumListDetailForm::WallpaperAlbumListDetailForm(void)
        : __itemCount(0)
+       , __pContentId(null)
        , __pPresentationModel(null)
        , __pIconListView(null)
        , __pAlbumPathList(null)
-       , __pContentId(null)
 {
 }
 
@@ -436,13 +436,13 @@ WallpaperAlbumListDetailForm::OnUserEventReceivedN(RequestId requestId, Tizen::B
 void
 WallpaperAlbumListDetailForm::OnAppControlCompleteResponseReceived(const AppId& appId, const Tizen::Base::String& operationId, AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData)
 {
-       if (appId.Equals(IMAGE_VIEWER_APP_ID)&&
-               operationId.Equals(IMAGE_VIEWER_CROP_OPERATION_ID))
+       if (appId.Equals(IMAGE_VIEWER_APP_ID)
+               && operationId.Equals(IMAGE_VIEWER_CROP_OPERATION_ID))
        {
                if (appControlResult == APP_CTRL_RESULT_SUCCEEDED)
                {
                        int argIndex = 0;
-                       AppLog("Image crop succeeded.");
+                       AppLogDebug("Image crop succeeded.");
                        String* pStr = WallpaperAlbumListPresentationModel::GetInstance()->GetHomeLockArgument();
                        if (pStr->Equals(L"0", true))
                        {
@@ -467,7 +467,7 @@ WallpaperAlbumListDetailForm::OnAppControlCompleteResponseReceived(const AppId&
                                                IList* pValueList = dynamic_cast<IList*>(pEnum->GetValue());
                                                if (pValueList)
                                                {
-                                                       for (int i=0; i<pValueList->GetCount(); i++)
+                                                       for (int i = 0; i < pValueList->GetCount(); i++)
                                                        {
                                                                if (__pContentId == null)
                                                                {