Massive improvements.

SebastianStehle · SebastianStehle · commit e27dec146870 · 2022-09-16T17:55:14.000+02:00
diff --git a/sdk/Notifo.SDK.FirebasePlugin/Notifo.SDK.FirebasePlugin.csproj b/sdk/Notifo.SDK.FirebasePlugin/Notifo.SDK.FirebasePlugin.csproj
@@ -7,20 +7,13 @@
     <RootNamespace>Notifo.SDK.FirebasePlugin</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="logo-squared.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <CodeAnalysisRuleSet>..\..\Notifo.ruleset</CodeAnalysisRuleSet>
     <AssemblyName>Notifo.Xamarin.FirebasePlugin</AssemblyName>
-  <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
+    <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
   </PropertyGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
+    <None Include="logo-squared.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -46,15 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Notifo.SDK" Version="1.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
-    <PackageReference Include="RefactoringEssentials" Version="5.6.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0.1" />
     <PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0.1" />
     <PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0.1" />
diff --git a/sdk/Notifo.SDK.FirebasePlugin/NotifoPushNotificationHandler.android.cs b/sdk/Notifo.SDK.FirebasePlugin/NotifoPushNotificationHandler.android.cs
@@ -29,7 +29,7 @@ public override void OnReceived(IDictionary<string, object> parameters)
         {
             Log.Debug(Strings.ReceivedNotification, parameters);
 
-            var notification = new NotificationDto()
+            var notification = new UserNotificationDto()
                 .FromDictionary(new Dictionary<string, object>(parameters));
 
             if (notification.Silent)
@@ -48,7 +48,7 @@ public override void OnReceived(IDictionary<string, object> parameters)
 
         public override void OnBuildNotification(NotificationCompat.Builder notificationBuilder, IDictionary<string, object> parameters)
         {
-            var notification = new NotificationDto()
+            var notification = new UserNotificationDto()
                 .FromDictionary(new Dictionary<string, object>(parameters));
 
             notifoMobilePush.OnBuildNotification(notificationBuilder, notification);
diff --git a/sdk/Notifo.SDK.FirebasePlugin/PluginEventsProvider.cs b/sdk/Notifo.SDK.FirebasePlugin/PluginEventsProvider.cs
@@ -7,6 +7,8 @@
 
 using System;
 using System.Collections.Generic;
+using Notifo.SDK;
+using Notifo.SDK.Extensions;
 using Notifo.SDK.PushEventProvider;
 using Plugin.FirebasePushNotification;
 
@@ -45,7 +47,9 @@ private void FirebasePushNotification_OnNotificationReceived(object source, Fire
                 return;
             }
 
-            var args = new NotificationEventArgs(new Dictionary<string, object>(e.Data));
+            var args = new NotificationEventArgs(
+                new UserNotificationDto().FromDictionary(new Dictionary<string, object>(e.Data)));
+
             OnNotificationReceivedEvent(args);
         }
 
@@ -61,7 +65,9 @@ private void FirebasePushNotification_OnNotificationOpened(object source, Fireba
                 return;
             }
 
-            var args = new NotificationEventArgs(new Dictionary<string, object>(e.Data));
+            var args = new NotificationEventArgs(
+                new UserNotificationDto().FromDictionary(new Dictionary<string, object>(e.Data)));
+
             OnNotificationOpenedEvent(args);
         }
 
diff --git a/sdk/Notifo.SDK/CommandQueue/DefaultCommandQueue.cs b/sdk/Notifo.SDK/CommandQueue/DefaultCommandQueue.cs
@@ -9,6 +9,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Notifo.SDK.CommandQueue
@@ -18,19 +19,21 @@ internal sealed class DefaultCommandQueue : ICommandQueue
         private readonly ICommandStore commandStore;
         private readonly ICommandTrigger[] commandTriggers;
         private readonly int maxRetries;
