Update dependencies

diff --git a/build.gradle b/build.gradle
index 13fd298e3190e0b552ac8d1210b5b4be57b4db65..97f0d0c268e795d3a95875cf5a579dc4361fb533 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ repositories {
 }
 
 dependencies {
 }
 
 dependencies {

-    compile 'com.github.turasa:signal-service-java:2.12.7_unofficial_1'
-    compile 'org.bouncycastle:bcprov-jdk15on:1.60'
+    compile 'com.github.turasa:signal-service-java:2.13.0_unofficial_2'
+    compile 'org.bouncycastle:bcprov-jdk15on:1.61'

     compile 'net.sourceforge.argparse4j:argparse4j:0.8.1'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'
 }
     compile 'net.sourceforge.argparse4j:argparse4j:0.8.1'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'
 }

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index e5335b282ff713a1b2bb961fc4ef7bbfeabd8446..e1343fbfb684fa888da0e306e0e73a7c5f10f76f 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -19,7 +19,6 @@ package org.asamk.signal;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.*;

-import org.apache.http.util.TextUtils;

 import org.asamk.Signal;
 import org.asamk.signal.commands.*;
 import org.asamk.signal.manager.BaseConfig;
 import org.asamk.Signal;
 import org.asamk.signal.commands.*;
 import org.asamk.signal.manager.BaseConfig;


@@ -35,6 +34,8 @@ import java.io.File;
 import java.security.Security;
 import java.util.Map;
 
 import java.security.Security;
 import java.util.Map;
 

+import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
+

 public class Main {
 
     public static void main(String[] args) {
 public class Main {
 
     public static void main(String[] args) {


@@ -82,7 +83,7 @@ public class Main {
                 }
             } else {
                 String dataPath = ns.getString("config");
                 }
             } else {
                 String dataPath = ns.getString("config");

-                if (TextUtils.isEmpty(dataPath)) {
+                if (isEmpty(dataPath)) {

                     dataPath = getDefaultDataPath();
                 }
 
                     dataPath = getDefaultDataPath();
                 }
 

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index e358fcb943913d029ed4aa844e67c677441e1b5d..94605632e26b6077a05c7065e86a9e66a048e79e 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -189,9 +189,9 @@ public class Manager implements Signal {
         accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, account.getUsername(), account.getPassword(), BaseConfig.USER_AGENT, timer);
 
         if (voiceVerification) {
         accountManager = new SignalServiceAccountManager(BaseConfig.serviceConfiguration, account.getUsername(), account.getPassword(), BaseConfig.USER_AGENT, timer);
 
         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);

diff --git a/src/main/java/org/asamk/signal/manager/Utils.java b/src/main/java/org/asamk/signal/manager/Utils.java
index dbcd7e428f888df891c656c9fe3e2e14b5452dcb..4012674f1c76219296fa7e71f7433351c860dd90 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Utils.java
+++ b/src/main/java/org/asamk/signal/manager/Utils.java
@@ -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.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.whispersystems.libsignal.IdentityKey;
 import org.asamk.signal.AttachmentInvalidException;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.whispersystems.libsignal.IdentityKey;


@@ -25,6 +24,8 @@ import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.util.*;
 
 import java.nio.file.Files;
 import java.util.*;
 

+import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
+

 class Utils {
 
     static List<SignalServiceAttachment> getSignalServiceAttachments(List<String> attachments) throws AttachmentInvalidException {
 class Utils {
 
     static List<SignalServiceAttachment> getSignalServiceAttachments(List<String> attachments) throws AttachmentInvalidException {


@@ -100,7 +101,7 @@ class Utils {
         String deviceIdentifier = query.get("uuid");
         String publicKeyEncoded = query.get("pub_key");
 
         String deviceIdentifier = query.get("uuid");
         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");
         }