Fixed Nabi Issues N_SE-40864, N_SE-40869

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

diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 0c391c4..67829f5 100644 (file)
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -2445,7 +2445,7 @@ MainForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
        }
        else if(__pWindowInfo != null)
        {
-               if(__pWindowInfo->pageUrl.GetLength() > 0 && previousSceneId != IDSCN_MULTIPLE_WINDOW && previousSceneId != IDSCN_MULTIPLE_WINDOW_GRID && previousSceneId != IDSCN_BOOKMARK_VIEW && previousSceneId != IDSCN_SETTINGS && previousSceneId != IDSCN_MAIN_VIEW)
+               if(__pWindowInfo->pageUrl.GetLength() > 0 &&previousSceneId != IDSCN_BRIGHTNESS && previousSceneId != IDSCN_HISTORY_LIST && previousSceneId != IDSCN_MULTIPLE_WINDOW && previousSceneId != IDSCN_MULTIPLE_WINDOW_GRID && previousSceneId != IDSCN_BOOKMARK_VIEW && previousSceneId != IDSCN_SETTINGS && previousSceneId != IDSCN_MAIN_VIEW)
                {
                        LoadUrl(__pWindowInfo->pageUrl);
                }
@@ -3303,7 +3303,7 @@ MainForm::OnAddressBarKeypadBoundsChanged(const Addressbar& addBar)
 void
 MainForm::OnPageTitleReceived(const Tizen::Base::String& title)
 {
-       AppLog("MainForm::OnPageTitleReceived");
+       AppLog("MainForm::OnPageTitleReceived %ls",title.GetPointer());
        if (__pWindowInfo)
        {
                __pWindowInfo->pageTitle = title;
@@ -4064,7 +4064,7 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
 
                //__isLongPressedDone = true;
                result r =__pWebViewer->SetBlockSelectionPosition(currentPosition);
-               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) && innerHtml.GetLength() == 0 && __isWebKeypadOpened == true && __currentSelectedStr.CompareTo(L"") == 0 && r == E_INVALID_ARG)
+               if (((tagName.CompareTo(L"INPUT") == 0)  || tagName.CompareTo(L"TEXTAREA") == 0) && innerHtml.GetLength() == 0 /*&& __isWebKeypadOpened == true*/ && __currentSelectedStr.CompareTo(L"") == 0 && r == E_INVALID_ARG)
                {
                        AppLog("MainForm::OnWebPageBlockSelected show paste option");
 

diff --git a/src/IntPresentationModelBase.cpp b/src/IntPresentationModelBase.cpp
index 8155f5b..25783e7 100644 (file)
--- a/src/IntPresentationModelBase.cpp
+++ b/src/IntPresentationModelBase.cpp
@@ -572,8 +572,10 @@ PresentationModelBase::ExecuteHistoryQuery(const Tizen::Base::String& formatQuer
                                        AppLog("CreateStatementN error: %s", GetErrorMessage(GetLastResult()));
                                        return GetLastResult();
                                }
-                               __pDbStatement->BindString(0,historyUrl);
-                               __pDbStatement->BindString(1,historyTitle);
+                               r = __pDbStatement->BindString(0,historyUrl);
+                               AppLog("BindString result historyUrl %s",GetErrorMessage(r));
+                               r = __pDbStatement->BindString(1,historyTitle);
+                               AppLog("BindString result historyTitle %s historyTitle %ls",GetErrorMessage(r),historyTitle.GetPointer());
 
                                String visitedTime = GetStringFromDate(date);
                                /*DateTimeFormatter *pFormatter = DateTimeFormatter::CreateDateFormatterN(DATE_TIME_STYLE_DEFAULT);