Added back button listener in Setting and ViewCert screens.

Signed-off-by: varinder.p <varinder.p@samsung.com>

diff --git a/project/inc/CipherMessageSettings.h b/project/inc/CipherMessageSettings.h
index 7e6b247..1df347c 100644 (file)
--- a/project/inc/CipherMessageSettings.h
+++ b/project/inc/CipherMessageSettings.h
@@ -25,6 +25,7 @@ class CipherMessageSetting
        : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::Controls::IListViewItemEventListener
+       , public Tizen::Ui::Controls::IFormBackEventListener
 {
 public:
        CipherMessageSetting(void);
@@ -43,6 +44,7 @@ public:
        void SavePadding(CryptoHandler* pCryptoHandler);
        void SaveHashAlgo(CryptoHandler* pCryptoHandler);
        result AddItemsInLists(Tizen::Ui::Controls::ScrollPanel& scrollPanel);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
 private:
        KeyExchangeListItemProvider __keyExchangeListItemProvider;

diff --git a/project/inc/ViewCertForm.h b/project/inc/ViewCertForm.h
index 38972f5..895d9a3 100644 (file)
--- a/project/inc/ViewCertForm.h
+++ b/project/inc/ViewCertForm.h
@@ -25,6 +25,7 @@ class ViewCertForm
        : public Tizen::Ui::Controls::Form
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::Scenes::ISceneEventListener
+       , public Tizen::Ui::Controls::IFormBackEventListener
 {
 
 public:
@@ -41,6 +42,7 @@ public:
        result ViewCert(Tizen::Security::Cert::X509Certificate* pCertificate);
        void SetCert(Tizen::Security::Cert::X509Certificate* pCertificate);
        void ShowStatus(Tizen::Base::String statusMsg);
+       virtual void OnFormBackRequested(Tizen::Ui::Controls::Form& source);
 
 private:
        Tizen::Security::Cert::X509Certificate* __pCertificate;

diff --git a/project/src/CipherMessageSettings.cpp b/project/src/CipherMessageSettings.cpp
index a168d7a..e1040c8 100644 (file)
--- a/project/src/CipherMessageSettings.cpp
+++ b/project/src/CipherMessageSettings.cpp
@@ -95,6 +95,9 @@ CipherMessageSetting::OnInitializing(void)
        {
                pCryptoHandler->LoadCert(App::GetInstance()->GetAppRootPath() + L"data/data/FreeCA.der", __pRootCert);
        }
+
+       SetFormBackEventListener(this);
+
        return E_SUCCESS;
 }
 
@@ -477,6 +480,15 @@ CipherMessageSetting::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView&
 }
 
 void
+CipherMessageSetting::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
+{
+       AppLog("Back button is clicked! \n");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+       pSceneManager->GoBackward(BackwardSceneTransition());
+}
+
+void
 CipherMessageSetting::OnListViewItemSwept(Tizen::Ui::Controls::ListView& listView, int index, Tizen::Ui::Controls::SweepDirection direction)
 {
 }

diff --git a/project/src/ViewCertForm.cpp b/project/src/ViewCertForm.cpp
index 96f55df..7b7a17c 100644 (file)
--- a/project/src/ViewCertForm.cpp
+++ b/project/src/ViewCertForm.cpp
@@ -72,6 +72,8 @@ ViewCertForm::OnInitializing(void)
                pButton->AddActionEventListener(*this);
        }
 
+       SetFormBackEventListener(this);
+
        return r;
 }
 
@@ -91,7 +93,6 @@ ViewCertForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                        AppLog("Back button is clicked! \n");
                        // Go back to pervious form
-
                        SceneManager* pSceneManager = SceneManager::GetInstance();
                        AppAssert(pSceneManager);
                        pSceneManager->GoBackward(BackwardSceneTransition());
@@ -260,7 +261,8 @@ ViewCertForm::ShowStatus(String statusMessage)
        }
 }
 
-void ViewCertForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId & previousSceneId, const Tizen::Ui::Scenes::SceneId & currentSceneId, Tizen::Base::Collection::IList *pArgs)
+void
+ViewCertForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId & previousSceneId, const Tizen::Ui::Scenes::SceneId & currentSceneId, Tizen::Base::Collection::IList *pArgs)
 {
        Tizen::Security::Cert::X509Certificate* pCert = static_cast< Tizen::Security::Cert::X509Certificate* >(pArgs->GetAt(0));
        if(pCert != null)
@@ -274,6 +276,16 @@ void ViewCertForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId & previous
        }
 
 }
-void ViewCertForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId & currentSceneId, const Tizen::Ui::Scenes::SceneId & nextSceneId)
+void
+ViewCertForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId & currentSceneId, const Tizen::Ui::Scenes::SceneId & nextSceneId)
+{
+}
+
+void
+ViewCertForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
+       AppLog("Back button is clicked! \n");
+       SceneManager* pSceneManager = SceneManager::GetInstance();
+       AppAssert(pSceneManager);
+       pSceneManager->GoBackward(BackwardSceneTransition());
 }