Force AWT tray mode on MacOS

thewca · May 13, 2021 · ce33254 · ce33254
1 parent 3b47111
commit ce33254
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/proguard-rules.pro b/proguard-rules.pro
@@ -23,6 +23,10 @@
 -keep class com.sun.jna.** { *; }
 -keep class dorkbox.jna.** { *; }
 -keep class dorkbox.systemTray.** { *; }
+-keep class sun.awt.windows.** { *; }
+-keep class sun.lwawt.macosx.** { *; }
+-keep class sun.awt.X11.** { *; }
+-keep class sun.awt.SunToolkit { *; }
 
 -keep,includedescriptorclasses class kotlinx.serialization.json.**$$serializer { *; }
 -keep,includedescriptorclasses class org.worldcubeassociation.tnoodle.server.webscrambles.**$$serializer { *; }

diff --git a/...ain/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/server/OfflineJarUtils.kt b/...ain/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/server/OfflineJarUtils.kt
@@ -43,6 +43,15 @@ data class OfflineJarUtils(val port: Int) {
         // Find out which icon to use.
         val iconFileName = if (isWrapper) ICON_WRAPPER else ICON_WORKER
 
+        val os = System.getProperty("os.name").toLowerCase()
+
+        if (os.contains("mac") || os.contains("darwin")) {
+            LOG.debug("Detected MacOS implementation for os.name value $os")
+            LOG.debug("Using workaround for BigSur SystemTray error!")
+
+            SystemTray.FORCE_TRAY_TYPE = SystemTray.TrayType.Awt
+        }
+
         val trayAdapter = SystemTray.get()
 
         if (trayAdapter == null) {