Fixed #334 And #414

Notification not working on iOS
thudugala · Jun 16, 2023 · 22541b3 · 22541b3
1 parent 8fc97a2
commit 22541b3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 20 deletions.
diff --git a/Sample/Direct Maui/LocalNotification.Sample/MauiProgram.cs b/Sample/Direct Maui/LocalNotification.Sample/MauiProgram.cs
@@ -59,8 +59,7 @@ public static MauiApp CreateMauiApp()
                 .AddiOS(iOS =>
                 {
 #if IOS
-                    iOS.UseCustomDelegate = true;
-                    iOS.SetCustomUserNotificationCenterDelegate(new CustomUserNotificationCenterDelegate());
+                    //iOS.SetCustomUserNotificationCenterDelegate(new CustomUserNotificationCenterDelegate());
 #endif
                 });
             });

diff --git a/Source/Plugin.LocalNotification/LocalNotificationExtensions.cs b/Source/Plugin.LocalNotification/LocalNotificationExtensions.cs
@@ -64,10 +64,7 @@ public static MauiAppBuilder UseLocalNotification(this MauiAppBuilder builder, A
                 {
                     iOS.FinishedLaunching((application, _) =>
                     {
-                        if (localNotificationBuilder.IOSBuilder.UseCustomDelegate)
-                        {
-                            LocalNotificationCenter.SetCustomUserNotificationCenterDelegate(localNotificationBuilder.IOSBuilder.CustomUserNotificationCenterDelegate);
-                        }
+                        LocalNotificationCenter.SetUserNotificationCenterDelegate(localNotificationBuilder.IOSBuilder.CustomUserNotificationCenterDelegate);                        
                         return true;
                     });
                     iOS.WillEnterForeground(application =>

diff --git a/Source/Plugin.LocalNotification/Platforms/iOS/LocalNotificationCenter.cs b/Source/Plugin.LocalNotification/Platforms/iOS/LocalNotificationCenter.cs
@@ -21,7 +21,7 @@ public partial class LocalNotificationCenter
         /// and set it using this method
         /// </summary>
         /// <param name="notificationDelegate"></param>
-        public static void SetCustomUserNotificationCenterDelegate(UserNotificationCenterDelegate notificationDelegate = null)
+        public static void SetUserNotificationCenterDelegate(UserNotificationCenterDelegate notificationDelegate = null)
         {
             UNUserNotificationCenter.Current.Delegate = notificationDelegate ?? new UserNotificationCenterDelegate();
         }

diff --git a/Source/Plugin.LocalNotification/Plugin.LocalNotification.csproj b/Source/Plugin.LocalNotification/Plugin.LocalNotification.csproj
@@ -20,7 +20,7 @@
     <Description>The local notification plugin provides a way to show local notifications from Xamarin and MAUI apps.</Description>
     <PackageIcon>icon.png</PackageIcon>
     <Copyright>Copyright © Elvin (Tharindu) Thudugala</Copyright>
-    <Version>10.1.5</Version>
+    <Version>10.1.6</Version>
     <PackageReleaseNotes>Check: https://github.com/thudugala/Plugin.LocalNotification/releases </PackageReleaseNotes>
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -71,7 +71,7 @@
     <Compile Include="**/Platforms/Android/**/*.cs" />
     <PackageReference Include="Xamarin.Build.Download" Version="0.11.4" PrivateAssets="All"/>  
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.1.1" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Location" Version="120.0.0.2" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Location" Version="120.0.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
   </ItemGroup>
@@ -84,7 +84,7 @@
 
   <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
     <Compile Include="**/Platforms/Android/**/*.cs" />
-    <PackageReference Include="Xamarin.GooglePlayServices.Location" Version="120.0.0.2" />
+    <PackageReference Include="Xamarin.GooglePlayServices.Location" Version="120.0.0.1" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework.Contains('-ios'))">

diff --git a/Source/Plugin.LocalNotification/iOSOption/IiOSLocalNotificationBuilder.cs b/Source/Plugin.LocalNotification/iOSOption/IiOSLocalNotificationBuilder.cs
@@ -9,11 +9,6 @@ namespace Plugin.LocalNotification.iOSOption
     /// </summary>
     public interface IiOSLocalNotificationBuilder
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        bool UseCustomDelegate { get; set; }
-
 #if IOS    
         /// <summary>
         /// 

diff --git a/Source/Plugin.LocalNotification/iOSOption/iOSLocalNotificationBuilder.cs b/Source/Plugin.LocalNotification/iOSOption/iOSLocalNotificationBuilder.cs
@@ -7,11 +7,6 @@ namespace Plugin.LocalNotification.iOSOption
     /// <inheritdoc/>
     public class iOSLocalNotificationBuilder : IiOSLocalNotificationBuilder
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool UseCustomDelegate { get; set; }
-
 #if IOS
         /// <summary>
         ///