fix: self-send messages now send to yourself only and aren't treated as sync messages

pull/441/head
Jubb 4 years ago
parent a44a79e59f
commit a63fce4ca6

@ -287,11 +287,12 @@ public class PushMediaSendJob extends PushSendJob implements InjectableType {
if (SessionMetaProtocol.shared.isNoteToSelf(address.getNumber())) { if (SessionMetaProtocol.shared.isNoteToSelf(address.getNumber())) {
// Loki - Device link messages don't go through here // Loki - Device link messages don't go through here
Optional<UnidentifiedAccessPair> syncAccess = UnidentifiedAccessUtil.getAccessForSync(context); SendMessageResult result = messageSender.sendMessage(messageId, address, unidentifiedAccessPair, mediaMessage);
SignalServiceSyncMessage syncMessage = buildSelfSendSyncMessage(context, mediaMessage, syncAccess); if (result.getLokiAPIError() != null) {
throw result.getLokiAPIError();
messageSender.sendMessage(syncMessage, syncAccess); } else {
return syncAccess.isPresent(); return result.getSuccess().isUnidentified();
}
} else { } else {
SendMessageResult result = messageSender.sendMessage(messageId, address, unidentifiedAccessPair, mediaMessage); SendMessageResult result = messageSender.sendMessage(messageId, address, unidentifiedAccessPair, mediaMessage);
if (result.getLokiAPIError() != null) { if (result.getLokiAPIError() != null) {

@ -226,11 +226,12 @@ public class PushTextSendJob extends PushSendJob implements InjectableType {
if (SessionMetaProtocol.shared.isNoteToSelf(address.getNumber())) { if (SessionMetaProtocol.shared.isNoteToSelf(address.getNumber())) {
// Loki - Device link messages don't go through here // Loki - Device link messages don't go through here
Optional<UnidentifiedAccessPair> syncAccess = UnidentifiedAccessUtil.getAccessForSync(context); SendMessageResult result = messageSender.sendMessage(messageId, address, unidentifiedAccess, textSecureMessage);
SignalServiceSyncMessage syncMessage = buildSelfSendSyncMessage(context, textSecureMessage, syncAccess); if (result.getLokiAPIError() != null) {
throw result.getLokiAPIError();
messageSender.sendMessage(syncMessage, syncAccess); } else {
return syncAccess.isPresent(); return result.getSuccess().isUnidentified();
}
} else { } else {
SendMessageResult result = messageSender.sendMessage(messageId, address, unidentifiedAccess, textSecureMessage); SendMessageResult result = messageSender.sendMessage(messageId, address, unidentifiedAccess, textSecureMessage);
if (result.getLokiAPIError() != null) { if (result.getLokiAPIError() != null) {

Loading…
Cancel
Save