Print warning if libzkgroup is missing

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index a547e026ad7ceb4d92960ca823455471c15ad8b3..de827b1c284fcab49e74e05c28134a61fff72685 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -106,6 +106,11 @@ public class Main {
             final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration(
                     BaseConfig.USER_AGENT);
 
+            if (!ServiceConfig.getCapabilities().isGv2()) {
+                System.err.println("WARNING: Support for new group V2 is disabled,"
+                        + " because the required native library dependency is missing: libzkgroup");
+            }
+
             if (username == null) {
                 ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
                 return handleCommands(ns, pm);

diff --git a/src/main/java/org/asamk/signal/manager/ServiceConfig.java b/src/main/java/org/asamk/signal/manager/ServiceConfig.java
index 5721b1661d0e4cb855de39b518f1842f06273d32..353670ae97dbf793ec158aa33e1f614459de65b4 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/ServiceConfig.java
+++ b/src/main/java/org/asamk/signal/manager/ServiceConfig.java
@@ -88,6 +88,10 @@ public class ServiceConfig {
                 zkGroupServerPublicParams);
     }
 
+    public static AccountAttributes.Capabilities getCapabilities() {
+        return capabilities;
+    }
+
     static KeyStore getIasKeyStore() {
         try {
             TrustStore contactTrustStore = IAS_TRUST_STORE;

diff --git a/src/main/java/org/asamk/signal/storage/profiles/ProfileStore.java b/src/main/java/org/asamk/signal/storage/profiles/ProfileStore.java
index 527ec15a7741d954158871aef42fe127538d81ba..3b3d3f9f662f5593c379cfcb3ba688ba987b22b8 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/profiles/ProfileStore.java
+++ b/src/main/java/org/asamk/signal/storage/profiles/ProfileStore.java
@@ -112,7 +112,7 @@ public class ProfileStore {
                         try {
                             profileKeyCredential = new ProfileKeyCredential(Base64.decode(entry.get(
                                     "profileKeyCredential").asText()));
-                        } catch (InvalidInputException ignored) {
+                        } catch (Throwable ignored) {
                         }
                     }
                     long lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong();