Update

Author: ahqsoftwares

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "win32_notif"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2021"
 description = "Wrapper around Windows UWP XAML (WinRT) Notification api"
 license = "MIT"

Cargo.toml

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use windows::{
-  core::{Error, IInspectable, Interface, HSTRING},
+  core::{Error, IInspectable, Interface, Ref, HSTRING},
   Foundation::{IReference, TypedEventHandler},
   UI::Notifications::{ToastActivatedEventArgs, ToastNotification},
 };
@@ -61,7 +61,7 @@ impl NotificationActivatedEventHandler {
     mut func: T,
   ) -> Self {
     let handler: TypedEventHandler<ToastNotification, IInspectable> = TypedEventHandler::new(
-      move |a: &Option<ToastNotification>, b: &Option<IInspectable>| {
+      move |a: Ref<ToastNotification>, b: Ref<IInspectable>| {
         let a = a.as_ref();
         let a = a.and_then(|a| PartialNotification { _toast: a }.into());
 

src/structs/handler/activated.rs

@@ -1,5 +1,5 @@
 use windows::{
-  core::{Error, Interface},
+  core::{Error, Interface, Ref},
   Foundation::TypedEventHandler,
   UI::Notifications::{ToastDismissalReason, ToastDismissedEventArgs, ToastNotification},
 };
@@ -48,7 +48,7 @@ impl NotificationDismissedEventHandler {
     mut func: T,
   ) -> Self {
     let handler: TypedEventHandler<ToastNotification, ToastDismissedEventArgs> = TypedEventHandler::new(
-      move |a: &Option<ToastNotification>, b: &Option<ToastDismissedEventArgs>| {
+      move |a: Ref<ToastNotification>, b: Ref<ToastDismissedEventArgs>| {
         let a = a.as_ref();
         let a = a.and_then(|a| PartialNotification { _toast: a }.into());
 

src/structs/handler/dismissed.rs

@@ -1,5 +1,5 @@
 use windows::{
-  core::{Error, Interface},
+  core::{Error, Interface, Ref},
   Foundation::TypedEventHandler,
   UI::Notifications::{ToastFailedEventArgs, ToastNotification},
 };
@@ -33,7 +33,7 @@ impl NotificationFailedEventHandler {
     mut func: T,
   ) -> Self {
     let handler: TypedEventHandler<ToastNotification, ToastFailedEventArgs> = TypedEventHandler::new(
-      move |a: &Option<ToastNotification>, b: &Option<ToastFailedEventArgs>| {
+      move |a: Ref<ToastNotification>, b: Ref<ToastFailedEventArgs>| {
         let a = a.as_ref();
         let a = a.and_then(|a| PartialNotification { _toast: a }.into());
 

src/structs/handler/failed.rs

@@ -10,7 +10,6 @@ pub use notification::{Notification, NotificationBuilder};
 pub use notifier::ToastsNotifier;
 use windows::{
   core::HSTRING,
-  Foundation::EventRegistrationToken,
   UI::Notifications::{
     NotificationMirroring as ToastNotificationMirroring, ToastNotification,
     ToastNotificationPriority,
@@ -151,35 +150,35 @@ impl<T: NotificationImpl> ManageNotification for T {
     &self,
     handler: NotificationActivatedEventHandler,
   ) -> Result<i64, NotifError> {
-    Ok(self.notif().Activated(&handler.handler)?.Value)
+    Ok(self.notif().Activated(&handler.handler)?)
   }
   fn remove_activated_handler(&self, token: i64) -> Result<(), NotifError> {
     Ok(
       self
         .notif()
-        .RemoveActivated(EventRegistrationToken { Value: token })?,
+        .RemoveActivated(token)?,
     )
   }
 
   fn set_dismissed_handler(&self, handler: NotificationDismissedEventHandler) -> Result<i64, NotifError> {
-    Ok(self.notif().Dismissed(&handler.handler)?.Value)
+    Ok(self.notif().Dismissed(&handler.handler)?)
   }
   fn remove_dismissed_handler(&self, token: i64) -> Result<(), NotifError> {
     Ok(
       self
         .notif()
-        .RemoveDismissed(EventRegistrationToken { Value: token })?,
+        .RemoveDismissed(token)?,
     )
   }
 
   fn set_failed_handler(&self, handler: NotificationFailedEventHandler) -> Result<i64, NotifError> {
-    Ok(self.notif().Failed(&handler.handler)?.Value)
+    Ok(self.notif().Failed(&handler.handler)?)
   }
   fn remove_failed_handler(&self, token: i64) -> Result<(), NotifError> {
     Ok(
       self
         .notif()
-        .RemoveFailed(EventRegistrationToken { Value: token })?,
+        .RemoveFailed(token)?,
     )
   }
 

src/structs/mod.rs

@@ -289,15 +289,15 @@ impl NotificationBuilder {
     let toast = ToastNotification::CreateToastNotification(&doc)?;
     if let Some(x) = self.on_activated {
       let token = toast.Activated(&x.handler)?;
-      activated_event_handler_token = Some(token.Value);
+      activated_event_handler_token = Some(token);
     }
     if let Some(x) = self.on_dismissed {
       let token = toast.Dismissed(&x.handler)?;
-      dismissed_event_handler_token = Some(token.Value);
+      dismissed_event_handler_token = Some(token);
     }
     if let Some(x) = self.on_failed {
       let token = toast.Failed(&x.handler)?;
-      failed_event_handler_token = Some(token.Value);
+      failed_event_handler_token = Some(token);
     }
     toast.SetTag(&tag.into())?;
     toast.SetGroup(&group.into())?;