Cleanup.

Author: SebastianStehle

sample/Sample.Android/MainActivity.cs

@@ -10,6 +10,7 @@
 using Android.Content.PM;
 using Android.OS;
 using Android.Runtime;
+using Notifo.SDK;
 using Notifo.SDK.FirebasePlugin;
 using Prism;
 using Prism.Ioc;
@@ -30,13 +31,13 @@ protected override void OnCreate(Bundle savedInstanceState)
             global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
             LoadApplication(new App(new AndroidInitializer()));
 
-            NotifoFirebasePlugin.ProcessIntent(this, Intent);
+            NotifoIO.Current.ProcessIntent(this, Intent);
         }
 
         protected override void OnNewIntent(Intent intent)
         {
             base.OnNewIntent(intent);
-            NotifoFirebasePlugin.ProcessIntent(this, intent);
+            NotifoIO.Current.ProcessIntent(this, intent);
         }
 
         public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults)

sample/Sample.Android/MainApplication.cs

@@ -9,6 +9,7 @@
 using Android.App;
 using Android.OS;
 using Android.Runtime;
+using Notifo.SDK;
 using Notifo.SDK.FirebasePlugin;
 using Plugin.FirebasePushNotification;
 
@@ -31,11 +32,15 @@ public override void OnCreate()
                 FirebasePushNotificationManager.DefaultNotificationChannelId = "FirebasePushNotificationChannel";
                 FirebasePushNotificationManager.DefaultNotificationChannelName = "General";
             }
+
+            var resetToken = false;
 #if DEBUG
-            NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), new NotificationHandler(), resetToken: true);
-#else
-            NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), new NotificationHandler(), resetToken: false);
+            resetToken = true;
 #endif
+            NotifoIO.Current
+                .SetNotificationHandler(new NotificationHandler())
+                .UseDefaults()
+                .UseFirebasePluginEventsProvider(this, resetToken: resetToken);
         }
     }
 }

sample/Sample.iOS/AppDelegate.cs

@@ -7,6 +7,7 @@
 
 using System;
 using Foundation;
+using Notifo.SDK;
 using Notifo.SDK.FirebasePlugin;
 using Prism;
 using Prism.Ioc;
@@ -26,33 +27,39 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary
             global::Xamarin.Forms.Forms.Init();
             LoadApplication(new App(new iOSInitializer()));
 
-            NotifoFirebasePlugin.Initialize(launchOptions, new NotifoStartup(), new NotificationHandler(), true);
+            NotifoIO.Current
+                .SetNotificationHandler(new NotificationHandler())
+                .UseDefaults()
+                .UseFirebasePluginEventsProvider(launchOptions, true);
+
             UNUserNotificationCenter.Current.Delegate = this;
 
             return base.FinishedLaunching(uiApplication, launchOptions);
         }
 
         public override void RegisteredForRemoteNotifications(UIApplication application, NSData deviceToken)
         {
-            NotifoFirebasePlugin.DidRegisterRemoteNotifications(deviceToken);
+            NotifoIO.Current.DidRegisterRemoteNotifications(deviceToken);
         }
 
         public override void FailedToRegisterForRemoteNotifications(UIApplication application, NSError error)
         {
-            NotifoFirebasePlugin.RemoteNotificationRegistrationFailed(error);
+            NotifoIO.Current.RemoteNotificationRegistrationFailed(error);
         }
 
 #pragma warning disable RECS0165 // Asynchronous methods should return a Task instead of void
         public override async void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo, Action<UIBackgroundFetchResult> completionHandler)
 #pragma warning restore RECS0165 // Asynchronous methods should return a Task instead of void
         {
-            await NotifoFirebasePlugin.DidReceiveMessageAsync(userInfo);
+            await NotifoIO.Current.DidReceiveMessageAsync(userInfo);
             completionHandler(UIBackgroundFetchResult.NewData);
         }
 
         [Export("userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:")]
-        public void DidReceiveNotificationResponse(UNUserNotificationCenter center, UNNotificationResponse response, Action completionHandler) =>
-            NotifoFirebasePlugin.DidReceiveNotificationResponse(center, response, completionHandler);
+        public void DidReceiveNotificationResponse(UNUserNotificationCenter center, UNNotificationResponse response, Action completionHandler)
+        {
+            NotifoIO.Current.DidReceiveNotificationResponse(center, response, completionHandler);
+        }
 
 #pragma warning disable SA1300 // Element should begin with upper-case letter
 #pragma warning disable IDE1006 // Naming Styles

sample/Sample/NotifoStartup.cs

