Securing against memory leaks 2

Author: kubaflo

src/Core/src/Handlers/DatePicker/DatePickerHandler.Android.cs

@@ -8,8 +8,7 @@ namespace Microsoft.Maui.Handlers
 	public partial class DatePickerHandler : ViewHandler<IDatePicker, MauiDatePicker>
 	{
 		DatePickerDialog? _dialog;
-		EventHandler? _setDateLater;
-		EventHandler? _dismiss;
+		(int year, int month, int day) _selectedDate;
 
 		protected override MauiDatePicker CreatePlatformView()
 		{
@@ -54,8 +53,11 @@ protected override void DisconnectHandler(MauiDatePicker platformView)
 		{
 			if (_dialog != null)
 			{
-				_dialog.DismissEvent -= _dismiss;
-				_dialog.ShowEvent -= _setDateLater;
+				_dialog.DismissEvent -= OnDismissEvent;
+				_dialog.ShowEvent -= OnShowEvent;
+				if (OperatingSystem.IsAndroidVersionAtLeast(24))
+					_dialog.DateSet -= OnDateSet;
+
 				_dialog.Hide();
 				_dialog.Dispose();
 				_dialog = null;
@@ -70,17 +72,7 @@ protected override void DisconnectHandler(MauiDatePicker platformView)
 
 		protected virtual DatePickerDialog CreateDatePickerDialog(int year, int month, int day)
 		{
-			void OnDateSelectedCallback(object? obj, DatePickerDialog.DateSetEventArgs e)
-			{
-				if (VirtualView != null)
-				{
-					VirtualView.Date = e.Date;
-					VirtualView.IsFocused = false;
-				}
-			}
-
-			var dialog = new DatePickerDialog(Context!, OnDateSelectedCallback, year, month, day);
-
+			var dialog = new DatePickerDialog(Context!, OnDateSet, year, month, day);
 			return dialog;
 		}
 
@@ -148,22 +140,42 @@ void ShowPickerDialog(int year, int month, int day)
 				_dialog = CreateDatePickerDialog(year, month, day);
 			else
 			{
-				_setDateLater = (sender, e) => { _dialog!.UpdateDate(year, month, day); _dialog.ShowEvent -= _setDateLater; };
-				_dialog.ShowEvent += _setDateLater;
-				_dismiss = (sender, e) =>
-				{
-					if (VirtualView != null)
-					{
-						VirtualView.IsFocused = false;
-					}
-					_dialog.DismissEvent -= _dismiss;
-				};
-				_dialog.DismissEvent += _dismiss;
+				_selectedDate = (year, month, day);
+				_dialog.ShowEvent += OnShowEvent;
+				_dialog.DismissEvent += OnDismissEvent;
 			}
 
 			_dialog.Show();
 		}
 
+		void OnDismissEvent(object? sender, EventArgs e)
+		{
+			if (VirtualView != null)
+			{
+				VirtualView.IsFocused = false;
+			}
+
+			if (_dialog != null)
+			{
+				_dialog.DismissEvent -= OnDismissEvent;
+			}
+		}
+
+		void OnShowEvent(object? sender, EventArgs e)
+		{
+			_dialog!.UpdateDate(_selectedDate.year, _selectedDate.month, _selectedDate.day);
+			_dialog.ShowEvent -= OnShowEvent;
+		}
+
+		void OnDateSet(object? obj, DatePickerDialog.DateSetEventArgs e)
+		{
+			if (VirtualView != null)
+			{
+				VirtualView.Date = e.Date;
+				VirtualView.IsFocused = false;
+			}
+		}
+
 		void HidePickerDialog()
 		{
 			_dialog?.Hide();

src/Core/src/Handlers/TimePicker/TimePickerHandler.Android.cs

@@ -10,7 +10,6 @@ public partial class TimePickerHandler : ViewHandler<ITimePicker, MauiTimePicker
 	{
 		MauiTimePicker? _timePicker;
 		TimePickerDialog? _dialog;
-		EventHandler? dismiss;
 
 		protected override MauiTimePicker CreatePlatformView()
 		{
@@ -28,41 +27,45 @@ protected override void DisconnectHandler(MauiTimePicker platformView)
 			if (_dialog != null)
 			{
 				_dialog.Hide();
-				_dialog.DismissEvent -= dismiss;
+				_dialog.DismissEvent -= OnDismiss;
 				_dialog = null;
 			}
 		}
 
 		protected virtual TimePickerDialog CreateTimePickerDialog(int hour, int minute)
 		{
-			void onTimeSetCallback(object? obj, TimePickerDialog.TimeSetEventArgs args)
-			{
-				if (VirtualView == null || PlatformView == null)
-					return;
+			var dialog = new TimePickerDialog(Context!, OnTimeSetCallback, hour, minute, Use24HourView);
+			dialog.DismissEvent += OnDismiss;
 
-				VirtualView.Time = new TimeSpan(args.HourOfDay, args.Minute, 0);
-				VirtualView.IsFocused = false;
+			return dialog;
+		}
 
-				if (_dialog != null)
-				{
-					_dialog.DismissEvent -= dismiss;
-					_dialog = null;
-				}
-			}
+		private void OnTimeSetCallback(object? obj, TimePickerDialog.TimeSetEventArgs args)
+		{
+			if (VirtualView == null || PlatformView == null)
+				return;
 
-			var dialog = new TimePickerDialog(Context!, onTimeSetCallback, hour, minute, Use24HourView);
+			VirtualView.Time = new TimeSpan(args.HourOfDay, args.Minute, 0);
+			VirtualView.IsFocused = false;
 
-			dismiss = (sender, e) =>
+			if (_dialog != null)
 			{
-				if (VirtualView != null)
-				{
-					VirtualView.IsFocused = false;
-				}
-				dialog.DismissEvent -= dismiss;
-			};
-			dialog.DismissEvent += dismiss;
+				_dialog.DismissEvent -= OnDismiss;
+				_dialog = null;
+			}
+		}
 
-			return dialog;
+		private void OnDismiss(object? sender, EventArgs e)
+		{
+			if (VirtualView != null)
+			{
+				VirtualView.IsFocused = false;
+			}
+
+			if (_dialog != null)
+			{
+				_dialog.DismissEvent -= OnDismiss;
+			}
 		}
 
 		// This is a Android-specific mapping