no message

BlauhausTechnology · Jul 26, 2023 · c9c4cab · c9c4cab
1 parent b95e601
commit c9c4cab
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -69,17 +69,19 @@ Enter the server key in the Azure Notification Hub Google (GCM / FCM) section.
 
 Install Xamarin.Firebase.Messaging and Blauhaus.Push.Client.Maui from nuget:
 
-	<!--Project references-->
-	<ItemGroup>
-	  <ProjectReference Include="..\Lumen.Maui\Lumen.Maui.csproj" />
-	</ItemGroup>
+```xml
+<!--Project references-->
+<ItemGroup>
+	<ProjectReference Include="..\Lumen.Maui\Lumen.Maui.csproj" />
+</ItemGroup>
 
-	<!--Android packages-->
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
-		<PackageReference Include="Xamarin.Firebase.Messaging">
-			<Version>123.1.2.2</Version>
-		</PackageReference> 
-	</ItemGroup>
+<!--Android packages-->
+<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
+	<PackageReference Include="Xamarin.Firebase.Messaging">
+		<Version>123.1.2.2</Version>
+	</PackageReference> 
+</ItemGroup>
+```
 
 At the moment it also looks like we have to install Xamarin.Google.Dagger:
 https://stackoverflow.com/questions/64428377/java-lang-nosuchmethoderror-no-static-method-checkbuilderrequirement
