From: AsamK Date: Fri, 19 Oct 2018 21:39:25 +0000 (+0200) Subject: Update libsignal-service-java to 2.9.0 X-Git-Tag: v0.6.1~17 X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/35c00f1b2a7376a28714bd191a27fe75454d59aa Update libsignal-service-java to 2.9.0 --- diff --git a/build.gradle b/build.gradle index d2fddabe..ffea41c3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ repositories { } dependencies { - compile 'com.github.turasa:signal-service-java:2.8.0_unofficial_1' + compile 'com.github.turasa:signal-service-java:2.9.0_unofficial_1' compile 'org.bouncycastle:bcprov-jdk15on:1.59' compile 'net.sourceforge.argparse4j:argparse4j:0.8.1' compile 'org.freedesktop.dbus:dbus-java:2.7.0' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 91ca28c8..29953ea1 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 16d28051..e0b3fb8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java index 8a606edd..09677548 100644 --- a/src/main/java/org/asamk/signal/Manager.java +++ b/src/main/java/org/asamk/signal/Manager.java @@ -64,6 +64,7 @@ import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; import org.whispersystems.signalservice.api.util.SleepTimer; import org.whispersystems.signalservice.api.util.UptimeSleepTimer; import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl; +import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl; import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration; import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl; import org.whispersystems.signalservice.internal.push.SignalServiceProtos; @@ -95,7 +96,8 @@ class Manager implements Signal { private final static TrustStore TRUST_STORE = new WhisperTrustStore(); private final static SignalServiceConfiguration serviceConfiguration = new SignalServiceConfiguration( new SignalServiceUrl[]{new SignalServiceUrl(URL, TRUST_STORE)}, - new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)} + new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)}, + new SignalContactDiscoveryUrl[0] ); public final static String PROJECT_NAME = Manager.class.getPackage().getImplementationTitle(); @@ -827,7 +829,7 @@ class Manager implements Signal { List groups = getGroups(); List ids = new ArrayList(groups.size()); for (GroupInfo group : groups) { - ids.add(group.groupId); + ids.add(group.groupId); } return ids; } @@ -1500,7 +1502,7 @@ class Manager implements Signal { out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name), new ArrayList<>(record.members), createGroupAvatarAttachment(record.groupId), record.active, Optional.fromNullable(info != null ? info.messageExpirationTime : null), - Optional.fromNullable(record.color))); + Optional.fromNullable(record.color), false)); } }