From e7aeb08cae7667fd63f01bb8b41de32151dc5cd6 Mon Sep 17 00:00:00 2001
From: Dinis Vieira <dinisvieira@outlook.com>
Date: Tue, 24 Oct 2023 23:37:18 +0100
Subject: [PATCH] PM-3350 Checked some [MAUI-Migration] and changed as needed.
 TimePickerHandlerMappings: Remove old code for forcing the Wheel. After
 testing without it wheel picker is still used so this code shouldn't be
 needed anymore. AppDelegate.ContinueUserActivity: Uncommented and changed the
 iOS ContinueUserActivity. It needs to call Platform.ContinueUserActivity
 according with Xamarin Essentials migration docs.

---
 src/App/Platforms/iOS/AppDelegate.cs              |  7 +++----
 src/Core/Pages/Send/SendAddEditPage.xaml          |  2 +-
 .../Handlers/TimePickerHandlerMappings.cs         | 15 ---------------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/App/Platforms/iOS/AppDelegate.cs b/src/App/Platforms/iOS/AppDelegate.cs
index 278484776..50bda6e67 100644
--- a/src/App/Platforms/iOS/AppDelegate.cs
+++ b/src/App/Platforms/iOS/AppDelegate.cs
@@ -249,16 +249,15 @@ namespace Bit.iOS
             return _deepLinkContext.Value.OnNewUri(url) || base.OpenUrl(app, url, options);
         }
 
-        // TODO: [MAUI-Migration] Check if this works given that the baes will call the invoke the service lifecycle.
-        /* public override bool ContinueUserActivity(UIApplication application, NSUserActivity userActivity,
+        public override bool ContinueUserActivity(UIApplication application, NSUserActivity userActivity,
             UIApplicationRestorationHandler completionHandler)
         {
-            if (Xamarin.Essentials.Platform.ContinueUserActivity(application, userActivity, completionHandler))
+            if (Microsoft.Maui.ApplicationModel.Platform.ContinueUserActivity(application, userActivity, completionHandler))
             {
                 return true;
             }
             return base.ContinueUserActivity(application, userActivity, completionHandler);
-        } */
+        }
 
         [Export("application:didFailToRegisterForRemoteNotificationsWithError:")]
         public void FailedToRegisterForRemoteNotifications(UIApplication application, NSError error)
diff --git a/src/Core/Pages/Send/SendAddEditPage.xaml b/src/Core/Pages/Send/SendAddEditPage.xaml
index fc58cd30c..38755bb51 100644
--- a/src/Core/Pages/Send/SendAddEditPage.xaml
+++ b/src/Core/Pages/Send/SendAddEditPage.xaml
@@ -249,7 +249,7 @@
                                     AutomationId="SendHideTextByDefaultToggle" />
                             </StackLayout>
                         </StackLayout>
-                            <!--TODO: [MAUI-Migration] xct:TouchEffect.Command="{Binding ToggleOptionsCommand}" for below-->
+                            <!--TODO: [MAUI-Migration] xct:TouchEffect.Command="{Binding ToggleOptionsCommand}" for below ( https://github.com/CommunityToolkit/Maui/issues/86 ) -->
                         <StackLayout
                             Orientation="Horizontal"
                             Spacing="0"
diff --git a/src/iOS.Core/Handlers/TimePickerHandlerMappings.cs b/src/iOS.Core/Handlers/TimePickerHandlerMappings.cs
index 149a90528..1795b67de 100644
--- a/src/iOS.Core/Handlers/TimePickerHandlerMappings.cs
+++ b/src/iOS.Core/Handlers/TimePickerHandlerMappings.cs
@@ -20,21 +20,6 @@ namespace Bit.iOS.Core.Handlers
                     {
                         handler.PlatformView.Text = extTimePicker.PlaceHolder;
                     }
-
-                    // force use of wheel picker on iOS 14+
-                    // TODO remove this when we upgrade to X.F 5 SR-1
-                    // TODO: [Maui-Migration] Check if this is needed given that we're not on XForms anymore.
-                    // https://github.com/xamarin/Xamarin.Forms/issues/12258#issuecomment-700168665
-                    try
-                    {
-                        if (UIDevice.CurrentDevice.CheckSystemVersion(13, 2)
-                            &&
-                            handler.PlatformView.InputView is UIDatePicker picker)
-                        {
-                            picker.PreferredDatePickerStyle = UIDatePickerStyle.Wheels;
-                        }
-                    }
-                    catch { }
                 }
             });