From: AsamK <asamk@gmx.de>
Date: Wed, 16 Mar 2022 18:37:58 +0000 (+0100)
Subject: Fix NoSuchElementException in json serialization for messages from an untrusted identity
X-Git-Tag: v0.10.4.2~4
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/3c2fa65e05ee6e57e88edb947385e0858f205949?ds=inline

Fix NoSuchElementException in json serialization for messages from an untrusted identity

Fixes #910
---

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 264b7fce..18207747 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -3,9 +3,9 @@ package org.asamk.signal.json;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.api.UntrustedIdentityException;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.UntrustedIdentityException;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 import java.util.UUID;
@@ -48,8 +48,7 @@ public record JsonMessageEnvelope(
             source = sourceAddress.getLegacyIdentifier();
             sourceNumber = sourceAddress.number().orElse(null);
             sourceUuid = sourceAddress.uuid().map(UUID::toString).orElse(null);
-            sourceName = m.getContactOrProfileName(RecipientIdentifier.Single.fromAddress(envelope.sourceAddress()
-                    .get()));
+            sourceName = m.getContactOrProfileName(RecipientIdentifier.Single.fromAddress(sourceAddress));
         } else {
             source = null;
             sourceNumber = null;