Update dependencies

diff --git a/build.gradle b/build.gradle
index fdb28534894a08826cacf95831b6d6e5d8bfc7d9..ddad876a31386666dceed73acb8737e1b703f9a8 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
 }
 
 dependencies {

-    compile 'com.github.turasa:signal-service-java:2.4.4_unofficial_1'
+    compile 'com.github.turasa:signal-service-java:2.4.7_unofficial_1'

     compile 'org.bouncycastle:bcprov-jdk15on:1.55'
     compile 'net.sourceforge.argparse4j:argparse4j:0.7.0'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'
     compile 'org.bouncycastle:bcprov-jdk15on:1.55'
     compile 'net.sourceforge.argparse4j:argparse4j:0.7.0'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index a272883b516bd9dad4f13fcfffaf29e9fe108e66..ab1f1191d92a565833b155edc9bceaf8ef3ebbfc 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -110,6 +110,7 @@ class Manager implements Signal {
     private JsonGroupStore groupStore;
     private JsonContactsStore contactStore;
     private JsonThreadStore threadStore;
     private JsonGroupStore groupStore;
     private JsonContactsStore contactStore;
     private JsonThreadStore threadStore;

+    private SignalServiceMessagePipe messagePipe = null;

 
     public Manager(String username, String settingsPath) {
         this.username = username;
 
     public Manager(String username, String settingsPath) {
         this.username = username;


@@ -786,7 +787,7 @@ class Manager implements Signal {
     private void sendSyncMessage(SignalServiceSyncMessage message)
             throws IOException, UntrustedIdentityException {
         SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,
     private void sendSyncMessage(SignalServiceSyncMessage message)
             throws IOException, UntrustedIdentityException {
         SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,

-                deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
+                deviceId, signalProtocolStore, USER_AGENT, Optional.fromNullable(messagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());

         try {
             messageSender.sendMessage(message);
         } catch (UntrustedIdentityException e) {
         try {
             messageSender.sendMessage(message);
         } catch (UntrustedIdentityException e) {


@@ -803,7 +804,7 @@ class Manager implements Signal {
         SignalServiceDataMessage message = null;
         try {
             SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,
         SignalServiceDataMessage message = null;
         try {
             SignalServiceMessageSender messageSender = new SignalServiceMessageSender(serviceUrls, username, password,

-                    deviceId, signalProtocolStore, USER_AGENT, Optional.<SignalServiceMessageSender.EventListener>absent());
+                    deviceId, signalProtocolStore, USER_AGENT, Optional.fromNullable(messagePipe), Optional.<SignalServiceMessageSender.EventListener>absent());

 
             message = messageBuilder.build();
             if (message.getGroupInfo().isPresent()) {
 
             message = messageBuilder.build();
             if (message.getGroupInfo().isPresent()) {


@@ -1032,10 +1033,11 @@ class Manager implements Signal {
     public void receiveMessages(long timeout, TimeUnit unit, boolean returnOnTimeout, boolean ignoreAttachments, ReceiveMessageHandler handler) throws IOException {
         retryFailedReceivedMessages(handler, ignoreAttachments);
         final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);
     public void receiveMessages(long timeout, TimeUnit unit, boolean returnOnTimeout, boolean ignoreAttachments, ReceiveMessageHandler handler) throws IOException {
         retryFailedReceivedMessages(handler, ignoreAttachments);
         final SignalServiceMessageReceiver messageReceiver = new SignalServiceMessageReceiver(serviceUrls, username, password, deviceId, signalingKey, USER_AGENT);

-        SignalServiceMessagePipe messagePipe = null;

 
         try {
 
         try {

-            messagePipe = messageReceiver.createMessagePipe();
+            if (messagePipe == null) {
+                messagePipe = messageReceiver.createMessagePipe();
+            }

 
             while (true) {
                 SignalServiceEnvelope envelope;
 
             while (true) {
                 SignalServiceEnvelope envelope;


@@ -1084,8 +1086,10 @@ class Manager implements Signal {
                 }
             }
         } finally {
                 }
             }
         } finally {

-            if (messagePipe != null)
+            if (messagePipe != null) {

                 messagePipe.shutdown();
                 messagePipe.shutdown();

+                messagePipe = null;
+            }

         }
     }
 
         }
     }