summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeungha Son <seungha.son@samsung.com>2017-08-18 19:47:32 +0900
committerSeungha Son <seungha.son@samsung.com>2017-08-18 19:48:11 +0900
commite250c9fc16e0dfb45e6ae78874f72b522f7fdfde (patch)
treed909a1909d863888ef4e2f16d75184c9e3556c2f
parent282065b56965a51b79160b546f482b383753fb7b (diff)
downloadapplication-e250c9fc16e0dfb45e6ae78874f72b522f7fdfde.tar.gz
application-e250c9fc16e0dfb45e6ae78874f72b522f7fdfde.tar.bz2
application-e250c9fc16e0dfb45e6ae78874f72b522f7fdfde.zip
Add IsInvalid exception
Signed-off-by: Seungha Son <seungha.son@samsung.com> Change-Id: Ia4a28dc1ff51cec3201c16147a619ee8b2d31ff4
-rwxr-xr-xTizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs6
-rwxr-xr-xTizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs9
2 files changed, 8 insertions, 7 deletions
diff --git a/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs b/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs
index a442e51..a9bcc59 100755
--- a/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs
+++ b/Tizen.Applications.Notification/Tizen.Applications.Notifications/NotificationStyleBinder.cs
@@ -175,21 +175,21 @@ namespace Tizen.Applications.Notifications
appcontrol = null;
Interop.Notification.GetExtensionAction(notification.Handle, NotificationEventType.HiddenByUser, out appcontrol);
- if (appcontrol != null)
+ if (appcontrol != null && appcontrol.IsInvalid == false)
{
active.HiddenByUserAction = new AppControl(appcontrol);
}
appcontrol = null;
Interop.Notification.GetExtensionAction(notification.Handle, NotificationEventType.HiddenByTimeout, out appcontrol);
- if (appcontrol != null)
+ if (appcontrol != null && appcontrol.IsInvalid == false)
{
active.HiddenByTimeoutAction = new AppControl(appcontrol);
}
appcontrol = null;
Interop.Notification.GetExtensionAction(notification.Handle, NotificationEventType.HiddenByExternal, out appcontrol);
- if (appcontrol != null)
+ if (appcontrol != null && appcontrol.IsInvalid == false)
{
active.HiddenByExternalAction = new AppControl(appcontrol);
}
diff --git a/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs b/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs
index e6d81ad..0ccf9bb 100755
--- a/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs
+++ b/Tizen.Applications.NotificationEventListener/Tizen.Applications.NotificationEventListener/NotificationStyleArgsBinder.cs
@@ -26,6 +26,7 @@ namespace Tizen.Applications.NotificationEventListener
string path;
int styleList;
int timeout;
+ SafeAppControlHandle appcontrol = null;
Interop.NotificationEventListener.GetStyleList(eventargs.Handle, out styleList);
@@ -63,23 +64,23 @@ namespace Tizen.Applications.NotificationEventListener
}
activeStyle.DeleteTimeout = timeout;
- SafeAppControlHandle appcontrol = null;
+ appcontrol = null;
Interop.NotificationEventListener.GetExtensionAction(eventargs.Handle, UserEventType.HiddenByUser, out appcontrol);
- if (appcontrol != null)
+ if (appcontrol != null && appcontrol.IsInvalid == false)
{
activeStyle.HiddenByUserAction = new AppControl(appcontrol);
}
appcontrol = null;
Interop.NotificationEventListener.GetExtensionAction(eventargs.Handle, UserEventType.HiddenByTimeout, out appcontrol);
- if (appcontrol != null)
+ if (appcontrol != null && appcontrol.IsInvalid == false)
{
activeStyle.HiddenByTimeoutAction = new AppControl(appcontrol);
}
appcontrol = null;
Interop.NotificationEventListener.GetExtensionAction(eventargs.Handle, UserEventType.HiddenByExternal, out appcontrol);
- if (appcontrol != null)
+ if (appcontrol != null && appcontrol.IsInvalid == false)
{
activeStyle.HiddenByExternalAction = new AppControl(appcontrol);
}