]> nmode's Git Repositories - signal-cli/commitdiff
Fix sending to username
authorAsamK <asamk@gmx.de>
Sun, 18 Feb 2024 19:58:55 +0000 (20:58 +0100)
committerAsamK <asamk@gmx.de>
Sun, 18 Feb 2024 19:58:55 +0000 (20:58 +0100)
graalvm-config-dir/reflect-config.json
lib/src/main/java/org/asamk/signal/manager/api/RecipientAddress.java
lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientAddress.java

index 8be375768fb7a86c0f459c29b62703b726e7c24c..899c6dfcde76dbb17b7434b5f701018891fe0917 100644 (file)
   "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,
index f042f8fbab8ce0b184f5fa570934cbf05d857d26..c94a21acb47563f28785ccc5f717403d7824a1d6 100644 (file)
@@ -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!");
         }
     }
 
index d0bd033e079c252e93f5def28eca2fa04b8b3a80..7eacb6a42f54961f63d7dfb85e3e3e5d1735a35d 100644 (file)
@@ -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!");
         }
     }