@@ -11,19 +11,21 @@
 
 namespace Sample
 {
-    public class NotifoStartup : INotifoStartup
+    public static class NotifoStartup
     {
-        public void ConfigureService(INotifoMobilePush notifo)
+        public static INotifoMobilePush UseDefaults(this INotifoMobilePush notifo)
         {
             notifo
                 .SetSharedName("notifo.Sample")
                 .SetBaseUrl(Constants.ApiUrl)
                 .UseFirebasePluginEventsProvider();
 
             notifo.OnNotificationOpened += Current_OnNotificationOpened;
+
+            return notifo;
         }
 
-        private void Current_OnNotificationOpened(object source, NotificationEventArgs e)
+        private static void Current_OnNotificationOpened(object source, NotificationEventArgs e)
         {
             Device.BeginInvokeOnMainThread(() =>
             {

sample/Sample/Sample.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<ImplicitUsings>enable</ImplicitUsings>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>

sample/Sample/ViewModels/EventsPageViewModel.cs

@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System;
 using System.Diagnostics;
 using MvvmHelpers;
 using Notifo.SDK;

sample/SampleNotificationServiceExtension/NotificationService.cs

@@ -37,7 +37,7 @@ public override async void DidReceiveNotificationRequest(UNNotificationRequest r
 				.SetSharedName("notifo.Sample")
 				.SetNotificationHandler(new NotificationHandler());
 
-			await NotifoIO.DidReceiveNotificationRequestAsync(request, BestAttemptContent);
+			await NotifoIO.Current.DidReceiveNotificationRequestAsync(request, BestAttemptContent);
 
 			// Display the notification.
 			ContentHandler(BestAttemptContent);

sdk/Notifo.SDK.FirebasePlugin/Notifo.SDK.FirebasePlugin.csproj

@@ -40,7 +40,7 @@
     <None Include="**\*.netstandard.cs" />
     <None Include="**\*.android.cs" />
   </ItemGroup>
-
+	
   <ItemGroup>
 	<PackageReference Include="Notifo.SDK" Version="1.7.3" />
   </ItemGroup>

sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.android.cs renamed to sdk/Notifo.SDK.FirebasePlugin/NotifoMobilePushExtensions.android.cs

@@ -9,38 +9,50 @@
 using Android.Content;
 using Plugin.FirebasePushNotification;
 using Notifo.SDK;
+using System;
+using System.Threading;
+using Notifo.SDK.NotifoMobilePush;
+using Notifo.SDK.PushEventProvider;
 
 namespace Notifo.SDK.FirebasePlugin;
 
 /// <summary>
-/// Plugin initialization.
+/// The <see cref="INotifoMobilePush"/> extension methods.
 /// </summary>
-public class NotifoFirebasePlugin
+public static partial class NotifoMobilePushExtensions
 {
+    private static bool isAndroidHandlerRegistered;
+
     /// <summary>
-    /// Initializes the firebase plugin.
+    /// Use the firebase plugin as the push events provider.
     /// </summary>
+    /// <param name="notifo">The <see cref="INotifoMobilePush"/> instance.</param>
     /// <param name="context">The current application context.</param>
-    /// <param name="notifoStartup">The <see cref="INotifoStartup"/> implementation.</param>
-    /// <param name="notificationHandler">The <see cref="INotificationHandler"/> implementation.</param>
     /// <param name="resetToken">Set to <see langword="true"/> while debugging.</param>
     /// <param name="autoRegistration">Automatically register for push notifications.</param>
-    public static void Initialize(Context context, INotifoStartup notifoStartup, INotificationHandler notificationHandler = null, bool resetToken = false, bool autoRegistration = true)
+    /// <returns>The current instance.</returns>
+    public static INotifoMobilePush UseFirebasePluginEventsProvider(this INotifoMobilePush notifo, Context context, bool resetToken = false, bool autoRegistration = true)
     {
+        if (isAndroidHandlerRegistered)
+        {
+            return notifo;
+        }
+
         FirebasePushNotificationManager.Initialize(context, new NotifoPushNotificationHandler(), resetToken, createDefaultNotificationChannel: true, autoRegistration);
+        isAndroidHandlerRegistered = true;
 
-        NotifoIO.Current.SetNotificationHandler(notificationHandler);
-        notifoStartup.ConfigureService(NotifoIO.Current);
+        return notifo.UseFirebasePluginEventsProvider();
     }
 
     /// <summary>
     /// Method for processing open notification intent.
     /// </summary>
+    /// <param name="notifo">The <see cref="INotifoMobilePush"/> instance.</param>
     /// <param name="activity">The current activity.</param>
     /// <param name="intent">The intent for processing.</param>
-    public static void ProcessIntent(Activity activity, Intent intent)
+    public static void ProcessIntent(this INotifoMobilePush notifo, Activity activity, Intent intent)
     {
+        notifo.UseFirebasePluginEventsProvider();
         FirebasePushNotificationManager.ProcessIntent(activity, intent, enableDelayedResponse: true);
-        NotifoIO.Current.UseFirebasePluginEventsProvider();
     }
 }

sdk/Notifo.SDK.FirebasePlugin/NotifoMobilePushExtensions.cs

@@ -15,18 +15,25 @@ namespace Notifo.SDK.FirebasePlugin;
 /// <summary>
 /// The <see cref="INotifoMobilePush"/> extension methods.
 /// </summary>
-public static class NotifoMobilePushExtensions
+public static partial class NotifoMobilePushExtensions
 {
-    private static readonly Lazy<IPushEventsProvider> CurrentPluginEventsProvider =
-        new Lazy<IPushEventsProvider>(() => new PluginEventsProvider(), LazyThreadSafetyMode.PublicationOnly);
+    private static bool isHandlerRegistered;
 
     /// <summary>
     /// Use the firebase plugin as the push events provider.
     /// </summary>
-    /// <param name="notifoMobilePush">The <see cref="INotifoMobilePush"/> instance.</param>
+    /// <param name="notifo">The <see cref="INotifoMobilePush"/> instance.</param>
     /// <returns>The current instance.</returns>
-    public static INotifoMobilePush UseFirebasePluginEventsProvider(this INotifoMobilePush notifoMobilePush)
+    public static INotifoMobilePush UseFirebasePluginEventsProvider(this INotifoMobilePush notifo)
     {
-        return notifoMobilePush.SetPushEventsProvider(CurrentPluginEventsProvider.Value);
+        if (isHandlerRegistered)
+        {
+            return notifo;
+        }
+
+        notifo.SetPushEventsProvider(new PluginEventsProvider());
+        isHandlerRegistered = true;
+
+        return notifo;
     }
 }