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

catch NullPointerException instead of checking for null

Browse source
This commit is contained in:
technillogue 2021-07-21 15:35:26 -04:00
parent 72e89cd0fc
commit 17ccb20507
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -67,17 +67,13 @@ public class JsonMessageEnvelope {
this.sourceDevice = null; this.sourceDevice = null;
this.relay = null; this.relay = null;
} }
if (this.source != null) {
String name; String name;
try { try {
name = m.getContactOrProfileName(this.source); name = m.getContactOrProfileName(this.source);
} catch (InvalidNumberException e) { } catch (InvalidNumberException | NullPointerException e) {
name = null; name = null;
} }
this.sourceName = name; this.sourceName = name;
} else {
this.sourceName = null;
}
this.timestamp = envelope.getTimestamp(); this.timestamp = envelope.getTimestamp();
if (envelope.isReceipt()) { if (envelope.isReceipt()) {
this.receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp)); this.receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));