Merge branch 'dev'

shinyorg · Apr 8, 2024 · 854b47b · 854b47b
2 parents 659b846 + bf02b88
commit 854b47b
Show file tree

Hide file tree

Showing 7 changed files with 136 additions and 73 deletions.
diff --git a/src/Shiny.Core/Platforms/Android/AndroidPlatform.cs b/src/Shiny.Core/Platforms/Android/AndroidPlatform.cs
@@ -49,6 +49,7 @@ public AndroidPlatform()
         this.requestedPermissions = this.store.Get<List<string>>(PermissionsKey) ?? new List<string>();
     }
 
+
     public AccessState GetCurrentPermissionStatus(string androidPermission)
     {
         var self = ContextCompat.CheckSelfPermission(this.AppContext, androidPermission);
@@ -164,6 +165,14 @@ public void StopService(Type serviceType)
     //    return result == Permission.Granted ? AccessState.Available : AccessState.Denied;
     //}
 
+    public int GetDrawableByName(string name) => this
+        .AppContext
+        .Resources!
+        .GetIdentifier(
+            name,
+            "drawable",
+            this.AppContext.PackageName
+        );
 
     public IObservable<AccessState> RequestAccess(string androidPermissions)
         => this.RequestPermissions(new[] { androidPermissions }).Select(x => x.IsSuccess() ? AccessState.Available : AccessState.Denied);

diff --git a/src/Shiny.Push.FirebaseMessaging/FirebaseConfiguration.cs b/src/Shiny.Push.FirebaseMessaging/FirebaseConfiguration.cs
@@ -1,4 +1,7 @@
 using System;
+#if ANDROID
+using Android.App;
+#endif
 
 namespace Shiny.Push;
 
@@ -13,16 +16,14 @@ public record FirebaseConfiguration(
     string? SenderId = null,
     string? ProjectId = null,
     string? ApiKey = null
+
+#if ANDROID
+    , NotificationChannel? DefaultChannel = null
+    , string? IntentAction = null
+#endif
 )
 {
     public static FirebaseConfiguration Embedded { get; } = new(true);
-    public static FirebaseConfiguration FromValues(string apiId, string senderId, string projectId, string apiKey)
-    {
-        var cfg = new FirebaseConfiguration(false, apiId, senderId, projectId, apiKey);
-        cfg.AssertValid();
-        return cfg;
-    }
-
 
     public void AssertValid()
     {

diff --git a/src/Shiny.Push.FirebaseMessaging/Platforms/Shared/ServiceCollectionExtensions.cs b/src/Shiny.Push.FirebaseMessaging/Platforms/Shared/ServiceCollectionExtensions.cs
@@ -20,11 +20,14 @@ public static IServiceCollection AddPushFirebaseMessaging(this IServiceCollectio
         }
         else
         {
-            services.AddPush(FirebaseConfig.FromValues(
+            services.AddPush(new FirebaseConfig(
+                false,
                 config.AppId,
                 config.SenderId,
                 config.ProjectId,
-                config.ApiKey
+                config.ApiKey,
+                config.DefaultChannel,
+                config.IntentAction
             ));
         }
 #endif

diff --git a/src/Shiny.Push/Platforms/Android/AndroidPushNotification.cs b/src/Shiny.Push/Platforms/Android/AndroidPushNotification.cs
@@ -0,0 +1,95 @@
+using Android.App;
+using Android.Content;
+using AndroidX.Core.App;
+using Firebase.Messaging;
+
+namespace Shiny.Push;
+
+
+public record AndroidPushNotification(
+    Notification? Notification,
+    RemoteMessage NativeMessage,
+    FirebaseConfig Config,
+    AndroidPlatform Platform
+) : PushNotification(NativeMessage.Data, Notification)
+{
+
+    public NotificationCompat.Builder CreateBuilder()
+    {
+        var not = this.NativeMessage.GetNotification();
+        var channelId = not.ChannelId ?? this.Config.DefaultChannel?.Id;
+        var builder = new NotificationCompat.Builder(this.Platform.AppContext, channelId!)!;
+
+        if (not != null)
+        {
+            // TODO: config OR click_action
+            var intent = new Intent(not.ClickAction ?? ShinyPushIntents.NotificationClickAction);
+            var pendingIntent = PendingIntent.GetActivity(
+                this.Platform.AppContext,
+                99,
+                intent,
+                PendingIntentFlags.OneShot | PendingIntentFlags.Immutable
+            );
+
+            builder
+                .SetContentTitle(not.Title)
+                .SetContentIntent(pendingIntent);
+
+            if (!not.Body.IsEmpty())
+                builder.SetContentText(not.Body);
+
+            if (!not.Ticker.IsEmpty())
+                builder.SetTicker(not.Ticker);
+
+            if (not.Icon.IsEmpty())
+            {
+                var id = this.Platform.GetDrawableByName("notification");
+                if (id > 0)
+                {
+                    builder.SetSmallIcon(id);
+                }
+                else if (this.Platform.AppContext.ApplicationInfo!.Icon > 0)
+                {
+                    builder.SetSmallIcon(this.Platform.AppContext.ApplicationInfo!.Icon);
+                }
+            }
+            else
+            {
+                var drawableId = this.Platform.GetDrawableByName(not.Icon);
+                builder.SetSmallIcon(drawableId);
+            }
+
+            if (!not.Color.IsEmpty())
+            {
+                var colorId = this.Platform
+                    .AppContext
+                    .Resources!
+                    .GetIdentifier(
+                        not.Color,
+                        "color",
+                        this.Platform.AppContext.PackageName
+                    );
+
+                builder.SetColor(colorId);
+            }
+        }
+        return builder;
+    }
+
+
+    public void Notify(int notificationId, NotificationCompat.Builder builder)
+    {
+        using var service = this.Platform.GetSystemService<NotificationManager>(Context.NotificationService);
+        service.Notify(notificationId, builder.Build());
+    }
+
+
+    /// <summary>
+    /// This will create the default builder and send it
+    /// </summary>
+    public void SendDefault(int notificationId)
+    {
+        var builder = this.CreateBuilder();
+        this.Notify(notificationId, builder);
+    }
+}
diff --git a/src/Shiny.Push/Platforms/Android/PushManager.cs b/src/Shiny.Push/Platforms/Android/PushManager.cs
@@ -80,7 +80,7 @@ void TryCreateConfiguredChannel()
         if (this.config.DefaultChannel == null)
             return;
 
-        var nativeManager = this.platform.GetSystemService<NotificationManager>(Context.NotificationService);
+        using var nativeManager = this.platform.GetSystemService<NotificationManager>(Context.NotificationService);
         var channel = nativeManager.GetNotificationChannel(this.config.DefaultChannel.Id);
         if (channel != null)
             nativeManager.DeleteNotificationChannel(channel.Id);
@@ -174,11 +174,12 @@ await this.services
     }
 
 
-    public void ActivityOnCreate(Activity activity, Bundle? savedInstanceState) => this.Handle(activity, activity.Intent);
+    public void ActivityOnCreate(Activity activity, Bundle? savedInstanceState)
+        => this.Handle(activity, activity.Intent);
 
-    public void Handle(Activity activity, Intent intent)
+    public void Handle(Activity activity, Intent? intent)
     {
-        var intentAction = this.config.IntentAction; //?? ShinyPushIntents.NotificationClickAction;
+        var intentAction = this.config.IntentAction ?? ShinyPushIntents.NotificationClickAction;
         var clickAction = intent?.Action?.Equals(intentAction, StringComparison.InvariantCultureIgnoreCase) ?? false;
         if (!clickAction)
             return;
@@ -250,10 +251,12 @@ void DoInit()
             if (this.NativeRegistrationToken == token || this.registrationRequest)
                 return;
 
-            var regToken = await this.provider.Register(token);
+            this.NativeRegistrationToken = token;
+            this.RegistrationToken = await this.provider.Register(token);
+            
             await this.services
                 .RunDelegates<IPushDelegate>(
-                    x => x.OnNewToken(regToken),
+                    x => x.OnNewToken(this.RegistrationToken),
                     this.logger
                 )
                 .ConfigureAwait(false);
@@ -268,15 +271,17 @@ await this.services
 
                 if (native != null)
                 {
-                    //native.ChannelId
-                    //native.ImageUrl
                     notification = new Notification(
                         native.Title,
                         native.Body
                     );
-                    //this.TryTriggerNotification(msg);
                 }
-                var push = new PushNotification(msg.Data, notification);
+                var push = new AndroidPushNotification(
+                    notification,
+                    msg,
+                    this.config,
+                    this.platform
+                );
                 await this.services
                     .RunDelegates<IPushDelegate>(
                         x => x.OnReceived(push),
@@ -309,56 +314,4 @@ bool IsFirebaseAappAlreadyInitialized()
 
         return isAppInitialized;
     }
-
-
-    //    protected virtual void TryTriggerNotification(RemoteMessage message)
-    //    {
-    //        try
-    //        {
-    //            var notification = message.GetNotification();
-    //            var intent = new Intent(notification.ClickAction ?? ShinyIntents.NotificationClickAction);
-
-    //            if (message.Data != null)
-    //            {
-    //                foreach (var data in message.Data)
-    //                    intent.PutExtra(data.Key, data.Value);
-    //            }
-
-    //            var pendingIntent = PendingIntent.GetActivity(this.platform.AppContext, 99, intent, PendingIntentFlags.Mutable);
-
-    //            var builder = new NotificationCompat
-    //                .Builder(
-    //                    this.platform.AppContext,
-    //                    notification.ChannelId ?? Channel.Default.Identifier
-    //                )
-    //                .SetAutoCancel(true)
-    //                .SetSilent(false)
-    //                .SetSmallIcon(this.platform.GetSmallIconResource(notification.Icon))
-    //                .SetContentIntent(pendingIntent)
-    //                .SetContentTitle(notification.Title);
-
-    //            if (!notification.Ticker.IsEmpty())
-    //                builder.SetTicker(notification.Ticker);
-
-    //            if (!notification.Body.IsEmpty())
-    //                builder.SetContentText(notification.Body);
-
-    //            ///this.platform.TrySetImage(notification.ImageUrl, builder);
-
-    //            if (!notification.Color.IsEmpty())
-    //            {
-    //                var color = this.platform.GetColorResourceId(notification.Color);
-    //                builder.SetColor(color);
-    //            }
-
-    //            var notificationId = this.settings.IncrementValue("NotificationId");
-    //            this.platform
-    //                .GetSystemService<NotificationManager>(Context.NotificationService)
-    //                .Notify(notificationId, builder.Build());
-    //        }
-    //        catch (Exception ex)
-    //        {
-    //            this.logger.LogError("Error processing foreground remote notification", ex);
-    //        }
-    //    }
 }
diff --git a/src/Shiny.Push/Platforms/Apple/PushManager.cs b/src/Shiny.Push/Platforms/Apple/PushManager.cs
@@ -209,7 +209,9 @@ public void OnWillPresentNotification(UNNotification notification, Action<UNNoti
 
                 this.platform.InvokeOnMainThread(() =>
                     completionHandler.Invoke(
-                        options ?? UNNotificationPresentationOptions.List | UNNotificationPresentationOptions.Banner
+                        options ??
+                        UNNotificationPresentationOptions.List |
+                        UNNotificationPresentationOptions.Banner
                     )
                 );
             }

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "3.3.1-beta.{height}",
+  "version": "3.3.3-beta.{height}",
   "assemblyVersion": {
     "precision": "revision"
   },