webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-04 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix unmerged files

Browse source
This commit is contained in:
technillogue 2021-04-24 22:37:59 -04:00
parent 685fce477c
commit cc5bb13519
5 changed files with 6 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/asamk/signal/json/JsonDataMessage.java
View file

@ -125,19 +125,18 @@ class JsonDataMessage {
} else {
this.attachments = List.of();
}
<<<<<<< HEAD
if (dataMessage.getReaction().isPresent()) {
/*if (dataMessage.getReaction().isPresent()) { // not sure if json reactions have been implemented elsewhere
final SignalServiceDataMessage.Reaction reaction = dataMessage.getReaction().get();
this.reaction = new JsonReaction(reaction);
/* this.emoji = reaction.getEmoji();
this.emoji = reaction.getEmoji();
this.targetAuthor = reaction.getTargetAuthor().getLegacyIdentifier();
this.targetTimestamp = reaction.getTargetSentTimestamp();
*/ } /*else {
this.reaction = null;
this.targetTimestamp = reaction.getTargetSentTimestamp();
} else {
this.reaction = null;
this.emoji = "";
this.targetAuthor = "";
this.targetTimestamp = 0;
=======
}*/
this.sticker = dataMessage.getSticker().isPresent() ? new JsonSticker(dataMessage.getSticker().get()) : null;
if (dataMessage.getSharedContacts().isPresent()) {
@ -150,7 +149,6 @@ class JsonDataMessage {
this.contacts = List.of();
}
}
>>>>>>> upstream/master
}