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

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
}

37
src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
View file

@ -12,17 +12,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
import java.util.List;
public class JsonMessageEnvelope {
<<<<<<< HEAD
String source;
int sourceDevice;
String relay;
long timestamp;
JsonDataMessage dataMessage;
JsonSyncMessage syncMessage;
JsonCallMessage callMessage;
JsonReceiptMessage receiptMessage;
// String typingAction;
=======
@JsonProperty
final String source;
@ -56,7 +45,6 @@ public class JsonMessageEnvelope {
@JsonProperty
@JsonInclude(JsonInclude.Include.NON_NULL)
final JsonTypingMessage typingMessage;
>>>>>>> upstream/master
public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
@ -81,30 +69,6 @@ public class JsonMessageEnvelope {
} else {
this.receiptMessage = null;
}
<<<<<<< HEAD
if (content != null) {
if (envelope.isUnidentifiedSender()) {
this.source = content.getSender().getLegacyIdentifier();
this.sourceDevice = content.getSenderDevice();
}
if (content.getDataMessage().isPresent()) {
this.dataMessage = new JsonDataMessage(content.getDataMessage().get(), m);
}
if (content.getSyncMessage().isPresent()) {
this.syncMessage = new JsonSyncMessage(content.getSyncMessage().get(), m);
}
if (content.getCallMessage().isPresent()) {
this.callMessage = new JsonCallMessage(content.getCallMessage().get());
}
if (content.getReceiptMessage().isPresent()) {
this.receiptMessage = new JsonReceiptMessage(content.getReceiptMessage().get());
}
/* if (content.getTypingMessage().isPresent()) {
SignalServiceTypingMessage typingMessage = content.getTypingMessage().get();
this.typingAction = content.getTypingMessage().get();
}
*/ }
=======
this.typingMessage = content != null && content.getTypingMessage().isPresent()
? new JsonTypingMessage(content.getTypingMessage().get())
: null;
@ -118,7 +82,6 @@ public class JsonMessageEnvelope {
this.callMessage = content != null && content.getCallMessage().isPresent()
? new JsonCallMessage(content.getCallMessage().get())
: null;
>>>>>>> upstream/master
}
public JsonMessageEnvelope(Signal.MessageReceived messageReceived) {