Merge branch 'dev'

shinyorg · Apr 8, 2024 · 4e65f26 · 4e65f26
2 parents 37783ad + a3458bf
commit 4e65f26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/Shiny.BluetoothLE/Platforms/Android/AndroidConnectionConfig.cs b/src/Shiny.BluetoothLE/Platforms/Android/AndroidConnectionConfig.cs
@@ -1,11 +1,9 @@
-using Android.Bluetooth;
-
-namespace Shiny.BluetoothLE;
+namespace Shiny.BluetoothLE;
 
 
 public record AndroidConnectionConfig(
     bool AutoConnect = true,
-    GattConnectionPriority ConnectionPriority = GattConnectionPriority.Balanced
+    Android.Bluetooth.GattConnectionPriority ConnectionPriority = Android.Bluetooth.GattConnectionPriority.Balanced
 ) : ConnectionConfig(
     AutoConnect
 );
diff --git a/src/Shiny.Logging.Sqlite/Shiny.Logging.Sqlite.csproj b/src/Shiny.Logging.Sqlite/Shiny.Logging.Sqlite.csproj
@@ -8,7 +8,7 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsVersion)" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
-        <PackageReference Include="sqlite-net-pcl" Version="1.9.141-beta" />
+        <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Shiny.Push/Platforms/Android/AndroidPushNotification.cs b/src/Shiny.Push/Platforms/Android/AndroidPushNotification.cs
@@ -22,8 +22,10 @@ public NotificationCompat.Builder CreateBuilder()
 
         if (not != null)
         {
-            // TODO: config OR click_action
             var intent = new Intent(not.ClickAction ?? ShinyPushIntents.NotificationClickAction);
+            foreach (var item in this.NativeMessage.Data)
+                intent.PutExtra(item.Key, item.Value);
+
             var pendingIntent = PendingIntent.GetActivity(
                 this.Platform.AppContext,
                 99,