signalapp/libsignal-service-java
signalapp/libsignal-service-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify isNeedsSync logic.

Browse Source
This commit is contained in:
Greyson Parrelli 2019-10-29 13:26:40 -04:00
parent 2f59a9487e
commit 878805c63e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -1,5 +1,5 @@
subprojects {
ext.version_number = "2.13.9"
ext.version_number = "2.13.9-UUID"
ext.group_info = "org.whispersystems"
ext.signal_version = "0.0.5"

10
java/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@ -223,7 +223,7 @@ public class SignalServiceMessageSender {
long timestamp = message.getTimestamp();
SendMessageResult result = sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, content, false);
if ((result.getSuccess() != null && result.getSuccess().isNeedsSync()) || (unidentifiedAccess.isPresent() && isMultiDevice.get())) {
if (result.getSuccess() != null && result.getSuccess().isNeedsSync()) {
byte[] syncMessage = createMultiDeviceSentTranscriptContent(content, Optional.of(recipient), timestamp, Collections.singletonList(result), false);
sendMessage(localAddress, Optional.<UnidentifiedAccess>absent(), timestamp, syncMessage, false);
}
@ -269,7 +269,7 @@ public class SignalServiceMessageSender {
}
}
if (needsSyncInResults || (isMultiDevice.get())) {
if (needsSyncInResults || isMultiDevice.get()) {
byte[] syncMessage = createMultiDeviceSentTranscriptContent(content, Optional.<SignalServiceAddress>absent(), timestamp, results, isRecipientUpdate);
sendMessage(localAddress, Optional.<UnidentifiedAccess>absent(), timestamp, syncMessage, false);
}
@ -1005,7 +1005,7 @@ public class SignalServiceMessageSender {
try {
Log.w(TAG, "Transmitting over pipe...");
SendMessageResponse response = pipe.get().send(messages, Optional.<UnidentifiedAccess>absent());
return SendMessageResult.success(recipient, false, response.getNeedsSync());
return SendMessageResult.success(recipient, false, response.getNeedsSync() || isMultiDevice.get());
} catch (IOException e) {
Log.w(TAG, e);
Log.w(TAG, "Falling back to new connection...");
@ -1014,7 +1014,7 @@ public class SignalServiceMessageSender {
try {
Log.w(TAG, "Transmitting over unidentified pipe...");
SendMessageResponse response = unidentifiedPipe.get().send(messages, unidentifiedAccess);
return SendMessageResult.success(recipient, true, response.getNeedsSync());
return SendMessageResult.success(recipient, true, response.getNeedsSync() || isMultiDevice.get());
} catch (IOException e) {
Log.w(TAG, e);
Log.w(TAG, "Falling back to new connection...");
@ -1023,7 +1023,7 @@ public class SignalServiceMessageSender {
Log.w(TAG, "Not transmitting over pipe...");
SendMessageResponse response = socket.sendMessage(messages, unidentifiedAccess);
return SendMessageResult.success(recipient, unidentifiedAccess.isPresent(), response.getNeedsSync());
return SendMessageResult.success(recipient, unidentifiedAccess.isPresent(), response.getNeedsSync() || isMultiDevice.get());
} catch (InvalidKeyException ike) {
Log.w(TAG, ike);