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

Removed debug null check and made minor changes to match existing coding style

Browse source
This commit is contained in:
david-harley 2020-12-22 15:36:35 +10:30
parent 5767853ef0
commit 7eb0487719
7 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ class JsonDataMessage {
List<JsonAttachment> attachments;
JsonGroupInfo groupInfo;
JsonDataMessage(SignalServiceDataMessage dataMessage, final Manager m) {
JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {
this.timestamp = dataMessage.getTimestamp();
if (dataMessage.getGroupContext().isPresent()) {
if (dataMessage.getGroupContext().get().getGroupV1().isPresent()) {
@ -39,17 +39,10 @@ class JsonDataMessage {
}
this.expiresInSeconds = dataMessage.getExpiresInSeconds();
if (dataMessage.getReaction().isPresent()) {
if(m == null){
System.out.println("ERROR, MANAGER NOT SET");
}
else {
this.reaction = new JsonReaction(dataMessage.getReaction().get(), m);
}
this.reaction = new JsonReaction(dataMessage.getReaction().get(), m);
}
if (dataMessage.getQuote().isPresent()) {
this.quote = new JsonQuote(dataMessage.getQuote().get());
} else {
this.quote = null;
}
if (dataMessage.getMentions().isPresent()) {
this.mentions = new ArrayList<>(dataMessage.getMentions().get().size());

2
src/main/java/org/asamk/signal/json/JsonMention.java
View file

@ -9,7 +9,7 @@ public class JsonMention {
int start;
int length;
JsonMention(SignalServiceDataMessage.Mention mention){
JsonMention(SignalServiceDataMessage.Mention mention) {
this.uuid = mention.getUuid();
this.start = mention.getStart();
this.length = mention.getLength();

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

@ -20,7 +20,7 @@ public class JsonMessageEnvelope {
JsonReceiptMessage receiptMessage;
public JsonMessageEnvelope(
SignalServiceEnvelope envelope, SignalServiceContent content, final Manager m
SignalServiceEnvelope envelope, SignalServiceContent content, Manager m
) {
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
SignalServiceAddress source = envelope.getSourceAddress();

2
src/main/java/org/asamk/signal/json/JsonQuote.java
View file

@ -13,7 +13,7 @@ public class JsonQuote {
String text;
List<JsonAttachment> attachments;
JsonQuote(SignalServiceDataMessage.Quote quote){
JsonQuote(SignalServiceDataMessage.Quote quote) {
this.id = quote.getId();
this.author = quote.getAuthor().getLegacyIdentifier();
this.text = quote.getText();

2
src/main/java/org/asamk/signal/json/JsonReaction.java
View file

@ -10,7 +10,7 @@ public class JsonReaction {
long targetSentTimestamp;
boolean isRemove;
JsonReaction(Reaction reaction, final Manager m){
JsonReaction(Reaction reaction, Manager m) {
this.emoji = reaction.getEmoji();
this.targetAuthor = m.resolveSignalServiceAddress(reaction.getTargetAuthor()).getLegacyIdentifier();
this.targetSentTimestamp = reaction.getTargetSentTimestamp();

2
src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
View file

@ -8,7 +8,7 @@ class JsonSyncDataMessage extends JsonDataMessage {
String destination;
JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, final Manager m) {
JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, Manager m) {
super(transcriptMessage.getMessage(), m);
if (transcriptMessage.getDestination().isPresent()) {
this.destination = transcriptMessage.getDestination().get().getLegacyIdentifier();

2
src/main/java/org/asamk/signal/json/JsonSyncMessage.java
View file

@ -22,7 +22,7 @@ class JsonSyncMessage {
List<ReadMessage> readMessages;
JsonSyncMessageType type;
JsonSyncMessage(SignalServiceSyncMessage syncMessage, final Manager m) {
JsonSyncMessage(SignalServiceSyncMessage syncMessage, Manager m) {
if (syncMessage.getSent().isPresent()) {
this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get(), m);
}