Fixed Nabi Issues

Change-Id: Ic10826d50d66503ac26e6e6240bdd179252eeb3a
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>

diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index a3056fd..13944d8 100644 (file)
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -893,7 +893,10 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
                }
        }
 
-       __pEditFieldTitle->ShowKeypad();
+       if(__pEditFieldTitle != NULL)
+       {
+               __pEditFieldTitle->ShowKeypad();
+       }
        if ( previousSceneId != IDSCN_CREATE_BOOKMARK_FOLDER )
        {
                if (__pEditFieldTitle != NULL)

diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 7ebc99f..bb4b31b 100644 (file)
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -289,6 +289,7 @@ BookmarkListForm::OnInitializing(void)
                history.SetIcon(HEADER_ITEM_STATUS_PRESSED, pIconBitmap);
                pHeader->AddItem(history);
                pHeader->SetItemSelected(0);
+               pHeader->SetTabEditModeEnabled(false);
 
                if (pIconBitmap != NULL)
                {
@@ -1172,12 +1173,6 @@ BookmarkListForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen:
 void
 BookmarkListForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId& nextSceneId)
 {
-       if (__pData != null)
-       {
-               __pData->RemoveAll(true);
-               delete __pData;
-               __pData = null;
-       }
        __pSearchBar->SetMode(SEARCH_BAR_MODE_NORMAL);
        return;
 }

diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index d718994..5b7b24f 100644 (file)
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -210,6 +210,7 @@ HistoryListForm::OnInitializing(void)
                history.SetIcon(HEADER_ITEM_STATUS_PRESSED, pIconBitmap);
                pHeader->AddItem(history);
                pHeader->SetItemSelected(1);
+               pHeader->SetTabEditModeEnabled(false);
 
                if (pIconBitmap != NULL)
                {

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index cdbfc4a..69b30e3 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -470,6 +470,8 @@ MainForm::InitWebControl()
 
                if (IsFailed(r))
                {
+                       delete __pWebViewer;
+                       __pWebViewer = null;
                        AppLogDebug("Web addcontrol failed with %s", GetErrorMessage(r));
                        return r;
                }
@@ -1272,8 +1274,10 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                                }
                                        }
                                }
-                               totalCount = pAllWindowList->GetCount();
-
+                               if (pAllWindowList != null)
+                               {
+                                       totalCount = pAllWindowList->GetCount();
+                               }
                                for (int count = 0; count < totalCount; count++)
                                {
                                        pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count));
@@ -1916,6 +1920,11 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        break;
        case IDA_HYPERLINK_SHARE_IMAGE_CLICKED:
        {
+               if (__pHitElementResult == null)
+               {
+                       return;
+               }
+
                if(__pPopUp != null)
                {
                        delete __pPopUp;
@@ -1925,12 +1934,6 @@ MainForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                __pPopUp->Initialize();
 
                ShareInfo* pShareInfo = new(std::nothrow) ShareInfo();
-
-               if(__pHitElementResult == null)
-               {
-                       return;
-               }
-
                pShareInfo->SetPageUrl(__pHitElementResult->GetUrl());
                pShareInfo->SetImageAttached(false);
                __pPopUp->RemoveAllShareInfo();
@@ -2832,31 +2835,6 @@ MainForm::OnBackClicked(/*const Addressbar& addBar*/)
 {
 //     AppLog("MainForm::OnBackClicked");
        result r = E_FAILURE;
-//
-//     if (__pWebViewer != null && __pWebViewer->CanGoBack())
-//     {
-//             __pWebViewer->GoBack();
-//     }
-//     else
-//     {
-//             UiApp* pApp = null;
-//             pApp = UiApp::GetInstance();
-//             if(pApp != null)
-//             {
-//                     r = pApp->Terminate();
-//                     if (IsFailed(r))
-//                     {
-//                             return;
-//                     }
-//             }
-//     }
-
-
-
-
-
-
-
 
        if (__pWebViewer && __pWebViewer->CanGoBack())
        {
@@ -2900,8 +2878,10 @@ MainForm::OnBackClicked(/*const Addressbar& addBar*/)
                                }
                        }
                }
-               totalCount = pAllWindowList->GetCount();
-
+               if (pAllWindowList != null)
+               {
+                       totalCount = pAllWindowList->GetCount();
+               }
                for (int count = 0; count < totalCount; count++)
                {
                        pWindowInfo = dynamic_cast< WindowInfo* >(pAllWindowList->GetAt(count));
@@ -2918,7 +2898,7 @@ MainForm::OnBackClicked(/*const Addressbar& addBar*/)
                                        }
                                }
                        }
-                       if (pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID && pWindowInfo->isJavascriptInitiated == true)
+                       if (pSceneManager != null && pWindowInfo != null && pSceneManager->GetCurrentSceneId() == pWindowInfo->sceneID && pWindowInfo->isJavascriptInitiated == true)
                        {
                                r = SceneRegister::DestroyAndUnRegisterScene(pWindowInfo->sceneID);
                                if (IsFailed(r))
@@ -3802,6 +3782,20 @@ MainForm::OnTouchPressed(Tizen::Ui::Control& source, const Tizen::Ui::TouchEvent
 bool
 MainForm::OnTouchReleased(Tizen::Ui::Control& source, const Tizen::Ui::TouchEventInfo& touchEventInfo)
 {
+       if(__pFindWordControl && __pFindWordControl->GetShowState() == true)
+       {
+               __currentSearchStr = L"";
+               __currentWordIndex = 0;
+               __maxOccurrances = 0;
+               __pFindWordEditField->SetText(L"");
+               __pFindWordNext->SetEnabled(false);
+               __pFindWordPrev->SetEnabled(false);
+               __pFindWordCountLabel->SetText(L"0/0");
+               __pWebViewer->SearchText(L"aaaabbbbcccc",true);
+               __pFindWordControl->SetShowState(false);
+               if (__pFindWordEditField)
+                       __pFindWordEditField->HideKeypad();
+       }
        if(__pAddressbar->GetShowState() == false)
        {
                __pAddressbar->SetShowState(true);