Print warning if libzkgroup is missing

This commit is contained in:
AsamK 2020-12-21 21:56:48 +01:00
parent 445e8592c4
commit 8957a08453
3 changed files with 10 additions and 1 deletions

View file

@ -106,6 +106,11 @@ public class Main {
final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration( final SignalServiceConfiguration serviceConfiguration = ServiceConfig.createDefaultServiceConfiguration(
BaseConfig.USER_AGENT); 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) { if (username == null) {
ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT); ProvisioningManager pm = new ProvisioningManager(dataPath, serviceConfiguration, BaseConfig.USER_AGENT);
return handleCommands(ns, pm); return handleCommands(ns, pm);

View file

@ -88,6 +88,10 @@ public class ServiceConfig {
zkGroupServerPublicParams); zkGroupServerPublicParams);
} }
public static AccountAttributes.Capabilities getCapabilities() {
return capabilities;
}
static KeyStore getIasKeyStore() { static KeyStore getIasKeyStore() {
try { try {
TrustStore contactTrustStore = IAS_TRUST_STORE; TrustStore contactTrustStore = IAS_TRUST_STORE;

View file

@ -112,7 +112,7 @@ public class ProfileStore {
try { try {
profileKeyCredential = new ProfileKeyCredential(Base64.decode(entry.get( profileKeyCredential = new ProfileKeyCredential(Base64.decode(entry.get(
"profileKeyCredential").asText())); "profileKeyCredential").asText()));
} catch (InvalidInputException ignored) { } catch (Throwable ignored) {
} }
} }
long lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong(); long lastUpdateTimestamp = entry.get("lastUpdateTimestamp").asLong();