Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Send an empty group sync when linking devices if no groups exist.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-04-13 11:35:42 -04:00
committed by GitHub
parent 35c102aa98
commit 20b98122c1
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
View File

@@ -244,8 +244,8 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
@Override
public boolean onShouldRetry(@NonNull Exception exception) {
if (exception instanceof PushNetworkException) return true;
return false;
return exception instanceof PushNetworkException ||
exception instanceof NetworkException;
}
@Override

23
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
View File

@@ -30,6 +30,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSy
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -128,7 +129,11 @@ public class MultiDeviceGroupUpdateJob extends BaseJob {
BlobProvider.getInstance().getStream(context, uri),
length);
} else {
Log.w(TAG, "No groups present for sync message...");
Log.w(TAG, "No groups present for sync message. Sending an empty update.");
sendUpdate(ApplicationDependencies.getSignalServiceMessageSender(),
null,
0);
}
} finally {
BlobProvider.getInstance().delete(context, uri);
@@ -149,11 +154,17 @@ public class MultiDeviceGroupUpdateJob extends BaseJob {
private void sendUpdate(SignalServiceMessageSender messageSender, InputStream stream, long length)
throws IOException, UntrustedIdentityException
{
SignalServiceAttachmentStream attachmentStream = SignalServiceAttachment.newStreamBuilder()
.withStream(stream)
.withContentType("application/octet-stream")
.withLength(length)
.build();
SignalServiceAttachmentStream attachmentStream;
if (length > 0) {
attachmentStream = SignalServiceAttachment.newStreamBuilder()
.withStream(stream)
.withContentType("application/octet-stream")
.withLength(length)
.build();
} else {
attachmentStream = SignalServiceAttachment.emptyStream("application/octet-stream");
}
messageSender.sendMessage(SignalServiceSyncMessage.forGroups(attachmentStream),
UnidentifiedAccessUtil.getAccessForSync(context));