Merge branch 'project/PH1' into project/PH1-net8

# Conflicts: # Softeq.XToolkit.Connectivity/ConnectivityService.cs
Softeq · Jul 15, 2024 · eb4f4b0 · eb4f4b0
2 parents eb1be10 + ef82b6d
commit eb4f4b0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 35 deletions.
diff --git a/Softeq.XToolkit.Bindings.Droid/Bindable/BindableRecyclerViewAdapter.cs b/Softeq.XToolkit.Bindings.Droid/Bindable/BindableRecyclerViewAdapter.cs
@@ -397,7 +397,7 @@ protected override void Dispose(bool disposing)
             _subscription?.Dispose();
         }
 
-        private void ReloadMapping()
+        protected void ReloadMapping()
         {
             _flatMapping.Clear();
 

diff --git a/Softeq.XToolkit.Common/Commands/IAsyncCommand.cs b/Softeq.XToolkit.Common/Commands/IAsyncCommand.cs
@@ -19,7 +19,7 @@ public interface IAsyncCommand : ICommand
         ///     If the command does not require data to be passed, this object can be set to null.
         /// </param>
         /// <returns>The Task to execute.</returns>
-        Task ExecuteAsync(object parameter);
+        Task ExecuteAsync(object? parameter);
     }
 
     /// <summary>

diff --git a/Softeq.XToolkit.PushNotifications.Droid/Services/DroidPushNotificationsConsumer.cs b/Softeq.XToolkit.PushNotifications.Droid/Services/DroidPushNotificationsConsumer.cs
@@ -54,11 +54,6 @@ public DroidPushNotificationsConsumer(
             });
         }
 
-        ~DroidPushNotificationsConsumer()
-        {
-            Dispose(false);
-        }
-
         /// <inheritdoc />
         public bool TryHandleNotification(RemoteMessage message)
         {
@@ -101,8 +96,10 @@ public Task OnUnregisterFromPushNotifications()
 
         public void Dispose()
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            Execute.BeginOnUIThread(() =>
+            {
+                ProcessLifecycleOwner.Get().Lifecycle.RemoveObserver(_lifecycleObserver);
+            });
         }
 
         private void OnMessageReceivedInternal(PushNotificationModel parsedNotification, bool inForeground)
@@ -116,16 +113,5 @@ private void OnMessageReceivedInternal(PushNotificationModel parsedNotification,
                 _pushNotificationsHandler.HandlePushNotificationReceived(parsedNotification, inForeground);
             }
         }
-
-        private void Dispose(bool isDisposing)
-        {
-            if (isDisposing)
-            {
-                Execute.BeginOnUIThread(() =>
-                {
-                    ProcessLifecycleOwner.Get().Lifecycle.RemoveObserver(_lifecycleObserver);
-                });
-            }
-        }
     }
 }
diff --git a/Softeq.XToolkit.WhiteLabel.Essentials/ImagePicker/ImagePickerResult.cs b/Softeq.XToolkit.WhiteLabel.Essentials/ImagePicker/ImagePickerResult.cs
@@ -49,21 +49,7 @@ public string? Extension
 
         public void Dispose()
         {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        ~ImagePickerResult()
-        {
-            Dispose(false);
-        }
-
-        protected void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                ImageObject?.Dispose();
-            }
+            ImageObject?.Dispose();
         }
 
         /// <summary>