TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-08 05:08:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not set or read reaction target phone number.

Browse Source
This commit is contained in:
Alan Evans 2020-09-17 14:51:23 -03:00 committed by Greyson Parrelli
parent e05f137bd8
commit 64efb3d2a4
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@ -681,11 +681,6 @@ public class SignalServiceMessageSender {
.setRemove(message.getReaction().get().isRemove()) .setRemove(message.getReaction().get().isRemove())
.setTargetSentTimestamp(message.getReaction().get().getTargetSentTimestamp()); .setTargetSentTimestamp(message.getReaction().get().getTargetSentTimestamp());
// TODO [Alan] PhoneNumberPrivacy: Do not set this number
if (message.getReaction().get().getTargetAuthor().getNumber().isPresent()) {
reactionBuilder.setTargetAuthorE164(message.getReaction().get().getTargetAuthor().getNumber().get());
}
if (message.getReaction().get().getTargetAuthor().getUuid().isPresent()) { if (message.getReaction().get().getTargetAuthor().getUuid().isPresent()) {
reactionBuilder.setTargetAuthorUuid(message.getReaction().get().getTargetAuthor().getUuid().get().toString()); reactionBuilder.setTargetAuthorUuid(message.getReaction().get().getTargetAuthor().getUuid().get().toString());
} }

15
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
View File

@ -49,6 +49,7 @@ import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID;
import static org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContext.Type.DELIVER; import static org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContext.Type.DELIVER;
@ -745,19 +746,25 @@ public final class SignalServiceContent {
} }
private static SignalServiceDataMessage.Reaction createReaction(SignalServiceProtos.DataMessage content) { private static SignalServiceDataMessage.Reaction createReaction(SignalServiceProtos.DataMessage content) {
if (!content.hasReaction() || if (!content.hasReaction() ||
!content.getReaction().hasEmoji() || !content.getReaction().hasEmoji() ||
!(content.getReaction().hasTargetAuthorE164() || content.getReaction().hasTargetAuthorUuid()) || !content.getReaction().hasTargetAuthorUuid() ||
!content.getReaction().hasTargetSentTimestamp()) !content.getReaction().hasTargetSentTimestamp())
{ {
return null; return null;
} }
SignalServiceProtos.DataMessage.Reaction reaction = content.getReaction(); SignalServiceProtos.DataMessage.Reaction reaction = content.getReaction();
UUID uuid = UuidUtil.parseOrNull(reaction.getTargetAuthorUuid());
if (uuid == null) {
Log.w(TAG, "Cannot parse author UUID on reaction");
return null;
}
return new SignalServiceDataMessage.Reaction(reaction.getEmoji(), return new SignalServiceDataMessage.Reaction(reaction.getEmoji(),
reaction.getRemove(), reaction.getRemove(),
new SignalServiceAddress(UuidUtil.parseOrNull(reaction.getTargetAuthorUuid()), reaction.getTargetAuthorE164()), new SignalServiceAddress(uuid, null),
reaction.getTargetSentTimestamp()); reaction.getTargetSentTimestamp());
} }

2
libsignal/service/src/main/proto/SignalService.proto
View File

@ -221,7 +221,7 @@ message DataMessage {
message Reaction { message Reaction {
optional string emoji = 1; optional string emoji = 1;
optional bool remove = 2; optional bool remove = 2;
optional string targetAuthorE164 = 3; // optional string targetAuthorE164 = 3;
optional string targetAuthorUuid = 4; optional string targetAuthorUuid = 4;
optional uint64 targetSentTimestamp = 5; optional uint64 targetSentTimestamp = 5;
} }