Fixed prevent defects & Excluded IME appsettings form the Downloaded app menu

Change-Id: I20856ea669a8882487f556836ede62ff6213ac69
Signed-off-by: Hongryeol Gil <hr.gil@samsung.com>

diff --git a/src/StAppSettingForm.cpp b/src/StAppSettingForm.cpp
index 0d34888..f92d5cf 100644 (file)
--- a/src/StAppSettingForm.cpp
+++ b/src/StAppSettingForm.cpp
@@ -1862,9 +1862,11 @@ AppSettingForm::OnTextValueChanged(const Tizen::Ui::Control& source)
                {
                        AppLogDebug(" current[%d]  min [%d] max[%d]", currentLength, minLength, maxLength);
                        __pIOAppSetting->UpdateChangedValue();
-                       return;
                }
        }
+
+       delete pMin;
+       delete pMax;
 }
 
 void
@@ -1872,7 +1874,10 @@ AppSettingForm::OnKeypadOpened(Tizen::Ui::Control& source)
 {
        unsigned int hashCode = source.GetName().GetHashCode();
        ItemTag* itemTag = GetTranslateTableHashCodeToItemTag(hashCode);
-       __pTableView->ScrollToItem(itemTag->GetGroupIndex(), itemTag->GetItemIndex(), TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
+       if (itemTag)
+       {
+               __pTableView->ScrollToItem(itemTag->GetGroupIndex(), itemTag->GetItemIndex(), TABLE_VIEW_SCROLL_ITEM_ALIGNMENT_BOTTOM);
+       }
 }
 
 void

diff --git a/src/StDownloadedApplicationForm.cpp b/src/StDownloadedApplicationForm.cpp
index 8d24c5d..5184b79 100644 (file)
--- a/src/StDownloadedApplicationForm.cpp
+++ b/src/StDownloadedApplicationForm.cpp
@@ -515,6 +515,27 @@ DownloadedApplicationForm::SetAppIdListFromPackageManager(void)
 
                                String currentAppId = pPackage->GetMainAppId();
                                PackageAppInfo* pPackageInfo = static_cast<PackageAppInfo*>(pPackage->GetPackageAppInfoN(currentAppId));
+
+                               bool isIME = false;
+                               IList* pCategoryList = pPackageInfo->GetAppCategoryListN();
+                               if (pCategoryList)
+                               {
+                                       for (int i=0; i<pCategoryList->GetCount(); ++i)
+                                       {
+                                               String* pCategory = static_cast<String*>(pCategoryList->GetAt(i));
+                                               if(pCategory->Equals(L"http://tizen.org/category/ime", false))
+                                               {
+                                                       isIME = true;
+                                                       break;
+                                               }
+                                       }
+                               }
+
+                               if (isIME)
+                               {
+                                       continue;
+                               }
+
                                String iconPath = pPackageInfo->GetAppMenuIconPath();
 
                                __pAppIdHashMap->Add(*(new (std::nothrow) String(key)), *(new (std::nothrow) String(path)));

diff --git a/src/StScreenTypeForm.cpp b/src/StScreenTypeForm.cpp
index 23007a2..7fbba0d 100644 (file)
--- a/src/StScreenTypeForm.cpp
+++ b/src/StScreenTypeForm.cpp
@@ -295,7 +295,7 @@ ScreenTypeForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedT
        SceneManager* pSceneManager = SceneManager::GetInstance();
        AppAssert(pSceneManager);
 
-       PackageAppInfo* pPackageAppInfo = dynamic_cast <PackageAppInfo*>(__pPackageAppInfoList->GetAt(itemIndex));
+       PackageAppInfo* pPackageAppInfo = static_cast <PackageAppInfo*>(__pPackageAppInfoList->GetAt(itemIndex));
        AppLogDebug("AppId [%ls]", pPackageAppInfo->GetAppId().GetPointer());
 
        String screenType;
@@ -398,11 +398,11 @@ ScreenTypeForm::InitPackageInfoList(void)
        String* pKey = null;
        if (GetWallpaperIndex() == ID_INDEX_HOME_SCREEN_WALLPAPER)
        {
-               pKey = new String("http://tizen.org/category/homeapp");
+               pKey = new String(L"http://tizen.org/category/homeapp");
        }
        else
        {
-               pKey = new String("http://tizen.org/category/lockapp");
+               pKey = new String(L"http://tizen.org/category/lockapp");
        }
 
        Boolean* pValue = new Boolean(true);