mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-11 14:27:42 +00:00
Merge remote-tracking branch 'origin/add_sync_target' into testing_multi_merge
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java # libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageSender.java
This commit is contained in:
jubb
@@ -26,10 +26,6 @@ import org.session.libsignal.service.api.messages.SignalServiceDataMessage;
|
||||
import org.session.libsignal.service.api.messages.SignalServiceGroup;
|
||||
import org.session.libsignal.service.api.messages.SignalServiceReceiptMessage;
|
||||
import org.session.libsignal.service.api.messages.SignalServiceTypingMessage;
|
||||
import org.session.libsignal.service.api.messages.calls.AnswerMessage;
|
||||
import org.session.libsignal.service.api.messages.calls.IceUpdateMessage;
|
||||
import org.session.libsignal.service.api.messages.calls.OfferMessage;
|
||||
import org.session.libsignal.service.api.messages.calls.SignalServiceCallMessage;
|
||||
import org.session.libsignal.service.api.messages.multidevice.BlockedListMessage;
|
||||
import org.session.libsignal.service.api.messages.multidevice.ConfigurationMessage;
|
||||
import org.session.libsignal.service.api.messages.multidevice.ReadMessage;
|
||||
@@ -51,7 +47,6 @@ import org.session.libsignal.service.internal.push.PushServiceSocket;
|
||||
import org.session.libsignal.service.internal.push.PushTransportDetails;
|
||||
import org.session.libsignal.service.internal.push.SignalServiceProtos;
|
||||
import org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer;
|
||||
import org.session.libsignal.service.internal.push.SignalServiceProtos.CallMessage;
|
||||
import org.session.libsignal.service.internal.push.SignalServiceProtos.Content;
|
||||
import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage;
|
||||
import org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext;
|
||||
@@ -217,34 +212,14 @@ public class SignalServiceMessageSender {
|
||||
* @param recipient The sender of the received message you're acknowledging.
|
||||
* @param message The read receipt to deliver.
|
||||
* @throws IOException
|
||||
* @throws UntrustedIdentityException
|
||||
*/
|
||||
public void sendReceipt(SignalServiceAddress recipient,
|
||||
Optional<UnidentifiedAccessPair> unidentifiedAccess,
|
||||
SignalServiceReceiptMessage message)
|
||||
throws IOException, UntrustedIdentityException
|
||||
{
|
||||
throws IOException {
|
||||
byte[] content = createReceiptContent(message);
|
||||
boolean useFallbackEncryption = SessionManagementProtocol.shared.shouldMessageUseFallbackEncryption(message, recipient.getNumber(), store);
|
||||
sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), message.getWhen(), content, false, message.getTTL(), useFallbackEncryption, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a typing indicator.
|
||||
*
|
||||
* @param recipient The destination
|
||||
* @param message The typing indicator to deliver
|
||||
* @throws IOException
|
||||
* @throws UntrustedIdentityException
|
||||
*/
|
||||
public void sendTyping(SignalServiceAddress recipient,
|
||||
Optional<UnidentifiedAccessPair> unidentifiedAccess,
|
||||
SignalServiceTypingMessage message)
|
||||
throws IOException, UntrustedIdentityException
|
||||
{
|
||||
byte[] content = createTypingContent(message);
|
||||
boolean useFallbackEncryption = SessionManagementProtocol.shared.shouldMessageUseFallbackEncryption(message, recipient.getNumber(), store);
|
||||
sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), message.getTimestamp(), content, true, message.getTTL(), useFallbackEncryption, false);
|
||||
sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), message.getWhen(), content, false, message.getTTL(), useFallbackEncryption);
|
||||
}
|
||||
|
||||
public void sendTyping(List<SignalServiceAddress> recipients,
|
||||
@@ -256,42 +231,24 @@ public class SignalServiceMessageSender {
|
||||
sendMessage(0, recipients, getTargetUnidentifiedAccess(unidentifiedAccess), message.getTimestamp(), content, true, message.getTTL(), false, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a call setup message to a single recipient.
|
||||
*
|
||||
* @param recipient The message's destination.
|
||||
* @param message The call message.
|
||||
* @throws IOException
|
||||
*/
|
||||
public void sendCallMessage(SignalServiceAddress recipient,
|
||||
Optional<UnidentifiedAccessPair> unidentifiedAccess,
|
||||
SignalServiceCallMessage message)
|
||||
throws IOException, UntrustedIdentityException
|
||||
{
|
||||
byte[] content = createCallContent(message);
|
||||
boolean useFallbackEncryption = SessionManagementProtocol.shared.shouldMessageUseFallbackEncryption(message, recipient.getNumber(), store);
|
||||
sendMessage(recipient, getTargetUnidentifiedAccess(unidentifiedAccess), System.currentTimeMillis(), content, false, message.getTTL(), useFallbackEncryption, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a message to a single recipient.
|
||||
*
|
||||
* @param recipient The message's destination.
|
||||
* @param message The message.
|
||||
* @throws UntrustedIdentityException
|
||||
* @throws IOException
|
||||
*/
|
||||
public SendMessageResult sendMessage(long messageID,
|
||||
SignalServiceAddress recipient,
|
||||
Optional<UnidentifiedAccessPair> unidentifiedAccess,
|
||||
SignalServiceDataMessage message)
|
||||
throws UntrustedIdentityException, IOException
|
||||
throws IOException
|
||||
{
|
||||
byte[] content = createMessageContent(message, recipient);
|
||||
long timestamp = message.getTimestamp();
|
||||
boolean useFallbackEncryption = SessionManagementProtocol.shared.shouldMessageUseFallbackEncryption(message, recipient.getNumber(), store);
|
||||
boolean isClosedGroup = message.group.isPresent() && message.group.get().getGroupType() == SignalServiceGroup.GroupType.SIGNAL;
|
||||
SendMessageResult result = sendMessage(messageID, recipient, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, content, false, message.getTTL(), message.getDeviceLink().isPresent(), useFallbackEncryption, isClosedGroup, false, message.hasVisibleContent());
|
||||
SendMessageResult result = sendMessage(messageID, recipient, getTargetUnidentifiedAccess(unidentifiedAccess), timestamp, content, false, message.getTTL(), message.getDeviceLink().isPresent(), useFallbackEncryption, isClosedGroup, message.hasVisibleContent(), message.getSyncTarget());
|
||||
|
||||
// // Loki - This shouldn't get invoked for note to self
|
||||
// boolean wouldSignalSendSyncMessage = (result.getSuccess() != null && result.getSuccess().isNeedsSync()) || unidentifiedAccess.isPresent();
|
||||
@@ -325,8 +282,7 @@ public class SignalServiceMessageSender {
|
||||
List<SignalServiceAddress> recipients,
|
||||
List<Optional<UnidentifiedAccessPair>> unidentifiedAccess,
|
||||
SignalServiceDataMessage message)
|
||||
throws IOException, UntrustedIdentityException
|
||||
{
|
||||
throws IOException {
|
||||
// Loki - We only need the first recipient in the line below. This is because the recipient is only used to determine
|
||||
// whether an attachment is being sent to an open group or not.
|
||||
byte[] content = createMessageContent(message, recipients.get(0));
|
||||
@@ -350,7 +306,7 @@ public class SignalServiceMessageSender {
|
||||
for (String device : linkedDevices) {
|
||||
SignalServiceAddress deviceAsAddress = new SignalServiceAddress(device);
|
||||
boolean useFallbackEncryption = SessionManagementProtocol.shared.shouldMessageUseFallbackEncryption(syncMessage, device, store);
|
||||
sendMessage(deviceAsAddress, Optional.<UnidentifiedAccess>absent(), timestamp, syncMessage, false, message.getTTL(), useFallbackEncryption, true);
|
||||
sendMessage(deviceAsAddress, Optional.<UnidentifiedAccess>absent(), timestamp, syncMessage, false, message.getTTL(), useFallbackEncryption);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -391,18 +347,10 @@ public class SignalServiceMessageSender {
|
||||
for (String device : linkedDevices) {
|
||||
SignalServiceAddress deviceAsAddress = new SignalServiceAddress(device);
|
||||
boolean useFallbackEncryption = SessionManagementProtocol.shared.shouldMessageUseFallbackEncryption(message, device, store);
|
||||
sendMessageToPrivateChat(0, deviceAsAddress, Optional.<UnidentifiedAccess>absent(), timestamp, content, false, message.getTTL(), useFallbackEncryption, false, false);
|
||||
// sendMessageToPrivateChat(0, deviceAsAddress, Optional.<UnidentifiedAccess>absent(), timestamp, content, false, message.getTTL(), useFallbackEncryption, false, false);
|
||||
}
|
||||
}
|
||||
|
||||
public void setSoTimeoutMillis(long soTimeoutMillis) {
|
||||
socket.setSoTimeoutMillis(soTimeoutMillis);
|
||||
}
|
||||
|
||||
public void cancelInFlightRequests() {
|
||||
socket.cancelInFlightRequests();
|
||||
}
|
||||
|
||||
public void setMessagePipe(SignalServiceMessagePipe pipe, SignalServiceMessagePipe unidentifiedPipe) {
|
||||
this.pipe.set(Optional.fromNullable(pipe));
|
||||
this.unidentifiedPipe.set(Optional.fromNullable(unidentifiedPipe));
|
||||
@@ -487,32 +435,6 @@ public class SignalServiceMessageSender {
|
||||
{
|
||||
Content.Builder container = Content.newBuilder();
|
||||
|
||||
// if (message.getPreKeyBundle().isPresent()) {
|
||||
// PreKeyBundle preKeyBundle = message.getPreKeyBundle().get();
|
||||
// PreKeyBundleMessage.Builder preKeyBundleMessageBuilder = PreKeyBundleMessage.newBuilder()
|
||||
// .setDeviceId(preKeyBundle.getDeviceId())
|
||||
// .setIdentityKey(ByteString.copyFrom(preKeyBundle.getIdentityKey().serialize()))
|
||||
// .setPreKeyId(preKeyBundle.getPreKeyId())
|
||||
// .setPreKey(ByteString.copyFrom(preKeyBundle.getPreKey().serialize()))
|
||||
// .setSignedKeyId(preKeyBundle.getSignedPreKeyId())
|
||||
// .setSignedKey(ByteString.copyFrom(preKeyBundle.getSignedPreKey().serialize()))
|
||||
// .setSignature(ByteString.copyFrom(preKeyBundle.getSignedPreKeySignature()))
|
||||
// .setIdentityKey(ByteString.copyFrom(preKeyBundle.getIdentityKey().serialize()));
|
||||
// container.setPreKeyBundleMessage(preKeyBundleMessageBuilder);
|
||||
// }
|
||||
|
||||
// if (message.getDeviceLink().isPresent()) {
|
||||
// DeviceLink deviceLink = message.getDeviceLink().get();
|
||||
// SignalServiceProtos.DeviceLinkMessage.Builder deviceLinkMessageBuilder = SignalServiceProtos.DeviceLinkMessage.newBuilder()
|
||||
// .setPrimaryPublicKey(deviceLink.getMasterPublicKey())
|
||||
// .setSecondaryPublicKey(deviceLink.getSlavePublicKey())
|
||||
// .setRequestSignature(ByteString.copyFrom(Objects.requireNonNull(deviceLink.getRequestSignature())));
|
||||
// if (deviceLink.getAuthorizationSignature() != null) {
|
||||
// deviceLinkMessageBuilder.setAuthorizationSignature(ByteString.copyFrom(deviceLink.getAuthorizationSignature()));
|
||||
// }
|
||||
// container.setDeviceLinkMessage(deviceLinkMessageBuilder.build());
|
||||
// }
|
||||
|
||||
DataMessage.Builder builder = DataMessage.newBuilder();
|
||||
List<AttachmentPointer> pointers = createAttachmentPointers(message.getAttachments(), recipient);
|
||||
|
||||
@@ -552,6 +474,10 @@ public class SignalServiceMessageSender {
|
||||
builder.setProfileKey(ByteString.copyFrom(message.getProfileKey().get()));
|
||||
}
|
||||
|
||||
if (message.getSyncTarget().isPresent()) {
|
||||
builder.setSyncTarget(message.getSyncTarget().get());
|
||||
}
|
||||
|
||||
if (message.getQuote().isPresent()) {
|
||||
DataMessage.Quote.Builder quoteBuilder = DataMessage.Quote.newBuilder()
|
||||
.setId(message.getQuote().get().getId())
|
||||
@@ -629,40 +555,6 @@ public class SignalServiceMessageSender {
|
||||
return container.build().toByteArray();
|
||||
}
|
||||
|
||||
private byte[] createCallContent(SignalServiceCallMessage callMessage) {
|
||||
Content.Builder container = Content.newBuilder();
|
||||
CallMessage.Builder builder = CallMessage.newBuilder();
|
||||
|
||||
if (callMessage.getOfferMessage().isPresent()) {
|
||||
OfferMessage offer = callMessage.getOfferMessage().get();
|
||||
builder.setOffer(CallMessage.Offer.newBuilder()
|
||||
.setId(offer.getId())
|
||||
.setDescription(offer.getDescription()));
|
||||
} else if (callMessage.getAnswerMessage().isPresent()) {
|
||||
AnswerMessage answer = callMessage.getAnswerMessage().get();
|
||||
builder.setAnswer(CallMessage.Answer.newBuilder()
|
||||
.setId(answer.getId())
|
||||
.setDescription(answer.getDescription()));
|
||||
} else if (callMessage.getIceUpdateMessages().isPresent()) {
|
||||
List<IceUpdateMessage> updates = callMessage.getIceUpdateMessages().get();
|
||||
|
||||
for (IceUpdateMessage update : updates) {
|
||||
builder.addIceUpdate(CallMessage.IceUpdate.newBuilder()
|
||||
.setId(update.getId())
|
||||
.setSdp(update.getSdp())
|
||||
.setSdpMid(update.getSdpMid())
|
||||
.setSdpMLineIndex(update.getSdpMLineIndex()));
|
||||
}
|
||||
} else if (callMessage.getHangupMessage().isPresent()) {
|
||||
builder.setHangup(CallMessage.Hangup.newBuilder().setId(callMessage.getHangupMessage().get().getId()));
|
||||
} else if (callMessage.getBusyMessage().isPresent()) {
|
||||
builder.setBusy(CallMessage.Busy.newBuilder().setId(callMessage.getBusyMessage().get().getId()));
|
||||
}
|
||||
|
||||
container.setCallMessage(builder);
|
||||
return container.build().toByteArray();
|
||||
}
|
||||
|
||||
private byte[] createMultiDeviceContactsContent(SignalServiceAttachmentStream contacts, boolean complete)
|
||||
throws IOException
|
||||
{
|
||||
@@ -980,6 +872,7 @@ public class SignalServiceMessageSender {
|
||||
throws IOException
|
||||
{
|
||||
List<SendMessageResult> results = new LinkedList<>();
|
||||
SignalServiceAddress ownAddress = localAddress;
|
||||
Iterator<SignalServiceAddress> recipientIterator = recipients.iterator();
|
||||
Iterator<Optional<UnidentifiedAccess>> unidentifiedAccessIterator = unidentifiedAccess.iterator();
|
||||
|
||||
@@ -988,7 +881,7 @@ public class SignalServiceMessageSender {
|
||||
|
||||
try {
|
||||
boolean useFallbackEncryption = SessionManagementProtocol.shared.shouldMessageUseFallbackEncryption(content, recipient.getNumber(), store);
|
||||
SendMessageResult result = sendMessage(messageID, recipient, unidentifiedAccessIterator.next(), timestamp, content, online, ttl, false, useFallbackEncryption, isClosedGroup, false, notifyPNServer);
|
||||
SendMessageResult result = sendMessage(messageID, recipient, unidentifiedAccessIterator.next(), timestamp, content, online, ttl, false, useFallbackEncryption, isClosedGroup, notifyPNServer, Optional.absent());
|
||||
results.add(result);
|
||||
} catch (UnregisteredUserException e) {
|
||||
Log.w(TAG, e);
|
||||
@@ -1002,41 +895,46 @@ public class SignalServiceMessageSender {
|
||||
return results;
|
||||
}
|
||||
|
||||
private SendMessageResult sendMessage(SignalServiceAddress recipient,
|
||||
private SendMessageResult sendMessage(SignalServiceAddress recipient,
|
||||
Optional<UnidentifiedAccess> unidentifiedAccess,
|
||||
long timestamp,
|
||||
byte[] content,
|
||||
boolean online,
|
||||
int ttl,
|
||||
boolean useFallbackEncryption,
|
||||
boolean isSyncMessage)
|
||||
long timestamp,
|
||||
byte[] content,
|
||||
boolean online,
|
||||
int ttl,
|
||||
boolean useFallbackEncryption)
|
||||
throws IOException
|
||||
{
|
||||
// Loki - This method is only invoked for various types of control messages
|
||||
return sendMessage(0, recipient, unidentifiedAccess, timestamp, content, online, ttl, false, false, useFallbackEncryption, isSyncMessage, false);
|
||||
return sendMessage(0, recipient, unidentifiedAccess, timestamp, content, online, ttl, false, false, useFallbackEncryption, false,Optional.absent());
|
||||
}
|
||||
|
||||
public SendMessageResult sendMessage(final long messageID,
|
||||
final SignalServiceAddress recipient,
|
||||
public SendMessageResult sendMessage(final long messageID,
|
||||
final SignalServiceAddress recipient,
|
||||
Optional<UnidentifiedAccess> unidentifiedAccess,
|
||||
long timestamp,
|
||||
byte[] content,
|
||||
boolean online,
|
||||
int ttl,
|
||||
boolean isDeviceLinkMessage,
|
||||
boolean useFallbackEncryption,
|
||||
boolean isClosedGroup,
|
||||
boolean isSyncMessage,
|
||||
boolean notifyPNServer)
|
||||
long timestamp,
|
||||
byte[] content,
|
||||
boolean online,
|
||||
int ttl,
|
||||
boolean isDeviceLinkMessage,
|
||||
boolean useFallbackEncryption,
|
||||
boolean isClosedGroup,
|
||||
boolean notifyPNServer,
|
||||
Optional<String> syncTarget)
|
||||
throws IOException
|
||||
{
|
||||
long threadID = threadDatabase.getThreadID(recipient.getNumber());
|
||||
boolean isSelfSend = syncTarget.isPresent() && !syncTarget.get().isEmpty();
|
||||
long threadID;
|
||||
if (isSelfSend) {
|
||||
threadID = threadDatabase.getThreadID(syncTarget.get());
|
||||
} else {
|
||||
threadID = threadDatabase.getThreadID(recipient.getNumber());
|
||||
}
|
||||
PublicChat publicChat = threadDatabase.getPublicChat(threadID);
|
||||
try {
|
||||
if (publicChat != null) {
|
||||
return sendMessageToPublicChat(messageID, recipient, timestamp, content, publicChat);
|
||||
} else {
|
||||
return sendMessageToPrivateChat(messageID, recipient, unidentifiedAccess, timestamp, content, online, ttl, useFallbackEncryption, isClosedGroup, notifyPNServer);
|
||||
return sendMessageToPrivateChat(messageID, recipient, unidentifiedAccess, timestamp, content, online, ttl, useFallbackEncryption, isClosedGroup, notifyPNServer, syncTarget);
|
||||
}
|
||||
} catch (PushNetworkException e) {
|
||||
return SendMessageResult.networkFailure(recipient);
|
||||
@@ -1145,10 +1043,10 @@ public class SignalServiceMessageSender {
|
||||
int ttl,
|
||||
boolean useFallbackEncryption,
|
||||
boolean isClosedGroup,
|
||||
final boolean notifyPNServer)
|
||||
final boolean notifyPNServer,
|
||||
Optional<String> syncTarget)
|
||||
throws IOException, UntrustedIdentityException
|
||||
{
|
||||
// if (recipient.getNumber().equals(userPublicKey)) { return SendMessageResult.success(recipient, false, false); }
|
||||
final SettableFuture<?>[] future = { new SettableFuture<Unit>() };
|
||||
OutgoingPushMessageList messages = getSessionProtocolEncryptedMessage(recipient, timestamp, content);
|
||||
// Loki - Remove this when we have shared sender keys
|
||||
@@ -1214,14 +1112,10 @@ public class SignalServiceMessageSender {
|
||||
}
|
||||
return Unit.INSTANCE;
|
||||
}
|
||||
}).fail(new Function1<Exception, Unit>() {
|
||||
|
||||
@Override
|
||||
public Unit invoke(Exception exception) {
|
||||
@SuppressWarnings("unchecked") SettableFuture<Unit> f = (SettableFuture<Unit>)future[0];
|
||||
f.setException(exception);
|
||||
return Unit.INSTANCE;
|
||||
}
|
||||
}).fail(exception -> {
|
||||
@SuppressWarnings("unchecked") SettableFuture<Unit> f = (SettableFuture<Unit>)future[0];
|
||||
f.setException(exception);
|
||||
return Unit.INSTANCE;
|
||||
});
|
||||
|
||||
@SuppressWarnings("unchecked") SettableFuture<Unit> f = (SettableFuture<Unit>)future[0];
|
||||
@@ -1297,12 +1191,6 @@ public class SignalServiceMessageSender {
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
private AttachmentPointer createAttachmentPointer(SignalServiceAttachmentStream attachment)
|
||||
throws IOException
|
||||
{
|
||||
return createAttachmentPointer(attachment, false, null);
|
||||
}
|
||||
|
||||
private AttachmentPointer createAttachmentPointer(SignalServiceAttachmentStream attachment, SignalServiceAddress recipient)
|
||||
throws IOException
|
||||
{
|
||||
|
||||
@@ -342,7 +342,6 @@ public class SignalServiceCipher {
|
||||
kotlin.Pair<byte[], String> plaintextAndSenderPublicKey = SessionProtocolUtilities.INSTANCE.decryptClosedGroupCiphertext(ciphertext, groupPublicKey, apiDB, sessionProtocolImpl);
|
||||
paddedMessage = plaintextAndSenderPublicKey.getFirst();
|
||||
String senderPublicKey = plaintextAndSenderPublicKey.getSecond();
|
||||
if (senderPublicKey.equals(localAddress.getNumber())) { throw new SelfSendException(); } // Will be caught and ignored in PushDecryptJob
|
||||
metadata = new Metadata(senderPublicKey, 1, envelope.getTimestamp(), false);
|
||||
sessionVersion = sessionCipher.getSessionVersion();
|
||||
} else if (envelope.isPreKeySignalMessage()) {
|
||||
@@ -400,6 +399,7 @@ public class SignalServiceCipher {
|
||||
ClosedGroupUpdate closedGroupUpdate = content.getClosedGroupUpdate();
|
||||
ClosedGroupUpdateV2 closedGroupUpdateV2 = content.getClosedGroupUpdateV2();
|
||||
boolean isDeviceUnlinkingRequest = ((content.getFlags() & DataMessage.Flags.DEVICE_UNLINKING_REQUEST_VALUE) != 0);
|
||||
String syncTarget = content.getSyncTarget();
|
||||
|
||||
for (AttachmentPointer pointer : content.getAttachmentsList()) {
|
||||
attachments.add(createAttachmentPointer(pointer));
|
||||
@@ -428,7 +428,8 @@ public class SignalServiceCipher {
|
||||
null,
|
||||
closedGroupUpdate,
|
||||
closedGroupUpdateV2,
|
||||
isDeviceUnlinkingRequest);
|
||||
isDeviceUnlinkingRequest,
|
||||
syncTarget);
|
||||
}
|
||||
|
||||
private SignalServiceSyncMessage createSynchronizeMessage(Metadata metadata, SyncMessage content)
|
||||
|
||||
@@ -41,6 +41,7 @@ public class SignalServiceDataMessage {
|
||||
private final Optional<ClosedGroupUpdate> closedGroupUpdate;
|
||||
private final Optional<ClosedGroupUpdateV2> closedGroupUpdateV2;
|
||||
private final boolean isDeviceUnlinkingRequest;
|
||||
private final Optional<String> syncTarget;
|
||||
|
||||
/**
|
||||
* Construct a SignalServiceDataMessage with a body and no attachments.
|
||||
@@ -134,7 +135,7 @@ public class SignalServiceDataMessage {
|
||||
Quote quote, List<SharedContact> sharedContacts, List<Preview> previews,
|
||||
Sticker sticker)
|
||||
{
|
||||
this(timestamp, group, attachments, body, endSession, expiresInSeconds, expirationUpdate, profileKey, profileKeyUpdate, quote, sharedContacts, previews, sticker, null, null, null, null, false);
|
||||
this(timestamp, group, attachments, body, endSession, expiresInSeconds, expirationUpdate, profileKey, profileKeyUpdate, quote, sharedContacts, previews, sticker, null, null, null, null, false, null);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -155,7 +156,7 @@ public class SignalServiceDataMessage {
|
||||
Quote quote, List<SharedContact> sharedContacts, List<Preview> previews,
|
||||
Sticker sticker, PreKeyBundle preKeyBundle, DeviceLink deviceLink,
|
||||
ClosedGroupUpdate closedGroupUpdate, ClosedGroupUpdateV2 closedGroupUpdateV2,
|
||||
boolean isDeviceUnlinkingRequest)
|
||||
boolean isDeviceUnlinkingRequest, String syncTarget)
|
||||
{
|
||||
this.timestamp = timestamp;
|
||||
this.body = Optional.fromNullable(body);
|
||||
@@ -172,6 +173,7 @@ public class SignalServiceDataMessage {
|
||||
this.closedGroupUpdate = Optional.fromNullable(closedGroupUpdate);
|
||||
this.closedGroupUpdateV2 = Optional.fromNullable(closedGroupUpdateV2);
|
||||
this.isDeviceUnlinkingRequest = isDeviceUnlinkingRequest;
|
||||
this.syncTarget = Optional.fromNullable(syncTarget);
|
||||
|
||||
if (attachments != null && !attachments.isEmpty()) {
|
||||
this.attachments = Optional.of(attachments);
|
||||
@@ -250,6 +252,10 @@ public class SignalServiceDataMessage {
|
||||
return profileKey;
|
||||
}
|
||||
|
||||
public Optional<String> getSyncTarget() {
|
||||
return syncTarget;
|
||||
}
|
||||
|
||||
public Optional<Quote> getQuote() {
|
||||
return quote;
|
||||
}
|
||||
@@ -307,6 +313,7 @@ public class SignalServiceDataMessage {
|
||||
private Sticker sticker;
|
||||
private PreKeyBundle preKeyBundle;
|
||||
private DeviceLink deviceLink;
|
||||
private String syncTarget;
|
||||
private boolean isDeviceUnlinkingRequest;
|
||||
|
||||
private Builder() {}
|
||||
@@ -336,6 +343,11 @@ public class SignalServiceDataMessage {
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder withSyncTarget(String syncTarget) {
|
||||
this.syncTarget = syncTarget;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder asEndSessionMessage() {
|
||||
return asEndSessionMessage(true);
|
||||
}
|
||||
@@ -417,7 +429,7 @@ public class SignalServiceDataMessage {
|
||||
profileKeyUpdate, quote, sharedContacts, previews,
|
||||
sticker, preKeyBundle, deviceLink,
|
||||
null, null,
|
||||
isDeviceUnlinkingRequest);
|
||||
isDeviceUnlinkingRequest, syncTarget);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -65,19 +65,20 @@ object DownloadUtilities {
|
||||
Log.d("Loki", "Attachment size limit exceeded.")
|
||||
throw PushNetworkException("Max response size exceeded.")
|
||||
}
|
||||
val input = body.inputStream()
|
||||
val buffer = ByteArray(32768)
|
||||
var count = 0
|
||||
var bytes = input.read(buffer)
|
||||
while (bytes >= 0) {
|
||||
outputStream.write(buffer, 0, bytes)
|
||||
count += bytes
|
||||
if (count > maxSize) {
|
||||
Log.d("Loki", "Attachment size limit exceeded.")
|
||||
throw PushNetworkException("Max response size exceeded.")
|
||||
body.inputStream().use { input ->
|
||||
val buffer = ByteArray(32768)
|
||||
var count = 0
|
||||
var bytes = input.read(buffer)
|
||||
while (bytes >= 0) {
|
||||
outputStream.write(buffer, 0, bytes)
|
||||
count += bytes
|
||||
if (count > maxSize) {
|
||||
Log.d("Loki", "Attachment size limit exceeded.")
|
||||
throw PushNetworkException("Max response size exceeded.")
|
||||
}
|
||||
listener?.onAttachmentProgress(body.size.toLong(), count.toLong())
|
||||
bytes = input.read(buffer)
|
||||
}
|
||||
listener?.onAttachmentProgress(body.size.toLong(), count.toLong())
|
||||
bytes = input.read(buffer)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Log.d("Loki", "Couldn't download attachment due to error: $e.")
|
||||
|
||||
Reference in New Issue
Block a user