+        private readonly TimeSpan timeout;
         private readonly Task task;
         private readonly BlockingCollection<QueuedCommand> queue = new BlockingCollection<QueuedCommand>();
         private readonly Queue<QueuedCommand> retryQueue = new Queue<QueuedCommand>();
 
         public DefaultCommandQueue(
             ICommandStore commandStore,
             ICommandTrigger[] commandTriggers,
-            int maxRetries)
+            int maxRetries,
+            TimeSpan timeout)
         {
             this.commandStore = commandStore;
             this.commandTriggers = commandTriggers;
             this.maxRetries = maxRetries;
-
+            this.timeout = timeout;
             foreach (var trigger in commandTriggers)
             {
                 trigger.Start(this);
@@ -105,7 +108,10 @@ private async Task RunAsync()
                 {
                     try
                     {
-                        await enqueued.Command.ExecuteAsync();
+                        using (var cts = new CancellationTokenSource(timeout))
+                        {
+                            await enqueued.Command.ExecuteAsync(cts.Token);
+                        }
 
                         // We have completed the command successfully, so we can remove it here.
                         await commandStore.RemoveAsync(enqueued.CommandId);
diff --git a/sdk/Notifo.SDK/CommandQueue/ICommand.cs b/sdk/Notifo.SDK/CommandQueue/ICommand.cs
@@ -5,13 +5,15 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace Notifo.SDK.CommandQueue
 {
     internal interface ICommand
     {
-        ValueTask ExecuteAsync();
+        ValueTask ExecuteAsync(
+            CancellationToken ct);
 
         bool Merge(ICommand other);
     }
diff --git a/sdk/Notifo.SDK/INotifoStartup.cs b/sdk/Notifo.SDK/INotifoStartup.cs
@@ -5,8 +5,6 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-using Notifo.SDK.NotifoMobilePush;
-
 namespace Notifo.SDK
 {
     /// <summary>
diff --git a/sdk/Notifo.SDK/NotifoIO.shared.cs b/sdk/Notifo.SDK/NotifoIO.shared.cs
@@ -41,7 +41,7 @@ private static INotifoMobilePush SetupNotifoMobilePush()
                     new TriggerPeriodically(TimeSpan.FromMinutes(10), CrossConnectivity.Current),
                     new TriggerWhenConnected(CrossConnectivity.Current)
                 },
-                10);
+                10, TimeSpan.FromSeconds(5));
 
             return new NotifoMobilePushImplementation(HttpClientFactory, settings, commandQueue);
         }
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/TokenRegisterCommand.cs b/sdk/Notifo.SDK/NotifoMobilePush/TokenRegisterCommand.cs
@@ -6,6 +6,7 @@
 // ==========================================================================
 
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Notifo.SDK.CommandQueue;
 using Notifo.SDK.Resources;
@@ -20,7 +21,8 @@ internal sealed class TokenRegisterCommand : ICommand
 
         public string Token { get; set; }
 
-        public async ValueTask ExecuteAsync()
+        public async ValueTask ExecuteAsync(
+            CancellationToken ct)
         {
             refreshCount++;
 
@@ -45,7 +47,7 @@ public async ValueTask ExecuteAsync()
                     request.DeviceType = MobileDeviceType.IOS;
                 }
 
-                await NotifoIO.Current.MobilePush.PostMyTokenAsync(request);
+                await NotifoIO.Current.MobilePush.PostMyTokenAsync(request, ct);
             }
             catch (Exception ex)
             {
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/TokenUnregisterCommand.cs b/sdk/Notifo.SDK/NotifoMobilePush/TokenUnregisterCommand.cs
@@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System.Threading;
 using System.Threading.Tasks;
 using Notifo.SDK.CommandQueue;
 
@@ -14,9 +15,10 @@ internal sealed class TokenUnregisterCommand : ICommand
     {
         public string Token { get; set; }
 
-        public async ValueTask ExecuteAsync()
+        public async ValueTask ExecuteAsync(
+            CancellationToken ct)
         {
-            await NotifoIO.Current.MobilePush.DeleteMyTokenAsync(Token);
+            await NotifoIO.Current.MobilePush.DeleteMyTokenAsync(Token, ct);
         }
 
         public bool Merge(ICommand other)
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/TrackSeenCommand.cs b/sdk/Notifo.SDK/NotifoMobilePush/TrackSeenCommand.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Notifo.SDK.CommandQueue;
 using Notifo.SDK.Resources;
@@ -20,7 +21,8 @@ internal sealed class TrackSeenCommand : ICommand
 
         public string Token { get; set; }
 
-        public async ValueTask ExecuteAsync()
+        public async ValueTask ExecuteAsync(
+            CancellationToken ct)
         {
             try
             {
@@ -30,7 +32,7 @@ public async ValueTask ExecuteAsync()
                     DeviceIdentifier = Token
                 };
 
-                await NotifoIO.Current.Notifications.ConfirmMeAsync(trackUserNotificationDto);
+                await NotifoIO.Current.Notifications.ConfirmMeAsync(trackUserNotificationDto, ct);
             }
             catch (Exception ex)
             {
diff --git a/sdk/Notifo.SDK/Services/ISettings.cs b/sdk/Notifo.SDK/Services/ISettings.cs

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public override void OnReceived(IDictionary<string, object> parameters)`
`29`	`29`	`{`
`30`	`30`	`Log.Debug(Strings.ReceivedNotification, parameters);`
`31`	`31`
`32`		`- var notification = new NotificationDto()`
	`32`	`+ var notification = new UserNotificationDto()`
`33`	`33`	`.FromDictionary(new Dictionary<string, object>(parameters));`
`34`	`34`
`35`	`35`	`if (notification.Silent)`
`@@ -48,7 +48,7 @@ public override void OnReceived(IDictionary<string, object> parameters)`
`48`	`48`
`49`	`49`	`public override void OnBuildNotification(NotificationCompat.Builder notificationBuilder, IDictionary<string, object> parameters)`
`50`	`50`	`{`
`51`		`- var notification = new NotificationDto()`
	`51`	`+ var notification = new UserNotificationDto()`
`52`	`52`	`.FromDictionary(new Dictionary<string, object>(parameters));`
`53`	`53`
`54`	`54`	`notifoMobilePush.OnBuildNotification(notificationBuilder, notification);`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`
`8`	`8`	`using System;`
`9`	`9`	`using System.Collections.Generic;`
	`10`	`+using Notifo.SDK;`
	`11`	`+using Notifo.SDK.Extensions;`
`10`	`12`	`using Notifo.SDK.PushEventProvider;`
`11`	`13`	`using Plugin.FirebasePushNotification;`
`12`	`14`
`@@ -45,7 +47,9 @@ private void FirebasePushNotification_OnNotificationReceived(object source, Fire`
`45`	`47`	`return;`
`46`	`48`	`}`
`47`	`49`
`48`		`- var args = new NotificationEventArgs(new Dictionary<string, object>(e.Data));`
	`50`	`+ var args = new NotificationEventArgs(`
	`51`	`+ new UserNotificationDto().FromDictionary(new Dictionary<string, object>(e.Data)));`
	`52`	`+`
`49`	`53`	`OnNotificationReceivedEvent(args);`
`50`	`54`	`}`
`51`	`55`
`@@ -61,7 +65,9 @@ private void FirebasePushNotification_OnNotificationOpened(object source, Fireba`
`61`	`65`	`return;`
`62`	`66`	`}`
`63`	`67`
`64`		`- var args = new NotificationEventArgs(new Dictionary<string, object>(e.Data));`
	`68`	`+ var args = new NotificationEventArgs(`
	`69`	`+ new UserNotificationDto().FromDictionary(new Dictionary<string, object>(e.Data)));`
	`70`	`+`
`65`	`71`	`OnNotificationOpenedEvent(args);`
`66`	`72`	`}`
`67`	`73`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,15 @@`
`5`	`5`	`// All rights reserved. Licensed under the MIT license.`
`6`	`6`	`// ==========================================================================`
`7`	`7`
	`8`	`+using System.Threading;`
`8`	`9`	`using System.Threading.Tasks;`
`9`	`10`
`10`	`11`	`namespace Notifo.SDK.CommandQueue`
`11`	`12`	`{`
`12`	`13`	`internal interface ICommand`
`13`	`14`	`{`
`14`		`- ValueTask ExecuteAsync();`
	`15`	`+ ValueTask ExecuteAsync(`
	`16`	`+ CancellationToken ct);`
`15`	`17`
`16`	`18`	`bool Merge(ICommand other);`
`17`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`// All rights reserved. Licensed under the MIT license.`
`6`	`6`	`// ==========================================================================`
`7`	`7`
`8`		`-using Notifo.SDK.NotifoMobilePush;`
`9`		`-`
`10`	`8`	`namespace Notifo.SDK`
`11`	`9`	`{`
`12`	`10`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private static INotifoMobilePush SetupNotifoMobilePush()`
`41`	`41`	`new TriggerPeriodically(TimeSpan.FromMinutes(10), CrossConnectivity.Current),`
`42`	`42`	`new TriggerWhenConnected(CrossConnectivity.Current)`
`43`	`43`	`},`
`44`		`- 10);`
	`44`	`+ 10, TimeSpan.FromSeconds(5));`
`45`	`45`
`46`	`46`	`return new NotifoMobilePushImplementation(HttpClientFactory, settings, commandQueue);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`// ==========================================================================`
`7`	`7`
`8`	`8`	`using System;`
	`9`	`+using System.Threading;`
`9`	`10`	`using System.Threading.Tasks;`
`10`	`11`	`using Notifo.SDK.CommandQueue;`
`11`	`12`	`using Notifo.SDK.Resources;`
`@@ -20,7 +21,8 @@ internal sealed class TokenRegisterCommand : ICommand`
`20`	`21`
`21`	`22`	`public string Token { get; set; }`
`22`	`23`
`23`		`- public async ValueTask ExecuteAsync()`
	`24`	`+ public async ValueTask ExecuteAsync(`
	`25`	`+ CancellationToken ct)`
`24`	`26`	`{`
`25`	`27`	`refreshCount++;`
`26`	`28`
`@@ -45,7 +47,7 @@ public async ValueTask ExecuteAsync()`
`45`	`47`	`request.DeviceType = MobileDeviceType.IOS;`
`46`	`48`	`}`
`47`	`49`
`48`		`- await NotifoIO.Current.MobilePush.PostMyTokenAsync(request);`
	`50`	`+ await NotifoIO.Current.MobilePush.PostMyTokenAsync(request, ct);`
`49`	`51`	`}`
`50`	`52`	`catch (Exception ex)`
`51`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`// All rights reserved. Licensed under the MIT license.`
`6`	`6`	`// ==========================================================================`
`7`	`7`
	`8`	`+using System.Threading;`
`8`	`9`	`using System.Threading.Tasks;`
`9`	`10`	`using Notifo.SDK.CommandQueue;`
`10`	`11`
`@@ -14,9 +15,10 @@ internal sealed class TokenUnregisterCommand : ICommand`
`14`	`15`	`{`
`15`	`16`	`public string Token { get; set; }`
`16`	`17`
`17`		`- public async ValueTask ExecuteAsync()`
	`18`	`+ public async ValueTask ExecuteAsync(`
	`19`	`+ CancellationToken ct)`
`18`	`20`	`{`
`19`		`- await NotifoIO.Current.MobilePush.DeleteMyTokenAsync(Token);`
	`21`	`+ await NotifoIO.Current.MobilePush.DeleteMyTokenAsync(Token, ct);`
`20`	`22`	`}`
`21`	`23`
`22`	`24`	`public bool Merge(ICommand other)`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`using System;`
`9`	`9`	`using System.Collections.Generic;`
	`10`	`+using System.Threading;`
`10`	`11`	`using System.Threading.Tasks;`
`11`	`12`	`using Notifo.SDK.CommandQueue;`
`12`	`13`	`using Notifo.SDK.Resources;`
`@@ -20,7 +21,8 @@ internal sealed class TrackSeenCommand : ICommand`
`20`	`21`
`21`	`22`	`public string Token { get; set; }`
`22`	`23`
`23`		`- public async ValueTask ExecuteAsync()`
	`24`	`+ public async ValueTask ExecuteAsync(`
	`25`	`+ CancellationToken ct)`
`24`	`26`	`{`
`25`	`27`	`try`
`26`	`28`	`{`
`@@ -30,7 +32,7 @@ public async ValueTask ExecuteAsync()`
`30`	`32`	`DeviceIdentifier = Token`
`31`	`33`	`};`
`32`	`34`
`33`		`- await NotifoIO.Current.Notifications.ConfirmMeAsync(trackUserNotificationDto);`
	`35`	`+ await NotifoIO.Current.Notifications.ConfirmMeAsync(trackUserNotificationDto, ct);`
`34`	`36`	`}`
`35`	`37`	`catch (Exception ex)`
`36`	`38`	`{`