Switch to a less cpu intensive function to check if libsignal-client is available

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index acbf7f3fdb9a6b6380d2d8cd6da2dda034c207a8..18ba01fc3911a30ef0c9e7220f2815307af58bb3 100644 (file)
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -19,6 +19,10 @@
     {"name":"loadClass","parameterTypes":["java.lang.String"] }
   ]
 },
     {"name":"loadClass","parameterTypes":["java.lang.String"] }
   ]
 },

+{
+  "name":"java.lang.IllegalArgumentException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},

 {
   "name":"java.lang.IllegalStateException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 {
   "name":"java.lang.IllegalStateException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 8ecaa74152453507375c321c04cba60648e8d93d..78decc8140bd471ab287ba9c824d978f5d3be4f8 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -47,7 +47,10 @@ public class ServiceConfig {
 
     public static boolean isSignalClientAvailable() {
         try {
 
     public static boolean isSignalClientAvailable() {
         try {

-            org.signal.client.internal.Native.DeviceTransfer_GeneratePrivateKey();
+            try {
+                org.signal.client.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
+            } catch (IllegalArgumentException ignored) {
+            }

             return true;
         } catch (UnsatisfiedLinkError e) {
             logger.warn("Failed to call libsignal-client: {}", e.getMessage());
             return true;
         } catch (UnsatisfiedLinkError e) {
             logger.warn("Failed to call libsignal-client: {}", e.getMessage());