disposable-services

Softeq.XToolkit.PushNotifications.Droid/Services/DroidPushNotificationsConsumer.cs

@@ -1,6 +1,7 @@
 // Developed by Softeq Development Corporation
 // http://www.softeq.com
 
+using System;
 using System.Threading.Tasks;
 using Android.Content;
 using AndroidX.Lifecycle;
@@ -15,7 +16,7 @@ namespace Softeq.XToolkit.PushNotifications.Droid.Services
     /// <summary>
     ///     Default implementation of <see cref="IDroidPushNotificationsConsumer"/> interface for Android platform.
     /// </summary>
-    public sealed class DroidPushNotificationsConsumer : IDroidPushNotificationsConsumer
+    public sealed class DroidPushNotificationsConsumer : IDroidPushNotificationsConsumer, IDisposable
     {
         private readonly IDroidPushNotificationsParser _pushNotificationsParser;
         private readonly IPushNotificationsHandler _pushNotificationsHandler;
@@ -53,6 +54,11 @@ public DroidPushNotificationsConsumer(
             });
         }
 
+        ~DroidPushNotificationsConsumer()
+        {
+            Dispose(false);
+        }
+
         /// <inheritdoc />
         public bool TryHandleNotification(RemoteMessage message)
         {
@@ -93,6 +99,12 @@ public Task OnUnregisterFromPushNotifications()
             return _pushTokenSynchronizer.UnregisterFromRemotePushNotificationsAsync();
         }
 
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
         private void OnMessageReceivedInternal(PushNotificationModel parsedNotification, bool inForeground)
         {
             if (parsedNotification.IsSilent)
@@ -104,5 +116,16 @@ private void OnMessageReceivedInternal(PushNotificationModel parsedNotification,
                 _pushNotificationsHandler.HandlePushNotificationReceived(parsedNotification, inForeground);
             }
         }
+
+        private void Dispose(bool isDisposing)
+        {
+            if (isDisposing)
+            {
+                Execute.BeginOnUIThread(() =>
+                {
+                    ProcessLifecycleOwner.Get().Lifecycle.RemoveObserver(_lifecycleObserver);
+                });
+            }
+        }
     }
 }

Softeq.XToolkit.PushNotifications.Droid/Services/DroidPushNotificationsService.cs

@@ -20,7 +20,7 @@ namespace Softeq.XToolkit.PushNotifications.Droid.Services
     ///     interfaces for Android platform. Handles all interactions with the platform, related to push notifications.
     /// </summary>
     public sealed class DroidPushNotificationsService :
-        IPushNotificationsService, IActivityLauncherDelegate, IDroidFirebaseMessagingHandler
+        IPushNotificationsService, IActivityLauncherDelegate, IDroidFirebaseMessagingHandler, IDisposable
     {
         private readonly IDroidPushNotificationsConsumer _pushNotificationsConsumer;
         private readonly ILogger _logger;
@@ -40,6 +40,11 @@ public DroidPushNotificationsService(
             _logger = logManager.GetLogger<DroidPushNotificationsService>();
         }
 
+        ~DroidPushNotificationsService()
+        {
+            Dispose(false);
+        }
+
         private bool IsRegistered { get; set; }
 
         /// <inheritdoc />
@@ -114,6 +119,20 @@ public bool TryHandleLaunchIntent(Intent? intent)
             return intent != null && _pushNotificationsConsumer.TryHandlePushNotificationIntent(intent);
         }
 
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool isDisposing)
+        {
+            if (isDisposing)
+            {
+                _registrationSemaphore.Dispose();
+            }
+        }
+
         /// <inheritdoc />
         void IDroidFirebaseMessagingHandler.OnNotificationReceived(RemoteMessage message)
         {