Use Java 17

[signal-cli] / src / main / java / org / asamk / signal / json / JsonMessageEnvelope.java

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 7b884b0e3887588013854933ab7013c0356b35d8..0d44de5d91fd3540ebc4135bafae138ffaf640ea 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -71,8 +71,7 @@ public class JsonMessageEnvelope {
             this.sourceNumber = source.getNumber().orNull();
             this.sourceUuid = source.getUuid().toString();
             this.sourceDevice = content.getSenderDevice();
-        } else if (exception instanceof UntrustedIdentityException) {
-            var e = (UntrustedIdentityException) exception;
+        } else if (exception instanceof UntrustedIdentityException e) {
             final var source = m.resolveSignalServiceAddress(e.getSender());
             this.source = getLegacyIdentifier(source);
             this.sourceNumber = source.getNumber().orNull();
@@ -86,7 +85,7 @@ public class JsonMessageEnvelope {
         }
         String name;
         try {
-            name = m.getContactOrProfileName(RecipientIdentifier.Single.fromString(this.source, m.getUsername()));
+            name = m.getContactOrProfileName(RecipientIdentifier.Single.fromString(this.source, m.getSelfNumber()));
         } catch (InvalidNumberException | NullPointerException e) {
             name = null;
         }