Fixed name

Change-Id: I75df169298064b71f4d90b87cb304fed293ddece
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/project/inc/LiveboxViewerMainForm.h b/project/inc/LiveboxViewerMainForm.h
index 25aa762..d7aaef9 100644 (file)
--- a/project/inc/LiveboxViewerMainForm.h
+++ b/project/inc/LiveboxViewerMainForm.h
@@ -59,7 +59,7 @@ private:
 
        virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId, const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData);
        void StartConfigurationAppControl(const Tizen::Base::String& appId, const Tizen::Base::String& providerName);
-       void GoLiveboxViewScene(const Tizen::Base::String& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& userInfo);
+       void GoLiveboxViewScene(const Tizen::Base::String& appId, const Tizen::Base::String& providerName, const Tizen::Base::String& displayName, const Tizen::Base::String& userInfo);
 
 private:
        static const int ID_FORMAT_STRING = 500;

diff --git a/project/src/LiveboxViewerMainForm.cpp b/project/src/LiveboxViewerMainForm.cpp
index 0216579..de5a0a8 100644 (file)
--- a/project/src/LiveboxViewerMainForm.cpp
+++ b/project/src/LiveboxViewerMainForm.cpp
@@ -191,7 +191,7 @@ LiveboxViewerMainForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView
                else
                {
                        AppLog("%ls", __pSelectedProviderInfo->GetDisplayName().GetPointer());
-                       GoLiveboxViewScene(__pSelectedProviderInfo->GetAppId(), __pSelectedProviderInfo->GetName(), L"");
+                       GoLiveboxViewScene(__pSelectedProviderInfo->GetAppId(), __pSelectedProviderInfo->GetName(), __pSelectedProviderInfo->GetDisplayName(), L"");
                }
        }
 }
@@ -211,7 +211,7 @@ LiveboxViewerMainForm::StartConfigurationAppControl(const Tizen::Base::String& a
 }
 
 void
-LiveboxViewerMainForm::GoLiveboxViewScene(const String& appId, const String& providerName, const String& userInfo)
+LiveboxViewerMainForm::GoLiveboxViewScene(const String& appId, const String& providerName, const Tizen::Base::String& displayName, const String& userInfo)
 {
        ArrayList* pList = new (std::nothrow) ArrayList;
        AppAssert(pList);
@@ -219,6 +219,7 @@ LiveboxViewerMainForm::GoLiveboxViewScene(const String& appId, const String& pro
 
        pList->Add(*(new (std::nothrow) String(appId) ));
        pList->Add(*(new (std::nothrow) String(providerName) ));
+       pList->Add(*(new (std::nothrow) String(displayName)));
        pList->Add(*(new (std::nothrow) String(userInfo )) );
 
        SceneManager* pSceneManager = SceneManager::GetInstance();
@@ -292,6 +293,6 @@ LiveboxViewerMainForm::OnAppControlCompleteResponseReceived(const AppId& appId,
                const String* pUserInfoValue = dynamic_cast<const String*>(pExtraData->GetValue(userInfokey) );
                AppLog("%ls, %ls, %ls", appId.GetPointer(), operationId.GetPointer(), pUserInfoValue->GetPointer() );
 
-               GoLiveboxViewScene(__pSelectedProviderInfo->GetAppId(), __pSelectedProviderInfo->GetName(), *pUserInfoValue);
+               GoLiveboxViewScene(__pSelectedProviderInfo->GetAppId(), __pSelectedProviderInfo->GetName(), __pSelectedProviderInfo->GetDisplayName(), *pUserInfoValue);
        }
 }

diff --git a/project/src/ViewForm.cpp b/project/src/ViewForm.cpp
index 19ecd83..9f17ae9 100644 (file)
--- a/project/src/ViewForm.cpp
+++ b/project/src/ViewForm.cpp
@@ -196,13 +196,14 @@ ViewForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, c
        {
                String* pAppId = dynamic_cast<String*>(pArgs->GetAt(0));
                String* pLiveboxProviderName = dynamic_cast<String*>(pArgs->GetAt(1));
-               String* pUserInfo = dynamic_cast<String*>(pArgs->GetAt(2));
+               String* pDisplayName = dynamic_cast<String*>(pArgs->GetAt(2));
+               String* pUserInfo = dynamic_cast<String*>(pArgs->GetAt(3));
                if (pAppId != null && pLiveboxProviderName != null)
                {
                        AppLog("%ls", pAppId->GetPointer());
 
                        Header* pHeader = GetHeader();
-                       pHeader->SetTitleText(*pAppId);
+                       pHeader->SetTitleText(*pDisplayName);
 
                        CreateLiveboxView(*pAppId, *pLiveboxProviderName, *pUserInfo);
                }