Merge pull request #182 from badmannersteam/init_failure_catch

kdroidFilter · web-flow · commit d76d9e01aec2 · 2025-06-10T05:11:30.000+03:00
Fixed init exception handling - also catching Throwable to handle UnsatisfiedLinkError
diff --git a/src/commonMain/kotlin/com/kdroid/composetray/tray/api/NativeTray.kt b/src/commonMain/kotlin/com/kdroid/composetray/tray/api/NativeTray.kt
@@ -106,8 +106,8 @@ internal class NativeTray {
 
                     else -> {}
                 }
-            } catch (e: Exception) {
-                Log.e("NativeTray", "Error initializing tray:", e)
+            } catch (th: Throwable) {
+                Log.e("NativeTray", "Error initializing tray:", th)
             }
 
             val awtTrayRequired = os == MACOS || os == UNKNOWN || !trayInitialized
@@ -117,8 +117,8 @@ internal class NativeTray {
                         Log.d("NativeTray", "Initializing AWT tray with icon path: $iconPath")
                         AwtTrayInitializer.initialize(iconPath, tooltip, primaryAction, menuContent)
                         awtTrayUsed.set(true)
-                    } catch (e: Exception) {
-                        Log.e("NativeTray", "Error initializing AWT tray:", e)
+                    } catch (th: Throwable) {
+                        Log.e("NativeTray", "Error initializing AWT tray:", th)
                     }
                 } else {
                     Log.d("NativeTray", "AWT tray is not supported")

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,8 @@ internal class NativeTray {`
`106`	`106`
`107`	`107`	`else -> {}`
`108`	`108`	`}`
`109`		`- } catch (e: Exception) {`
`110`		`- Log.e("NativeTray", "Error initializing tray:", e)`
	`109`	`+ } catch (th: Throwable) {`
	`110`	`+ Log.e("NativeTray", "Error initializing tray:", th)`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`val awtTrayRequired = os == MACOS \|\| os == UNKNOWN \|\| !trayInitialized`
`@@ -117,8 +117,8 @@ internal class NativeTray {`
`117`	`117`	`Log.d("NativeTray", "Initializing AWT tray with icon path: $iconPath")`
`118`	`118`	`AwtTrayInitializer.initialize(iconPath, tooltip, primaryAction, menuContent)`
`119`	`119`	`awtTrayUsed.set(true)`
`120`		`- } catch (e: Exception) {`
`121`		`- Log.e("NativeTray", "Error initializing AWT tray:", e)`
	`120`	`+ } catch (th: Throwable) {`
	`121`	`+ Log.e("NativeTray", "Error initializing AWT tray:", th)`
`122`	`122`	`}`
`123`	`123`	`} else {`
`124`	`124`	`Log.d("NativeTray", "AWT tray is not supported")`