Fixed tray issue on non-display devices.

little-fish · Sep 30, 2018 · 92adb3c · 92adb3c
1 parent 686657d
commit 92adb3c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/webapp/gradle.properties b/webapp/gradle.properties
@@ -16,4 +16,4 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-version=1.0.0
+version=1.0.1
diff --git a/...resources/misc/gcUnicorn-webapp-1.0.0.exe → ...resources/misc/gcUnicorn-webapp-1.0.1.exe b/...resources/misc/gcUnicorn-webapp-1.0.0.exe → ...resources/misc/gcUnicorn-webapp-1.0.1.exe
diff --git a/webapp/src/main/kotlin/cz/babi/gcunicorn/webapp/desktop/TrayCondition.kt b/webapp/src/main/kotlin/cz/babi/gcunicorn/webapp/desktop/TrayCondition.kt
@@ -18,9 +18,11 @@
 
 package cz.babi.gcunicorn.webapp.desktop
 
+import cz.babi.gcunicorn.`fun`.loggerFor
 import org.springframework.context.annotation.Condition
 import org.springframework.context.annotation.ConditionContext
 import org.springframework.core.type.AnnotatedTypeMetadata
+import java.awt.AWTError
 import java.awt.SystemTray
 
 /**
@@ -33,5 +35,17 @@ import java.awt.SystemTray
  * @since 1.0.0
  */
 class TrayCondition : Condition {
-    override fun matches(context: ConditionContext, metadata: AnnotatedTypeMetadata) = SystemTray.isSupported() && context.environment.containsProperty("tray")
+
+    companion object {
+        private val LOG = loggerFor<TrayCondition>()
+    }
+
+    override fun matches(context: ConditionContext, metadata: AnnotatedTypeMetadata): Boolean {
+        return try {
+            context.environment.containsProperty("tray") && SystemTray.isSupported()
+        } catch (e: AWTError) {
+            LOG.warn("Tray is not supported.", e)
+            false
+        }
+    }
 }
diff --git a/webapp/src/main/kotlin/cz/babi/gcunicorn/webapp/spring/web/advice/VersionControllerAdvice.kt b/webapp/src/main/kotlin/cz/babi/gcunicorn/webapp/spring/web/advice/VersionControllerAdvice.kt
@@ -35,8 +35,8 @@ import org.springframework.web.bind.annotation.ModelAttribute
 class VersionControllerAdvice {
 
     @ModelAttribute(name = "versionCore")
-    fun coreVersion() = VersionControllerAdvice::class.java.`package`?.implementationVersion ?: "unknown"
+    fun versionCore() = Service::class.java.`package`?.implementationVersion ?: "unknown"
 
-    @ModelAttribute(name = "versionServer")
-    fun uiVersion() = Service::class.java.`package`?.implementationVersion ?: "unknown"
+    @ModelAttribute(name = "versionWebapp")
+    fun versionWebapp() = VersionControllerAdvice::class.java.`package`?.implementationVersion ?: "unknown"
 }
diff --git a/webapp/src/main/resources/templates/fragment/version.html b/webapp/src/main/resources/templates/fragment/version.html
@@ -19,6 +19,6 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
     <body>
-        <div th:fragment="version" th:utext="${'core: v' + versionCore + ' & server: v' + versionServer}"></div>
+        <div th:fragment="version" th:utext="${'core: v' + versionCore + ' & webapp: v' + versionWebapp}"></div>
     </body>
 </html>