fix notification with appid handling

Change-Id: I545fe81e320fa63a5a8ea4bf631846567b5e9d66
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>

diff --git a/packaging/osp-appfw.spec b/packaging/osp-appfw.spec
index 2a843d7..c40e072 100755 (executable)
--- a/packaging/osp-appfw.spec
+++ b/packaging/osp-appfw.spec
@@ -72,7 +72,7 @@ BuildRequires:  capi-security-privilege-manager-devel
 BuildRequires:  boost-devel
 BuildRequires:  gettext-tools
 BuildRequires:  pkgconfig(security-server)
-BuildRequires:  badge
+BuildRequires:  pkgconfig(badge)
 
 # runtime requires
 Requires: capi-appfw-application

diff --git a/src/app/FApp_AppImpl.cpp b/src/app/FApp_AppImpl.cpp
index 9a197d9..28d640d 100644 (file)
--- a/src/app/FApp_AppImpl.cpp
+++ b/src/app/FApp_AppImpl.cpp
@@ -38,8 +38,9 @@
 #include <FAppIAppControlProviderEventListener.h>
 #include <FAppIAppLaunchConditionEventListener.h>
 #include <FIoFile.h>
-
 #include <FBaseSysLog.h>
+
+#include <FBase_StringConverter.h>
 #include <FIo_RegistryImpl.h>
 #include <FSys_EnvironmentImpl.h>
 #include <FSys_PowerManagerImpl.h>
@@ -182,13 +183,8 @@ _AppImpl::Execute(_IAppImpl* pIAppImpl)
 //     }
 
        eflResult = app_efl_main(&argc, &pArgv, &state_handler, this);
-
        SysTryLog(NID_APP, eflResult == APP_ERROR_NONE, "app_efl_main failed with error (%d): Unknown", eflResult);
 
-       // clear outstanding ongoing notification
-       notification_delete_all_by_type(NULL, NOTIFICATION_TYPE_ONGOING);
-
-//CATCH:
        pAppManager = _AppManagerProxy::GetService();
 
        if (pAppManager != null)
@@ -196,6 +192,11 @@ _AppImpl::Execute(_IAppImpl* pIAppImpl)
                pAppManager->UnregisterApplication(_AppInfo::GetProcessId());
        }
 
+       // clear outstanding ongoing notification
+       const AppId& appId = _AppInfo::GetApplicationId();
+       std::unique_ptr<char[]> pAppId(_StringConverter::CopyToCharArrayN(appId));
+       notification_delete_all_by_type(pAppId.get(), NOTIFICATION_TYPE_ONGOING);
+
        return r;
 }
 

diff --git a/src/app/FApp_AppManagerImpl.cpp b/src/app/FApp_AppManagerImpl.cpp
index 6772012..44000c8 100755 (executable)
--- a/src/app/FApp_AppManagerImpl.cpp
+++ b/src/app/FApp_AppManagerImpl.cpp
@@ -42,7 +42,6 @@
 
 #include <FBase_StringConverter.h>
 #include <FBaseRt_LibraryImpl.h>
-#include <FIo_DataControlResultSetImpl.h>
 #include <FSys_SystemInfoImpl.h>
 
 #include "FApp_AppControlRegistry.h"

diff --git a/src/app/inc/FApp_AppManagerImpl.h b/src/app/inc/FApp_AppManagerImpl.h
index 524d637..098c249 100755 (executable)
--- a/src/app/inc/FApp_AppManagerImpl.h
+++ b/src/app/inc/FApp_AppManagerImpl.h
@@ -415,9 +415,6 @@ private:
        friend class _AppControlImpl;
        friend class _SqlDataControlImpl;
        friend class _MapDataControlImpl;
-       friend class _DataControlProviderManagerImpl;
-       friend class _AppControlProviderManagerImpl;
-       friend class Tizen::Io::_DataControlResultSetImpl;
 }; // _AppManagerImpl
 
 }} // Tizen::App