- improved push notifications

- downgraded Maui.Controls and Maui.Controls.Compatibility nugets from 8.0.100 to 8.0.93, due to a bug not resetting badge counter on iOS

Author: IxiAngel

Spixi/Platforms/Android/SPushService.cs

@@ -44,7 +44,7 @@ public static void initialize()
             OneSignal.Debug.AlertLevel = LogLevel.NONE;
 
             OneSignal.Initialize(SPIXI.Meta.Config.oneSignalAppId);
-
+            
             OneSignal.Notifications.Clicked += handleNotificationOpened;
             OneSignal.Notifications.WillDisplay += handleNotificationReceived;
 
@@ -80,6 +80,7 @@ public static void clearNotifications()
                 {
                     clearNotificationsAfterInit = true;
                     Logging.warn("Cannot clear notifications, OneSignal is not initialized yet.");
+                    return;
                 }
             }
             catch (Exception e)

Spixi/Platforms/iOS/SPushService.cs

@@ -6,11 +6,16 @@
 using SPIXI;
 using UIKit;
 using UserNotifications;
+using OneSignalNative = Com.OneSignal.iOS.OneSignal;
 
 namespace Spixi
 {
     public class SPushService
     {
+        private static bool isInitializing = false;
+        private static bool isInitialized = false;
+
+        private static bool clearNotificationsAfterInit = false;
         public class NotificationDelegate : UNUserNotificationCenterDelegate
         {
             public override void DidReceiveNotificationResponse(UNUserNotificationCenter center, UNNotificationResponse response, Action completionHandler)
@@ -22,30 +27,62 @@ public override void DidReceiveNotificationResponse(UNUserNotificationCenter cen
                         var fa = response.Notification.Request.Content.UserInfo[(NSString)"fa"];
                         if (fa != null)
                         {
-                            App.startingScreen = Convert.ToString(fa);
-                            HomePage.Instance().onChat(App.startingScreen, null);
-                            App.startingScreen = "";
+                            HomePage.Instance().onChat(Convert.ToString(fa), null);
                         }
                     }
                 }
                 catch (Exception ex)
                 {
                     Logging.error("Exception occured in DidReceiveNotificationResponse: {0}", ex);
                 }
+                finally
+                {
+                    completionHandler();
+                }
             }
         }
 
         public static void initialize()
         {
+            if (isInitializing
+                || isInitialized)
+            {
+                return;
+            }
+
+            isInitializing = true;
             OneSignal.Debug.LogLevel = LogLevel.WARN;
             OneSignal.Debug.AlertLevel = LogLevel.NONE;
-
+            UNUserNotificationCenter.Current.Delegate = new NotificationDelegate();
             OneSignal.Initialize(SPIXI.Meta.Config.oneSignalAppId);
 
-            OneSignal.Notifications.RequestPermissionAsync(true);
 
-            OneSignal.Notifications.Clicked += handleNotificationOpened;
-            OneSignal.Notifications.WillDisplay += handleNotificationReceived;
+            OneSignal.Notifications.RequestPermissionAsync(true).ContinueWith(task =>
+            {
+                if (task.IsFaulted)
+                {
+                    Logging.error("RequestPermissionAsync failed: {0}", task.Exception?.Flatten().InnerException?.Message);
+                }
+                else if (task.IsCanceled)
+                {
+                    Logging.warn("RequestPermissionAsync was canceled.");
+                }
+                else
+                {
+                    Logging.info("RequestPermissionAsync succeeded.");
+                }
+
+                OneSignal.Notifications.Clicked += handleNotificationOpened;
+                OneSignal.Notifications.WillDisplay += handleNotificationReceived;
+
+                isInitialized = true;
+
+                if (clearNotificationsAfterInit)
+                {
+                    clearNotificationsAfterInit = false;
+                    clearNotifications();
+                }
+            });
         }
 
         public static void setTag(string tag)
@@ -55,8 +92,24 @@ public static void setTag(string tag)
 
         public static void clearNotifications()
         {
+            if (!isInitialized)
+            {
+                clearNotificationsAfterInit = true;
+                Logging.warn("Cannot clear notifications, OneSignal is not initialized yet.");
+                return;
+            }
+
             MainThread.BeginInvokeOnMainThread(() =>
             {
+                try
+                {
+                    OneSignalNative.Notifications.ClearAll();
+                    UNUserNotificationCenter.Current.RemoveAllDeliveredNotifications();
+                }
+                catch (Exception e)
+                {
+                    Logging.error("Exception while clearing all notifications: {0}.", e);
+                }
                 if (UIDevice.CurrentDevice.CheckSystemVersion(16, 0))
                 {
                     // For iOS 16+, use UNUserNotificationCenter
@@ -96,7 +149,6 @@ public static void showLocalNotification(string title, string message, string da
 
                 var trigger = UNTimeIntervalNotificationTrigger.CreateTrigger(0.25, false);
                 var request = UNNotificationRequest.FromIdentifier(data, content, trigger);
-                UNUserNotificationCenter.Current.Delegate = new NotificationDelegate();
 
                 UNUserNotificationCenter.Current.AddNotificationRequest(request, (err) =>
                 {

Spixi/Spixi.csproj

@@ -223,7 +223,7 @@
 		<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
 		<PackageReference Include="CommunityToolkit.Maui" Version="9.1.1" />
 		<PackageReference Include="Concentus" Version="2.2.2" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.100" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.93" />
 		<PackageReference Include="NAudio" Version="2.2.1" Condition="$(TargetFramework.Contains('-windows'))"></PackageReference>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="OneSignalSDK.DotNet" Version="5.2.1" />
@@ -387,7 +387,7 @@
 	</ProjectExtensions>
 
 	<ItemGroup>
-	  <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
+	  <PackageReference Update="Microsoft.Maui.Controls.Compatibility" Version="8.0.93" />
 	</ItemGroup>
 
 	<!-- Fix for https://github.com/dotnet/runtime/issues/96872 -->