From: AsamK <asamk@gmx.de>
Date: Mon, 21 Dec 2020 20:56:48 +0000 (+0100)
Subject: Print warning if libzkgroup is missing
X-Git-Tag: v0.7.1~1
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/8957a08453edb6a68ddae1a9bd01485032c4e2d8

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 a547e026..de827b1c 100644
--- 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 5721b166..353670ae 100644
--- 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 527ec15a..3b3d3f9f 100644
--- 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();