Merge branch 'timschneeb:master' into master

timschneeb · Jun 17, 2024 · 8ac42b6 · 8ac42b6
2 parents f0a329c + eae9fa1
commit 8ac42b6
Show file tree

Hide file tree

Showing 9 changed files with 7,747 additions and 18 deletions.
diff --git a/GalaxyBudsClient.Platform.Linux/BluetoothService.cs b/GalaxyBudsClient.Platform.Linux/BluetoothService.cs
@@ -463,21 +463,21 @@ private async void BluetoothServiceLoop()
                     return;
                 }
 
-                var hasIoActivity = false;
+                bool hasIoActivity;
                 try
                 {
                     var incomingCount = _profile.Stream?.AvailableBytes;
                     if (incomingCount == null)
                     {
                         /* Stream not yet ready */
+                        await Task.Delay(100);
                         continue;
                     }
 
                     if (incomingCount > 0)
                     {
                         IsStreamConnected = true;
-                        hasIoActivity = true;
-
+
                         /* Handle incoming stream */
                         var buffer = new byte[incomingCount ?? 0];
                         var dataAvailable = false;
@@ -501,25 +501,35 @@ private async void BluetoothServiceLoop()
                     /* Handle outgoing stream */
                     lock (TransmitterQueue)
                     {
-                        if (TransmitterQueue.IsEmpty) continue;
-                        if (!TransmitterQueue.TryDequeue(out var raw)) continue;
-                        hasIoActivity = true;
-                        try
-                        {
-                            _profile.Stream?.Write(raw, 0, raw.Length);
-                        }
-                        catch (SocketException ex)
+                        if (TransmitterQueue.IsEmpty || !TransmitterQueue.TryDequeue(out var raw))
                         {
-                            Log.Error("Linux.BluetoothService: BluetoothServiceLoop: SocketException thrown while writing unsafe stream: {ExMessage}. Cancelled", ex.Message);
-                            Disconnected?.Invoke(this, ex.Message);
+                            hasIoActivity = false;
                         }
-                        catch (IOException ex)
+                        else
                         {
-                            if (ex.InnerException != null && ex.InnerException.GetType() == typeof(SocketException))
+                            hasIoActivity = true;
+
+                            try
+                            {
+                                _profile.Stream?.Write(raw, 0, raw.Length);
+                            }
+                            catch (SocketException ex)
                             {
-                                Log.Error("Linux.BluetoothService: BluetoothServiceLoop: IO and SocketException thrown while writing unsafe stream: {ExMessage}. Cancelled", ex.Message);
+                                Log.Error(
+                                    "Linux.BluetoothService: BluetoothServiceLoop: SocketException thrown while writing unsafe stream: {ExMessage}. Cancelled",
+                                    ex.Message);
                                 Disconnected?.Invoke(this, ex.Message);
                             }
+                            catch (IOException ex)
+                            {
+                                if (ex.InnerException != null && ex.InnerException.GetType() == typeof(SocketException))
+                                {
+                                    Log.Error(
+                                        "Linux.BluetoothService: BluetoothServiceLoop: IO and SocketException thrown while writing unsafe stream: {ExMessage}. Cancelled",
+                                        ex.Message);
+                                    Disconnected?.Invoke(this, ex.Message);
+                                }
+                            }
                         }
                     }
                 }

diff --git a/GalaxyBudsClient/App.axaml b/GalaxyBudsClient/App.axaml
@@ -46,7 +46,7 @@
     <TrayIcon.Icons>
         <TrayIcons>
             <TrayIcon Menu="{Binding TrayMenu, DataType=galaxyBudsClient:App}"
-                      Icon="{OnPlatform '/Resources/icon_white_tray.ico', macOS='/Resources/icon_black_tray.ico'}"
+                      Icon="{OnPlatform '/Resources/icon_white_outlined_multi_tray.ico', Windows='/Resources/icon_white_outlined_single_tray.ico', macOS='/Resources/icon_black_tray.ico'}"
                       MacOSProperties.IsTemplateIcon="true"
                       ToolTipText="Galaxy Buds"
                       Clicked="TrayIcon_OnClicked" />

diff --git a/GalaxyBudsClient/Resources/icon_white_outlined_multi_tray.ico b/GalaxyBudsClient/Resources/icon_white_outlined_multi_tray.ico
diff --git a/GalaxyBudsClient/Resources/icon_white_outlined_single_tray.ico b/GalaxyBudsClient/Resources/icon_white_outlined_single_tray.ico
diff --git a/GalaxyBudsClient/Resources/icon_white_outlined_single_tray.svg b/GalaxyBudsClient/Resources/icon_white_outlined_single_tray.svg
diff --git a/GalaxyBudsClient/Resources/icon_white_outlined_tray.ico b/GalaxyBudsClient/Resources/icon_white_outlined_tray.ico
diff --git a/GalaxyBudsClient/Resources/icon_white_outlined_tray.png b/GalaxyBudsClient/Resources/icon_white_outlined_tray.png
diff --git a/GalaxyBudsClient/Resources/icon_white_outlined_tray.svg b/GalaxyBudsClient/Resources/icon_white_outlined_tray.svg
diff --git a/GalaxyBudsClient/Utils/Interface/WindowIconRenderer.cs b/GalaxyBudsClient/Utils/Interface/WindowIconRenderer.cs
@@ -101,7 +101,8 @@ private static WindowIcon MakeDefaultIcon()
     private static Bitmap MakeDefaultBitmap()
     {
         // OSX uses templated icons
-        var uri = $"{Program.AvaresUrl}/Resources/icon_{(PlatformUtils.IsOSX ? "black" : "white")}_tray.ico";
+        var type = PlatformUtils.IsOSX ? "black" : PlatformUtils.IsWindows ? "white_outlined_single" : "white_outlined_multi";
+        var uri = $"{Program.AvaresUrl}/Resources/icon_{type}_tray.ico";
         return new Bitmap(AssetLoader.Open(new Uri(uri)));
     }
 }