From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 19:58:55 +0000 (+0100)
Subject: Fix sending to username
X-Git-Tag: v0.13.0~6
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/ed40d116b70f17950f58e66005cb7a00d619c635

Fix sending to username
---

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 8be37576..899c6dfc 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2425,6 +2425,13 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.GetUsernameFromLinkResponseBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }, {"name":"<init>","parameterTypes":["java.lang.String","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.GroupMismatchedDevices",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientAddress.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientAddress.java
index f042f8fb..c94a21ac 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientAddress.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientAddress.java
@@ -19,7 +19,7 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number, Opt
     public RecipientAddress {
         uuid = uuid.isPresent() && uuid.get().equals(UNKNOWN_UUID) ? Optional.empty() : uuid;
         if (uuid.isEmpty() && number.isEmpty() && username.isEmpty()) {
-            throw new AssertionError("Must have either a UUID or E164 number!");
+            throw new AssertionError("Must have either a UUID, username or E164 number!");
         }
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java
index d0bd033e..7eacb6a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java
@@ -26,8 +26,8 @@ public record RecipientAddress(
         if (pni.isPresent() && pni.get().isUnknown()) {
             pni = Optional.empty();
         }
-        if (aci.isEmpty() && pni.isEmpty() && number.isEmpty()) {
-            throw new AssertionError("Must have either a ServiceId or E164 number!");
+        if (aci.isEmpty() && pni.isEmpty() && number.isEmpty() && username.isEmpty()) {
+            throw new AssertionError("Must have either a ServiceId, username or E164 number!");
         }
     }