@@ -152,7 +154,7 @@ In OnCreate, add a call to Initialize the Android handler:
 ```c#
 protected override void OnCreate(Bundle savedInstanceState)
 {
-    base.OnCreate(message);
+    base.OnCreate(savedInstanceState);
 
     AppServiceLocator.Resolve<AndroidPushNotificationHandler>()
         .Initialize(this, Intent, (NotificationManager)GetSystemService(NotificationService));

diff --git a/....Config/IPushNotificationsClientConfig.cs → .../Client/IPushNotificationsClientConfig.cs b/....Config/IPushNotificationsClientConfig.cs → .../Client/IPushNotificationsClientConfig.cs
@@ -1,4 +1,4 @@
-namespace Blauhaus.Push.Client.Config
+namespace Blauhaus.Push.Abstractions.Client
 {
     public interface IPushNotificationsClientConfig
     {

diff --git a/src/Blauhaus.Push.Client.Maui/Platforms/Android/AndroidPushNotificationHandler.cs b/src/Blauhaus.Push.Client.Maui/Platforms/Android/AndroidPushNotificationHandler.cs
@@ -17,16 +17,16 @@ public class AndroidPushNotificationHandler
         private readonly IAnalyticsLogger<AndroidPushNotificationHandler> _logger;
 
         private readonly AndroidPushNotificationsClientService _pushNotificationsService;
-        private readonly PushNotificationsClientOptions _options;
+        private readonly IPushNotificationsClientConfig _options;
 
         public AndroidPushNotificationHandler(
             IAnalyticsLogger<AndroidPushNotificationHandler> logger, 
             IPushNotificationsClientService pushNotificationsService,
-            IOptions<PushNotificationsClientOptions> options)
+            IPushNotificationsClientConfig options)
         {
             _logger = logger;
             _pushNotificationsService = (AndroidPushNotificationsClientService)pushNotificationsService;
-            _options = options.Value;
+            _options = options;
 }
 
 

diff --git a/src/Blauhaus.Push.Client.Maui/Platforms/Windows/WindowsPushNotificationHandler.cs b/src/Blauhaus.Push.Client.Maui/Platforms/Windows/WindowsPushNotificationHandler.cs
@@ -18,7 +18,7 @@ public class WindowsPushNotificationHandler
     {
 
         private readonly IAnalyticsService _analyticsService;
-        private readonly PushNotificationsClientOptions _options;
+        private readonly IPushNotificationsClientConfig _options;
         private readonly WindowsPushNotificationsClientService _pushNotificationsService;
         private bool _appIsActive;
         private static bool _appIsInitialized;
@@ -27,11 +27,11 @@ public class WindowsPushNotificationHandler
         public WindowsPushNotificationHandler(
             IAnalyticsService analyticsService, 
             IPushNotificationsClientService pushNotificationsService,
-            IOptions<PushNotificationsClientOptions> options)
+            IPushNotificationsClientConfig options)
         {
             _pushNotificationsService = (WindowsPushNotificationsClientService)pushNotificationsService;
             _analyticsService = analyticsService;
-            _options = options.Value;
+            _options = options;
         }
 
         public async Task InitializeAsync(Window currentWindow)

diff --git a/src/Blauhaus.Push.Client.Maui/Platforms/iOS/IosPushNotificationsHandler.cs b/src/Blauhaus.Push.Client.Maui/Platforms/iOS/IosPushNotificationsHandler.cs
@@ -16,17 +16,17 @@ namespace Blauhaus.Push.Client.Maui
     public class IosPushNotificationHandler
     {
         private readonly IAnalyticsService _analyticsService;
-        private readonly PushNotificationsClientOptions _options;
+        private readonly IPushNotificationsClientConfig _options;
         private readonly IosPushNotificationsClientService _pushNotificationsService;
 
         public IosPushNotificationHandler(
             IAnalyticsService analyticsService, 
             IPushNotificationsClientService pushNotificationsService,
-            IOptions<PushNotificationsClientOptions> options)
+            IPushNotificationsClientConfig options)
         {
             _pushNotificationsService = (IosPushNotificationsClientService) pushNotificationsService;
             _analyticsService = analyticsService;
-            _options = options.Value;
+            _options = options;
         }
 
 

diff --git a/src/Blauhaus.Push.Client/.Config/ConfigurationPushNotificationsClientConfig.cs b/src/Blauhaus.Push.Client/.Config/ConfigurationPushNotificationsClientConfig.cs
@@ -1,4 +1,5 @@
 using Blauhaus.Common.Configuration.Extensions;
+using Blauhaus.Push.Abstractions.Client;
 using Microsoft.Extensions.Configuration;
 
 namespace Blauhaus.Push.Client.Config

diff --git a/src/Blauhaus.Push.Client/.Config/PushNotificationsClientConfig.cs b/src/Blauhaus.Push.Client/.Config/PushNotificationsClientConfig.cs
@@ -1,4 +1,6 @@
-namespace Blauhaus.Push.Client.Config
+using Blauhaus.Push.Abstractions.Client;
+
+namespace Blauhaus.Push.Client.Config
 {
     public class PushNotificationsClientConfig : IPushNotificationsClientConfig
     {

diff --git a/src/Blauhaus.Push.Client/.Ioc/ServiceCollectionExtensions.cs b/src/Blauhaus.Push.Client/.Ioc/ServiceCollectionExtensions.cs
@@ -29,11 +29,7 @@ public static IServiceCollection AddPushNotificationsClient<TPushNotificationHan
             return services
                 .AddSingleton<TPushNotificationHandler>()
                 .AddSingleton<IPushNotificationTapHandler>(sp => sp.GetRequiredService<TPushNotificationHandler>())
-                .AddSingleton<IPushNotificationsClientConfig>(new PushNotificationsClientConfig
-                {
-                    NotificationHubName = configuration.GetRequiredString("PushNotifications", nameof(IPushNotificationsClientConfig.NotificationHubName)),
-                    ConnectionString = configuration.GetRequiredString("PushNotifications", nameof(IPushNotificationsClientConfig.ConnectionString)),
-                });
+                .AddSingleton<IPushNotificationsClientConfig, ConfigurationPushNotificationsClientConfig>();
         }
 
         private static IServiceCollection AddClient<TConfig, THandler>(this IServiceCollection services) 

diff --git a/src/Blauhaus.Push.Client/Blauhaus.Push.Client.csproj b/src/Blauhaus.Push.Client/Blauhaus.Push.Client.csproj
@@ -9,7 +9,6 @@
 
   <ItemGroup>
     <Compile Include=".Base\BasePushNotificationsClientService.cs" />
-    <Compile Include=".Config\IPushNotificationsClientConfig.cs" />
     <Compile Include=".Config\ConfigurationPushNotificationsClientConfig.cs" />
     <Compile Include=".Config\PushNotificationsClientConfig.cs" />
     <Compile Include=".Ioc\EmptyPushNotificationTapHandler.cs" />