webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 18:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update dependencies

Browse source
This commit is contained in:
AsamK 2019-03-23 18:32:31 +01:00
parent 6d5cfa32e2
commit 6f7350d031
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -20,8 +20,8 @@ repositories {
} }
dependencies { dependencies {
compile 'com.github.turasa:signal-service-java:2.12.7_unofficial_1' compile 'com.github.turasa:signal-service-java:2.13.0_unofficial_2'
compile 'org.bouncycastle:bcprov-jdk15on:1.60' compile 'org.bouncycastle:bcprov-jdk15on:1.61'
compile 'net.sourceforge.argparse4j:argparse4j:0.8.1' compile 'net.sourceforge.argparse4j:argparse4j:0.8.1'
compile 'org.freedesktop.dbus:dbus-java:2.7.0' compile 'org.freedesktop.dbus:dbus-java:2.7.0'
} }

5
src/main/java/org/asamk/signal/Main.java
View file

@ -19,7 +19,6 @@ package org.asamk.signal;
import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.ArgumentParsers;
import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.*; import net.sourceforge.argparse4j.inf.*;
import org.apache.http.util.TextUtils;
import org.asamk.Signal; import org.asamk.Signal;
import org.asamk.signal.commands.*; import org.asamk.signal.commands.*;
import org.asamk.signal.manager.BaseConfig; import org.asamk.signal.manager.BaseConfig;
@ -35,6 +34,8 @@ import java.io.File;
import java.security.Security; import java.security.Security;
import java.util.Map; import java.util.Map;
import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
@ -82,7 +83,7 @@ public class Main {
} }
} else { } else {
String dataPath = ns.getString("config"); String dataPath = ns.getString("config");
if (TextUtils.isEmpty(dataPath)) { if (isEmpty(dataPath)) {
dataPath = getDefaultDataPath(); dataPath = getDefaultDataPath();
} }

4
src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -189,9 +189,9 @@ public class Manager implements Signal {
accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, account.getUsername(), account.getPassword(), BaseConfig.USER_AGENT, timer); accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, account.getUsername(), account.getPassword(), BaseConfig.USER_AGENT, timer);
if (voiceVerification) { if (voiceVerification) {
accountManager.requestVoiceVerificationCode(Locale.getDefault()); accountManager.requestVoiceVerificationCode(Locale.getDefault(), Optional.<String>absent());
} else { } else {
accountManager.requestSmsVerificationCode(false); accountManager.requestSmsVerificationCode(false, Optional.<String>absent());
} }
account.setRegistered(false); account.setRegistered(false);

5
src/main/java/org/asamk/signal/manager/Utils.java
View file

@ -1,6 +1,5 @@
package org.asamk.signal.manager; package org.asamk.signal.manager;
import org.apache.http.util.TextUtils;
import org.asamk.signal.AttachmentInvalidException; import org.asamk.signal.AttachmentInvalidException;
import org.signal.libsignal.metadata.certificate.CertificateValidator; import org.signal.libsignal.metadata.certificate.CertificateValidator;
import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.libsignal.IdentityKey;
@ -25,6 +24,8 @@ import java.net.URLEncoder;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.*; import java.util.*;
import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
class Utils { class Utils {
static List<SignalServiceAttachment> getSignalServiceAttachments(List<String> attachments) throws AttachmentInvalidException { static List<SignalServiceAttachment> getSignalServiceAttachments(List<String> attachments) throws AttachmentInvalidException {
@ -100,7 +101,7 @@ class Utils {
String deviceIdentifier = query.get("uuid"); String deviceIdentifier = query.get("uuid");
String publicKeyEncoded = query.get("pub_key"); String publicKeyEncoded = query.get("pub_key");
if (TextUtils.isEmpty(deviceIdentifier) || TextUtils.isEmpty(publicKeyEncoded)) { if (isEmpty(deviceIdentifier) || isEmpty(publicKeyEncoded)) {
throw new RuntimeException("Invalid device link uri"); throw new RuntimeException("Invalid device link uri");
} }