Securing against memory leaks

Author: kubaflo

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

@@ -8,6 +8,8 @@ namespace Microsoft.Maui.Handlers
 	public partial class DatePickerHandler : ViewHandler<IDatePicker, MauiDatePicker>
 	{
 		DatePickerDialog? _dialog;
+		EventHandler? _setDateLater;
+		EventHandler? _dismiss;
 
 		protected override MauiDatePicker CreatePlatformView()
 		{
@@ -52,6 +54,8 @@ protected override void DisconnectHandler(MauiDatePicker platformView)
 		{
 			if (_dialog != null)
 			{
+				_dialog.DismissEvent -= _dismiss;
+				_dialog.ShowEvent -= _setDateLater;
 				_dialog.Hide();
 				_dialog.Dispose();
 				_dialog = null;
@@ -144,19 +148,17 @@ void ShowPickerDialog(int year, int month, int day)
 				_dialog = CreateDatePickerDialog(year, month, day);
 			else
 			{
-				EventHandler? setDateLater = null;
-				EventHandler? dismiss = null;
-				setDateLater = (sender, e) => { _dialog!.UpdateDate(year, month, day); _dialog.ShowEvent -= setDateLater; };
-				_dialog.ShowEvent += setDateLater;
-				dismiss = (sender, e) =>
+				_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;
 				};
-				_dialog.DismissEvent += dismiss;
+				_dialog.DismissEvent += _dismiss;
 			}
 
 			_dialog.Show();

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

@@ -10,6 +10,7 @@ public partial class TimePickerHandler : ViewHandler<ITimePicker, MauiTimePicker
 	{
 		MauiTimePicker? _timePicker;
 		TimePickerDialog? _dialog;
+		EventHandler? dismiss;
 
 		protected override MauiTimePicker CreatePlatformView()
 		{
@@ -27,13 +28,13 @@ protected override void DisconnectHandler(MauiTimePicker platformView)
 			if (_dialog != null)
 			{
 				_dialog.Hide();
+				_dialog.DismissEvent -= dismiss;
 				_dialog = null;
 			}
 		}
 
 		protected virtual TimePickerDialog CreateTimePickerDialog(int hour, int minute)
 		{
-			EventHandler? dismiss = null;
 			void onTimeSetCallback(object? obj, TimePickerDialog.TimeSetEventArgs args)
 			{
 				if (VirtualView == null || PlatformView == null)