Log error message if libzkgroup or libsignal-client is missing

Fixes #660

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 5324439b2ee163e0c296a426da21c608388f3e63..3677bba1a3dab34f1a0ccaadae56a8ae214094b6 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
@@ -1,6 +1,8 @@
 package org.asamk.signal.manager.config;
 
 import org.signal.zkgroup.internal.Native;
 package org.asamk.signal.manager.config;
 
 import org.signal.zkgroup.internal.Native;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.push.TrustStore;
 
 import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.push.TrustStore;
 


@@ -15,6 +17,8 @@ import okhttp3.Interceptor;
 
 public class ServiceConfig {
 
 
 public class ServiceConfig {
 

+    private final static Logger logger = LoggerFactory.getLogger(ServiceConfig.class);
+

     public final static int PREKEY_MINIMUM_COUNT = 20;
     public final static int PREKEY_BATCH_SIZE = 100;
     public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
     public final static int PREKEY_MINIMUM_COUNT = 20;
     public final static int PREKEY_BATCH_SIZE = 100;
     public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;


@@ -31,7 +35,8 @@ public class ServiceConfig {
         try {
             Native.serverPublicParamsCheckValidContentsJNI(new byte[]{});
             zkGroupAvailable = true;
         try {
             Native.serverPublicParamsCheckValidContentsJNI(new byte[]{});
             zkGroupAvailable = true;

-        } catch (Throwable ignored) {
+        } catch (Throwable e) {
+            logger.warn("Failed to call libzkgroup: {}", e.getMessage());

             zkGroupAvailable = false;
         }
         capabilities = new AccountAttributes.Capabilities(false, zkGroupAvailable, false, zkGroupAvailable, true, true);
             zkGroupAvailable = false;
         }
         capabilities = new AccountAttributes.Capabilities(false, zkGroupAvailable, false, zkGroupAvailable, true, true);


@@ -53,7 +58,8 @@ public class ServiceConfig {
         try {
             org.signal.client.internal.Native.DeviceTransfer_GeneratePrivateKey();
             return true;
         try {
             org.signal.client.internal.Native.DeviceTransfer_GeneratePrivateKey();
             return true;

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

             return false;
         }
     }
             return false;
         }
     }