From 2a1be0bd85547a9308224ef44917a74186ec7b7b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 21 Oct 2022 10:25:57 +0200
Subject: [PATCH 001/672] Improve graalvm native build wih resource autodetect

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2bf8eede..b88a6bf8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,8 +20,8 @@ application {
 graalvmNative {
     binaries {
         this["main"].run {
+            resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
-            buildArgs.add("--report-unsupported-elements-at-runtime")
         }
     }
 }

From ae221e0447e163f02ad5a198586ce998136a55e7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 21 Oct 2022 10:33:46 +0200
Subject: [PATCH 002/672] Disable graalvm toolchain detection if GRAALVM_HOME
 is set

---
 build.gradle.kts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index b88a6bf8..49ff1f46 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,6 +22,13 @@ graalvmNative {
         this["main"].run {
             resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
+            if (System.getenv("GRAALVM_HOME") == null) {
+                javaLauncher.set(javaToolchains.launcherFor {
+                    languageVersion.set(JavaLanguageVersion.of(17))
+                })
+            } else {
+                toolchainDetection.set(false)
+            }
         }
     }
 }

From e450f36e813250f3a2a78ff13970b34d01ab1924 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 21 Oct 2022 16:22:09 +0200
Subject: [PATCH 003/672] Don't output caption if it's empty

---
 .../main/java/org/asamk/signal/manager/api/MessageEnvelope.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 2140d413..2eb0546a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -289,7 +289,7 @@ public record MessageEnvelope(
                             a.getSize().map(Integer::longValue),
                             a.getPreview(),
                             Optional.empty(),
-                            a.getCaption(),
+                            a.getCaption().map(c -> c.isEmpty() ? null : c),
                             a.getWidth() == 0 ? Optional.empty() : Optional.of(a.getWidth()),
                             a.getHeight() == 0 ? Optional.empty() : Optional.of(a.getHeight()),
                             a.getVoiceNote(),

From b9eee539bdaa6eb27b9acd4e829e1eaeeb6e1c6c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 16 Oct 2022 19:17:43 +0200
Subject: [PATCH 004/672] Add PNI to recipients

---
 .idea/codeStyles/Project.xml                  |   3 +
 lib/build.gradle.kts                          |   6 +
 .../helper/IncomingMessageHandler.java        |  71 +++-
 .../manager/storage/AccountDatabase.java      |  10 +-
 .../signal/manager/storage/SignalAccount.java |   5 +-
 .../recipients/MergeRecipientHelper.java      | 140 ++++++++
 .../storage/recipients/RecipientAddress.java  |  60 ++++
 .../storage/recipients/RecipientStore.java    | 178 +++++-----
 .../recipients/RecipientWithAddress.java      |   3 +
 .../recipients/MergeRecipientHelperTest.java  | 330 ++++++++++++++++++
 10 files changed, 696 insertions(+), 110 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java
 create mode 100644 lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index bb65b3e9..adf3548b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -54,6 +54,9 @@
       <option name="TERNARY_OPERATION_WRAP" value="5" />
       <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
       <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
+      <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
       <option name="ENUM_CONSTANTS_WRAP" value="2" />
     </codeStyleSettings>
     <codeStyleSettings language="XML">
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 2e5feb3a..ca37c1f3 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -21,6 +21,12 @@ dependencies {
     implementation("org.slf4j", "slf4j-api", "2.0.3")
     implementation("org.xerial", "sqlite-jdbc", "3.39.3.0")
     implementation("com.zaxxer", "HikariCP", "5.0.1")
+
+    testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.0")
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
 }
 
 configurations {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 80cf7687..bd42ae5f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -56,16 +56,19 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
+import org.whispersystems.signalservice.api.messages.SignalServicePniSignatureMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
+import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 public final class IncomingMessageHandler {
@@ -194,7 +197,18 @@ public final class IncomingMessageHandler {
         if (content != null) {
             // Store uuid if we don't have it already
             // address/uuid is validated by unidentified sender certificate
-            account.getRecipientTrustedResolver().resolveRecipientTrusted(content.getSender());
+
+            boolean handledPniSignature = false;
+            if (content.getPniSignatureMessage().isPresent()) {
+                final var message = content.getPniSignatureMessage().get();
+                final var senderAddress = getSenderAddress(envelope, content);
+                if (senderAddress != null) {
+                    handledPniSignature = handlePniSignatureMessage(message, senderAddress);
+                }
+            }
+            if (!handledPniSignature) {
+                account.getRecipientTrustedResolver().resolveRecipientTrusted(content.getSender());
+            }
         }
         if (envelope.isReceipt()) {
             final var senderDeviceAddress = getSender(envelope, content);
@@ -215,8 +229,9 @@ public final class IncomingMessageHandler {
             logger.info("Ignoring a message from blocked user/group: {}", envelope.getTimestamp());
             return List.of();
         } else if (notAllowedToSendToGroup) {
+            final var senderAddress = getSenderAddress(envelope, content);
             logger.info("Ignoring a group message from an unauthorized sender (no member or admin): {} {}",
-                    (envelope.hasSourceUuid() ? envelope.getSourceAddress() : content.getSender()).getIdentifier(),
+                    senderAddress == null ? null : senderAddress.getIdentifier(),
                     envelope.getTimestamp());
             return List.of();
         } else {
@@ -323,6 +338,32 @@ public final class IncomingMessageHandler {
         return actions;
     }
 
+    private boolean handlePniSignatureMessage(
+            final SignalServicePniSignatureMessage message, final SignalServiceAddress senderAddress
+    ) {
+        final var aci = ACI.from(senderAddress.getServiceId());
+        final var aciIdentity = account.getIdentityKeyStore().getIdentityInfo(aci);
+        final var pni = message.getPni();
+        final var pniIdentity = account.getIdentityKeyStore().getIdentityInfo(pni);
+
+        if (aciIdentity == null || pniIdentity == null || aci.equals(pni)) {
+            return false;
+        }
+
+        final var verified = pniIdentity.getIdentityKey()
+                .verifyAlternateIdentity(aciIdentity.getIdentityKey(), message.getSignature());
+
+        if (!verified) {
+            logger.debug("Invalid PNI signature of ACI {} with PNI {}", aci, pni);
+            return false;
+        }
+
+        logger.debug("Verified association of ACI {} with PNI {}", aci, pni);
+        account.getRecipientTrustedResolver()
+                .resolveRecipientTrusted(Optional.of(aci), Optional.of(pni), senderAddress.getNumber());
+        return true;
+    }
+
     private void handleDecryptionErrorMessage(
             final List<HandleAction> actions,
             final RecipientId sender,
@@ -585,12 +626,8 @@ public final class IncomingMessageHandler {
     }
 
     private boolean isMessageBlocked(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        SignalServiceAddress source;
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
-            source = envelope.getSourceAddress();
-        } else if (content != null) {
-            source = content.getSender();
-        } else {
+        SignalServiceAddress source = getSenderAddress(envelope, content);
+        if (source == null) {
             return false;
         }
         final var recipientId = context.getRecipientHelper().resolveRecipient(source);
@@ -608,12 +645,8 @@ public final class IncomingMessageHandler {
     }
 
     private boolean isNotAllowedToSendToGroup(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        SignalServiceAddress source;
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
-            source = envelope.getSourceAddress();
-        } else if (content != null) {
-            source = content.getSender();
-        } else {
+        SignalServiceAddress source = getSenderAddress(envelope, content);
+        if (source == null) {
             return false;
         }
 
@@ -853,6 +886,16 @@ public final class IncomingMessageHandler {
         this.account.getProfileStore().storeProfileKey(source, profileKey);
     }
 
+    private SignalServiceAddress getSenderAddress(SignalServiceEnvelope envelope, SignalServiceContent content) {
+        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
+            return envelope.getSourceAddress();
+        } else if (content != null) {
+            return content.getSender();
+        } else {
+            return null;
+        }
+    }
+
     private DeviceAddress getSender(SignalServiceEnvelope envelope, SignalServiceContent content) {
         if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
             return new DeviceAddress(context.getRecipientHelper().resolveRecipient(envelope.getSourceAddress()),
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 3c168860..c13be697 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -22,7 +22,7 @@ import java.sql.SQLException;
 public class AccountDatabase extends Database {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 10;
+    private static final long DATABASE_VERSION = 11;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -288,5 +288,13 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 11) {
+            logger.debug("Updating database: Adding pni field");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD COLUMN pni BLOB;
+                                        """);
+            }
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index db919269..1759649e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -102,7 +102,7 @@ public class SignalAccount implements Closeable {
     private final static Logger logger = LoggerFactory.getLogger(SignalAccount.class);
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
-    private static final int CURRENT_STORAGE_VERSION = 5;
+    private static final int CURRENT_STORAGE_VERSION = 6;
 
     private final Object LOCK = new Object();
 
@@ -634,6 +634,9 @@ public class SignalAccount implements Closeable {
                 migratedLegacyConfig = true;
             }
         }
+        if (previousStorageVersion < 6) {
+            getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
+        }
         final var legacyAciPreKeysPath = getAciPreKeysPath(dataPath, accountPath);
         if (legacyAciPreKeysPath.exists()) {
             LegacyPreKeyStore.migrate(legacyAciPreKeysPath, getAciPreKeyStore());
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
new file mode 100644
index 00000000..0afde555
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -0,0 +1,140 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.asamk.signal.manager.api.Pair;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class MergeRecipientHelper {
+
+    private final static Logger logger = LoggerFactory.getLogger(MergeRecipientHelper.class);
+
+    static Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
+            Store store, RecipientAddress address
+    ) throws SQLException {
+        // address has serviceId and number, optionally also pni
+
+        final var recipients = store.findAllByAddress(address);
+
+        if (recipients.isEmpty()) {
+            logger.debug("Got new recipient, serviceId, PNI and number are unknown");
+            return new Pair<>(store.addNewRecipient(address), List.of());
+        }
+
+        if (recipients.size() == 1) {
+            final var recipient = recipients.stream().findFirst().get();
+            if (recipient.address().hasIdentifiersOf(address)) {
+                return new Pair<>(recipient.id(), List.of());
+            }
+
+            if (recipient.address().serviceId().isEmpty() || (
+                    recipient.address().serviceId().equals(address.serviceId())
+            ) || (
+                    recipient.address().pni().isPresent() && recipient.address().pni().equals(address.serviceId())
+            ) || (
+                    recipient.address().serviceId().equals(address.pni())
+            ) || (
+                    address.pni().isPresent() && address.pni().equals(recipient.address().pni())
+            )) {
+                logger.debug("Got existing recipient {}, updating with high trust address", recipient.id());
+                store.updateRecipientAddress(recipient.id(), recipient.address().withIdentifiersFrom(address));
+                return new Pair<>(recipient.id(), List.of());
+            }
+
+            logger.debug(
+                    "Got recipient {} existing with number/pni, but different serviceId, so stripping its number and adding new recipient",
+                    recipient.id());
+            store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(address));
+
+            return new Pair<>(store.addNewRecipient(address), List.of());
+        }
+
+        var resultingRecipient = recipients.stream()
+                .filter(r -> r.address().serviceId().equals(address.serviceId()) || r.address()
+                        .pni()
+                        .equals(address.serviceId()))
+                .findFirst();
+        if (resultingRecipient.isEmpty() && address.pni().isPresent()) {
+            resultingRecipient = recipients.stream().filter(r -> r.address().serviceId().equals(address.pni()) || (
+                    address.serviceId().equals(address.pni()) && r.address().pni().equals(address.pni())
+            )).findFirst();
+        }
+
+        final Set<RecipientWithAddress> remainingRecipients;
+        if (resultingRecipient.isEmpty()) {
+            remainingRecipients = recipients;
+        } else {
+            remainingRecipients = new HashSet<>(recipients);
+            remainingRecipients.remove(resultingRecipient.get());
+        }
+
+        final var recipientsToBeMerged = new HashSet<RecipientWithAddress>();
+        final var recipientsToBeStripped = new HashSet<RecipientWithAddress>();
+        for (final var recipient : remainingRecipients) {
+            if (!recipient.address().hasAdditionalIdentifiersThan(address)) {
+                recipientsToBeMerged.add(recipient);
+                continue;
+            }
+
+            if (recipient.address().hasOnlyPniAndNumber()) {
+                // PNI and phone number are linked by the server
+                recipientsToBeMerged.add(recipient);
+                continue;
+            }
+
+            recipientsToBeStripped.add(recipient);
+        }
+
+        logger.debug("Got separate recipients for high trust identifiers {}, need to merge ({}) and strip ({})",
+                address,
+                recipientsToBeMerged.stream().map(r -> r.id().toString()).collect(Collectors.joining(", ")),
+                recipientsToBeStripped.stream().map(r -> r.id().toString()).collect(Collectors.joining(", ")));
+
+        RecipientAddress finalAddress = resultingRecipient.map(RecipientWithAddress::address).orElse(null);
+        for (final var recipient : recipientsToBeMerged) {
+            if (finalAddress == null) {
+                finalAddress = recipient.address();
+            } else {
+                finalAddress = finalAddress.withIdentifiersFrom(recipient.address());
+            }
+            store.removeRecipientAddress(recipient.id());
+        }
+        if (finalAddress == null) {
+            finalAddress = address;
+        } else {
+            finalAddress = finalAddress.withIdentifiersFrom(address);
+        }
+
+        for (final var recipient : recipientsToBeStripped) {
+            store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(address));
+        }
+
+        // Create fixed RecipientIds that won't update its id after merged
+        final var toBeMergedRecipientIds = recipientsToBeMerged.stream()
+                .map(r -> new RecipientId(r.id().id(), null))
+                .toList();
+
+        if (resultingRecipient.isPresent()) {
+            store.updateRecipientAddress(resultingRecipient.get().id(), finalAddress);
+            return new Pair<>(resultingRecipient.get().id(), toBeMergedRecipientIds);
+        }
+
+        return new Pair<>(store.addNewRecipient(finalAddress), toBeMergedRecipientIds);
+    }
+
+    public interface Store {
+
+        Set<RecipientWithAddress> findAllByAddress(final RecipientAddress address) throws SQLException;
+
+        RecipientId addNewRecipient(final RecipientAddress address) throws SQLException;
+
+        void updateRecipientAddress(RecipientId recipientId, final RecipientAddress address) throws SQLException;
+
+        void removeRecipientAddress(RecipientId recipientId) throws SQLException;
+    }
+}
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 c3b18299..7dc193a9 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
@@ -24,6 +24,14 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
         if (serviceId.isEmpty() && pni.isPresent()) {
             serviceId = Optional.of(pni.get());
         }
+        if (serviceId.isPresent() && serviceId.get() instanceof PNI sPNI) {
+            if (pni.isPresent() && !sPNI.equals(pni.get())) {
+                throw new AssertionError("Must not have two different PNIs!");
+            }
+            if (pni.isEmpty()) {
+                pni = Optional.of(sPNI);
+            }
+        }
         if (serviceId.isEmpty() && number.isEmpty()) {
             throw new AssertionError("Must have either a ServiceId or E164 number!");
         }
@@ -49,6 +57,22 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
         this(Optional.of(serviceId), Optional.empty());
     }
 
+    public RecipientAddress withIdentifiersFrom(RecipientAddress address) {
+        return new RecipientAddress((
+                this.serviceId.isEmpty() || this.isServiceIdPNI() || this.serviceId.equals(address.pni)
+        ) && !address.isServiceIdPNI() ? address.serviceId : this.serviceId,
+                address.pni.or(this::pni),
+                address.number.or(this::number));
+    }
+
+    public RecipientAddress removeIdentifiersFrom(RecipientAddress address) {
+        return new RecipientAddress(address.serviceId.equals(this.serviceId) || address.pni.equals(this.serviceId)
+                ? Optional.empty()
+                : this.serviceId,
+                address.pni.equals(this.pni) || address.serviceId.equals(this.pni) ? Optional.empty() : this.pni,
+                address.number.equals(this.number) ? Optional.empty() : this.number);
+    }
+
     public ServiceId getServiceId() {
         return serviceId.orElse(ServiceId.UNKNOWN);
     }
@@ -89,6 +113,42 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
         );
     }
 
+    public boolean hasSingleIdentifier() {
+        return serviceId().isEmpty() || number.isEmpty();
+    }
+
+    public boolean hasIdentifiersOf(RecipientAddress address) {
+        return (address.serviceId.isEmpty() || address.serviceId.equals(serviceId) || address.serviceId.equals(pni))
+                && (address.pni.isEmpty() || address.pni.equals(pni))
+                && (address.number.isEmpty() || address.number.equals(number));
+    }
+
+    public boolean hasAdditionalIdentifiersThan(RecipientAddress address) {
+        return (
+                serviceId.isPresent() && (
+                        address.serviceId.isEmpty() || (
+                                !address.serviceId.equals(serviceId) && !address.pni.equals(serviceId)
+                        )
+                )
+        ) || (
+                pni.isPresent() && !address.serviceId.equals(pni) && (
+                        address.pni.isEmpty() || !address.pni.equals(pni)
+                )
+        ) || (
+                number.isPresent() && (
+                        address.number.isEmpty() || !address.number.equals(number)
+                )
+        );
+    }
+
+    public boolean hasOnlyPniAndNumber() {
+        return pni.isPresent() && serviceId.equals(pni) && number.isPresent();
+    }
+
+    public boolean isServiceIdPNI() {
+        return serviceId.isPresent() && (pni.isPresent() && serviceId.equals(pni));
+    }
+
     public SignalServiceAddress toSignalServiceAddress() {
         return new SignalServiceAddress(getServiceId(), number);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 1b601980..81470e83 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -53,6 +53,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       _id INTEGER PRIMARY KEY AUTOINCREMENT,
                                       number TEXT UNIQUE,
                                       uuid BLOB UNIQUE,
+                                      pni BLOB UNIQUE,
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
 
@@ -92,7 +93,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public RecipientAddress resolveRecipientAddress(RecipientId recipientId) {
         final var sql = (
                 """
-                SELECT r.number, r.uuid
+                SELECT r.number, r.uuid, r.pni
                 FROM %s r
                 WHERE r._id = ?
                 """
@@ -246,7 +247,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Optional<ACI> aci, final Optional<PNI> pni, final Optional<String> number
     ) {
         final var serviceId = aci.map(a -> (ServiceId) a).or(() -> pni);
-        return resolveRecipientTrusted(new RecipientAddress(serviceId, number), false);
+        return resolveRecipientTrusted(new RecipientAddress(serviceId, pni, number), false);
     }
 
     @Override
@@ -308,7 +309,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 SELECT r._id,
-                       r.number, r.uuid,
+                       r.number, r.uuid, r.pni,
                        r.profile_key, r.profile_key_credential,
                        r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities
@@ -601,21 +602,33 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private RecipientId resolveRecipientTrusted(RecipientAddress address, boolean isSelf) {
-        final Pair<RecipientId, Optional<RecipientId>> pair;
+        final Pair<RecipientId, List<RecipientId>> pair;
         synchronized (recipientsLock) {
             try (final var connection = database.getConnection()) {
                 connection.setAutoCommit(false);
-                pair = resolveRecipientTrustedLocked(connection, address, isSelf);
+                if (address.hasSingleIdentifier() || (
+                        !isSelf && selfAddressProvider.getSelfAddress().matches(address)
+                )) {
+                    pair = new Pair<>(resolveRecipientLocked(connection, address), List.of());
+                } else {
+                    pair = MergeRecipientHelper.resolveRecipientTrustedLocked(new HelperStore(connection), address);
+
+                    for (final var toBeMergedRecipientId : pair.second()) {
+                        mergeRecipientsLocked(connection, pair.first(), toBeMergedRecipientId);
+                    }
+                }
                 connection.commit();
             } catch (SQLException e) {
                 throw new RuntimeException("Failed update recipient store", e);
             }
         }
 
-        if (pair.second().isPresent()) {
+        if (pair.second().size() > 0) {
             try (final var connection = database.getConnection()) {
-                recipientMergeHandler.mergeRecipients(connection, pair.first(), pair.second().get());
-                deleteRecipient(connection, pair.second().get());
+                for (final var toBeMergedRecipientId : pair.second()) {
+                    recipientMergeHandler.mergeRecipients(connection, pair.first(), toBeMergedRecipientId);
+                    deleteRecipient(connection, toBeMergedRecipientId);
+                }
             } catch (SQLException e) {
                 throw new RuntimeException("Failed update recipient store", e);
             }
@@ -623,82 +636,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return pair.first();
     }
 
-    private Pair<RecipientId, Optional<RecipientId>> resolveRecipientTrustedLocked(
-            Connection connection, RecipientAddress address, boolean isSelf
-    ) throws SQLException {
-        if (!isSelf) {
-            if (selfAddressProvider.getSelfAddress().matches(address)) {
-                return new Pair<>(resolveRecipientLocked(connection, address), Optional.empty());
-            }
-        }
-        final var byNumber = address.number().isEmpty()
-                ? Optional.<RecipientWithAddress>empty()
-                : findByNumber(connection, address.number().get());
-        final var byUuid = address.serviceId().isEmpty()
-                ? Optional.<RecipientWithAddress>empty()
-                : findByServiceId(connection, address.serviceId().get());
-
-        if (byNumber.isEmpty() && byUuid.isEmpty()) {
-            logger.debug("Got new recipient, both uuid and number are unknown");
-            return new Pair<>(addNewRecipient(connection, address), Optional.empty());
-        }
-
-        if (address.serviceId().isEmpty() || address.number().isEmpty() || byNumber.equals(byUuid)) {
-            return new Pair<>(byUuid.or(() -> byNumber).map(RecipientWithAddress::id).get(), Optional.empty());
-        }
-
-        if (byNumber.isEmpty()) {
-            logger.debug("Got recipient {} existing with uuid, updating with high trust number", byUuid.get().id());
-            updateRecipientAddress(connection, byUuid.get().id(), address);
-            return new Pair<>(byUuid.get().id(), Optional.empty());
-        }
-
-        final var byNumberRecipient = byNumber.get();
-
-        if (byUuid.isEmpty()) {
-            if (byNumberRecipient.address().serviceId().isPresent()) {
-                logger.debug(
-                        "Got recipient {} existing with number, but different uuid, so stripping its number and adding new recipient",
-                        byNumberRecipient.id());
-
-                updateRecipientAddress(connection,
-                        byNumberRecipient.id(),
-                        new RecipientAddress(byNumberRecipient.address().serviceId().get()));
-                return new Pair<>(addNewRecipient(connection, address), Optional.empty());
-            }
-
-            logger.debug("Got recipient {} existing with number and no uuid, updating with high trust uuid",
-                    byNumberRecipient.id());
-            updateRecipientAddress(connection, byNumberRecipient.id(), address);
-            return new Pair<>(byNumberRecipient.id(), Optional.empty());
-        }
-
-        final var byUuidRecipient = byUuid.get();
-
-        if (byNumberRecipient.address().serviceId().isPresent()) {
-            logger.debug(
-                    "Got separate recipients for high trust number {} and uuid {}, recipient for number has different uuid, so stripping its number",
-                    byNumberRecipient.id(),
-                    byUuidRecipient.id());
-
-            updateRecipientAddress(connection,
-                    byNumberRecipient.id(),
-                    new RecipientAddress(byNumberRecipient.address().serviceId().get()));
-            updateRecipientAddress(connection, byUuidRecipient.id(), address);
-            return new Pair<>(byUuidRecipient.id(), Optional.empty());
-        }
-
-        logger.debug("Got separate recipients for high trust number {} and uuid {}, need to merge them",
-                byNumberRecipient.id(),
-                byUuidRecipient.id());
-        // Create a fixed RecipientId that won't update its id after merge
-        final var toBeMergedRecipientId = new RecipientId(byNumberRecipient.id().id(), null);
-        mergeRecipientsLocked(connection, byUuidRecipient.id(), toBeMergedRecipientId);
-        removeRecipientAddress(connection, toBeMergedRecipientId);
-        updateRecipientAddress(connection, byUuidRecipient.id(), address);
-        return new Pair<>(byUuidRecipient.id(), Optional.of(toBeMergedRecipientId));
-    }
-
     private RecipientId resolveRecipientLocked(
             Connection connection, RecipientAddress address
     ) throws SQLException {
@@ -762,13 +699,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     ) throws SQLException {
         final var sql = (
                 """
-                INSERT INTO %s (number, uuid)
-                VALUES (?, ?)
+                INSERT INTO %s (number, uuid, pni)
+                VALUES (?, ?, ?)
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, address.number().orElse(null));
             statement.setBytes(2, address.serviceId().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(3, address.pni().map(PNI::uuid).map(UuidUtil::toByteArray).orElse(null));
             statement.executeUpdate();
             final var generatedKeys = statement.getGeneratedKeys();
             if (generatedKeys.next()) {
@@ -785,7 +723,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET number = NULL, uuid = NULL
+                SET number = NULL, uuid = NULL, pni = NULL
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -801,14 +739,15 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET number = ?, uuid = ?
+                SET number = ?, uuid = ?, pni = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, address.number().orElse(null));
             statement.setBytes(2, address.serviceId().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setLong(3, recipientId.id());
+            statement.setBytes(3, address.pni().map(PNI::uuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setLong(4, recipientId.id());
             statement.executeUpdate();
         }
     }
@@ -861,9 +800,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Connection connection, final String number
     ) throws SQLException {
         final var sql = """
-                        SELECT r._id, r.number, r.uuid
+                        SELECT r._id, r.number, r.uuid, r.pni
                         FROM %s r
                         WHERE r.number = ?
+                        LIMIT 1
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, number);
@@ -875,9 +815,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Connection connection, final ServiceId serviceId
     ) throws SQLException {
         final var sql = """
-                        SELECT r._id, r.number, r.uuid
+                        SELECT r._id, r.number, r.uuid, r.pni
                         FROM %s r
-                        WHERE r.uuid = ?
+                        WHERE r.uuid = ? OR r.pni = ?
+                        LIMIT 1
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setBytes(1, UuidUtil.toByteArray(serviceId.uuid()));
@@ -885,6 +826,25 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    private Set<RecipientWithAddress> findAllByAddress(
+            final Connection connection, final RecipientAddress address
+    ) throws SQLException {
+        final var sql = """
+                        SELECT r._id, r.number, r.uuid, r.pni
+                        FROM %s r
+                        WHERE r.uuid = ?1 OR r.pni = ?1 OR
+                              r.uuid = ?2 OR r.pni = ?2 OR
+                              r.number = ?3
+                        """.formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, address.serviceId().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(2, address.pni().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setString(3, address.number().orElse(null));
+            return Utils.executeQueryForStream(statement, this::getRecipientWithAddressFromResultSet)
+                    .collect(Collectors.toSet());
+        }
+    }
+
     private Contact getContact(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
@@ -946,8 +906,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private RecipientAddress getRecipientAddressFromResultSet(ResultSet resultSet) throws SQLException {
         final var serviceId = Optional.ofNullable(resultSet.getBytes("uuid")).map(ServiceId::parseOrNull);
+        final var pni = Optional.ofNullable(resultSet.getBytes("pni")).map(PNI::parseOrNull);
         final var number = Optional.ofNullable(resultSet.getString("number"));
-        return new RecipientAddress(serviceId, Optional.empty(), number);
+        return new RecipientAddress(serviceId, pni, number);
     }
 
     private RecipientId getRecipientIdFromResultSet(ResultSet resultSet) throws SQLException {
@@ -1032,5 +993,34 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         ) throws SQLException;
     }
 
-    private record RecipientWithAddress(RecipientId id, RecipientAddress address) {}
+    private class HelperStore implements MergeRecipientHelper.Store {
+
+        private final Connection connection;
+
+        public HelperStore(final Connection connection) {
+            this.connection = connection;
+        }
+
+        @Override
+        public Set<RecipientWithAddress> findAllByAddress(final RecipientAddress address) throws SQLException {
+            return RecipientStore.this.findAllByAddress(connection, address);
+        }
+
+        @Override
+        public RecipientId addNewRecipient(final RecipientAddress address) throws SQLException {
+            return RecipientStore.this.addNewRecipient(connection, address);
+        }
+
+        @Override
+        public void updateRecipientAddress(
+                final RecipientId recipientId, final RecipientAddress address
+        ) throws SQLException {
+            RecipientStore.this.updateRecipientAddress(connection, recipientId, address);
+        }
+
+        @Override
+        public void removeRecipientAddress(final RecipientId recipientId) throws SQLException {
+            RecipientStore.this.removeRecipientAddress(connection, recipientId);
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java
new file mode 100644
index 00000000..6885a8af
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java
@@ -0,0 +1,3 @@
+package org.asamk.signal.manager.storage.recipients;
+
+record RecipientWithAddress(RecipientId id, RecipientAddress address) {}
diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
new file mode 100644
index 00000000..42a57d35
--- /dev/null
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
@@ -0,0 +1,330 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.whispersystems.signalservice.api.push.PNI;
+import org.whispersystems.signalservice.api.push.ServiceId;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class MergeRecipientHelperTest {
+
+    static final ServiceId SERVICE_ID_A = ServiceId.from(UUID.randomUUID());
+    static final ServiceId SERVICE_ID_B = ServiceId.from(UUID.randomUUID());
+    static final ServiceId SERVICE_ID_C = ServiceId.from(UUID.randomUUID());
+    static final PNI PNI_A = PNI.from(UUID.randomUUID());
+    static final PNI PNI_B = PNI.from(UUID.randomUUID());
+    static final PNI PNI_C = PNI.from(UUID.randomUUID());
+    static final String NUMBER_A = "+AAA";
+    static final String NUMBER_B = "+BBB";
+    static final String NUMBER_C = "+CCC";
+
+    static final PartialAddresses ADDR_A = new PartialAddresses(SERVICE_ID_A, PNI_A, NUMBER_A);
+    static final PartialAddresses ADDR_B = new PartialAddresses(SERVICE_ID_B, PNI_B, NUMBER_B);
+
+    static T[] testInstancesNone = new T[]{
+            // 1
+            new T(Set.of(), ADDR_A.FULL, Set.of(rec(1000000, ADDR_A.FULL))),
+            new T(Set.of(), ADDR_A.ACI_NUM, Set.of(rec(1000000, ADDR_A.ACI_NUM))),
+            new T(Set.of(), ADDR_A.ACI_PNI, Set.of(rec(1000000, ADDR_A.ACI_PNI))),
+            new T(Set.of(), ADDR_A.PNI_S_NUM, Set.of(rec(1000000, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(), ADDR_A.PNI_NUM, Set.of(rec(1000000, ADDR_A.PNI_NUM))),
+    };
+
+    static T[] testInstancesSingle = new T[]{
+            // 1
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+
+            // 10
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.PNI), rec(1000000, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S)),
+                    ADDR_A.ACI_NUM,
+                    Set.of(rec(1, ADDR_A.PNI_S), rec(1000000, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)),
+                    ADDR_A.ACI_NUM,
+                    Set.of(rec(1, ADDR_A.PNI), rec(1000000, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)),
+                    ADDR_A.ACI_NUM,
+                    Set.of(rec(1, ADDR_A.PNI_S), rec(1000000, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+
+            // 19
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)),
+                    ADDR_A.PNI_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+
+            // 28
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI)),
+                    ADDR_A.PNI_S_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)),
+                    ADDR_A.PNI_S_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.FULL))),
+
+            // 37
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.NUM), rec(1000000, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_B.FULL, Set.of(rec(1, ADDR_A.FULL), rec(1000000, ADDR_B.FULL))),
+    };
+
+    static T[] testInstancesTwo = new T[]{
+            // 1
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.ACI_NUM)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.PNI_S)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
+
+            // 12
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)),
+                    ADDR_A.ACI_NUM,
+                    Set.of(rec(1, ADDR_A.ACI_NUM), rec(2, ADDR_A.PNI_S))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.ACI_NUM, Set.of(rec(2, ADDR_A.FULL))),
+
+            // 16
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)),
+                    ADDR_A.PNI_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)),
+                    ADDR_A.PNI_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)),
+                    ADDR_A.PNI_NUM,
+                    Set.of(rec(1, ADDR_A.PNI_NUM), rec(2, ADDR_A.ACI))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.ACI_NUM)),
+                    ADDR_A.PNI_NUM,
+                    Set.of(rec(1, ADDR_A.PNI_NUM), rec(2, ADDR_A.ACI))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.PNI_S)), ADDR_A.PNI_NUM, Set.of(rec(2, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.PNI_NUM, Set.of(rec(2, ADDR_A.FULL))),
+
+            // 24
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)),
+                    ADDR_A.PNI_S_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)),
+                    ADDR_A.PNI_S_NUM,
+                    Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)),
+                    ADDR_A.PNI_S_NUM,
+                    Set.of(rec(1, ADDR_A.PNI_NUM), rec(2, ADDR_A.ACI))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.ACI_NUM)),
+                    ADDR_A.PNI_S_NUM,
+                    Set.of(rec(1, ADDR_A.PNI_S_NUM), rec(2, ADDR_A.ACI))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.PNI_S)), ADDR_A.PNI_S_NUM, Set.of(rec(2, ADDR_A.PNI_S_NUM))),
+            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.PNI_S_NUM, Set.of(rec(2, ADDR_A.FULL))),
+
+            // 32
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)),
+                    ADDR_A.ACI_PNI,
+                    Set.of(rec(1, ADDR_A.ACI_PNI), rec(2, ADDR_A.NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(2, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(2, ADDR_A.FULL))),
+    };
+
+    static T[] testInstancesThree = new T[]{
+            // 1
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
+                    ADDR_A.FULL,
+                    Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI.withIdentifiersFrom(ADDR_B.PNI)), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
+                    ADDR_A.FULL,
+                    Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI.withIdentifiersFrom(ADDR_B.NUM)), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
+                    ADDR_A.FULL,
+                    Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM.withIdentifiersFrom(ADDR_B.ACI))),
+                    ADDR_A.FULL,
+                    Set.of(rec(1, ADDR_A.FULL), rec(3, ADDR_B.ACI))),
+            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI.withIdentifiersFrom(ADDR_B.ACI)), rec(3, ADDR_A.NUM)),
+                    ADDR_A.FULL,
+                    Set.of(rec(1, ADDR_A.FULL), rec(2, ADDR_B.ACI))),
+    };
+
+    @ParameterizedTest
+    @MethodSource
+    void resolveRecipientTrustedLocked_NoneExisting(T test) throws Exception {
+        final var testStore = new TestStore(test.input);
+        MergeRecipientHelper.resolveRecipientTrustedLocked(testStore, test.request);
+        assertEquals(test.output, testStore.getRecipients());
+    }
+
+    private static Stream<Arguments> resolveRecipientTrustedLocked_NoneExisting() {
+        return Arrays.stream(testInstancesNone).map(Arguments::of);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void resolveRecipientTrustedLocked_SingleExisting(T test) throws Exception {
+        final var testStore = new TestStore(test.input);
+        MergeRecipientHelper.resolveRecipientTrustedLocked(testStore, test.request);
+        assertEquals(test.output, testStore.getRecipients());
+    }
+
+    private static Stream<Arguments> resolveRecipientTrustedLocked_SingleExisting() {
+        return Arrays.stream(testInstancesSingle).map(Arguments::of);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void resolveRecipientTrustedLocked_TwoExisting(T test) throws Exception {
+        final var testStore = new TestStore(test.input);
+        MergeRecipientHelper.resolveRecipientTrustedLocked(testStore, test.request);
+        assertEquals(test.output, testStore.getRecipients());
+    }
+
+    private static Stream<Arguments> resolveRecipientTrustedLocked_TwoExisting() {
+        return Arrays.stream(testInstancesTwo).map(Arguments::of);
+    }
+
+    @ParameterizedTest
+    @MethodSource
+    void resolveRecipientTrustedLocked_ThreeExisting(T test) throws Exception {
+        final var testStore = new TestStore(test.input);
+        MergeRecipientHelper.resolveRecipientTrustedLocked(testStore, test.request);
+        assertEquals(test.output, testStore.getRecipients());
+    }
+
+    private static Stream<Arguments> resolveRecipientTrustedLocked_ThreeExisting() {
+        return Arrays.stream(testInstancesThree).map(Arguments::of);
+    }
+
+    private static RecipientWithAddress rec(long recipientId, RecipientAddress address) {
+        return new RecipientWithAddress(new RecipientId(recipientId, null), address);
+    }
+
+    record T(
+            Set<RecipientWithAddress> input, RecipientAddress request, Set<RecipientWithAddress> output
+    ) {
+
+        @Override
+        public String toString() {
+            return "T{#input=%s, request=%s_%s_%s, #output=%s}".formatted(input.size(),
+                    request.serviceId().isPresent() ? "SVI" : "",
+                    request.pni().isPresent() ? "PNI" : "",
+                    request.number().isPresent() ? "NUM" : "",
+                    output.size());
+        }
+    }
+
+    static class TestStore implements MergeRecipientHelper.Store {
+
+        final Set<RecipientWithAddress> recipients;
+        long nextRecipientId = 1000000;
+
+        TestStore(final Set<RecipientWithAddress> recipients) {
+            this.recipients = new HashSet<>(recipients);
+        }
+
+        public Set<RecipientWithAddress> getRecipients() {
+            return recipients;
+        }
+
+        @Override
+        public Set<RecipientWithAddress> findAllByAddress(final RecipientAddress address) {
+            return recipients.stream().filter(r -> r.address().matches(address)).collect(Collectors.toSet());
+        }
+
+        @Override
+        public RecipientId addNewRecipient(final RecipientAddress address) {
+            final var recipientId = new RecipientId(nextRecipientId++, null);
+            recipients.add(new RecipientWithAddress(recipientId, address));
+            return recipientId;
+        }
+
+        @Override
+        public void updateRecipientAddress(
+                final RecipientId recipientId, final RecipientAddress address
+        ) {
+            recipients.removeIf(r -> r.id().equals(recipientId));
+            recipients.add(new RecipientWithAddress(recipientId, address));
+        }
+
+        @Override
+        public void removeRecipientAddress(final RecipientId recipientId) {
+            recipients.removeIf(r -> r.id().equals(recipientId));
+        }
+    }
+
+    private record PartialAddresses(
+            RecipientAddress FULL,
+            RecipientAddress ACI,
+            RecipientAddress PNI,
+            RecipientAddress PNI_S,
+            RecipientAddress NUM,
+            RecipientAddress ACI_NUM,
+            RecipientAddress PNI_NUM,
+            RecipientAddress PNI_S_NUM,
+            RecipientAddress ACI_PNI
+    ) {
+
+        PartialAddresses(ServiceId serviceId, PNI pni, String number) {
+            this(new RecipientAddress(serviceId, pni, number),
+                    new RecipientAddress(serviceId, null, null),
+                    new RecipientAddress(null, pni, null),
+                    new RecipientAddress(ServiceId.from(pni.uuid()), null, null),
+                    new RecipientAddress(null, null, number),
+                    new RecipientAddress(serviceId, null, number),
+                    new RecipientAddress(null, pni, number),
+                    new RecipientAddress(ServiceId.from(pni.uuid()), null, number),
+                    new RecipientAddress(serviceId, pni, null));
+        }
+    }
+}

From a8e68dce3af914d3e3d9d37c67a147a7ba2ae414 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Oct 2022 13:36:12 +0200
Subject: [PATCH 005/672] Extract MimeUtils

---
 .../signal/manager/helper/SyncHelper.java     |  5 +-
 .../asamk/signal/manager/util/DataURI.java    |  5 +-
 .../asamk/signal/manager/util/MimeUtils.java  | 51 +++++++++++++++++++
 .../signal/manager/util/StickerUtils.java     |  5 +-
 .../org/asamk/signal/manager/util/Utils.java  | 18 +------
 5 files changed, 59 insertions(+), 25 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 60887619..bad2efce 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -10,6 +10,7 @@ import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.MimeUtils;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -105,7 +106,7 @@ public class SyncHelper {
                 try (var groupsFileStream = new FileInputStream(groupsFile)) {
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(groupsFileStream)
-                            .withContentType("application/octet-stream")
+                            .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(groupsFile.length())
                             .build();
 
@@ -173,7 +174,7 @@ public class SyncHelper {
                 try (var contactsFileStream = new FileInputStream(contactsFile)) {
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(contactsFileStream)
-                            .withContentType("application/octet-stream")
+                            .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(contactsFile.length())
                             .build();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java b/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java
index 04d4bbc8..b848c868 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/DataURI.java
@@ -17,7 +17,6 @@ public record DataURI(String mediaType, Map<String, String> parameter, byte[] da
             Pattern.CASE_INSENSITIVE);
     public static final Pattern PARAMETER_PATTERN = Pattern.compile("\\G;(?<key>.+)=(?<value>.+)",
             Pattern.CASE_INSENSITIVE);
-    public static final String DEFAULT_TYPE = "text/plain";
 
     /**
      * Generates a new {@link DataURI} object that follows
@@ -32,7 +31,7 @@ public record DataURI(String mediaType, Map<String, String> parameter, byte[] da
      * The {@code <mediatype>} is an Internet media type specification (with
      * optional parameters.) The appearance of ";base64" means that the data
      * is encoded as base64. Without ";base64", the data is represented using (ASCII) URL Escaped encoding.
-     * If {@code <mediatype>} is omitted, it defaults to {@link DataURI#DEFAULT_TYPE}.
+     * If {@code <mediatype>} is omitted, it defaults to {@link MimeUtils#PLAIN_TEXT}.
      * Parameter values should use the URL Escaped encoding.
      *
      * @param dataURI the data URI
@@ -65,6 +64,6 @@ public record DataURI(String mediaType, Map<String, String> parameter, byte[] da
             data = URLDecoder.decode(matcher.group("data"), StandardCharsets.UTF_8).getBytes(StandardCharsets.UTF_8);
         }
 
-        return new DataURI(Optional.ofNullable(matcher.group("type")).orElse(DEFAULT_TYPE), parameters, data);
+        return new DataURI(Optional.ofNullable(matcher.group("type")).orElse(MimeUtils.PLAIN_TEXT), parameters, data);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java
new file mode 100644
index 00000000..17d81345
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MimeUtils.java
@@ -0,0 +1,51 @@
+package org.asamk.signal.manager.util;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.util.Optional;
+
+public class MimeUtils {
+
+    public static final String LONG_TEXT = "text/x-signal-plain";
+    public static final String PLAIN_TEXT = "text/plain";
+    public static final String OCTET_STREAM = "application/octet-stream";
+
+    public static Optional<String> getFileMimeType(final File file) throws IOException {
+        var mime = Files.probeContentType(file.toPath());
+        if (mime != null) {
+            return Optional.of(mime);
+        }
+
+        try (final InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) {
+            return getStreamMimeType(bufferedStream);
+        }
+    }
+
+    public static Optional<String> getStreamMimeType(final InputStream inputStream) throws IOException {
+        return Optional.ofNullable(URLConnection.guessContentTypeFromStream(inputStream));
+    }
+
+    public static Optional<String> guessExtensionFromMimeType(String mimeType) {
+        return Optional.ofNullable(switch (mimeType) {
+            case "application/vnd.android.package-archive" -> "apk";
+            case "application/json" -> "json";
+            case "image/png" -> "png";
+            case "image/jpeg" -> "jpg";
+            case "image/heic" -> "heic";
+            case "image/heif" -> "heif";
+            case "image/webp" -> "webp";
+            case "image/gif" -> "gif";
+            case "audio/aac" -> "aac";
+            case "video/mp4" -> "mp4";
+            case "text/x-vcard" -> "vcf";
+            case PLAIN_TEXT, LONG_TEXT -> "txt";
+            case OCTET_STREAM -> "bin";
+            default -> null;
+        });
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
index f3825cc4..302535d9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
@@ -12,7 +12,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Optional;
 import java.util.zip.ZipFile;
@@ -118,11 +117,11 @@ public class StickerUtils {
         if (zip != null) {
             final var entry = zip.getEntry(subfile);
             try (InputStream bufferedStream = new BufferedInputStream(zip.getInputStream(entry))) {
-                return URLConnection.guessContentTypeFromStream(bufferedStream);
+                return MimeUtils.getStreamMimeType(bufferedStream).orElse(null);
             }
         } else {
             final var file = new File(rootPath, subfile);
-            return Utils.getFileMimeType(file, null);
+            return MimeUtils.getFileMimeType(file).orElse(null);
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index c50988a1..4be7c39a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -9,16 +9,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLConnection;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -34,19 +31,6 @@ public class Utils {
 
     private final static Logger logger = LoggerFactory.getLogger(Utils.class);
 
-    public static String getFileMimeType(final File file, final String defaultMimeType) throws IOException {
-        var mime = Files.probeContentType(file.toPath());
-        if (mime == null) {
-            try (final InputStream bufferedStream = new BufferedInputStream(new FileInputStream(file))) {
-                mime = URLConnection.guessContentTypeFromStream(bufferedStream);
-            }
-        }
-        if (mime == null) {
-            return defaultMimeType;
-        }
-        return mime;
-    }
-
     public static Pair<StreamDetails, Optional<String>> createStreamDetailsFromDataURI(final String dataURI) {
         final DataURI uri = DataURI.of(dataURI);
 
@@ -57,7 +41,7 @@ public class Utils {
     public static StreamDetails createStreamDetailsFromFile(final File file) throws IOException {
         final InputStream stream = new FileInputStream(file);
         final var size = file.length();
-        final var mime = getFileMimeType(file, "application/octet-stream");
+        final var mime = MimeUtils.getFileMimeType(file).orElse(MimeUtils.OCTET_STREAM);
         return new StreamDetails(stream, mime, size);
     }
 

From 7805622f0717062deff752895ef2fd8cf53b80aa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Oct 2022 13:39:31 +0200
Subject: [PATCH 006/672] Send long text messages as attachment instead

This matches the behavior of the official clients.
---
 .../java/org/asamk/signal/manager/ManagerImpl.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 3e463edf..58863d08 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -61,6 +61,7 @@ import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
 import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.KeyUtils;
+import org.asamk.signal.manager.util.MimeUtils;
 import org.asamk.signal.manager.util.StickerUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,12 +75,15 @@ import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
+import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.signalservice.internal.util.Util;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -557,7 +561,15 @@ class ManagerImpl implements Manager {
     private void applyMessage(
             final SignalServiceDataMessage.Builder messageBuilder, final Message message
     ) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException {
-        messageBuilder.withBody(message.messageText());
+        if (message.messageText().length() > 2000) {
+            final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8);
+            final var textAttachment = AttachmentUtils.createAttachmentStream(new StreamDetails(new ByteArrayInputStream(
+                    messageBytes), MimeUtils.LONG_TEXT, messageBytes.length), Optional.empty());
+            messageBuilder.withBody(message.messageText().substring(0, 2000));
+            messageBuilder.withAttachment(textAttachment);
+        } else {
+            messageBuilder.withBody(message.messageText());
+        }
         if (message.attachments().size() > 0) {
             messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
         }

From 7ff1500122be3891ef2a7930071075f269e9f46a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Oct 2022 17:42:49 +0200
Subject: [PATCH 007/672] Improve logging in prekey store

---
 .../signal/manager/storage/prekeys/PreKeyStore.java    | 10 +++++-----
 .../manager/storage/prekeys/SignedPreKeyStore.java     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
index a70c6b8c..cc51a20a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
@@ -49,7 +49,7 @@ public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeySt
     public PreKeyRecord loadPreKey(int preKeyId) throws InvalidKeyIdException {
         final var preKey = getPreKey(preKeyId);
         if (preKey == null) {
-            throw new InvalidKeyIdException("No such signed pre key record!");
+            throw new InvalidKeyIdException("No such signed pre key record: " + preKeyId);
         }
         return preKey;
     }
@@ -65,7 +65,7 @@ public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeySt
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
-                statement.setLong(2, preKeyId);
+                statement.setInt(2, preKeyId);
                 final var keyPair = record.getKeyPair();
                 statement.setBytes(3, keyPair.getPublicKey().serialize());
                 statement.setBytes(4, keyPair.getPrivateKey().serialize());
@@ -93,7 +93,7 @@ public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeySt
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
-                statement.setLong(2, preKeyId);
+                statement.setInt(2, preKeyId);
                 statement.executeUpdate();
             }
         } catch (SQLException e) {
@@ -137,7 +137,7 @@ public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeySt
             try (final var statement = connection.prepareStatement(sql)) {
                 for (final var record : preKeys) {
                     statement.setInt(1, accountIdType);
-                    statement.setLong(2, record.getId());
+                    statement.setInt(2, record.getId());
                     final var keyPair = record.getKeyPair();
                     statement.setBytes(3, keyPair.getPublicKey().serialize());
                     statement.setBytes(4, keyPair.getPrivateKey().serialize());
@@ -163,7 +163,7 @@ public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeySt
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
-                statement.setLong(2, preKeyId);
+                statement.setInt(2, preKeyId);
                 return Utils.executeQueryForOptional(statement, this::getPreKeyRecordFromResultSet).orElse(null);
             }
         } catch (SQLException e) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
index 722bb56c..d618f6c3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
@@ -53,7 +53,7 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
     public SignedPreKeyRecord loadSignedPreKey(int signedPreKeyId) throws InvalidKeyIdException {
         final SignedPreKeyRecord signedPreKeyRecord = getSignedPreKey(signedPreKeyId);
         if (signedPreKeyRecord == null) {
-            throw new InvalidKeyIdException("No such signed pre key record!");
+            throw new InvalidKeyIdException("No such signed pre key record: " + signedPreKeyId);
         }
         return signedPreKeyRecord;
     }
@@ -90,7 +90,7 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
-                statement.setLong(2, signedPreKeyId);
+                statement.setInt(2, signedPreKeyId);
                 final var keyPair = record.getKeyPair();
                 statement.setBytes(3, keyPair.getPublicKey().serialize());
                 statement.setBytes(4, keyPair.getPrivateKey().serialize());
@@ -119,7 +119,7 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
-                statement.setLong(2, signedPreKeyId);
+                statement.setInt(2, signedPreKeyId);
                 statement.executeUpdate();
             }
         } catch (SQLException e) {
@@ -163,7 +163,7 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
             try (final var statement = connection.prepareStatement(sql)) {
                 for (final var record : signedPreKeys) {
                     statement.setInt(1, accountIdType);
-                    statement.setLong(2, record.getId());
+                    statement.setInt(2, record.getId());
                     final var keyPair = record.getKeyPair();
                     statement.setBytes(3, keyPair.getPublicKey().serialize());
                     statement.setBytes(4, keyPair.getPrivateKey().serialize());
@@ -190,7 +190,7 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
-                statement.setLong(2, signedPreKeyId);
+                statement.setInt(2, signedPreKeyId);
                 return Utils.executeQueryForOptional(statement, this::getSignedPreKeyRecordFromResultSet).orElse(null);
             }
         } catch (SQLException e) {

From 0084a2e72233798b0cbe331130fffec813659b4e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Oct 2022 17:43:02 +0200
Subject: [PATCH 008/672] Update reflect-config.json

---
 graalvm-config-dir/reflect-config.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 1feb0917..78f1d5e4 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -3060,6 +3060,14 @@
     {"name":"signature_"}
   ]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PniSignatureMessage",
+  "fields":[
+    {"name":"bitField0_"}, 
+    {"name":"pni_"}, 
+    {"name":"signature_"}
+  ]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Preview",
   "fields":[

From e0c2f58e8d25e5cb3c4b3e88f897f2c49e327be7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Oct 2022 20:32:11 +0200
Subject: [PATCH 009/672] Store attachments with a file extension

Taken from the filename if present, otherwise guessed from the contentType
---
 .../asamk/signal/manager/AttachmentStore.java | 43 +++++++++++++++----
 .../signal/manager/api/MessageEnvelope.java   |  9 ++--
 .../manager/helper/AttachmentHelper.java      | 10 ++---
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
index f983a90b..949e2862 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
@@ -1,12 +1,15 @@
 package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.MimeUtils;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Optional;
 
 public class AttachmentStore {
 
@@ -17,15 +20,23 @@ public class AttachmentStore {
     }
 
     public void storeAttachmentPreview(
-            final SignalServiceAttachmentRemoteId attachmentId, final AttachmentStorer storer
+            final SignalServiceAttachmentPointer pointer, final AttachmentStorer storer
     ) throws IOException {
-        storeAttachment(getAttachmentPreviewFile(attachmentId), storer);
+        storeAttachment(getAttachmentPreviewFile(pointer.getRemoteId(),
+                pointer.getFileName(),
+                Optional.ofNullable(pointer.getContentType())), storer);
     }
 
     public void storeAttachment(
-            final SignalServiceAttachmentRemoteId attachmentId, final AttachmentStorer storer
+            final SignalServiceAttachmentPointer pointer, final AttachmentStorer storer
     ) throws IOException {
-        storeAttachment(getAttachmentFile(attachmentId), storer);
+        storeAttachment(getAttachmentFile(pointer), storer);
+    }
+
+    public File getAttachmentFile(final SignalServiceAttachmentPointer pointer) {
+        return getAttachmentFile(pointer.getRemoteId(),
+                pointer.getFileName(),
+                Optional.ofNullable(pointer.getContentType()));
     }
 
     private void storeAttachment(final File attachmentFile, final AttachmentStorer storer) throws IOException {
@@ -35,12 +46,28 @@ public class AttachmentStore {
         }
     }
 
-    private File getAttachmentPreviewFile(SignalServiceAttachmentRemoteId attachmentId) {
-        return new File(attachmentsPath, attachmentId.toString() + ".preview");
+    private File getAttachmentPreviewFile(
+            SignalServiceAttachmentRemoteId attachmentId, Optional<String> filename, Optional<String> contentType
+    ) {
+        final var extension = getAttachmentExtension(filename, contentType);
+        return new File(attachmentsPath, attachmentId.toString() + extension + ".preview");
     }
 
-    public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
-        return new File(attachmentsPath, attachmentId.toString());
+    private File getAttachmentFile(
+            SignalServiceAttachmentRemoteId attachmentId, Optional<String> filename, Optional<String> contentType
+    ) {
+        final var extension = getAttachmentExtension(filename, contentType);
+        return new File(attachmentsPath, attachmentId.toString() + extension);
+    }
+
+    private static String getAttachmentExtension(
+            final Optional<String> filename, final Optional<String> contentType
+    ) {
+        return filename.filter(f -> f.contains("."))
+                .map(f -> f.substring(f.lastIndexOf(".") + 1))
+                .or(() -> contentType.flatMap(MimeUtils::guessExtensionFromMimeType))
+                .map(ext -> "." + ext)
+                .orElse("");
     }
 
     private void createAttachmentsDir() throws IOException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 2eb0546a..9b6a476e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -6,7 +6,7 @@ import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.metadata.ProtocolException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
@@ -281,8 +281,9 @@ public record MessageEnvelope(
             static Attachment from(SignalServiceAttachment attachment, AttachmentFileProvider fileProvider) {
                 if (attachment.isPointer()) {
                     final var a = attachment.asPointer();
-                    return new Attachment(Optional.of(a.getRemoteId().toString()),
-                            Optional.of(fileProvider.getFile(a.getRemoteId())),
+                    final var attachmentFile = fileProvider.getFile(a);
+                    return new Attachment(Optional.of(attachmentFile.getName()),
+                            Optional.of(attachmentFile),
                             a.getFileName(),
                             a.getContentType(),
                             a.getUploadTimestamp() == 0 ? Optional.empty() : Optional.of(a.getUploadTimestamp()),
@@ -918,6 +919,6 @@ public record MessageEnvelope(
 
     public interface AttachmentFileProvider {
 
-        File getFile(SignalServiceAttachmentRemoteId attachmentRemoteId);
+        File getFile(SignalServiceAttachmentPointer pointer);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 0d560e14..ea5739b3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -11,7 +11,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;
 
@@ -35,8 +34,8 @@ public class AttachmentHelper {
         this.attachmentStore = context.getAttachmentStore();
     }
 
-    public File getAttachmentFile(SignalServiceAttachmentRemoteId attachmentId) {
-        return attachmentStore.getAttachmentFile(attachmentId);
+    public File getAttachmentFile(SignalServiceAttachmentPointer pointer) {
+        return attachmentStore.getAttachmentFile(pointer);
     }
 
     public List<SignalServiceAttachment> uploadAttachments(final List<String> attachments) throws AttachmentInvalidException, IOException {
@@ -69,7 +68,7 @@ public class AttachmentHelper {
         if (pointer.getPreview().isPresent()) {
             final var preview = pointer.getPreview().get();
             try {
-                attachmentStore.storeAttachmentPreview(pointer.getRemoteId(),
+                attachmentStore.storeAttachmentPreview(pointer,
                         outputStream -> outputStream.write(preview, 0, preview.length));
             } catch (IOException e) {
                 logger.warn("Failed to download attachment preview, ignoring: {}", e.getMessage());
@@ -77,8 +76,7 @@ public class AttachmentHelper {
         }
 
         try {
-            attachmentStore.storeAttachment(pointer.getRemoteId(),
-                    outputStream -> this.retrieveAttachment(pointer, outputStream));
+            attachmentStore.storeAttachment(pointer, outputStream -> this.retrieveAttachment(pointer, outputStream));
         } catch (IOException e) {
             logger.warn("Failed to download attachment ({}), ignoring: {}", pointer.getRemoteId(), e.getMessage());
         }

From 0b5a063b6245886276123f2926f3636c432970f9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 28 Oct 2022 18:13:25 +0200
Subject: [PATCH 010/672] Use complete address instead of only identifier for
 retry envelope

Fixes #1074
---
 .../java/org/asamk/signal/manager/api/RecipientAddress.java   | 4 ----
 .../java/org/asamk/signal/manager/helper/ReceiveHelper.java   | 4 +++-
 .../signal/manager/storage/recipients/RecipientAddress.java   | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

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 f477b9e9..920eafc5 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
@@ -64,8 +64,4 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number) {
                 number.isPresent() && other.number.isPresent() && number.get().equals(other.number.get())
         );
     }
-
-    public SignalServiceAddress toSignalServiceAddress() {
-        return new SignalServiceAddress(getServiceId(), number);
-    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 5dca96ea..9fe1bf54 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -7,6 +7,7 @@ import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.messageCache.CachedMessage;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalWebSocket;
@@ -261,7 +262,8 @@ public class ReceiveHelper {
             }
             if (!envelope.hasSourceUuid()) {
                 final var identifier = ((UntrustedIdentityException) exception).getSender();
-                final var recipientId = account.getRecipientResolver().resolveRecipient(identifier.getServiceId());
+                final var recipientId = account.getRecipientResolver()
+                        .resolveRecipient(new RecipientAddress(identifier));
                 try {
                     account.getMessageCache().replaceSender(cachedMessage, recipientId);
                 } catch (IOException ioException) {
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 7dc193a9..6f796b4a 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
@@ -53,6 +53,10 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
         this(Optional.of(address.getServiceId()), Optional.empty(), address.getNumber());
     }
 
+    public RecipientAddress(org.asamk.signal.manager.api.RecipientAddress address) {
+        this(address.uuid().map(ServiceId::from), Optional.empty(), address.number());
+    }
+
     public RecipientAddress(ServiceId serviceId) {
         this(Optional.of(serviceId), Optional.empty());
     }

From e63f2fafb9e110430c085c0cb5136e4074d414b7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 28 Oct 2022 19:57:21 +0200
Subject: [PATCH 011/672] Add color to listContacts output

Fixes #1072
---
 .../asamk/signal/commands/ListContactsCommand.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index 8fc6f2d1..abcfdca3 100644
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -55,10 +55,11 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
             for (var r : recipients) {
                 final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
                 final var profile = r.getProfile() == null ? Profile.newBuilder().build() : r.getProfile();
-                writer.println("Number: {} Name: {} Profile name: {} Blocked: {} Message expiration: {}",
+                writer.println("Number: {} Name: {} Profile name: {} Color: {} Blocked: {} Message expiration: {}",
                         r.getAddress().getLegacyIdentifier(),
                         contact.getName(),
                         profile.getDisplayName(),
+                        contact.getColor(),
                         contact.isBlocked(),
                         contact.getMessageExpirationTime() == 0
                                 ? "disabled"
@@ -72,6 +73,7 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                 return new JsonContact(address.number().orElse(null),
                         address.uuid().map(UUID::toString).orElse(null),
                         contact.getName(),
+                        contact.getColor(),
                         contact.isBlocked(),
                         contact.getMessageExpirationTime(),
                         r.getProfile() == null
@@ -92,7 +94,13 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
     }
 
     private record JsonContact(
-            String number, String uuid, String name, boolean isBlocked, int messageExpirationTime, JsonProfile profile
+            String number,
+            String uuid,
+            String name,
+            String color,
+            boolean isBlocked,
+            int messageExpirationTime,
+            JsonProfile profile
     ) {
 
         private record JsonProfile(

From 25e84f2f5dcc93ff5d6a938004ae1ef56d1b04b9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 29 Oct 2022 13:49:14 +0200
Subject: [PATCH 012/672] Add account to plain text output

Fixes #1075
---
 src/main/java/org/asamk/signal/ReceiveMessageHandler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index f46a76f2..87753b05 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -33,9 +33,10 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
     private void handleMessageInternal(MessageEnvelope envelope, Throwable exception) {
         var source = envelope.sourceAddress();
-        writer.println("Envelope from: {} (device: {})",
+        writer.println("Envelope from: {} (device: {}) to {}",
                 source.map(this::formatContact).orElse("unknown source"),
-                envelope.sourceDevice());
+                envelope.sourceDevice(),
+                m.getSelfNumber());
         writer.println("Timestamp: {}", DateUtils.formatTimestamp(envelope.timestamp()));
         writer.println("Server timestamps: received: {} delivered: {}",
                 DateUtils.formatTimestamp(envelope.serverReceivedTimestamp()),

From 49aaff2bbe1ec6ed6cdbd26200ec806c46b16489 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 29 Oct 2022 13:54:06 +0200
Subject: [PATCH 013/672] Increase sqlite busy timeout

---
 .../main/java/org/asamk/signal/manager/storage/Database.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
index a55a8eed..3d0d9374 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
@@ -90,7 +90,7 @@ public abstract class Database implements AutoCloseable {
 
     private static HikariDataSource getHikariDataSource(final String databaseFile) {
         final var sqliteConfig = new SQLiteConfig();
-        sqliteConfig.setBusyTimeout(10_000);
+        sqliteConfig.setBusyTimeout(60_000);
         sqliteConfig.setTransactionMode(SQLiteConfig.TransactionMode.IMMEDIATE);
 
         HikariConfig config = new HikariConfig();

From 207764e0be91aeb9a6c52fa8639a822555f8759a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 30 Oct 2022 11:00:25 +0100
Subject: [PATCH 014/672] Add option to disable adding message to send log

---
 .../manager/ProvisioningManagerImpl.java      |  8 ++---
 .../org/asamk/signal/manager/Settings.java    |  8 +++++
 .../signal/manager/SignalAccountFiles.java    | 15 +++++----
 .../signal/manager/storage/SignalAccount.java | 31 ++++++++++---------
 .../storage/sendLog/MessageSendLogStore.java  | 17 +++++++++-
 man/signal-cli.1.adoc                         |  3 ++
 src/main/java/org/asamk/signal/App.java       |  9 +++++-
 7 files changed, 60 insertions(+), 31 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/Settings.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
index 17569401..c8df9774 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
@@ -21,7 +21,6 @@ import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.util.KeyHelper;
@@ -147,7 +146,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                     registrationId,
                     pniRegistrationId,
                     profileKey,
-                    TrustNewIdentity.ON_FIRST_USE);
+                    Settings.DEFAULT);
 
             ManagerImpl m = null;
             try {
@@ -194,10 +193,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
     private boolean canRelinkExistingAccount(final String accountPath) throws IOException {
         final SignalAccount signalAccount;
         try {
-            signalAccount = SignalAccount.load(pathConfig.dataPath(),
-                    accountPath,
-                    false,
-                    TrustNewIdentity.ON_FIRST_USE);
+            signalAccount = SignalAccount.load(pathConfig.dataPath(), accountPath, false, Settings.DEFAULT);
         } catch (IOException e) {
             logger.debug("Account in use or failed to load.", e);
             return false;
diff --git a/lib/src/main/java/org/asamk/signal/manager/Settings.java b/lib/src/main/java/org/asamk/signal/manager/Settings.java
new file mode 100644
index 00000000..e4f4554b
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/Settings.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager;
+
+import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+
+public record Settings(TrustNewIdentity trustNewIdentity, boolean disableMessageSendLog) {
+
+    public static Settings DEFAULT = new Settings(TrustNewIdentity.ON_FIRST_USE, false);
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
index 9d0b344a..12eb3d99 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
@@ -7,7 +7,6 @@ import org.asamk.signal.manager.config.ServiceEnvironment;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.util.KeyHelper;
 import org.slf4j.Logger;
@@ -28,27 +27,27 @@ public class SignalAccountFiles {
     private final ServiceEnvironment serviceEnvironment;
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
     private final String userAgent;
-    private final TrustNewIdentity trustNewIdentity;
+    private final Settings settings;
     private final AccountsStore accountsStore;
 
     public SignalAccountFiles(
             final File settingsPath,
             final ServiceEnvironment serviceEnvironment,
             final String userAgent,
-            final TrustNewIdentity trustNewIdentity
+            final Settings settings
     ) throws IOException {
         this.pathConfig = PathConfig.createDefault(settingsPath);
         this.serviceEnvironment = serviceEnvironment;
         this.serviceEnvironmentConfig = ServiceConfig.getServiceEnvironmentConfig(this.serviceEnvironment, userAgent);
         this.userAgent = userAgent;
-        this.trustNewIdentity = trustNewIdentity;
+        this.settings = settings;
         this.accountsStore = new AccountsStore(pathConfig.dataPath(), serviceEnvironment, accountPath -> {
             if (accountPath == null || !SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) {
                 return null;
             }
 
             try {
-                return SignalAccount.load(pathConfig.dataPath(), accountPath, false, trustNewIdentity);
+                return SignalAccount.load(pathConfig.dataPath(), accountPath, false, settings);
             } catch (Exception e) {
                 return null;
             }
@@ -90,7 +89,7 @@ public class SignalAccountFiles {
             throw new NotRegisteredException();
         }
 
-        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, trustNewIdentity);
+        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, settings);
         if (!number.equals(account.getNumber())) {
             account.close();
             throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
@@ -168,7 +167,7 @@ public class SignalAccountFiles {
                     registrationId,
                     pniRegistrationId,
                     profileKey,
-                    trustNewIdentity);
+                    settings);
 
             return new RegistrationManagerImpl(account,
                     pathConfig,
@@ -178,7 +177,7 @@ public class SignalAccountFiles {
                     new AccountFileUpdaterImpl(accountsStore, newAccountPath));
         }
 
-        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, trustNewIdentity);
+        var account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, settings);
         if (!number.equals(account.getNumber())) {
             account.close();
             throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 1759649e..dac8de94 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -3,6 +3,7 @@ package org.asamk.signal.manager.storage;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.asamk.signal.manager.Settings;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.config.ServiceEnvironment;
@@ -17,7 +18,6 @@ import org.asamk.signal.manager.storage.groups.LegacyGroupStore;
 import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
 import org.asamk.signal.manager.storage.identities.LegacyIdentityKeyStore;
 import org.asamk.signal.manager.storage.identities.SignalIdentityKeyStore;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.storage.messageCache.MessageCache;
 import org.asamk.signal.manager.storage.prekeys.LegacyPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.LegacySignedPreKeyStore;
@@ -136,7 +136,7 @@ public class SignalAccount implements Closeable {
     private IdentityKeyPair pniIdentityKeyPair;
     private int localRegistrationId;
     private int localPniRegistrationId;
-    private TrustNewIdentity trustNewIdentity;
+    private Settings settings;
     private long lastReceiveTimestamp = 0;
 
     private boolean registered = false;
@@ -170,7 +170,7 @@ public class SignalAccount implements Closeable {
     }
 
     public static SignalAccount load(
-            File dataPath, String accountPath, boolean waitForLock, final TrustNewIdentity trustNewIdentity
+            File dataPath, String accountPath, boolean waitForLock, final Settings settings
     ) throws IOException {
         logger.trace("Opening account file");
         final var fileName = getFileName(dataPath, accountPath);
@@ -178,7 +178,7 @@ public class SignalAccount implements Closeable {
         try {
             var signalAccount = new SignalAccount(pair.first(), pair.second());
             logger.trace("Loading account file");
-            signalAccount.load(dataPath, accountPath, trustNewIdentity);
+            signalAccount.load(dataPath, accountPath, settings);
             logger.trace("Migrating legacy parts of account file");
             signalAccount.migrateLegacyConfigs();
 
@@ -200,7 +200,7 @@ public class SignalAccount implements Closeable {
             int registrationId,
             int pniRegistrationId,
             ProfileKey profileKey,
-            final TrustNewIdentity trustNewIdentity
+            final Settings settings
     ) throws IOException {
         IOUtils.createPrivateDirectories(dataPath);
         var fileName = getFileName(dataPath, accountPath);
@@ -221,7 +221,7 @@ public class SignalAccount implements Closeable {
         signalAccount.pniIdentityKeyPair = pniIdentityKey;
         signalAccount.localRegistrationId = registrationId;
         signalAccount.localPniRegistrationId = pniRegistrationId;
-        signalAccount.trustNewIdentity = trustNewIdentity;
+        signalAccount.settings = settings;
         signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
 
         signalAccount.registered = false;
@@ -248,7 +248,7 @@ public class SignalAccount implements Closeable {
             int registrationId,
             int pniRegistrationId,
             ProfileKey profileKey,
-            final TrustNewIdentity trustNewIdentity
+            final Settings settings
     ) throws IOException {
         IOUtils.createPrivateDirectories(dataPath);
         var fileName = getFileName(dataPath, accountPath);
@@ -267,10 +267,10 @@ public class SignalAccount implements Closeable {
                     registrationId,
                     pniRegistrationId,
                     profileKey,
-                    trustNewIdentity);
+                    settings);
         }
 
-        final var signalAccount = load(dataPath, accountPath, true, trustNewIdentity);
+        final var signalAccount = load(dataPath, accountPath, true, settings);
         signalAccount.setProvisioningData(number,
                 aci,
                 pni,
@@ -318,7 +318,7 @@ public class SignalAccount implements Closeable {
             int registrationId,
             int pniRegistrationId,
             ProfileKey profileKey,
-            final TrustNewIdentity trustNewIdentity
+            final Settings settings
     ) throws IOException {
         var fileName = getFileName(dataPath, accountPath);
         IOUtils.createPrivateFile(fileName);
@@ -331,7 +331,7 @@ public class SignalAccount implements Closeable {
         signalAccount.serviceEnvironment = serviceEnvironment;
         signalAccount.localRegistrationId = registrationId;
         signalAccount.localPniRegistrationId = pniRegistrationId;
-        signalAccount.trustNewIdentity = trustNewIdentity;
+        signalAccount.settings = settings;
         signalAccount.setProvisioningData(number,
                 aci,
                 pni,
@@ -502,7 +502,7 @@ public class SignalAccount implements Closeable {
     }
 
     private void load(
-            File dataPath, String accountPath, final TrustNewIdentity trustNewIdentity
+            File dataPath, String accountPath, final Settings settings
     ) throws IOException {
         this.dataPath = dataPath;
         this.accountPath = accountPath;
@@ -685,7 +685,7 @@ public class SignalAccount implements Closeable {
 
         this.aciIdentityKeyPair = aciIdentityKeyPair;
         this.localRegistrationId = registrationId;
-        this.trustNewIdentity = trustNewIdentity;
+        this.settings = settings;
 
         migratedLegacyConfig = loadLegacyStores(rootNode, legacySignalProtocolStore) || migratedLegacyConfig;
 
@@ -1156,7 +1156,7 @@ public class SignalAccount implements Closeable {
 
     public IdentityKeyStore getIdentityKeyStore() {
         return getOrCreate(() -> identityKeyStore,
-                () -> identityKeyStore = new IdentityKeyStore(getAccountDatabase(), trustNewIdentity));
+                () -> identityKeyStore = new IdentityKeyStore(getAccountDatabase(), settings.trustNewIdentity()));
     }
 
     public SignalIdentityKeyStore getAciIdentityKeyStore() {
@@ -1242,7 +1242,8 @@ public class SignalAccount implements Closeable {
 
     public MessageSendLogStore getMessageSendLogStore() {
         return getOrCreate(() -> messageSendLogStore,
-                () -> messageSendLogStore = new MessageSendLogStore(getAccountDatabase()));
+                () -> messageSendLogStore = new MessageSendLogStore(getAccountDatabase(),
+                        settings.disableMessageSendLog()));
     }
 
     public CredentialsProvider getCredentialsProvider() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index f672667d..bab0aa4f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -33,9 +33,11 @@ public class MessageSendLogStore implements AutoCloseable {
 
     private final Database database;
     private final Thread cleanupThread;
+    private final boolean sendLogDisabled;
 
-    public MessageSendLogStore(final Database database) {
+    public MessageSendLogStore(final Database database, final boolean disableMessageSendLog) {
         this.database = database;
+        this.sendLogDisabled = disableMessageSendLog;
         this.cleanupThread = new Thread(() -> {
             try {
                 final var interval = Duration.ofHours(1).toMillis();
@@ -43,6 +45,7 @@ public class MessageSendLogStore implements AutoCloseable {
                     try (final var connection = database.getConnection()) {
                         deleteOutdatedEntries(connection);
                     } catch (SQLException e) {
+                        logger.debug("MSL", e);
                         logger.warn("Deleting outdated entries failed");
                         break;
                     }
@@ -113,6 +116,9 @@ public class MessageSendLogStore implements AutoCloseable {
     public long insertIfPossible(
             long sentTimestamp, SendMessageResult sendMessageResult, ContentHint contentHint, boolean urgent
     ) {
+        if (sendLogDisabled) {
+            return -1;
+        }
         final RecipientDevices recipientDevice = getRecipientDevices(sendMessageResult);
         if (recipientDevice == null) {
             return -1;
@@ -128,6 +134,9 @@ public class MessageSendLogStore implements AutoCloseable {
     public long insertIfPossible(
             long sentTimestamp, List<SendMessageResult> sendMessageResults, ContentHint contentHint, boolean urgent
     ) {
+        if (sendLogDisabled) {
+            return -1;
+        }
         final var recipientDevices = sendMessageResults.stream()
                 .map(this::getRecipientDevices)
                 .filter(Objects::nonNull)
@@ -146,6 +155,9 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     public void addRecipientToExistingEntryIfPossible(final long contentId, final SendMessageResult sendMessageResult) {
+        if (sendLogDisabled) {
+            return;
+        }
         final RecipientDevices recipientDevice = getRecipientDevices(sendMessageResult);
         if (recipientDevice == null) {
             return;
@@ -157,6 +169,9 @@ public class MessageSendLogStore implements AutoCloseable {
     public void addRecipientToExistingEntryIfPossible(
             final long contentId, final List<SendMessageResult> sendMessageResults
     ) {
+        if (sendLogDisabled) {
+            return;
+        }
         final var recipientDevices = sendMessageResults.stream()
                 .map(this::getRecipientDevices)
                 .filter(Objects::nonNull)
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 9b6ec2db..90b2c97d 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -79,6 +79,9 @@ Choose when to trust new identities:
 - `always`: Trust any new identity key without verification
 - `never`: Don't trust any unknown identity key, every key must be verified manually
 
+*--disable-send-log*::
+Disable message send log (for resending messages that recipient couldn't decrypt).
+
 == Commands
 
 === register
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 4f045345..058ae6bb 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -23,6 +23,7 @@ import org.asamk.signal.dbus.DbusProvisioningManagerImpl;
 import org.asamk.signal.dbus.DbusRegistrationManagerImpl;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.manager.Settings;
 import org.asamk.signal.manager.SignalAccountFiles;
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;
@@ -101,6 +102,10 @@ public class App {
                 .type(Arguments.enumStringType(TrustNewIdentityCli.class))
                 .setDefault(TrustNewIdentityCli.ON_FIRST_USE);
 
+        parser.addArgument("--disable-send-log")
+                .help("Disable message send log (for resending messages that recipient couldn't decrypt)")
+                .action(Arguments.storeTrue());
+
         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
         Commands.getCommandSubparserAttachers().forEach((key, value) -> {
@@ -167,12 +172,14 @@ public class App {
                 ? TrustNewIdentity.ON_FIRST_USE
                 : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
 
+        final var disableSendLog = Boolean.TRUE.equals(ns.getBoolean("disable-send-log"));
+
         final SignalAccountFiles signalAccountFiles;
         try {
             signalAccountFiles = new SignalAccountFiles(configPath,
                     serviceEnvironment,
                     BaseConfig.USER_AGENT,
-                    trustNewIdentity);
+                    new Settings(trustNewIdentity, disableSendLog));
         } catch (IOException e) {
             throw new IOErrorException("Failed to read local accounts list", e);
         }

From fea19c9e20ed07228420dae93399911a659e51b1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 30 Oct 2022 14:41:02 +0100
Subject: [PATCH 015/672] Implement reacting to stories

---
 client/src/cli.rs                                 |  3 +++
 client/src/jsonrpc.rs                             |  1 +
 client/src/main.rs                                |  2 ++
 .../java/org/asamk/signal/manager/Manager.java    |  3 ++-
 .../org/asamk/signal/manager/ManagerImpl.java     | 15 ++++++++++-----
 man/signal-cli.1.adoc                             |  3 +++
 .../signal/commands/SendReactionCommand.java      |  7 ++++++-
 .../org/asamk/signal/dbus/DbusManagerImpl.java    |  3 ++-
 .../org/asamk/signal/dbus/DbusSignalImpl.java     |  6 ++++--
 9 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 01910001..23d9e914 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -193,6 +193,9 @@ pub enum CliCommands {
 
         #[arg(short = 'r', long)]
         remove: bool,
+
+        #[arg(long)]
+        story: bool,
     },
     SendReceipt {
         recipient: String,
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 3c8abbbd..5881a1ac 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -155,6 +155,7 @@ pub trait Rpc {
         #[allow(non_snake_case)] targetAuthor: String,
         #[allow(non_snake_case)] targetTimestamp: u64,
         remove: bool,
+        story: bool,
     ) -> Result<Value>;
 
     #[rpc(name = "sendReceipt", params = "named")]
diff --git a/client/src/main.rs b/client/src/main.rs
index 50a0f4cb..29512953 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -164,6 +164,7 @@ async fn main() -> Result<(), anyhow::Error> {
             target_author,
             target_timestamp,
             remove,
+            story,
         } => {
             client
                 .send_reaction(
@@ -175,6 +176,7 @@ async fn main() -> Result<(), anyhow::Error> {
                     target_author,
                     target_timestamp,
                     remove,
+                    story,
                 )
                 .await
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 007a783e..3dcf8f59 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -136,7 +136,8 @@ public interface Manager extends Closeable {
             boolean remove,
             RecipientIdentifier.Single targetAuthor,
             long targetSentTimestamp,
-            Set<RecipientIdentifier> recipients
+            Set<RecipientIdentifier> recipients,
+            final boolean isStory
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException;
 
     SendMessageResults sendPaymentNotificationMessage(
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 58863d08..95aba4c4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -667,14 +667,19 @@ class ManagerImpl implements Manager {
             boolean remove,
             RecipientIdentifier.Single targetAuthor,
             long targetSentTimestamp,
-            Set<RecipientIdentifier> recipients
+            Set<RecipientIdentifier> recipients,
+            final boolean isStory
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException {
         var targetAuthorRecipientId = context.getRecipientHelper().resolveRecipient(targetAuthor);
-        var reaction = new SignalServiceDataMessage.Reaction(emoji,
-                remove,
-                context.getRecipientHelper().resolveSignalServiceAddress(targetAuthorRecipientId).getServiceId(),
-                targetSentTimestamp);
+        final var authorServiceId = context.getRecipientHelper()
+                .resolveSignalServiceAddress(targetAuthorRecipientId)
+                .getServiceId();
+        var reaction = new SignalServiceDataMessage.Reaction(emoji, remove, authorServiceId, targetSentTimestamp);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withReaction(reaction);
+        if (isStory) {
+            messageBuilder.withStoryContext(new SignalServiceDataMessage.StoryContext(authorServiceId,
+                    targetSentTimestamp));
+        }
         return sendMessage(messageBuilder, recipients);
     }
 
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 90b2c97d..4509f08f 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -313,6 +313,9 @@ Specify the timestamp of the message to which to react.
 *-r*, *--remove*::
 Remove a reaction.
 
+*--story*::
+React to a story instead of a normal message
+
 === sendReceipt
 
 Send a read or viewed receipt to a previously received message.
diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index f5b6a89d..a844fabf 100644
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -45,6 +45,9 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
                 .type(long.class)
                 .help("Specify the timestamp of the message to which to react.");
         subparser.addArgument("-r", "--remove").help("Remove a reaction.").action(Arguments.storeTrue());
+        subparser.addArgument("--story")
+                .help("React to a story instead of a normal message")
+                .action(Arguments.storeTrue());
     }
 
     @Override
@@ -64,13 +67,15 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
         final var isRemove = Boolean.TRUE.equals(ns.getBoolean("remove"));
         final var targetAuthor = ns.getString("target-author");
         final var targetTimestamp = ns.getLong("target-timestamp");
+        final var isStory = Boolean.TRUE.equals(ns.getBoolean("story"));
 
         try {
             final var results = m.sendMessageReaction(emoji,
                     isRemove,
                     CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
                     targetTimestamp,
-                    recipientIdentifiers);
+                    recipientIdentifiers,
+                    isStory);
             outputResult(outputWriter, results);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new UserErrorException(e.getMessage());
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index bbfa4f1c..8e92cdf4 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -364,7 +364,8 @@ public class DbusManagerImpl implements Manager {
             final boolean remove,
             final RecipientIdentifier.Single targetAuthor,
             final long targetSentTimestamp,
-            final Set<RecipientIdentifier> recipients
+            final Set<RecipientIdentifier> recipients,
+            final boolean isStory
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessageReaction(emoji,
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 92e92157..c19daadf 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -287,7 +287,8 @@ public class DbusSignalImpl implements Signal {
                     targetSentTimestamp,
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
-                            .collect(Collectors.toSet()));
+                            .collect(Collectors.toSet()),
+                    false);
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException e) {
@@ -485,7 +486,8 @@ public class DbusSignalImpl implements Signal {
                     remove,
                     getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
                     targetSentTimestamp,
-                    Set.of(getGroupRecipientIdentifier(groupId)));
+                    Set.of(getGroupRecipientIdentifier(groupId)),
+                    false);
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException e) {

From 5ed9db4f08e52ed0c42cb42740f85d2ad346e13c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 30 Oct 2022 18:18:21 +0100
Subject: [PATCH 016/672] Implement replying to stories

---
 client/src/cli.rs                             |  6 ++++++
 client/src/jsonrpc.rs                         |  2 ++
 client/src/main.rs                            |  4 ++++
 .../org/asamk/signal/manager/ManagerImpl.java |  8 ++++++++
 .../org/asamk/signal/manager/api/Message.java |  5 ++++-
 man/signal-cli.1.adoc                         |  6 ++++++
 .../asamk/signal/commands/SendCommand.java    | 20 +++++++++++++++++--
 .../org/asamk/signal/dbus/DbusSignalImpl.java |  9 ++++++---
 8 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 23d9e914..ca809290 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -162,6 +162,12 @@ pub enum CliCommands {
 
         #[arg(long)]
         sticker: Option<String>,
+
+        #[arg(long)]
+        story_timestamp: Option<u64>,
+
+        #[arg(long)]
+        story_author: Option<String>,
     },
     SendContacts,
     SendPaymentNotification {
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 5881a1ac..51e41c19 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -130,6 +130,8 @@ pub trait Rpc {
         #[allow(non_snake_case)] quoteMessage: Option<String>,
         #[allow(non_snake_case)] quoteMention: Vec<String>,
         sticker: Option<String>,
+        #[allow(non_snake_case)] storyTimestamp: Option<u64>,
+        #[allow(non_snake_case)] storyAuthor: Option<String>,
     ) -> Result<Value>;
 
     #[rpc(name = "sendContacts", params = "named")]
diff --git a/client/src/main.rs b/client/src/main.rs
index 29512953..ea9cb9c8 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -127,6 +127,8 @@ async fn main() -> Result<(), anyhow::Error> {
             quote_message,
             quote_mention,
             sticker,
+            story_timestamp,
+            story_author,
         } => {
             client
                 .send(
@@ -143,6 +145,8 @@ async fn main() -> Result<(), anyhow::Error> {
                     quote_message,
                     quote_mention,
                     sticker,
+                    story_timestamp,
+                    story_author,
                 )
                 .await
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 95aba4c4..4ffeb99f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -624,6 +624,14 @@ class ManagerImpl implements Manager {
             }
             messageBuilder.withPreviews(previews);
         }
+        if (message.storyReply().isPresent()) {
+            final var storyReply = message.storyReply().get();
+            final var authorServiceId = context.getRecipientHelper()
+                    .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(storyReply.author()))
+                    .getServiceId();
+            messageBuilder.withStoryContext(new SignalServiceDataMessage.StoryContext(authorServiceId,
+                    storyReply.timestamp()));
+        }
     }
 
     private ArrayList<SignalServiceDataMessage.Mention> resolveMentions(final List<Message.Mention> mentionList) throws UnregisteredRecipientException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Message.java b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
index 1e76faea..aba79cc5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Message.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
@@ -9,7 +9,8 @@ public record Message(
         List<Mention> mentions,
         Optional<Quote> quote,
         Optional<Sticker> sticker,
-        List<Preview> previews
+        List<Preview> previews,
+        Optional<StoryReply> storyReply
 ) {
 
     public record Mention(RecipientIdentifier.Single recipient, int start, int length) {}
@@ -19,4 +20,6 @@ public record Message(
     public record Sticker(byte[] packId, int stickerId) {}
 
     public record Preview(String url, String title, String description, Optional<String> image) {}
+
+    public record StoryReply(long timestamp, RecipientIdentifier.Single author) {}
 }
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 4509f08f..5b3af7c1 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -275,6 +275,12 @@ Specify the description for the link preview (optional).
 *--preview-image*::
 Specify the image file for the link preview (optional).
 
+*--story-timestamp*::
+Specify the timestamp of a story to reply to.
+
+*--story-author*::
+Specify the number of the author of the story.
+
 *-e*, *--end-session*::
 Clear session state and send end session message.
 
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 3fd00eaf..2a47ab8d 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -80,6 +80,10 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--preview-title").help("Specify the title for the link preview (mandatory).");
         subparser.addArgument("--preview-description").help("Specify the description for the link preview (optional).");
         subparser.addArgument("--preview-image").help("Specify the image file for the link preview (optional).");
+        subparser.addArgument("--story-timestamp")
+                .type(long.class)
+                .help("Specify the timestamp of a story to reply to.");
+        subparser.addArgument("--story-author").help("Specify the number of the author of the story.");
     }
 
     @Override
@@ -170,18 +174,30 @@ public class SendCommand implements JsonRpcLocalCommand {
             previews = List.of();
         }
 
+        final Message.StoryReply storyReply;
+        final var storyReplyTimestamp = ns.getLong("story-timestamp");
+        if (storyReplyTimestamp != null) {
+            final var storyAuthor = ns.getString("story-author");
+            storyReply = new Message.StoryReply(storyReplyTimestamp,
+                    CommandUtil.getSingleRecipientIdentifier(storyAuthor, m.getSelfNumber()));
+        } else {
+            storyReply = null;
+        }
+
         if (messageText.isEmpty() && attachments.isEmpty() && sticker == null && quote == null) {
             throw new UserErrorException(
                     "Sending empty message is not allowed, either a message, attachment or sticker must be given.");
         }
 
         try {
-            var results = m.sendMessage(new Message(messageText,
+            final var message = new Message(messageText,
                     attachments,
                     mentions,
                     Optional.ofNullable(quote),
                     Optional.ofNullable(sticker),
-                    previews), recipientIdentifiers);
+                    previews,
+                    Optional.ofNullable((storyReply)));
+            var results = m.sendMessage(message, recipientIdentifiers);
             outputResult(outputWriter, results);
         } catch (AttachmentInvalidException | IOException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index c19daadf..1a9118be 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -218,7 +218,8 @@ public class DbusSignalImpl implements Signal {
                             List.of(),
                             Optional.empty(),
                             Optional.empty(),
-                            List.of()),
+                            List.of(),
+                            Optional.empty()),
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
@@ -386,7 +387,8 @@ public class DbusSignalImpl implements Signal {
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
-                    List.of()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+                    List.of(),
+                    Optional.empty()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (AttachmentInvalidException e) {
@@ -428,7 +430,8 @@ public class DbusSignalImpl implements Signal {
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
-                    List.of()), Set.of(getGroupRecipientIdentifier(groupId)));
+                    List.of(),
+                    Optional.empty()), Set.of(getGroupRecipientIdentifier(groupId)));
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException | InvalidStickerException e) {

From de2bfc7f7942908222ebcbac17e6072055acc062 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Oct 2022 11:17:52 +0100
Subject: [PATCH 017/672] Add optional message limit for receive command

---
 .../org/asamk/signal/manager/Manager.java     |  9 ++--
 .../org/asamk/signal/manager/ManagerImpl.java | 17 ++++---
 .../signal/manager/helper/ReceiveHelper.java  | 13 ++++--
 man/signal-cli.1.adoc                         |  3 ++
 .../asamk/signal/commands/ReceiveCommand.java | 14 ++++--
 .../asamk/signal/dbus/DbusManagerImpl.java    | 46 +++++++++++--------
 6 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 3dcf8f59..ec168a4c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -202,12 +202,9 @@ public interface Manager extends Closeable {
     /**
      * Receive new messages from server, returns if no new message arrive in a timespan of timeout.
      */
-    void receiveMessages(Duration timeout, ReceiveMessageHandler handler) throws IOException;
-
-    /**
-     * Receive new messages from server, returns only if the thread is interrupted.
-     */
-    void receiveMessages(ReceiveMessageHandler handler) throws IOException;
+    public void receiveMessages(
+            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
+    ) throws IOException;
 
     void setReceiveConfig(ReceiveConfig receiveConfig);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 4ffeb99f..95f5bde4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -961,17 +961,16 @@ class ManagerImpl implements Manager {
     }
 
     @Override
-    public void receiveMessages(Duration timeout, ReceiveMessageHandler handler) throws IOException {
-        receiveMessages(timeout, true, handler);
-    }
-
-    @Override
-    public void receiveMessages(ReceiveMessageHandler handler) throws IOException {
-        receiveMessages(Duration.ofMinutes(1), false, handler);
+    public void receiveMessages(
+            Optional<Duration> timeout,
+            Optional<Integer> maxMessages,
+            ReceiveMessageHandler handler
+    ) throws IOException {
+        receiveMessages(timeout.orElse(Duration.ofMinutes(1)), timeout.isPresent(), maxMessages.orElse(null), handler);
     }
 
     private void receiveMessages(
-            Duration timeout, boolean returnOnTimeout, ReceiveMessageHandler handler
+            Duration timeout, boolean returnOnTimeout, Integer maxMessages, ReceiveMessageHandler handler
     ) throws IOException {
         if (isReceiving()) {
             throw new IllegalStateException("Already receiving message.");
@@ -979,7 +978,7 @@ class ManagerImpl implements Manager {
         isReceivingSynchronous = true;
         receiveThread = Thread.currentThread();
         try {
-            context.getReceiveHelper().receiveMessages(timeout, returnOnTimeout, handler);
+            context.getReceiveHelper().receiveMessages(timeout, returnOnTimeout, maxMessages, handler);
         } finally {
             receiveThread = null;
             isReceivingSynchronous = false;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 9fe1bf54..c15f4f94 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -80,7 +80,7 @@ public class ReceiveHelper {
     public void receiveMessagesContinuously(Manager.ReceiveMessageHandler handler) {
         while (!shouldStop) {
             try {
-                receiveMessages(Duration.ofMinutes(1), false, handler);
+                receiveMessages(Duration.ofMinutes(1), false, null, handler);
                 break;
             } catch (IOException e) {
                 logger.warn("Receiving messages failed, retrying", e);
@@ -89,7 +89,7 @@ public class ReceiveHelper {
     }
 
     public void receiveMessages(
-            Duration timeout, boolean returnOnTimeout, Manager.ReceiveMessageHandler handler
+            Duration timeout, boolean returnOnTimeout, Integer maxMessages, Manager.ReceiveMessageHandler handler
     ) throws IOException {
         needsToRetryFailedMessages = true;
         hasCaughtUpWithOldMessages = false;
@@ -107,7 +107,7 @@ public class ReceiveHelper {
         signalWebSocket.connect();
 
         try {
-            receiveMessagesInternal(signalWebSocket, timeout, returnOnTimeout, handler, queuedActions);
+            receiveMessagesInternal(signalWebSocket, timeout, returnOnTimeout, maxMessages, handler, queuedActions);
         } finally {
             hasCaughtUpWithOldMessages = false;
             handleQueuedActions(queuedActions.keySet());
@@ -122,13 +122,15 @@ public class ReceiveHelper {
             final SignalWebSocket signalWebSocket,
             Duration timeout,
             boolean returnOnTimeout,
+            Integer maxMessages,
             Manager.ReceiveMessageHandler handler,
             final Map<HandleAction, HandleAction> queuedActions
     ) throws IOException {
+        int remainingMessages = maxMessages == null ? -1 : maxMessages;
         var backOffCounter = 0;
         isWaitingForMessage = false;
 
-        while (!shouldStop) {
+        while (!shouldStop && remainingMessages != 0) {
             if (needsToRetryFailedMessages) {
                 retryFailedReceivedMessages(handler);
                 needsToRetryFailedMessages = false;
@@ -154,6 +156,9 @@ public class ReceiveHelper {
                 backOffCounter = 0;
 
                 if (result.isPresent()) {
+                    if (remainingMessages > 0) {
+                        remainingMessages -= 1;
+                    }
                     envelope = result.get();
                     logger.debug("New message received from server");
                 } else {
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 5b3af7c1..4d34582a 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -372,6 +372,9 @@ In json mode this is outputted as one json object per line.
 Number of seconds to wait for new messages (negative values disable timeout).
 Default is 5 seconds.
 
+*--max-messages*::
+Maximum number of messages to receive, before returning.
+
 *--ignore-attachments*::
 Don’t download attachments of received messages.
 
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 4d5bdff0..0095e758 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.List;
+import java.util.Optional;
 
 public class ReceiveCommand implements LocalCommand {
 
@@ -37,6 +38,10 @@ public class ReceiveCommand implements LocalCommand {
                 .type(double.class)
                 .setDefault(3.0)
                 .help("Number of seconds to wait for new messages (negative values disable timeout)");
+        subparser.addArgument("--max-messages")
+                .type(int.class)
+                .setDefault(-1)
+                .help("Maximum number of messages to receive, before returning.");
         subparser.addArgument("--ignore-attachments")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
@@ -58,6 +63,7 @@ public class ReceiveCommand implements LocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         final var timeout = ns.getDouble("timeout");
+        final var maxMessagesRaw = ns.getInt("max-messages");
         final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
         final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
         final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
@@ -65,11 +71,9 @@ public class ReceiveCommand implements LocalCommand {
         try {
             final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
                     (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
-            if (timeout < 0) {
-                m.receiveMessages(handler);
-            } else {
-                m.receiveMessages(Duration.ofMillis((long) (timeout * 1000)), handler);
-            }
+            final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
+            final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
+            m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 8e92cdf4..b59be923 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -58,6 +58,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -497,39 +498,46 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
-    @Override
-    public void receiveMessages(final ReceiveMessageHandler handler) throws IOException {
-        addReceiveHandler(handler);
-        try {
-            synchronized (this) {
-                this.wait();
-            }
-        } catch (InterruptedException ignored) {
-        }
-        removeReceiveHandler(handler);
-    }
-
     @Override
     public void receiveMessages(
-            final Duration timeout, final ReceiveMessageHandler handler
+            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
     ) throws IOException {
+        final var remainingMessages = new AtomicInteger(maxMessages.orElse(-1));
         final var lastMessage = new AtomicLong(System.currentTimeMillis());
+        final var thread = Thread.currentThread();
 
         final ReceiveMessageHandler receiveHandler = (envelope, e) -> {
             lastMessage.set(System.currentTimeMillis());
             handler.handleMessage(envelope, e);
+            if (remainingMessages.get() > 0) {
+                if (remainingMessages.decrementAndGet() <= 0) {
+                    remainingMessages.set(0);
+                    thread.interrupt();
+                }
+            }
         };
         addReceiveHandler(receiveHandler);
-        while (true) {
-            try {
-                final var sleepTimeRemaining = timeout.toMillis() - (System.currentTimeMillis() - lastMessage.get());
-                if (sleepTimeRemaining < 0) {
-                    break;
+        if (timeout.isPresent()) {
+            while (remainingMessages.get() != 0) {
+                try {
+                    final var passedTime = System.currentTimeMillis() - lastMessage.get();
+                    final var sleepTimeRemaining = timeout.get().toMillis() - passedTime;
+                    if (sleepTimeRemaining < 0) {
+                        break;
+                    }
+                    Thread.sleep(sleepTimeRemaining);
+                } catch (InterruptedException ignored) {
+                }
+            }
+        } else {
+            try {
+                synchronized (this) {
+                    this.wait();
                 }
-                Thread.sleep(sleepTimeRemaining);
             } catch (InterruptedException ignored) {
             }
         }
+
         removeReceiveHandler(receiveHandler);
     }
 

From 175057e781623d5e61128ccbb13f2eb47ae8bf94 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Oct 2022 11:56:25 +0100
Subject: [PATCH 018/672] Implement receive command for JSON-RPC mode

The command returns a list of messages, as soon as the timeout is reached
after the last message has been received or the maximum number of messages
has been received.
---
 graalvm-config-dir/reflect-config.json        |  7 +++++
 .../asamk/signal/commands/ReceiveCommand.java | 31 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 78f1d5e4..bd5a9dfc 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -605,6 +605,13 @@
     {"name":"id","parameterTypes":[] }
   ]
 },
+{
+  "name":"org.asamk.signal.commands.ReceiveCommand$ReceiveParams",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Double","java.lang.Integer"] }]
+},
 {
   "name":"org.asamk.signal.commands.RegisterCommand$RegistrationParams",
   "allDeclaredFields":true,
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 0095e758..79d0ee1d 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.commands;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
@@ -19,10 +21,11 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-public class ReceiveCommand implements LocalCommand {
+public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<ReceiveCommand.ReceiveParams> {
 
     private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
 
@@ -78,4 +81,30 @@ public class ReceiveCommand implements LocalCommand {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
         }
     }
+
+    @Override
+    public TypeReference<ReceiveParams> getRequestType() {
+        return new TypeReference<>() {};
+    }
+
+    @Override
+    public void handleCommand(
+            final ReceiveParams request, final Manager m, final JsonWriter jsonWriter
+    ) throws CommandException {
+        final var timeout = request.timeout() == null ? 3.0 : request.timeout();
+        final var maxMessagesRaw = request.maxMessages() == null ? -1 : request.maxMessages();
+
+        try {
+            final var messages = new ArrayList<>();
+            final var handler = new JsonReceiveMessageHandler(m, messages::add);
+            final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
+            final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
+            m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
+            jsonWriter.write(messages);
+        } catch (IOException e) {
+            throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
+        }
+    }
+
+    record ReceiveParams(Double timeout, Integer maxMessages) {}
 }

From 43a74787917532192793c4e35253b8db4db38c39 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Oct 2022 15:29:18 +0100
Subject: [PATCH 019/672] Update reflect-config.json

---
 graalvm-config-dir/reflect-config.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index bd5a9dfc..268952db 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -610,7 +610,11 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.Double","java.lang.Integer"] }]
+  "methods":[
+    {"name":"<init>","parameterTypes":["java.lang.Double","java.lang.Integer"] }, 
+    {"name":"maxMessages","parameterTypes":[] }, 
+    {"name":"timeout","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.commands.RegisterCommand$RegistrationParams",

From eec3d782d3b1b4f3eecd5b741fcfc4570caf126c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Oct 2022 16:15:57 +0100
Subject: [PATCH 020/672] Add caching for workflows

---
 .github/workflows/ci.yml                    | 2 ++
 .github/workflows/repackage-native-libs.yml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f336c480..5a1fd42a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: ${{ matrix.java }}
+          cache: 'gradle'
       - name: Build with Gradle
         run: ./gradlew --no-daemon build
       - name: Compress archive
@@ -37,6 +38,7 @@ jobs:
         with:
           version: 'latest'
           java-version: '17'
+          cache: 'gradle'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build with Gradle
diff --git a/.github/workflows/repackage-native-libs.yml b/.github/workflows/repackage-native-libs.yml
index 6d334ecf..a7428051 100644
--- a/.github/workflows/repackage-native-libs.yml
+++ b/.github/workflows/repackage-native-libs.yml
@@ -179,6 +179,7 @@ jobs:
         with:
           distribution: 'adopt'
           java-version: ${{ env.JAVA_VERSION }}
+          java-package: 'jre'
 
       - name: Run signal-cli
         run: |

From 90962296377ad76531191cea7caaad738af00f2f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 1 Nov 2022 13:56:40 +0100
Subject: [PATCH 021/672] Improve behavior with synchronous and asynchronous
 receivers

---
 .../org/asamk/signal/manager/Manager.java     |  3 +-
 .../org/asamk/signal/manager/ManagerImpl.java | 64 +++++++++++--------
 .../api/AlreadyReceivingException.java        | 12 ++++
 .../asamk/signal/commands/ReceiveCommand.java |  6 ++
 4 files changed, 56 insertions(+), 29 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/AlreadyReceivingException.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index ec168a4c..01d88e46 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -1,5 +1,6 @@
 package org.asamk.signal.manager;
 
+import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
@@ -204,7 +205,7 @@ public interface Manager extends Closeable {
      */
     public void receiveMessages(
             Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
-    ) throws IOException;
+    ) throws IOException, AlreadyReceivingException;
 
     void setReceiveConfig(ReceiveConfig receiveConfig);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 95f5bde4..31231630 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -16,6 +16,7 @@
  */
 package org.asamk.signal.manager;
 
+import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
@@ -25,6 +26,7 @@ import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
@@ -874,9 +876,6 @@ class ManagerImpl implements Manager {
 
     @Override
     public void addReceiveHandler(final ReceiveMessageHandler handler, final boolean isWeakListener) {
-        if (isReceivingSynchronous) {
-            throw new IllegalStateException("Already receiving message synchronously.");
-        }
         synchronized (messageHandlers) {
             if (isWeakListener) {
                 weakHandlers.add(handler);
@@ -890,23 +889,12 @@ class ManagerImpl implements Manager {
     private static final AtomicInteger threadNumber = new AtomicInteger(0);
 
     private void startReceiveThreadIfRequired() {
-        if (receiveThread != null) {
+        if (receiveThread != null || isReceivingSynchronous) {
             return;
         }
         receiveThread = new Thread(() -> {
             logger.debug("Starting receiving messages");
-            context.getReceiveHelper().receiveMessagesContinuously((envelope, e) -> {
-                synchronized (messageHandlers) {
-                    final var handlers = Stream.concat(messageHandlers.stream(), weakHandlers.stream()).toList();
-                    handlers.forEach(h -> {
-                        try {
-                            h.handleMessage(envelope, e);
-                        } catch (Throwable ex) {
-                            logger.warn("Message handler failed, ignoring", ex);
-                        }
-                    });
-                }
-            });
+            context.getReceiveHelper().receiveMessagesContinuously(this::passReceivedMessageToHandlers);
             logger.debug("Finished receiving messages");
             synchronized (messageHandlers) {
                 receiveThread = null;
@@ -923,6 +911,18 @@ class ManagerImpl implements Manager {
         receiveThread.start();
     }
 
+    private void passReceivedMessageToHandlers(MessageEnvelope envelope, Throwable e) {
+        synchronized (messageHandlers) {
+            Stream.concat(messageHandlers.stream(), weakHandlers.stream()).forEach(h -> {
+                try {
+                    h.handleMessage(envelope, e);
+                } catch (Throwable ex) {
+                    logger.warn("Message handler failed, ignoring", ex);
+                }
+            });
+        }
+    }
+
     @Override
     public void removeReceiveHandler(final ReceiveMessageHandler handler) {
         final Thread thread;
@@ -962,26 +962,34 @@ class ManagerImpl implements Manager {
 
     @Override
     public void receiveMessages(
-            Optional<Duration> timeout,
-            Optional<Integer> maxMessages,
-            ReceiveMessageHandler handler
-    ) throws IOException {
+            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
+    ) throws IOException, AlreadyReceivingException {
         receiveMessages(timeout.orElse(Duration.ofMinutes(1)), timeout.isPresent(), maxMessages.orElse(null), handler);
     }
 
     private void receiveMessages(
             Duration timeout, boolean returnOnTimeout, Integer maxMessages, ReceiveMessageHandler handler
-    ) throws IOException {
-        if (isReceiving()) {
-            throw new IllegalStateException("Already receiving message.");
+    ) throws IOException, AlreadyReceivingException {
+        synchronized (messageHandlers) {
+            if (isReceiving()) {
+                throw new AlreadyReceivingException("Already receiving message.");
+            }
+            isReceivingSynchronous = true;
+            receiveThread = Thread.currentThread();
         }
-        isReceivingSynchronous = true;
-        receiveThread = Thread.currentThread();
         try {
-            context.getReceiveHelper().receiveMessages(timeout, returnOnTimeout, maxMessages, handler);
+            context.getReceiveHelper().receiveMessages(timeout, returnOnTimeout, maxMessages, (envelope, e) -> {
+                passReceivedMessageToHandlers(envelope, e);
+                handler.handleMessage(envelope, e);
+            });
         } finally {
-            receiveThread = null;
-            isReceivingSynchronous = false;
+            synchronized (messageHandlers) {
+                receiveThread = null;
+                isReceivingSynchronous = false;
+                if (messageHandlers.size() > 0) {
+                    startReceiveThreadIfRequired();
+                }
+            }
         }
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/AlreadyReceivingException.java b/lib/src/main/java/org/asamk/signal/manager/api/AlreadyReceivingException.java
new file mode 100644
index 00000000..298e3f2f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/AlreadyReceivingException.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.manager.api;
+
+public class AlreadyReceivingException extends Exception {
+
+    public AlreadyReceivingException(String message) {
+        super(message);
+    }
+
+    public AlreadyReceivingException(String message, Exception e) {
+        super(message, e);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 79d0ee1d..ab65f837 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -10,8 +10,10 @@ import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
@@ -79,6 +81,8 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
             m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
+        } catch (AlreadyReceivingException e) {
+            throw new UserErrorException("Receive command cannot be used if messages are already being received.", e);
         }
     }
 
@@ -103,6 +107,8 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
             jsonWriter.write(messages);
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
+        } catch (AlreadyReceivingException e) {
+            throw new UserErrorException("Receive command cannot be used if messages are already being received.", e);
         }
     }
 

From 9620eb06ac81403d3ff0536d16a44a2afbf66fd6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 1 Nov 2022 13:42:23 +0100
Subject: [PATCH 022/672] Update libsignal-service

---
 graalvm-config-dir/proxy-config.json         | 28 ++++----
 graalvm-config-dir/reflect-config.json       | 67 +++++++++++++++++++-
 graalvm-config-dir/serialization-config.json |  2 +
 lib/build.gradle.kts                         |  2 +-
 4 files changed, 83 insertions(+), 16 deletions(-)

diff --git a/graalvm-config-dir/proxy-config.json b/graalvm-config-dir/proxy-config.json
index 3110286d..d9a734a8 100644
--- a/graalvm-config-dir/proxy-config.json
+++ b/graalvm-config-dir/proxy-config.json
@@ -1,23 +1,23 @@
 [
   {
-    "interfaces":["java.sql.Connection"]}
-  ,
+    "interfaces":["java.sql.Connection"]
+  },
   {
-    "interfaces":["org.asamk.Signal"]}
-  ,
+    "interfaces":["org.asamk.Signal"]
+  },
   {
-    "interfaces":["org.asamk.Signal$Configuration"]}
-  ,
+    "interfaces":["org.asamk.Signal$Configuration"]
+  },
   {
-    "interfaces":["org.asamk.Signal$Device"]}
-  ,
+    "interfaces":["org.asamk.Signal$Device"]
+  },
   {
-    "interfaces":["org.asamk.Signal$Group"]}
-  ,
+    "interfaces":["org.asamk.Signal$Group"]
+  },
   {
-    "interfaces":["org.asamk.SignalControl"]}
-  ,
+    "interfaces":["org.asamk.SignalControl"]
+  },
   {
-    "interfaces":["org.freedesktop.dbus.interfaces.DBus"]}
-  
+    "interfaces":["org.freedesktop.dbus.interfaces.DBus"]
+  }
 ]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 268952db..3f7b8de2 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -78,10 +78,22 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true
 },
+{
+  "name":"com.google.protobuf.DescriptorMessageInfoFactory"
+},
+{
+  "name":"com.google.protobuf.ExtensionRegistry"
+},
+{
+  "name":"com.google.protobuf.ExtensionSchemaFull"
+},
 {
   "name":"com.google.protobuf.GeneratedMessageLite",
   "fields":[{"name":"unknownFields"}]
 },
+{
+  "name":"com.google.protobuf.GeneratedMessageV3"
+},
 {
   "name":"com.google.protobuf.Internal$LongList",
   "allDeclaredMethods":true
@@ -96,10 +108,19 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"com.google.protobuf.MapFieldSchemaFull"
+},
+{
+  "name":"com.google.protobuf.NewInstanceSchemaFull"
+},
 {
   "name":"com.google.protobuf.PrimitiveNonBoxingCollection",
   "allDeclaredMethods":true
 },
+{
+  "name":"com.google.protobuf.UnknownFieldSetSchema"
+},
 {
   "name":"com.sun.crypto.provider.AESCipher$General",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -187,7 +208,42 @@
     {"name":"isAutoCommit","parameterTypes":[] }, 
     {"name":"isIsolateInternalQueries","parameterTypes":[] }, 
     {"name":"isReadOnly","parameterTypes":[] }, 
-    {"name":"isRegisterMbeans","parameterTypes":[] }
+    {"name":"isRegisterMbeans","parameterTypes":[] }, 
+    {"name":"setAllowPoolSuspension","parameterTypes":["boolean"] }, 
+    {"name":"setAutoCommit","parameterTypes":["boolean"] }, 
+    {"name":"setCatalog","parameterTypes":["java.lang.String"] }, 
+    {"name":"setConnectionInitSql","parameterTypes":["java.lang.String"] }, 
+    {"name":"setConnectionTestQuery","parameterTypes":["java.lang.String"] }, 
+    {"name":"setConnectionTimeout","parameterTypes":["long"] }, 
+    {"name":"setDataSource","parameterTypes":["javax.sql.DataSource"] }, 
+    {"name":"setDataSourceClassName","parameterTypes":["java.lang.String"] }, 
+    {"name":"setDataSourceJNDI","parameterTypes":["java.lang.String"] }, 
+    {"name":"setDataSourceProperties","parameterTypes":["java.util.Properties"] }, 
+    {"name":"setDriverClassName","parameterTypes":["java.lang.String"] }, 
+    {"name":"setExceptionOverrideClassName","parameterTypes":["java.lang.String"] }, 
+    {"name":"setHealthCheckProperties","parameterTypes":["java.util.Properties"] }, 
+    {"name":"setHealthCheckRegistry","parameterTypes":["java.lang.Object"] }, 
+    {"name":"setIdleTimeout","parameterTypes":["long"] }, 
+    {"name":"setInitializationFailTimeout","parameterTypes":["long"] }, 
+    {"name":"setIsolateInternalQueries","parameterTypes":["boolean"] }, 
+    {"name":"setJdbcUrl","parameterTypes":["java.lang.String"] }, 
+    {"name":"setKeepaliveTime","parameterTypes":["long"] }, 
+    {"name":"setLeakDetectionThreshold","parameterTypes":["long"] }, 
+    {"name":"setMaxLifetime","parameterTypes":["long"] }, 
+    {"name":"setMaximumPoolSize","parameterTypes":["int"] }, 
+    {"name":"setMetricRegistry","parameterTypes":["java.lang.Object"] }, 
+    {"name":"setMetricsTrackerFactory","parameterTypes":["com.zaxxer.hikari.metrics.MetricsTrackerFactory"] }, 
+    {"name":"setMinimumIdle","parameterTypes":["int"] }, 
+    {"name":"setPassword","parameterTypes":["java.lang.String"] }, 
+    {"name":"setPoolName","parameterTypes":["java.lang.String"] }, 
+    {"name":"setReadOnly","parameterTypes":["boolean"] }, 
+    {"name":"setRegisterMbeans","parameterTypes":["boolean"] }, 
+    {"name":"setScheduledExecutor","parameterTypes":["java.util.concurrent.ScheduledExecutorService"] }, 
+    {"name":"setSchema","parameterTypes":["java.lang.String"] }, 
+    {"name":"setThreadFactory","parameterTypes":["java.util.concurrent.ThreadFactory"] }, 
+    {"name":"setTransactionIsolation","parameterTypes":["java.lang.String"] }, 
+    {"name":"setUsername","parameterTypes":["java.lang.String"] }, 
+    {"name":"setValidationTimeout","parameterTypes":["long"] }
   ]
 },
 {
@@ -406,6 +462,12 @@
   "name":"javax.security.auth.x500.X500Principal",
   "methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
 },
+{
+  "name":"javax.smartcardio.CardPermission"
+},
+{
+  "name":"libcore.io.Memory"
+},
 {
   "name":"long",
   "allDeclaredMethods":true,
@@ -1746,6 +1808,9 @@
   "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
   "allPublicConstructors":true
 },
+{
+  "name":"org.robolectric.Robolectric"
+},
 {
   "name":"org.signal.cdsi.proto.ClientRequest",
   "fields":[
diff --git a/graalvm-config-dir/serialization-config.json b/graalvm-config-dir/serialization-config.json
index bf554e06..f3d7e06e 100644
--- a/graalvm-config-dir/serialization-config.json
+++ b/graalvm-config-dir/serialization-config.json
@@ -2,5 +2,7 @@
   "types":[
   ],
   "lambdaCapturingTypes":[
+  ],
+  "proxies":[
   ]
 }
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index ca37c1f3..9b12a328 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_62")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_63")
     implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.4.2")
     implementation("com.google.protobuf", "protobuf-javalite", "3.21.6")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")

From ae678871ec976f2bcf1cee969e555ca00239f7d8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 1 Nov 2022 17:10:15 +0100
Subject: [PATCH 023/672] Extract JSON-RPC command handler

---
 .../jsonrpc/SignalJsonRpcCommandHandler.java  | 257 ++++++++++++++++++
 .../SignalJsonRpcDispatcherHandler.java       | 221 +--------------
 2 files changed, 261 insertions(+), 217 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
new file mode 100644
index 00000000..0f6a00bd
--- /dev/null
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -0,0 +1,257 @@
+package org.asamk.signal.jsonrpc;
+
+import com.fasterxml.jackson.core.TreeNode;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import org.asamk.signal.commands.Command;
+import org.asamk.signal.commands.JsonRpcMultiCommand;
+import org.asamk.signal.commands.JsonRpcRegistrationCommand;
+import org.asamk.signal.commands.JsonRpcSingleCommand;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.output.JsonWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.channels.OverlappingFileLockException;
+import java.util.Map;
+import java.util.function.Function;
+
+public class SignalJsonRpcCommandHandler {
+
+    private final static Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
+
+    private static final int USER_ERROR = -1;
+    private static final int IO_ERROR = -3;
+    private static final int UNTRUSTED_KEY_ERROR = -4;
+
+    private final Manager m;
+    private final MultiAccountManager c;
+    private final Function<String, Command> commandProvider;
+
+    public SignalJsonRpcCommandHandler(final Manager m, final Function<String, Command> commandProvider) {
+        this.c = null;
+        this.m = m;
+        this.commandProvider = commandProvider;
+    }
+
+    public SignalJsonRpcCommandHandler(final MultiAccountManager c, final Function<String, Command> commandProvider) {
+        this.c = c;
+        this.m = null;
+        this.commandProvider = commandProvider;
+    }
+
+    JsonNode handleRequest(
+            final ObjectMapper objectMapper, final String method, ContainerNode<?> params
+    ) throws JsonRpcException {
+        var command = getCommand(method);
+        if (c != null) {
+            if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
+                final var manager = getManagerFromParams(params);
+                if (manager != null) {
+                    return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
+                }
+            }
+            if (command instanceof JsonRpcMultiCommand<?> jsonRpcCommand) {
+                return runCommand(objectMapper, params, new MultiCommandRunnerImpl<>(c, jsonRpcCommand));
+            }
+            if (command instanceof JsonRpcRegistrationCommand<?> jsonRpcCommand) {
+                try (var manager = getRegistrationManagerFromParams(params)) {
+                    if (manager != null) {
+                        return runCommand(objectMapper,
+                                params,
+                                new RegistrationCommandRunnerImpl<>(manager, c, jsonRpcCommand));
+                    } else {
+                        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
+                                "Method requires valid account parameter",
+                                null));
+                    }
+                } catch (IOException e) {
+                    logger.warn("Failed to close registration manager", e);
+                }
+            }
+        }
+        if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
+            if (m != null) {
+                return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
+            }
+
+            final var manager = getManagerFromParams(params);
+            if (manager != null) {
+                return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
+            } else {
+                throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
+                        "Method requires valid account parameter",
+                        null));
+            }
+        }
+
+        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.METHOD_NOT_FOUND,
+                "Method not implemented",
+                null));
+    }
+
+    private Manager getManagerFromParams(final ContainerNode<?> params) throws JsonRpcException {
+        if (params != null && params.hasNonNull("account")) {
+            final var manager = c.getManager(params.get("account").asText());
+            ((ObjectNode) params).remove("account");
+            if (manager == null) {
+                throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
+                        "Specified account does not exist",
+                        null));
+            }
+            return manager;
+        }
+        return null;
+    }
+
+    private RegistrationManager getRegistrationManagerFromParams(final ContainerNode<?> params) {
+        if (params != null && params.has("account")) {
+            try {
+                final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
+                ((ObjectNode) params).remove("account");
+                return registrationManager;
+            } catch (OverlappingFileLockException e) {
+                logger.warn("Account is already in use");
+                return null;
+            } catch (IOException | IllegalStateException e) {
+                logger.warn("Failed to load registration manager", e);
+                return null;
+            }
+        }
+        return null;
+    }
+
+    private Command getCommand(final String method) {
+        return commandProvider.apply(method);
+    }
+
+    private record CommandRunnerImpl<T>(Manager m, JsonRpcSingleCommand<T> command) implements CommandRunner<T> {
+
+        @Override
+        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+            command.handleCommand(request, m, jsonWriter);
+        }
+
+        @Override
+        public TypeReference<T> getRequestType() {
+            return command.getRequestType();
+        }
+    }
+
+    private record RegistrationCommandRunnerImpl<T>(
+            RegistrationManager m, MultiAccountManager c, JsonRpcRegistrationCommand<T> command
+    ) implements CommandRunner<T> {
+
+        @Override
+        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+            command.handleCommand(request, m, jsonWriter);
+        }
+
+        @Override
+        public TypeReference<T> getRequestType() {
+            return command.getRequestType();
+        }
+    }
+
+    private record MultiCommandRunnerImpl<T>(
+            MultiAccountManager c, JsonRpcMultiCommand<T> command
+    ) implements CommandRunner<T> {
+
+        @Override
+        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
+            command.handleCommand(request, c, jsonWriter);
+        }
+
+        @Override
+        public TypeReference<T> getRequestType() {
+            return command.getRequestType();
+        }
+    }
+
+    interface CommandRunner<T> {
+
+        void handleCommand(T request, JsonWriter jsonWriter) throws CommandException;
+
+        TypeReference<T> getRequestType();
+    }
+
+    private JsonNode runCommand(
+            final ObjectMapper objectMapper, final ContainerNode<?> params, final CommandRunner<?> command
+    ) throws JsonRpcException {
+        final Object[] result = {null};
+        final JsonWriter commandJsonWriter = s -> {
+            if (result[0] != null) {
+                throw new AssertionError("Command may only write one json result");
+            }
+
+            result[0] = s;
+        };
+
+        try {
+            parseParamsAndRunCommand(objectMapper, params, commandJsonWriter, command);
+        } catch (JsonMappingException e) {
+            throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
+                    e.getMessage(),
+                    null));
+        } catch (UserErrorException e) {
+            throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR,
+                    e.getMessage(),
+                    getErrorDataNode(objectMapper, result)));
+        } catch (IOErrorException e) {
+            throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR,
+                    e.getMessage(),
+                    getErrorDataNode(objectMapper, result)));
+        } catch (UntrustedKeyErrorException e) {
+            throw new JsonRpcException(new JsonRpcResponse.Error(UNTRUSTED_KEY_ERROR,
+                    e.getMessage(),
+                    getErrorDataNode(objectMapper, result)));
+        } catch (Throwable e) {
+            logger.error("Command execution failed", e);
+            throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                    e.getMessage(),
+                    getErrorDataNode(objectMapper, result)));
+        }
+
+        Object output = result[0] == null ? Map.of() : result[0];
+        return objectMapper.valueToTree(output);
+    }
+
+    private JsonNode getErrorDataNode(final ObjectMapper objectMapper, final Object[] result) {
+        if (result[0] == null) {
+            return null;
+        }
+        return objectMapper.valueToTree(Map.of("response", result[0]));
+    }
+
+    private <T> void parseParamsAndRunCommand(
+            final ObjectMapper objectMapper,
+            final TreeNode params,
+            final JsonWriter jsonWriter,
+            final CommandRunner<T> command
+    ) throws CommandException, JsonMappingException {
+        T requestParams = null;
+        final var requestType = command.getRequestType();
+        if (params != null && requestType != null) {
+            try {
+                requestParams = objectMapper.readValue(objectMapper.treeAsTokens(params), requestType);
+            } catch (JsonMappingException e) {
+                throw e;
+            } catch (IOException e) {
+                throw new AssertionError(e);
+            }
+        }
+        command.handleCommand(requestParams, jsonWriter);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 181233bc..3548f655 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -1,8 +1,6 @@
 package org.asamk.signal.jsonrpc;
 
-import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -13,25 +11,19 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.asamk.signal.commands.Command;
 import org.asamk.signal.commands.Commands;
 import org.asamk.signal.commands.JsonRpcMultiCommand;
-import org.asamk.signal.commands.JsonRpcRegistrationCommand;
 import org.asamk.signal.commands.JsonRpcSingleCommand;
 import org.asamk.signal.commands.exceptions.CommandException;
-import org.asamk.signal.commands.exceptions.IOErrorException;
-import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
-import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.nio.channels.ClosedChannelException;
-import java.nio.channels.OverlappingFileLockException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,19 +34,13 @@ public class SignalJsonRpcDispatcherHandler {
 
     private final static Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
 
-    private static final int USER_ERROR = -1;
-    private static final int IO_ERROR = -3;
-    private static final int UNTRUSTED_KEY_ERROR = -4;
-
     private final ObjectMapper objectMapper;
     private final JsonRpcSender jsonRpcSender;
     private final JsonRpcReader jsonRpcReader;
     private final boolean noReceiveOnStart;
 
-    private MultiAccountManager c;
     private final Map<Integer, List<Pair<Manager, Manager.ReceiveMessageHandler>>> receiveHandlers = new HashMap<>();
-
-    private Manager m;
+    private SignalJsonRpcCommandHandler commandHandler;
 
     public SignalJsonRpcDispatcherHandler(
             final JsonWriter jsonWriter, final Supplier<String> lineSupplier, final boolean noReceiveOnStart
@@ -66,7 +52,7 @@ public class SignalJsonRpcDispatcherHandler {
     }
 
     public void handleConnection(final MultiAccountManager c) {
-        this.c = c;
+        this.commandHandler = new SignalJsonRpcCommandHandler(c, this::getCommand);
 
         if (!noReceiveOnStart) {
             this.subscribeReceive(c.getManagers());
@@ -78,7 +64,7 @@ public class SignalJsonRpcDispatcherHandler {
     }
 
     public void handleConnection(final Manager m) {
-        this.m = m;
+        this.commandHandler = new SignalJsonRpcCommandHandler(m, this::getCommand);
 
         if (!noReceiveOnStart) {
             subscribeReceive(m);
@@ -141,7 +127,7 @@ public class SignalJsonRpcDispatcherHandler {
 
     private void handleConnection() {
         try {
-            jsonRpcReader.readMessages((method, params) -> handleRequest(objectMapper, method, params),
+            jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper, method, params),
                     response -> logger.debug("Received unexpected response for id {}", response.getId()));
         } finally {
             receiveHandlers.forEach((_subscriptionId, handlers) -> handlers.forEach(this::unsubscribeReceiveHandler));
@@ -155,87 +141,6 @@ public class SignalJsonRpcDispatcherHandler {
         m.removeReceiveHandler(handler);
     }
 
-    private JsonNode handleRequest(
-            final ObjectMapper objectMapper, final String method, ContainerNode<?> params
-    ) throws JsonRpcException {
-        var command = getCommand(method);
-        if (c != null) {
-            if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
-                final var manager = getManagerFromParams(params);
-                if (manager != null) {
-                    return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
-                }
-            }
-            if (command instanceof JsonRpcMultiCommand<?> jsonRpcCommand) {
-                return runCommand(objectMapper, params, new MultiCommandRunnerImpl<>(c, jsonRpcCommand));
-            }
-            if (command instanceof JsonRpcRegistrationCommand<?> jsonRpcCommand) {
-                try (var manager = getRegistrationManagerFromParams(params)) {
-                    if (manager != null) {
-                        return runCommand(objectMapper,
-                                params,
-                                new RegistrationCommandRunnerImpl<>(manager, c, jsonRpcCommand));
-                    } else {
-                        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
-                                "Method requires valid account parameter",
-                                null));
-                    }
-                } catch (IOException e) {
-                    logger.warn("Failed to close registration manager", e);
-                }
-            }
-        }
-        if (command instanceof JsonRpcSingleCommand<?> jsonRpcCommand) {
-            if (m != null) {
-                return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
-            }
-
-            final var manager = getManagerFromParams(params);
-            if (manager != null) {
-                return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
-            } else {
-                throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
-                        "Method requires valid account parameter",
-                        null));
-            }
-        }
-
-        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.METHOD_NOT_FOUND,
-                "Method not implemented",
-                null));
-    }
-
-    private Manager getManagerFromParams(final ContainerNode<?> params) throws JsonRpcException {
-        if (params != null && params.hasNonNull("account")) {
-            final var manager = c.getManager(params.get("account").asText());
-            ((ObjectNode) params).remove("account");
-            if (manager == null) {
-                throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_PARAMS,
-                        "Specified account does not exist",
-                        null));
-            }
-            return manager;
-        }
-        return null;
-    }
-
-    private RegistrationManager getRegistrationManagerFromParams(final ContainerNode<?> params) {
-        if (params != null && params.has("account")) {
-            try {
-                final var registrationManager = c.getNewRegistrationManager(params.get("account").asText());
-                ((ObjectNode) params).remove("account");
-                return registrationManager;
-            } catch (OverlappingFileLockException e) {
-                logger.warn("Account is already in use");
-                return null;
-            } catch (IOException | IllegalStateException e) {
-                logger.warn("Failed to load registration manager", e);
-                return null;
-            }
-        }
-        return null;
-    }
-
     private Command getCommand(final String method) {
         if ("subscribeReceive".equals(method)) {
             return new SubscribeReceiveCommand();
@@ -246,124 +151,6 @@ public class SignalJsonRpcDispatcherHandler {
         return Commands.getCommand(method);
     }
 
-    private record CommandRunnerImpl<T>(Manager m, JsonRpcSingleCommand<T> command) implements CommandRunner<T> {
-
-        @Override
-        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
-            command.handleCommand(request, m, jsonWriter);
-        }
-
-        @Override
-        public TypeReference<T> getRequestType() {
-            return command.getRequestType();
-        }
-    }
-
-    private record RegistrationCommandRunnerImpl<T>(
-            RegistrationManager m, MultiAccountManager c, JsonRpcRegistrationCommand<T> command
-    ) implements CommandRunner<T> {
-
-        @Override
-        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
-            command.handleCommand(request, m, jsonWriter);
-        }
-
-        @Override
-        public TypeReference<T> getRequestType() {
-            return command.getRequestType();
-        }
-    }
-
-    private record MultiCommandRunnerImpl<T>(
-            MultiAccountManager c, JsonRpcMultiCommand<T> command
-    ) implements CommandRunner<T> {
-
-        @Override
-        public void handleCommand(final T request, final JsonWriter jsonWriter) throws CommandException {
-            command.handleCommand(request, c, jsonWriter);
-        }
-
-        @Override
-        public TypeReference<T> getRequestType() {
-            return command.getRequestType();
-        }
-    }
-
-    interface CommandRunner<T> {
-
-        void handleCommand(T request, JsonWriter jsonWriter) throws CommandException;
-
-        TypeReference<T> getRequestType();
-    }
-
-    private JsonNode runCommand(
-            final ObjectMapper objectMapper, final ContainerNode<?> params, final CommandRunner<?> command
-    ) throws JsonRpcException {
-        final Object[] result = {null};
-        final JsonWriter commandJsonWriter = s -> {
-            if (result[0] != null) {
-                throw new AssertionError("Command may only write one json result");
-            }
-
-            result[0] = s;
-        };
-
-        try {
-            parseParamsAndRunCommand(objectMapper, params, commandJsonWriter, command);
-        } catch (JsonMappingException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
-                    e.getMessage(),
-                    null));
-        } catch (UserErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        } catch (IOErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        } catch (UntrustedKeyErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(UNTRUSTED_KEY_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        } catch (Throwable e) {
-            logger.error("Command execution failed", e);
-            throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        }
-
-        Object output = result[0] == null ? Map.of() : result[0];
-        return objectMapper.valueToTree(output);
-    }
-
-    private JsonNode getErrorDataNode(final ObjectMapper objectMapper, final Object[] result) {
-        if (result[0] == null) {
-            return null;
-        }
-        return objectMapper.valueToTree(Map.of("response", result[0]));
-    }
-
-    private <T> void parseParamsAndRunCommand(
-            final ObjectMapper objectMapper,
-            final TreeNode params,
-            final JsonWriter jsonWriter,
-            final CommandRunner<T> command
-    ) throws CommandException, JsonMappingException {
-        T requestParams = null;
-        final var requestType = command.getRequestType();
-        if (params != null && requestType != null) {
-            try {
-                requestParams = objectMapper.readValue(objectMapper.treeAsTokens(params), requestType);
-            } catch (JsonMappingException e) {
-                throw e;
-            } catch (IOException e) {
-                throw new AssertionError(e);
-            }
-        }
-        command.handleCommand(requestParams, jsonWriter);
-    }
-
     private class SubscribeReceiveCommand implements JsonRpcSingleCommand<Void>, JsonRpcMultiCommand<Void> {
 
         @Override

From bf76c046645f688840d2da939d49c5a5a02fae55 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 1 Nov 2022 18:06:40 +0100
Subject: [PATCH 024/672] Refactor JsonRpcReader to for handling a single
 message

---
 .../asamk/signal/jsonrpc/JsonRpcReader.java   | 130 +++++++++++-------
 1 file changed, 83 insertions(+), 47 deletions(-)

diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index f3784a2c..e49b6cd0 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
@@ -24,43 +25,77 @@ public class JsonRpcReader {
 
     private final JsonRpcSender jsonRpcSender;
     private final ObjectMapper objectMapper;
+    private final InputStream input;
     private final Supplier<String> lineSupplier;
 
-    public JsonRpcReader(
-            final JsonRpcSender jsonRpcSender, final Supplier<String> lineSupplier
-    ) {
+    public JsonRpcReader(final JsonRpcSender jsonRpcSender, final Supplier<String> lineSupplier) {
         this.jsonRpcSender = jsonRpcSender;
+        this.input = null;
         this.lineSupplier = lineSupplier;
         this.objectMapper = Util.createJsonObjectMapper();
     }
 
+    public JsonRpcReader(final JsonRpcSender jsonRpcSender, final InputStream input) {
+        this.jsonRpcSender = jsonRpcSender;
+        this.input = input;
+        this.lineSupplier = null;
+        this.objectMapper = Util.createJsonObjectMapper();
+    }
+
     public void readMessages(final RequestHandler requestHandler, final Consumer<JsonRpcResponse> responseHandler) {
-        while (!Thread.interrupted()) {
-            JsonRpcMessage message = readMessage();
-            if (message == null) break;
-
-            if (message instanceof final JsonRpcRequest jsonRpcRequest) {
-                logger.debug("Received json rpc request, method: " + jsonRpcRequest.getMethod());
-                final var response = handleRequest(requestHandler, jsonRpcRequest);
-                if (response != null) {
-                    jsonRpcSender.sendResponse(response);
-                }
-            } else if (message instanceof JsonRpcResponse jsonRpcResponse) {
-                responseHandler.accept(jsonRpcResponse);
-            } else {
-                final var responseList = ((JsonRpcBatchMessage) message).getMessages().stream().map(jsonNode -> {
-                    final JsonRpcRequest request;
-                    try {
-                        request = parseJsonRpcRequest(jsonNode);
-                    } catch (JsonRpcException e) {
-                        return JsonRpcResponse.forError(e.getError(), getId(jsonNode));
-                    }
-
-                    return handleRequest(requestHandler, request);
-                }).filter(Objects::nonNull).toList();
-
-                jsonRpcSender.sendBatchResponses(responseList);
+        if (input != null) {
+            JsonRpcMessage message = parseJsonRpcMessage(input);
+            if (message == null) {
+                return;
             }
+
+            handleMessage(message, requestHandler, responseHandler);
+            return;
+        }
+
+        while (!Thread.interrupted()) {
+            String input = lineSupplier.get();
+            if (input == null) {
+                logger.trace("Reached end of JSON-RPC input stream.");
+                break;
+            }
+
+            logger.trace("Incoming JSON-RPC message: {}", input);
+            JsonRpcMessage message = parseJsonRpcMessage(input);
+            if (message == null) {
+                continue;
+            }
+
+            handleMessage(message, requestHandler, responseHandler);
+        }
+    }
+
+    private void handleMessage(
+            final JsonRpcMessage message,
+            final RequestHandler requestHandler,
+            final Consumer<JsonRpcResponse> responseHandler
+    ) {
+        if (message instanceof final JsonRpcRequest jsonRpcRequest) {
+            logger.debug("Received json rpc request, method: " + jsonRpcRequest.getMethod());
+            final var response = handleRequest(requestHandler, jsonRpcRequest);
+            if (response != null) {
+                jsonRpcSender.sendResponse(response);
+            }
+        } else if (message instanceof JsonRpcResponse jsonRpcResponse) {
+            responseHandler.accept(jsonRpcResponse);
+        } else {
+            final var responseList = ((JsonRpcBatchMessage) message).getMessages().stream().map(jsonNode -> {
+                final JsonRpcRequest request;
+                try {
+                    request = parseJsonRpcRequest(jsonNode);
+                } catch (JsonRpcException e) {
+                    return JsonRpcResponse.forError(e.getError(), getId(jsonNode));
+                }
+
+                return handleRequest(requestHandler, request);
+            }).filter(Objects::nonNull).toList();
+
+            jsonRpcSender.sendBatchResponses(responseList);
         }
     }
 
@@ -85,25 +120,6 @@ public class JsonRpcReader {
         return null;
     }
 
-    private JsonRpcMessage readMessage() {
-        while (!Thread.interrupted()) {
-            String input = lineSupplier.get();
-
-            if (input == null) {
-                logger.trace("Reached end of JSON-RPC input stream.");
-                break;
-            }
-
-            logger.trace("Incoming JSON-RPC message: {}", input);
-            JsonRpcMessage message = parseJsonRpcMessage(input);
-            if (message == null) continue;
-
-            return message;
-        }
-
-        return null;
-    }
-
     private JsonRpcMessage parseJsonRpcMessage(final String input) {
         final JsonNode jsonNode;
         try {
@@ -117,6 +133,26 @@ public class JsonRpcReader {
             throw new AssertionError(e);
         }
 
+        return parseJsonRpcMessage(jsonNode);
+    }
+
+    private JsonRpcMessage parseJsonRpcMessage(final InputStream input) {
+        final JsonNode jsonNode;
+        try {
+            jsonNode = objectMapper.readTree(input);
+        } catch (JsonParseException e) {
+            jsonRpcSender.sendResponse(JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.PARSE_ERROR,
+                    e.getMessage(),
+                    null), null));
+            return null;
+        } catch (IOException e) {
+            throw new AssertionError(e);
+        }
+
+        return parseJsonRpcMessage(jsonNode);
+    }
+
+    private JsonRpcMessage parseJsonRpcMessage(final JsonNode jsonNode) {
         if (jsonNode == null) {
             jsonRpcSender.sendResponse(JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
                     "invalid request",

From 2e4d346bc826da5c35a17841772cf81ba4f98101 Mon Sep 17 00:00:00 2001
From: ced-b <cedric@cos.flag.org>
Date: Tue, 1 Nov 2022 17:47:43 -0400
Subject: [PATCH 025/672] Add command to get an attachment (#1080)

* Add command to get an attachment

* Refactor retrieving of attachments to use StreamDetails

* Refactor AttachmentCommand to GetAttachmentCommand

* Minor improvements to GetAttachmentCommand

* Use JSON serializer to serialize binary data

Serializing the stream is better for memory handling than
loading the whole thing into the file.

* Clean up unneeded class

* Added command to doc

Co-authored-by: cedb <cedb@keylimebox.org>
---
 .../asamk/signal/manager/AttachmentStore.java | 10 +++
 .../org/asamk/signal/manager/Manager.java     |  3 +
 .../org/asamk/signal/manager/ManagerImpl.java |  6 ++
 .../manager/helper/AttachmentHelper.java      |  6 ++
 man/signal-cli.1.adoc                         | 14 +++++
 .../org/asamk/signal/commands/Commands.java   |  1 +
 .../signal/commands/GetAttachmentCommand.java | 63 +++++++++++++++++++
 .../asamk/signal/dbus/DbusManagerImpl.java    |  6 ++
 .../asamk/signal/json/JsonAttachmentData.java |  9 +++
 .../signal/json/JsonStreamSerializer.java     | 20 ++++++
 10 files changed, 138 insertions(+)
 create mode 100644 src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
 create mode 100644 src/main/java/org/asamk/signal/json/JsonAttachmentData.java
 create mode 100644 src/main/java/org/asamk/signal/json/JsonStreamSerializer.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
index 949e2862..e3c96ad6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
@@ -2,8 +2,10 @@ package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.MimeUtils;
+import org.asamk.signal.manager.util.Utils;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;
+import org.whispersystems.signalservice.api.util.StreamDetails;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -39,6 +41,14 @@ public class AttachmentStore {
                 Optional.ofNullable(pointer.getContentType()));
     }
 
+    public StreamDetails retrieveAttachment(final String id) throws IOException {
+        final var attachmentFile = new File(attachmentsPath, id);
+        if (!attachmentFile.exists()) {
+            return null;
+        }
+        return Utils.createStreamDetailsFromFile(attachmentFile);
+    }
+
     private void storeAttachment(final File attachmentFile, final AttachmentStorer storer) throws IOException {
         createAttachmentsDir();
         try (OutputStream output = new FileOutputStream(attachmentFile)) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 01d88e46..75503790 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -39,6 +39,7 @@ import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.time.Duration;
 import java.util.Collection;
@@ -271,6 +272,8 @@ public interface Manager extends Closeable {
 
     void addClosedListener(Runnable listener);
 
+    InputStream retrieveAttachment(final String id) throws IOException;
+
     @Override
     void close() throws IOException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 31231630..aead1a28 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -84,6 +84,7 @@ import org.whispersystems.signalservice.internal.util.Util;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -1167,6 +1168,11 @@ class ManagerImpl implements Manager {
         }
     }
 
+    @Override
+    public InputStream retrieveAttachment(final String id) throws IOException {
+        return context.getAttachmentHelper().retrieveAttachment(id).getStream();
+    }
+
     @Override
     public void close() {
         Thread thread;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index ea5739b3..b4b0d04b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -13,6 +13,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.push.exceptions.MissingConfigurationException;
+import org.whispersystems.signalservice.api.util.StreamDetails;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,6 +39,11 @@ public class AttachmentHelper {
         return attachmentStore.getAttachmentFile(pointer);
     }
 
+    public StreamDetails retrieveAttachment(final String id) throws IOException {
+        return attachmentStore.retrieveAttachment(id);
+    }
+
+
     public List<SignalServiceAttachment> uploadAttachments(final List<String> attachments) throws AttachmentInvalidException, IOException {
         var attachmentStreams = AttachmentUtils.createAttachmentStreams(attachments);
 
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 4d34582a..be940418 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -635,6 +635,20 @@ The required manifest.json has the following format:
 PATH::
 The path of the manifest.json or a zip file containing the sticker pack you wish to upload.
 
+=== getAttachment
+
+Gets teh raw data for a specified attachment. This is done using the ID of the attachment the recipient or group ID.
+The attachment data is returned as a Base64 String.
+
+*--id* [ID]::
+The ID of the attachment as given in the attachment list of the message.
+
+*--recipient* [RECIPIENT]::
+Specify the number which sent the attachment. Referred to generally as recipient.
+
+*-g* [GROUP], *--group-id* [GROUP]::
+Alternatively, specify the group IDs that for which to get the attachment.
+
 === daemon
 
 signal-cli can run in daemon mode and provides an experimental dbus or JSON-RPC interface.
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 1c4251da..1f0fc2ec 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -11,6 +11,7 @@ public class Commands {
 
     static {
         addCommand(new AddDeviceCommand());
+        addCommand(new GetAttachmentCommand());
         addCommand(new BlockCommand());
         addCommand(new DaemonCommand());
         addCommand(new DeleteLocalAccountDataCommand());
diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
new file mode 100644
index 00000000..560be9f9
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
@@ -0,0 +1,63 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.json.JsonAttachmentData;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+
+public class GetAttachmentCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "getAttachment";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.addArgument("--id")
+                .required(true)
+                .help("The ID of the attachment file.");
+        var mut = subparser.addMutuallyExclusiveGroup()
+                .required(true);
+        mut.addArgument("--recipient")
+                .help("Sender of the attachment");
+        mut.addArgument("-g", "--group-id")
+                .help("Group in which the attachment was received");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
+    ) throws CommandException {
+
+        final var id = ns.getString("id");
+
+        try(InputStream attachment = m.retrieveAttachment(id)) {
+            if (outputWriter instanceof PlainTextWriter writer) {
+                final var bytes = attachment.readAllBytes();
+                final var base64 = Base64.getEncoder().encodeToString(bytes);
+                writer.println(base64);
+            } else if (outputWriter instanceof JsonWriter writer) {
+                writer.write(new JsonAttachmentData(attachment));
+            }
+        } catch (FileNotFoundException ex) {
+            throw new UserErrorException("Could not find attachment with ID: " + id, ex);
+        } catch (IOException ex) {
+            throw new UnexpectedErrorException("An error occurred reading attachment: " + id, ex);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index b59be923..c0dc1cf8 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -46,6 +46,7 @@ import org.freedesktop.dbus.types.Variant;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;
@@ -916,6 +917,11 @@ public class DbusManagerImpl implements Manager {
         }).toList();
     }
 
+    @Override
+    public InputStream retrieveAttachment(final String id) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @SuppressWarnings("unchecked")
     private <T> T getValue(
             final Map<String, Variant<?>> stringVariantMap, final String field
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
new file mode 100644
index 00000000..004f02d8
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
@@ -0,0 +1,9 @@
+package org.asamk.signal.json;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.io.InputStream;
+
+public record JsonAttachmentData(
+        @JsonSerialize(using=JsonStreamSerializer.class) InputStream data
+) {}
diff --git a/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java b/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
new file mode 100644
index 00000000..6eb359cd
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
@@ -0,0 +1,20 @@
+package org.asamk.signal.json;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class JsonStreamSerializer extends JsonSerializer<InputStream> {
+
+    @Override
+    public void serialize(
+            final InputStream value,
+            final JsonGenerator jsonGenerator,
+            final SerializerProvider serializers
+    ) throws IOException {
+        jsonGenerator.writeBinary(value, -1);
+    }
+}

From 43face8ead95344e3d0dcbc94c6cf85959f26203 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 1 Nov 2022 21:57:23 +0100
Subject: [PATCH 026/672] Small improvements

---
 graalvm-config-dir/reflect-config.json        | 11 +++++++++++
 .../asamk/signal/manager/AttachmentStore.java |  3 ---
 .../signal/manager/config/LiveConfig.java     |  5 +++--
 .../signal/manager/config/StagingConfig.java  |  5 +++--
 .../manager/helper/AttachmentHelper.java      |  1 -
 man/signal-cli.1.adoc                         |  8 +++++---
 .../org/asamk/signal/commands/Commands.java   |  2 +-
 .../signal/commands/GetAttachmentCommand.java | 19 ++++++-------------
 .../asamk/signal/json/JsonAttachmentData.java |  2 +-
 .../asamk/signal/json/JsonStoryMessage.java   |  6 +-----
 .../signal/json/JsonStreamSerializer.java     |  4 +---
 src/main/java/org/asamk/signal/util/Hex.java  |  4 +++-
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 3f7b8de2..61a3b144 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -713,6 +713,13 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"org.asamk.signal.json.JsonAttachmentData",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"data","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.json.JsonCallMessage",
   "allDeclaredFields":true,
@@ -975,6 +982,10 @@
     {"name":"startColor","parameterTypes":[] }
   ]
 },
+{
+  "name":"org.asamk.signal.json.JsonStreamSerializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.json.JsonSyncDataMessage",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
index e3c96ad6..e95c2069 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
@@ -43,9 +43,6 @@ public class AttachmentStore {
 
     public StreamDetails retrieveAttachment(final String id) throws IOException {
         final var attachmentFile = new File(attachmentsPath, id);
-        if (!attachmentFile.exists()) {
-            return null;
-        }
         return Utils.createStreamDetailsFromFile(attachmentFile);
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 4f581905..977544f2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -62,8 +62,9 @@ class LiveConfig {
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL,
-                        TRUST_STORE)},
+                new SignalContactDiscoveryUrl[]{
+                        new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, TRUST_STORE)
+                },
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 2f2cd8e3..050726b6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -62,8 +62,9 @@ class StagingConfig {
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalContactDiscoveryUrl[]{new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL,
-                        TRUST_STORE)},
+                new SignalContactDiscoveryUrl[]{
+                        new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, TRUST_STORE)
+                },
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index b4b0d04b..9250927d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -43,7 +43,6 @@ public class AttachmentHelper {
         return attachmentStore.retrieveAttachment(id);
     }
 
-
     public List<SignalServiceAttachment> uploadAttachments(final List<String> attachments) throws AttachmentInvalidException, IOException {
         var attachmentStreams = AttachmentUtils.createAttachmentStreams(attachments);
 
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index be940418..d55d8ec7 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -637,17 +637,19 @@ The path of the manifest.json or a zip file containing the sticker pack you wish
 
 === getAttachment
 
-Gets teh raw data for a specified attachment. This is done using the ID of the attachment the recipient or group ID.
+Gets the raw data for a specified attachment.
+This is done using the ID of the attachment the recipient or group ID.
 The attachment data is returned as a Base64 String.
 
 *--id* [ID]::
 The ID of the attachment as given in the attachment list of the message.
 
 *--recipient* [RECIPIENT]::
-Specify the number which sent the attachment. Referred to generally as recipient.
+Specify the number which sent the attachment.
+Referred to generally as recipient.
 
 *-g* [GROUP], *--group-id* [GROUP]::
-Alternatively, specify the group IDs that for which to get the attachment.
+Alternatively, specify the group IDs for which to get the attachment.
 
 === daemon
 
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 1f0fc2ec..51820c9a 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -11,11 +11,11 @@ public class Commands {
 
     static {
         addCommand(new AddDeviceCommand());
-        addCommand(new GetAttachmentCommand());
         addCommand(new BlockCommand());
         addCommand(new DaemonCommand());
         addCommand(new DeleteLocalAccountDataCommand());
         addCommand(new FinishLinkCommand());
+        addCommand(new GetAttachmentCommand());
         addCommand(new GetUserStatusCommand());
         addCommand(new JoinGroupCommand());
         addCommand(new JsonRpcDispatcherCommand());
diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
index 560be9f9..6deed90a 100644
--- a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
@@ -26,27 +26,20 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("--id")
-                .required(true)
-                .help("The ID of the attachment file.");
-        var mut = subparser.addMutuallyExclusiveGroup()
-                .required(true);
-        mut.addArgument("--recipient")
-                .help("Sender of the attachment");
-        mut.addArgument("-g", "--group-id")
-                .help("Group in which the attachment was received");
+        subparser.addArgument("--id").required(true).help("The ID of the attachment file.");
+        var mut = subparser.addMutuallyExclusiveGroup().required(true);
+        mut.addArgument("--recipient").help("Sender of the attachment");
+        mut.addArgument("-g", "--group-id").help("Group in which the attachment was received");
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns,
-            final Manager m,
-            final OutputWriter outputWriter
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
 
         final var id = ns.getString("id");
 
-        try(InputStream attachment = m.retrieveAttachment(id)) {
+        try (InputStream attachment = m.retrieveAttachment(id)) {
             if (outputWriter instanceof PlainTextWriter writer) {
                 final var bytes = attachment.readAllBytes();
                 final var base64 = Base64.getEncoder().encodeToString(bytes);
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
index 004f02d8..fd759674 100644
--- a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
@@ -5,5 +5,5 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import java.io.InputStream;
 
 public record JsonAttachmentData(
-        @JsonSerialize(using=JsonStreamSerializer.class) InputStream data
+        @JsonSerialize(using = JsonStreamSerializer.class) InputStream data
 ) {}
diff --git a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
index 4748e722..012df53d 100644
--- a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
@@ -43,11 +43,7 @@ record JsonStoryMessage(
         }
 
         public record Gradient(
-                String startColor,
-                String endColor,
-                List<String> colors,
-                List<Float> positions,
-                Integer angle
+                String startColor, String endColor, List<String> colors, List<Float> positions, Integer angle
         ) {
 
             static Gradient from(MessageEnvelope.Story.TextAttachment.Gradient gradient) {
diff --git a/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java b/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
index 6eb359cd..4cd2797e 100644
--- a/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
+++ b/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
@@ -11,9 +11,7 @@ public class JsonStreamSerializer extends JsonSerializer<InputStream> {
 
     @Override
     public void serialize(
-            final InputStream value,
-            final JsonGenerator jsonGenerator,
-            final SerializerProvider serializers
+            final InputStream value, final JsonGenerator jsonGenerator, final SerializerProvider serializers
     ) throws IOException {
         jsonGenerator.writeBinary(value, -1);
     }
diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index 596f23a9..f7a870ca 100644
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -2,7 +2,9 @@ package org.asamk.signal.util;
 
 public class Hex {
 
-    private final static char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+    private final static char[] HEX_DIGITS = {
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+    };
 
     private Hex() {
     }

From 1ad0e94b640d16a8d832287362e1785c78d3ec49 Mon Sep 17 00:00:00 2001
From: ced-b <cedric@cos.flag.org>
Date: Wed, 2 Nov 2022 12:44:12 -0400
Subject: [PATCH 027/672] Exposing Signal CLI as HTTP Server (#1078)

* Add initial proof of concept for http server

* Add support for registration commands

* Add support  for MultiLocalCommands

* Improve handling of HTTP responses

Makes it so that responses area all uniformly JSON and wrapped
into the proper response envelope.

* Add caching for workflows

* Run http server with daemon command

This fits the existing command line API better

* Wrap the existing JSON RPC handler in HTTP Service

This is a redesign of earlier attempts to make an HTTP service. Fixing
that service turned out that it would have to be a copy of the
SignalJsonRpcDispatcherHandler. So instead of copy pasting all the
code the existing service is simply being wrapped.

* Switch http server to use command handler

* Clean up and simplification

* Pass full InetSocketAddress

* Minor fixes and improvements

Based on code review.

Co-authored-by: cedb <cedb@keylimebox.org>
---
 .../asamk/signal/commands/DaemonCommand.java  |  25 ++++
 .../asamk/signal/http/HttpServerHandler.java  | 110 ++++++++++++++++++
 .../jsonrpc/SignalJsonRpcCommandHandler.java  |   2 +-
 3 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/asamk/signal/http/HttpServerHandler.java

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 01d0326f..bd6b9386 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -13,6 +13,7 @@ import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.dbus.DbusSignalControlImpl;
 import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.http.HttpServerHandler;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
@@ -69,6 +70,10 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 .nargs("?")
                 .setConst("localhost:7583")
                 .help("Expose a JSON-RPC interface on a TCP socket (default localhost:7583).");
+        subparser.addArgument("--http")
+                .nargs("?")
+                .setConst("localhost:8080")
+                .help("Expose a JSON-RPC interface as http endpoint.");
         subparser.addArgument("--no-receive-stdout")
                 .help("Don’t print received messages to stdout.")
                 .action(Arguments.storeTrue());
@@ -128,6 +133,16 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             final var serverChannel = IOUtils.bindSocket(address);
             runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
         }
+        final var httpAddress = ns.getString("http");
+        if (httpAddress != null) {
+            final var address = IOUtils.parseInetSocketAddress(httpAddress);
+            final var handler = new HttpServerHandler(address, m);
+            try {
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);
+            }
+        }
         final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
         if (isDbusSystem) {
             runDbusSingleAccount(m, true, receiveMode != ReceiveMode.ON_START);
@@ -199,6 +214,16 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             final var serverChannel = IOUtils.bindSocket(address);
             runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
         }
+        final var httpAddress = ns.getString("http");
+        if (httpAddress != null) {
+            final var address = IOUtils.parseInetSocketAddress(httpAddress);
+            final var handler = new HttpServerHandler(address, c);
+            try {
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);
+            }
+        }
         final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
         if (isDbusSystem) {
             runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, true);
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
new file mode 100644
index 00000000..b2544b25
--- /dev/null
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -0,0 +1,110 @@
+package org.asamk.signal.http;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpServer;
+
+import org.asamk.signal.commands.Commands;
+import org.asamk.signal.jsonrpc.JsonRpcReader;
+import org.asamk.signal.jsonrpc.JsonRpcResponse;
+import org.asamk.signal.jsonrpc.JsonRpcSender;
+import org.asamk.signal.jsonrpc.SignalJsonRpcCommandHandler;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.util.Util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.concurrent.Executors;
+
+public class HttpServerHandler {
+
+    private final static Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);
+
+    private final ObjectMapper objectMapper = Util.createJsonObjectMapper();
+
+    private final InetSocketAddress address;
+
+    private final SignalJsonRpcCommandHandler commandHandler;
+
+    public HttpServerHandler(final InetSocketAddress address, final Manager m) {
+        this.address = address;
+        commandHandler = new SignalJsonRpcCommandHandler(m, Commands::getCommand);
+    }
+
+    public HttpServerHandler(final InetSocketAddress address, final MultiAccountManager c) {
+        this.address = address;
+        commandHandler = new SignalJsonRpcCommandHandler(c, Commands::getCommand);
+    }
+
+    public void init() throws IOException {
+
+            logger.info("Starting server on " + address.toString());
+
+            final var server = HttpServer.create(address, 0);
+            server.setExecutor(Executors.newFixedThreadPool(10));
+
+            server.createContext("/api/v1/rpc", httpExchange -> {
+
+                if (!"POST".equals(httpExchange.getRequestMethod())) {
+                    sendResponse(405, null, httpExchange);
+                    return;
+                }
+
+                if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
+                    sendResponse(415, null, httpExchange);
+                    return;
+                }
+
+                try {
+
+                    final Object[] result = {null};
+                    final var jsonRpcSender = new JsonRpcSender(s -> {
+                        if (result[0] != null) {
+                            throw new AssertionError("There should only be a single JSON-RPC response");
+                        }
+
+                        result[0] = s;
+                    });
+
+                    final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, httpExchange.getRequestBody());
+                    jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper, method, params),
+                            response -> logger.debug("Received unexpected response for id {}", response.getId()));
+
+                    if (result[0] !=null) {
+                        sendResponse(200, result[0], httpExchange);
+                    } else {
+                        sendResponse(201, null, httpExchange);
+                    }
+
+                }
+                catch (Throwable aEx) {
+                    logger.error("Failed to process request.", aEx);
+                    sendResponse(200, JsonRpcResponse.forError(
+                            new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                            "An internal server error has occurred.", null), null), httpExchange);
+                }
+            });
+
+            server.start();
+
+    }
+
+    private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {
+        if (response != null) {
+            final var byteResponse = objectMapper.writeValueAsBytes(response);
+
+            httpExchange.getResponseHeaders().add("Content-Type", "application/json");
+            httpExchange.sendResponseHeaders(status, byteResponse.length);
+
+            httpExchange.getResponseBody().write(byteResponse);
+        } else {
+            httpExchange.sendResponseHeaders(status, 0);
+        }
+
+        httpExchange.getResponseBody().close();
+    }
+
+}
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 0f6a00bd..2249fad6 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -52,7 +52,7 @@ public class SignalJsonRpcCommandHandler {
         this.commandProvider = commandProvider;
     }
 
-    JsonNode handleRequest(
+    public JsonNode handleRequest(
             final ObjectMapper objectMapper, final String method, ContainerNode<?> params
     ) throws JsonRpcException {
         var command = getCommand(method);

From c628e27d2e1372c4ed9bc4ee319b83700cd11b17 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 2 Nov 2022 17:46:20 +0100
Subject: [PATCH 028/672] Update man page

---
 man/signal-cli-dbus.5.adoc                    |  1 +
 man/signal-cli-jsonrpc.5.adoc                 |  1 +
 man/signal-cli.1.adoc                         | 24 +++---
 .../asamk/signal/commands/DaemonCommand.java  |  2 +-
 .../asamk/signal/http/HttpServerHandler.java  | 80 ++++++++++---------
 5 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc
index bc3ad40d..1d78f7f6 100644
--- a/man/signal-cli-dbus.5.adoc
+++ b/man/signal-cli-dbus.5.adoc
@@ -5,6 +5,7 @@ vim:set ts=4 sw=4 tw=82 noet:
 :quotes.~:
 
 = signal-cli-dbus (5)
+:doctype: manpage
 
 == Name
 
diff --git a/man/signal-cli-jsonrpc.5.adoc b/man/signal-cli-jsonrpc.5.adoc
index f0b62ca9..ff709f31 100644
--- a/man/signal-cli-jsonrpc.5.adoc
+++ b/man/signal-cli-jsonrpc.5.adoc
@@ -5,6 +5,7 @@ vim:set ts=4 sw=4 tw=82 noet:
 :quotes.~:
 
 = signal-cli-jsonrpc (5)
+:doctype: manpage
 
 == Name
 
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index d55d8ec7..ad510dfe 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -5,6 +5,7 @@ vim:set ts=4 sw=4 tw=82 noet:
 :quotes.~:
 
 = signal-cli (1)
+:doctype: manpage
 
 == Name
 
@@ -601,7 +602,7 @@ The primary device will respond with synchronization messages with full contact
 
 === uploadStickerPack
 
-Upload a new sticker pack, consisting of a manifest file and the sticker images.
+Upload a new sticker pack, consisting of a manifest file and the sticker images. +
 Images must conform to the following specification: (see https://support.signal.org/hc/en-us/articles/360031836512-Stickers#sticker_reqs )
 
 - Static stickers in PNG or WebP format
@@ -657,20 +658,25 @@ signal-cli can run in daemon mode and provides an experimental dbus or JSON-RPC
 If no `-a` account is given, all local accounts will be exported as separate dbus objects under the same bus name.
 
 *--dbus*::
-Export DBus interface on user bus.
-See signal-cli-dbus (5) for info on the dbus interface.
+Export DBus interface on user bus. +
+See **signal-cli-dbus**(5) for info on the dbus interface.
 
 *--dbus-system*::
-Export DBus interface on system bus.
-See signal-cli-dbus (5) for info on the dbus interface.
+Export DBus interface on system bus. +
+See **signal-cli-dbus**(5) for info on the dbus interface.
 
 *--socket [SOCKET]*::
-Export a JSON-RPC interface on a UNIX socket (default $XDG_RUNTIME_DIR/signal-cli/socket).
-See signal-cli-jsonrpc (5) for info on the JSON-RPC interface.
+Export a JSON-RPC interface on a UNIX socket (default $XDG_RUNTIME_DIR/signal-cli/socket). +
+See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
 
 *--tcp [HOST:PORT]*::
-Export a JSON-RPC interface on a TCP socket (default localhost:7583).
-See signal-cli-jsonrpc (5) for info on the JSON-RPC interface.
+Export a JSON-RPC interface on a TCP socket (default localhost:7583). +
+See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
+
+*--http [HOST:PORT]*::
+Expose a JSON-RPC interface as http endpoint (default localhost:8080).
+The JSON-RPC endpoint is `/api/v1/rpc`. +
+See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
 
 *--ignore-attachments*::
 Don’t download attachments of received messages.
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index bd6b9386..0cdf9cc9 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -73,7 +73,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         subparser.addArgument("--http")
                 .nargs("?")
                 .setConst("localhost:8080")
-                .help("Expose a JSON-RPC interface as http endpoint.");
+                .help("Expose a JSON-RPC interface as http endpoint (default localhost:8080).");
         subparser.addArgument("--no-receive-stdout")
                 .help("Don’t print received messages to stdout.")
                 .action(Arguments.storeTrue());
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index b2544b25..9fb33a34 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -41,54 +41,56 @@ public class HttpServerHandler {
 
     public void init() throws IOException {
 
-            logger.info("Starting server on " + address.toString());
+        logger.info("Starting server on " + address.toString());
 
-            final var server = HttpServer.create(address, 0);
-            server.setExecutor(Executors.newFixedThreadPool(10));
+        final var server = HttpServer.create(address, 0);
+        server.setExecutor(Executors.newFixedThreadPool(10));
 
-            server.createContext("/api/v1/rpc", httpExchange -> {
+        server.createContext("/api/v1/rpc", httpExchange -> {
 
-                if (!"POST".equals(httpExchange.getRequestMethod())) {
-                    sendResponse(405, null, httpExchange);
-                    return;
-                }
+            if (!"POST".equals(httpExchange.getRequestMethod())) {
+                sendResponse(405, null, httpExchange);
+                return;
+            }
 
-                if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
-                    sendResponse(415, null, httpExchange);
-                    return;
-                }
+            if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
+                sendResponse(415, null, httpExchange);
+                return;
+            }
 
-                try {
+            try {
 
-                    final Object[] result = {null};
-                    final var jsonRpcSender = new JsonRpcSender(s -> {
-                        if (result[0] != null) {
-                            throw new AssertionError("There should only be a single JSON-RPC response");
-                        }
-
-                        result[0] = s;
-                    });
-
-                    final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, httpExchange.getRequestBody());
-                    jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper, method, params),
-                            response -> logger.debug("Received unexpected response for id {}", response.getId()));
-
-                    if (result[0] !=null) {
-                        sendResponse(200, result[0], httpExchange);
-                    } else {
-                        sendResponse(201, null, httpExchange);
+                final Object[] result = {null};
+                final var jsonRpcSender = new JsonRpcSender(s -> {
+                    if (result[0] != null) {
+                        throw new AssertionError("There should only be a single JSON-RPC response");
                     }
 
-                }
-                catch (Throwable aEx) {
-                    logger.error("Failed to process request.", aEx);
-                    sendResponse(200, JsonRpcResponse.forError(
-                            new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
-                            "An internal server error has occurred.", null), null), httpExchange);
-                }
-            });
+                    result[0] = s;
+                });
 
-            server.start();
+                final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, httpExchange.getRequestBody());
+                jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper,
+                        method,
+                        params), response -> logger.debug("Received unexpected response for id {}", response.getId()));
+
+                if (result[0] != null) {
+                    sendResponse(200, result[0], httpExchange);
+                } else {
+                    sendResponse(201, null, httpExchange);
+                }
+
+            } catch (Throwable aEx) {
+                logger.error("Failed to process request.", aEx);
+                sendResponse(200,
+                        JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                                "An internal server error has occurred.",
+                                null), null),
+                        httpExchange);
+            }
+        });
+
+        server.start();
 
     }
 

From 9563496efb58d287ab750daa16c4041c7aa4990a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 2 Nov 2022 17:47:52 +0100
Subject: [PATCH 029/672] Update CHANGELOG.md

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b16eb894..cc75f9e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## [Unreleased]
 
+### Added
+- Add `--http` flag to `daemon` command to provide a JSON-RPC http endpoint. (Thanks @ced-b)
+- The `receive` command is now also available in daemon mode, for polling new messages.
+- Add `getAttachment` command to get attachment file base64 encoded. (Thanks @ced-b)
+- Add `--disable-send-log` to disable the message send log.
+- Add `--story` to `sendReaction` command, to react to stories.
+- Add `--story-timestamp` and `--story-author` to `send` command, to reply to stories.
+- Add `--max-messages` to `receive` command, to only receive a certain number of messages.
+
+### Changed
+- Send long text messages as attachment instead. This matches the behavior of the official clients.
+- Store attachments with a file extension, for common file types.
+
 ## [0.11.4] - 2022-10-19
 
 ### Added

From 1b029b765fcc4ee99a52c8b4be1fe7426beb5f27 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 2 Nov 2022 21:13:52 +0100
Subject: [PATCH 030/672] Extract http endpoint handler function

---
 .../asamk/signal/http/HttpServerHandler.java  | 87 +++++++++----------
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 9fb33a34..f6301e0a 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -40,58 +40,14 @@ public class HttpServerHandler {
     }
 
     public void init() throws IOException {
-
         logger.info("Starting server on " + address.toString());
 
         final var server = HttpServer.create(address, 0);
         server.setExecutor(Executors.newFixedThreadPool(10));
 
-        server.createContext("/api/v1/rpc", httpExchange -> {
-
-            if (!"POST".equals(httpExchange.getRequestMethod())) {
-                sendResponse(405, null, httpExchange);
-                return;
-            }
-
-            if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
-                sendResponse(415, null, httpExchange);
-                return;
-            }
-
-            try {
-
-                final Object[] result = {null};
-                final var jsonRpcSender = new JsonRpcSender(s -> {
-                    if (result[0] != null) {
-                        throw new AssertionError("There should only be a single JSON-RPC response");
-                    }
-
-                    result[0] = s;
-                });
-
-                final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, httpExchange.getRequestBody());
-                jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper,
-                        method,
-                        params), response -> logger.debug("Received unexpected response for id {}", response.getId()));
-
-                if (result[0] != null) {
-                    sendResponse(200, result[0], httpExchange);
-                } else {
-                    sendResponse(201, null, httpExchange);
-                }
-
-            } catch (Throwable aEx) {
-                logger.error("Failed to process request.", aEx);
-                sendResponse(200,
-                        JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
-                                "An internal server error has occurred.",
-                                null), null),
-                        httpExchange);
-            }
-        });
+        server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
 
         server.start();
-
     }
 
     private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {
@@ -109,4 +65,45 @@ public class HttpServerHandler {
         httpExchange.getResponseBody().close();
     }
 
+    private void handleRpcEndpoint(HttpExchange httpExchange) throws IOException {
+        if (!"POST".equals(httpExchange.getRequestMethod())) {
+            sendResponse(405, null, httpExchange);
+            return;
+        }
+
+        if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
+            sendResponse(415, null, httpExchange);
+            return;
+        }
+
+        try {
+
+            final Object[] result = {null};
+            final var jsonRpcSender = new JsonRpcSender(s -> {
+                if (result[0] != null) {
+                    throw new AssertionError("There should only be a single JSON-RPC response");
+                }
+
+                result[0] = s;
+            });
+
+            final var jsonRpcReader = new JsonRpcReader(jsonRpcSender, httpExchange.getRequestBody());
+            jsonRpcReader.readMessages((method, params) -> commandHandler.handleRequest(objectMapper, method, params),
+                    response -> logger.debug("Received unexpected response for id {}", response.getId()));
+
+            if (result[0] != null) {
+                sendResponse(200, result[0], httpExchange);
+            } else {
+                sendResponse(201, null, httpExchange);
+            }
+
+        } catch (Throwable aEx) {
+            logger.error("Failed to process request.", aEx);
+            sendResponse(200,
+                    JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                            "An internal server error has occurred.",
+                            null), null),
+                    httpExchange);
+        }
+    }
 }

From 0c4642aa204683ee91e2447d2af8cdeb74a95d6f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 2 Nov 2022 21:15:08 +0100
Subject: [PATCH 031/672] Fix length for empty response to prevent chunked
 stream

The java HttpExchange expects length -1 to send Content-length: 0 ...
---
 src/main/java/org/asamk/signal/http/HttpServerHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index f6301e0a..a5213df7 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -59,7 +59,7 @@ public class HttpServerHandler {
 
             httpExchange.getResponseBody().write(byteResponse);
         } else {
-            httpExchange.sendResponseHeaders(status, 0);
+            httpExchange.sendResponseHeaders(status, -1);
         }
 
         httpExchange.getResponseBody().close();

From 36abb8ae8f9bdedff1bdc251c049890026700e59 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 2 Nov 2022 21:17:28 +0100
Subject: [PATCH 032/672] Add check for exact path match

HttpExchange just checks startsWith, so would also match /api/v1/rpcfoobar
---
 src/main/java/org/asamk/signal/http/HttpServerHandler.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index a5213df7..32000a1f 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -66,6 +66,10 @@ public class HttpServerHandler {
     }
 
     private void handleRpcEndpoint(HttpExchange httpExchange) throws IOException {
+        if (!"/api/v1/rpc".equals(httpExchange.getRequestURI().getPath())) {
+            sendResponse(404, null, httpExchange);
+            return;
+        }
         if (!"POST".equals(httpExchange.getRequestMethod())) {
             sendResponse(405, null, httpExchange);
             return;

From 1d98e5307ad42052b1463df1f7f3744828a04c5a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 2 Nov 2022 23:16:38 +0100
Subject: [PATCH 033/672] Handle missing separator in query string parser

---
 lib/src/main/java/org/asamk/signal/manager/util/Utils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 4be7c39a..792a107d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -123,7 +123,7 @@ public class Utils {
         for (var param : params) {
             final var paramParts = param.split("=");
             var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
-            var value = URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
+            var value = paramParts.length == 1 ? null : URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
             map.put(name, value);
         }
         return map;

From a780be70dd98679b732baa9ef0a4645126d31b08 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 3 Nov 2022 00:03:37 +0100
Subject: [PATCH 034/672] Add http endpoint events with SSE

---
 .../asamk/signal/http/HttpServerHandler.java  | 121 ++++++++++++++++++
 .../signal/http/ServerSentEventSender.java    |  55 ++++++++
 2 files changed, 176 insertions(+)
 create mode 100644 src/main/java/org/asamk/signal/http/ServerSentEventSender.java

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 32000a1f..f7f2768d 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -5,19 +5,25 @@ import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpServer;
 
 import org.asamk.signal.commands.Commands;
+import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.jsonrpc.JsonRpcReader;
 import org.asamk.signal.jsonrpc.JsonRpcResponse;
 import org.asamk.signal.jsonrpc.JsonRpcSender;
 import org.asamk.signal.jsonrpc.SignalJsonRpcCommandHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.util.Utils;
 import org.asamk.signal.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class HttpServerHandler {
 
@@ -28,15 +34,21 @@ public class HttpServerHandler {
     private final InetSocketAddress address;
 
     private final SignalJsonRpcCommandHandler commandHandler;
+    private final MultiAccountManager c;
+    private final Manager m;
 
     public HttpServerHandler(final InetSocketAddress address, final Manager m) {
         this.address = address;
         commandHandler = new SignalJsonRpcCommandHandler(m, Commands::getCommand);
+        this.c = null;
+        this.m = m;
     }
 
     public HttpServerHandler(final InetSocketAddress address, final MultiAccountManager c) {
         this.address = address;
         commandHandler = new SignalJsonRpcCommandHandler(c, Commands::getCommand);
+        this.c = c;
+        this.m = null;
     }
 
     public void init() throws IOException {
@@ -46,6 +58,7 @@ public class HttpServerHandler {
         server.setExecutor(Executors.newFixedThreadPool(10));
 
         server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
+        server.createContext("/api/v1/events", this::handleEventsEndpoint);
 
         server.start();
     }
@@ -110,4 +123,112 @@ public class HttpServerHandler {
                     httpExchange);
         }
     }
+
+    private void handleEventsEndpoint(HttpExchange httpExchange) throws IOException {
+        if (!"/api/v1/events".equals(httpExchange.getRequestURI().getPath())) {
+            sendResponse(404, null, httpExchange);
+            return;
+        }
+        if (!"GET".equals(httpExchange.getRequestMethod())) {
+            sendResponse(405, null, httpExchange);
+            return;
+        }
+
+        try {
+            final var queryString = httpExchange.getRequestURI().getQuery();
+            final var query = queryString == null ? Map.<String, String>of() : Utils.getQueryMap(queryString);
+
+            List<Manager> managers = getManagerFromQuery(query);
+            if (managers == null) {
+                sendResponse(400, null, httpExchange);
+                return;
+            }
+
+            httpExchange.getResponseHeaders().add("Content-Type", "text/event-stream");
+            httpExchange.sendResponseHeaders(200, 0);
+            final var sender = new ServerSentEventSender(httpExchange.getResponseBody());
+
+            final var shouldStop = new AtomicBoolean(false);
+            final var handlers = subscribeReceiveHandlers(managers, sender, () -> {
+                shouldStop.set(true);
+                synchronized (this) {
+                    this.notify();
+                }
+            });
+
+            try {
+                while (true) {
+                    synchronized (this) {
+                        wait(15_000);
+                    }
+                    if (shouldStop.get()) {
+                        break;
+                    }
+
+                    try {
+                        sender.sendKeepAlive();
+                    } catch (IOException e) {
+                        break;
+                    }
+                }
+            } finally {
+                for (final var pair : handlers) {
+                    unsubscribeReceiveHandler(pair);
+                }
+                try {
+                    httpExchange.getResponseBody().close();
+                } catch (IOException ignored) {
+                }
+            }
+        } catch (Throwable aEx) {
+            logger.error("Failed to process request.", aEx);
+            sendResponse(500, null, httpExchange);
+        }
+    }
+
+    private List<Manager> getManagerFromQuery(final Map<String, String> query) {
+        List<Manager> managers;
+        if (m != null) {
+            managers = List.of(m);
+        } else {
+            final var account = query.get("account");
+            if (account == null || account.isEmpty()) {
+                managers = c.getManagers();
+            } else {
+                final var manager = c.getManager(account);
+                if (manager == null) {
+                    return null;
+                }
+                managers = List.of(manager);
+            }
+        }
+        return managers;
+    }
+
+    private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(
+            final List<Manager> managers, final ServerSentEventSender sender, Callable unsubscribe
+    ) {
+        return managers.stream().map(m1 -> {
+            final var receiveMessageHandler = new JsonReceiveMessageHandler(m1, s -> {
+                try {
+                    sender.sendEvent(null, "receive", List.of(objectMapper.writeValueAsString(s)));
+                } catch (IOException e) {
+                    unsubscribe.call();
+                }
+            });
+            m1.addReceiveHandler(receiveMessageHandler);
+            return new Pair<>(m1, (Manager.ReceiveMessageHandler) receiveMessageHandler);
+        }).toList();
+    }
+
+    private void unsubscribeReceiveHandler(final Pair<Manager, Manager.ReceiveMessageHandler> pair) {
+        final var m = pair.first();
+        final var handler = pair.second();
+        m.removeReceiveHandler(handler);
+    }
+
+    private interface Callable {
+
+        void call();
+    }
 }
diff --git a/src/main/java/org/asamk/signal/http/ServerSentEventSender.java b/src/main/java/org/asamk/signal/http/ServerSentEventSender.java
new file mode 100644
index 00000000..b33d3310
--- /dev/null
+++ b/src/main/java/org/asamk/signal/http/ServerSentEventSender.java
@@ -0,0 +1,55 @@
+package org.asamk.signal.http;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+/**
+ * This class send Server-sent events payload to an OutputStream.
+ * See <a href="https://html.spec.whatwg.org/multipage/server-sent-events.html">spec</a>
+ */
+public class ServerSentEventSender {
+
+    private final BufferedWriter writer;
+
+    public ServerSentEventSender(final OutputStream outputStream) {
+        this.writer = new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8));
+    }
+
+    /**
+     * @param id    Event id
+     * @param event Event type
+     * @param data  Event data, each entry must not contain newline chars.
+     */
+    public synchronized void sendEvent(String id, String event, List<String> data) throws IOException {
+        if (id != null) {
+            writer.write("id:");
+            writer.write(id);
+            writer.write("\n");
+        }
+        if (event != null) {
+            writer.write("event:");
+            writer.write(event);
+            writer.write("\n");
+        }
+        if (data.size() == 0) {
+            writer.write("data\n");
+        } else {
+            for (final var d : data) {
+                writer.write("data:");
+                writer.write(d);
+                writer.write("\n");
+            }
+        }
+        writer.write("\n");
+        writer.flush();
+    }
+
+    public synchronized void sendKeepAlive() throws IOException {
+        writer.write(":\n");
+        writer.flush();
+    }
+}

From c5eb0fd351df8f1a782d6bcd962bf82bd4217b54 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 3 Nov 2022 11:40:19 +0100
Subject: [PATCH 035/672] Rework release workflow

---
 .github/workflows/ci.yml                      |  7 ++-
 ...{repackage-native-libs.yml => release.yml} | 62 ++++++++++---------
 2 files changed, 38 insertions(+), 31 deletions(-)
 rename .github/workflows/{repackage-native-libs.yml => release.yml} (70%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a1fd42a..3f3e7d8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,11 @@
 name: signal-cli CI
 
-on: [ push, pull_request, workflow_call ]
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+  workflow_call:
 
 jobs:
   build:
diff --git a/.github/workflows/repackage-native-libs.yml b/.github/workflows/release.yml
similarity index 70%
rename from .github/workflows/repackage-native-libs.yml
rename to .github/workflows/release.yml
index a7428051..20a894e0 100644
--- a/.github/workflows/repackage-native-libs.yml
+++ b/.github/workflows/release.yml
@@ -1,24 +1,22 @@
-name: repackage-native-libs
+name: release
 
 on:
   push:
     tags:
       - v*
 
-
 jobs:
 
   ci_wf:
     uses: AsamK/signal-cli/.github/workflows/ci.yml@master
     # ${{ github.repository }} not accepted here
 
-
   lib_to_jar:
     needs: ci_wf
     runs-on: ubuntu-latest
 
     outputs:
-      signal_cli_version: ${{ steps.cli_ver.outputs.signal_cli_version }}
+      signal_cli_version: ${{ steps.cli_ver.outputs.version }}
       release_id: ${{ steps.create_release.outputs.id }}
 
     steps:
@@ -29,13 +27,16 @@ jobs:
       - name: Get signal-cli version
         id: cli_ver
         run: |
-          #echo ${GITHUB_REF#refs/tag/}
+          ver="${GITHUB_REF_NAME#v}"
+          echo "version=${ver}" >> $GITHUB_OUTPUT
+
+      - name: Extract archive
+        run: |
           tree .
-          mv ./$(ls signal-cli-archive-*/ -d | tail -n1)/*.tar.gz .
-          ver=$(ls ./*.tar.gz | xargs basename | sed -E 's/signal-cli-(.*).tar.gz/\1/')
-          echo $ver
-          echo "::set-output name=signal_cli_version::${ver}"
-          tar -xzf ./*.tar.gz
+          ARCHIVE_DIR=$(ls signal-cli-archive-*/ -d | tail -n1)
+          tar -xzf ./"${ARCHIVE_DIR}"/*.tar.gz
+          mv ./"${ARCHIVE_DIR}"/*.tar.gz signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
+          rm -rf signal-cli-archive-*/
 
       - name: Get signal-client jar version
         id: lib_ver
@@ -44,7 +45,7 @@ jobs:
           jar_file=$(find ./signal-cli-*/lib/ -name "$JAR_PREFIX*.jar")
           jar_version=$(echo "$jar_file" | xargs basename | sed "s/$JAR_PREFIX//; s/.jar//")
           echo "$jar_version"
-          echo "::set-output name=signal_client_version::$jar_version"
+          echo "signal_client_version=${jar_version}" >> $GITHUB_OUTPUT
 
       - name: Download signal-client builds
         env:
@@ -59,28 +60,29 @@ jobs:
 
       - name: Compress native app
         env:
-          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
+          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
         run: |
           tar -czf signal-cli-${SIGNAL_CLI_VER}-Linux-native.tar.gz -C signal-cli-native signal-cli
+          rm -rf signal-cli-native/
 
       - name: Replace Windows lib
         env:
-          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
+          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
           SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
         run: |
           mv signal_jni.dll libsignal_jni.so
-          zip -u ./signal-cli-${SIGNAL_CLI_VER}/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so
-          tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-${SIGNAL_CLI_VER}/
+          zip -u ./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so
+          tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-*/
 
       - name: Replace macOS lib
         env:
-          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.signal_cli_version }}
+          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
           SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
         run: |
-          jar_file=./signal-cli-${SIGNAL_CLI_VER}/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar
-          zip -d "$jar_file" libsignal_jni.so
-          zip "$jar_file" libsignal_jni.dylib
-          tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-${SIGNAL_CLI_VER}/
+          jar_file=./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar
+          zip -d $jar_file libsignal_jni.so
+          zip $jar_file libsignal_jni.dylib
+          tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-*/
 
       - name: Create release
         id: create_release
@@ -88,8 +90,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: v${{ steps.cli_ver.outputs.signal_cli_version }}  # note: added `v`
-          release_name: v${{ steps.cli_ver.outputs.signal_cli_version }}  # note: added `v`
+          tag_name: v${{ steps.cli_ver.outputs.version }}  # note: added `v`
+          release_name: v${{ steps.cli_ver.outputs.version }}  # note: added `v`
           draft: true
 
       - name: Upload Linux archive
@@ -98,8 +100,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Linux.tar.gz
+          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
+          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
           asset_content_type: application/x-compressed-tar  # .tar.gz
 
       - name: Upload Linux native archive
@@ -108,8 +110,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Linux-native.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Linux-native.tar.gz
+          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux-native.tar.gz
+          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux-native.tar.gz
           asset_content_type: application/x-compressed-tar  # .tar.gz
 
       - name: Upload windows archive
@@ -118,8 +120,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Windows.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-Windows.tar.gz
+          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
+          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
           asset_content_type: application/x-compressed-tar  # .tar.gz
 
       - name: Upload macos archive
@@ -128,8 +130,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-macOS.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.signal_cli_version }}-macOS.tar.gz
+          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
+          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
           asset_content_type: application/x-compressed-tar  # .tar.gz
 
 

From e6cf11cb3de2d2a684189de7561fca1c520c60d0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 3 Nov 2022 15:10:02 +0100
Subject: [PATCH 036/672] Add missing check to httpAddres

---
 src/main/java/org/asamk/signal/commands/DaemonCommand.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 0cdf9cc9..d32dc69c 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -152,6 +152,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 !isDbusSystem
                         && socketFile == null
                         && tcpAddress == null
+                        && httpAddress == null
                         && !(inheritedChannel instanceof ServerSocketChannel)
         )) {
             runDbusSingleAccount(m, false, receiveMode != ReceiveMode.ON_START);
@@ -233,6 +234,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 !isDbusSystem
                         && socketFile == null
                         && tcpAddress == null
+                        && httpAddress == null
                         && !(inheritedChannel instanceof ServerSocketChannel)
         )) {
             runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, false);

From 00535c9a42d44ed0e95062f2e2bffcbabeb03e6e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 3 Nov 2022 15:18:47 +0100
Subject: [PATCH 037/672] Package native file as executable

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 20a894e0..f76e686c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -62,6 +62,7 @@ jobs:
         env:
           SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
         run: |
+          chmod +x signal-cli-native/signal-cli
           tar -czf signal-cli-${SIGNAL_CLI_VER}-Linux-native.tar.gz -C signal-cli-native signal-cli
           rm -rf signal-cli-native/
 

From 6502f3f487b6403a24b84bde2091fad2f3bdcc5f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 3 Nov 2022 13:37:12 +0100
Subject: [PATCH 038/672] Publish docker image to ghcr

---
 .github/workflows/release.yml | 98 +++++++++++++++++++++++++++++++++++
 Containerfile                 |  7 +++
 native.Containerfile          |  7 +++
 3 files changed, 112 insertions(+)
 create mode 100644 Containerfile
 create mode 100644 native.Containerfile

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f76e686c..117f26ad 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,12 @@ on:
     tags:
       - v*
 
+env:
+  IMAGE_NAME: signal-cli
+  IMAGE_REGISTRY: ghcr.io/asamk
+  REGISTRY_USER: ${{ github.actor }}
+  REGISTRY_PASSWORD: ${{ github.token }}
+
 jobs:
 
   ci_wf:
@@ -191,3 +197,95 @@ jobs:
             EXECUTABLE_SUFFIX=".bat"
           fi
           ./signal-cli${EXECUTABLE_SUFFIX} listAccounts
+
+  build-container:
+    needs: ci_wf
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download signal-cli build from CI workflow
+        uses: actions/download-artifact@v3
+
+      - name: Get signal-cli version
+        id: cli_ver
+        run: |
+          ver="${GITHUB_REF_NAME#v}"
+          echo "version=${ver}" >> $GITHUB_OUTPUT
+
+      - name: Move archive file
+        run: |
+          ARCHIVE_DIR=$(ls signal-cli-archive-*/ -d | tail -n1)
+          tar xf ./"${ARCHIVE_DIR}"/*.tar.gz
+          rm -r signal-cli-archive-* signal-cli-native
+          mkdir -p build/install/
+          mv ./signal-cli-*/ build/install/signal-cli
+
+      - name: Build Image
+        id: build_image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: ${{ env.IMAGE_NAME }}
+          tags: latest ${{ github.sha }} ${{ steps.cli_ver.outputs.version }}
+          containerfiles:
+            ./Containerfile
+          oci: true
+
+      - name: Push To GHCR
+        uses: redhat-actions/push-to-registry@v2
+        id: push
+        with:
+          image: ${{ steps.build_image.outputs.image }}
+          tags: ${{ steps.build_image.outputs.tags }}
+          registry: ${{ env.IMAGE_REGISTRY }}
+          username: ${{ env.REGISTRY_USER }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push.outputs) }}"
+
+  build-container-native:
+    needs: ci_wf
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download signal-cli build from CI workflow
+        uses: actions/download-artifact@v3
+
+      - name: Get signal-cli version
+        id: cli_ver
+        run: |
+          ver="${GITHUB_REF_NAME#v}"
+          echo "version=${ver}" >> $GITHUB_OUTPUT
+
+      - name: Move archive file
+        run: |
+          mkdir -p build/native/nativeCompile/
+          chmod +x ./signal-cli-native/signal-cli
+          mv ./signal-cli-native/signal-cli build/native/nativeCompile/
+
+      - name: Build Image
+        id: build_image
+        uses: redhat-actions/buildah-build@v2
+        with:
+          image: ${{ env.IMAGE_NAME }}
+          tags: latest-native ${{ github.sha }}-native ${{ steps.cli_ver.outputs.version }}-native
+          containerfiles:
+            ./native.Containerfile
+          oci: true
+
+      - name: Push To GHCR
+        uses: redhat-actions/push-to-registry@v2
+        id: push
+        with:
+          image: ${{ steps.build_image.outputs.image }}
+          tags: ${{ steps.build_image.outputs.tags }}
+          registry: ${{ env.IMAGE_REGISTRY }}
+          username: ${{ env.REGISTRY_USER }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+
+      - name: Echo outputs
+        run: |
+          echo "${{ toJSON(steps.push.outputs) }}"
diff --git a/Containerfile b/Containerfile
new file mode 100644
index 00000000..c7ba8260
--- /dev/null
+++ b/Containerfile
@@ -0,0 +1,7 @@
+FROM docker.io/eclipse-temurin:17-jre
+
+RUN useradd signal-cli --system --create-home --home-dir /var/lib/signal-cli
+ADD build/install/signal-cli /opt/signal-cli
+
+USER signal-cli
+ENTRYPOINT ["/opt/signal-cli/bin/signal-cli", "--config=/var/lib/signal-cli"]
diff --git a/native.Containerfile b/native.Containerfile
new file mode 100644
index 00000000..8f52449b
--- /dev/null
+++ b/native.Containerfile
@@ -0,0 +1,7 @@
+FROM docker.io/debian:testing-slim
+
+RUN useradd signal-cli --system --create-home --home-dir /var/lib/signal-cli
+ADD build/native/nativeCompile/signal-cli /usr/bin/signal-cli
+
+USER signal-cli
+ENTRYPOINT ["/usr/bin/signal-cli", "--config=/var/lib/signal-cli"]

From 6281cbfd5f875d6fc8ae79ac29ca3bfb03738ee9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 3 Nov 2022 15:55:12 +0100
Subject: [PATCH 039/672] Catch all exceptions when reading session record

Fixes #1083
---
 .../asamk/signal/manager/storage/sessions/SessionStore.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index ec933742..564df1d0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -3,7 +3,6 @@ package org.asamk.signal.manager.storage.sessions;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
-import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.NoSessionException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
@@ -339,7 +338,7 @@ public class SessionStore implements SignalServiceSessionStore {
         try {
             final var record = resultSet.getBytes("record");
             return new SessionRecord(record);
-        } catch (InvalidMessageException e) {
+        } catch (Exception e) {
             logger.warn("Failed to load session, resetting session: {}", e.getMessage());
             return null;
         }

From ccb37c00f6fed576664427a907fcecc21d2dbc67 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 7 Nov 2022 19:43:15 +0100
Subject: [PATCH 040/672] Update dependencies

---
 build.gradle.kts                                          | 4 ++--
 lib/build.gradle.kts                                      | 8 ++++----
 .../main/java/org/asamk/signal/manager/ManagerImpl.java   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 49ff1f46..3e446aaf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.16"
+    id("org.graalvm.buildtools.native") version "0.9.17"
 }
 
 version = "0.11.4"
@@ -40,7 +40,7 @@ repositories {
 
 dependencies {
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.4.2")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.0")
     implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
     implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.2.1")
     implementation("org.slf4j", "slf4j-api", "2.0.3")
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 9b12a328..16837b05 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,15 +14,15 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_63")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.4.2")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_64")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.0")
     implementation("com.google.protobuf", "protobuf-javalite", "3.21.6")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
     implementation("org.slf4j", "slf4j-api", "2.0.3")
-    implementation("org.xerial", "sqlite-jdbc", "3.39.3.0")
+    implementation("org.xerial", "sqlite-jdbc", "3.39.4.0")
     implementation("com.zaxxer", "HikariCP", "5.0.1")
 
-    testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.0")
+    testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.1")
 }
 
 tasks.named<Test>("test") {
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index aead1a28..652b4e76 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -699,7 +699,7 @@ class ManagerImpl implements Manager {
             byte[] receipt, String note, RecipientIdentifier.Single recipient
     ) throws IOException {
         final var paymentNotification = new SignalServiceDataMessage.PaymentNotification(receipt, note);
-        final var payment = new SignalServiceDataMessage.Payment(paymentNotification);
+        final var payment = new SignalServiceDataMessage.Payment(paymentNotification, null);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withPayment(payment);
         try {
             return sendMessage(messageBuilder, Set.of(recipient));

From 54a08f560ebaf42cb06faef8b7d69aa406fd4854 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 7 Nov 2022 19:55:53 +0100
Subject: [PATCH 041/672] Bump version

---
 CHANGELOG.md     | 7 +++++--
 build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc75f9e8..15eb4115 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,12 @@
 
 ## [Unreleased]
 
+## [0.11.5] - 2022-11-07
+**Attention**: Now requires native libsignal-client version 0.21.1
+
 ### Added
-- Add `--http` flag to `daemon` command to provide a JSON-RPC http endpoint. (Thanks @ced-b)
-- The `receive` command is now also available in daemon mode, for polling new messages.
+- Add `--http` flag to `daemon` command to provide a JSON-RPC http endpoint (`/api/v1/rpc`). (Thanks @ced-b)
+- The `receive` method is now also available in JSON-RPC daemon mode, for polling new messages.
 - Add `getAttachment` command to get attachment file base64 encoded. (Thanks @ced-b)
 - Add `--disable-send-log` to disable the message send log.
 - Add `--story` to `sendReaction` command, to react to stories.
diff --git a/build.gradle.kts b/build.gradle.kts
index 3e446aaf..feba8e39 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.17"
 }
 
-version = "0.11.4"
+version = "0.11.5"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From 8997d7f91f20e4c121415aa2464f4b6ba90b7d72 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 8 Nov 2022 17:17:18 +0100
Subject: [PATCH 042/672] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 50442c34..a2799d4a 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ of all country codes.)
 
         signal-cli -a ACCOUNT register
 
-  You can register Signal using a land line number. In this case you can skip SMS verification process and jump directly
+  You can register Signal using a landline number. In this case you can skip SMS verification process and jump directly
   to the voice call verification by adding the `--voice` switch at the end of above register command.
 
   Registering may require solving a CAPTCHA

From 5e1fc79c3382a66c4bfbb4847864b2356015861b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 8 Nov 2022 17:18:03 +0100
Subject: [PATCH 043/672] Fix SignalAccount initialization

Fixes #1092
---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index dac8de94..9d44c297 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -506,6 +506,7 @@ public class SignalAccount implements Closeable {
     ) throws IOException {
         this.dataPath = dataPath;
         this.accountPath = accountPath;
+        this.settings = settings;
         final JsonNode rootNode;
         synchronized (fileChannel) {
             fileChannel.position(0);
@@ -685,7 +686,6 @@ public class SignalAccount implements Closeable {
 
         this.aciIdentityKeyPair = aciIdentityKeyPair;
         this.localRegistrationId = registrationId;
-        this.settings = settings;
 
         migratedLegacyConfig = loadLegacyStores(rootNode, legacySignalProtocolStore) || migratedLegacyConfig;
 

From dcaf1cc189e93b0fc71b351b37a06f0d758ace50 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Nov 2022 19:00:59 +0100
Subject: [PATCH 044/672] Bump version

---
 CHANGELOG.md     | 5 +++++
 build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15eb4115..674acf88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## [Unreleased]
 
+## [0.11.5.1] - 2022-11-09
+
+### Fixed
+- Fix updating from older signal-cli version
+
 ## [0.11.5] - 2022-11-07
 **Attention**: Now requires native libsignal-client version 0.21.1
 
diff --git a/build.gradle.kts b/build.gradle.kts
index feba8e39..4945b04d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.17"
 }
 
-version = "0.11.5"
+version = "0.11.5.1"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From 5771bb858f6894c5eeb52e8614cd1c4132bf6b7f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 14 Nov 2022 19:31:40 +0100
Subject: [PATCH 045/672] Allow using data URIs for updateGroup/updateProfile
 avatars

Fixes #1082
---
 .../org/asamk/signal/manager/Manager.java     |  2 +-
 .../org/asamk/signal/manager/ManagerImpl.java |  2 +-
 .../asamk/signal/manager/api/UpdateGroup.java | 13 +++---
 .../signal/manager/api/UpdateProfile.java     | 10 ++---
 .../signal/manager/helper/GroupHelper.java    | 45 +++++++++++--------
 .../signal/manager/helper/GroupV2Helper.java  | 24 +++-------
 .../signal/manager/helper/ProfileHelper.java  | 11 ++---
 .../signal/commands/UpdateGroupCommand.java   |  7 +--
 .../signal/commands/UpdateProfileCommand.java |  3 +-
 .../asamk/signal/dbus/DbusManagerImpl.java    |  8 ++--
 .../org/asamk/signal/dbus/DbusSignalImpl.java |  8 ++--
 11 files changed, 60 insertions(+), 73 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 75503790..d4f8b76f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -102,7 +102,7 @@ public interface Manager extends Closeable {
     void deleteGroup(GroupId groupId) throws IOException;
 
     Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientIdentifier.Single> members, File avatarFile
+            String name, Set<RecipientIdentifier.Single> members, String avatarFile
     ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException;
 
     SendGroupMessageResults updateGroup(
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 652b4e76..5191e2d9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -394,7 +394,7 @@ class ManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientIdentifier.Single> members, File avatarFile
+            String name, Set<RecipientIdentifier.Single> members, String avatarFile
     ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException {
         return context.getGroupHelper()
                 .createGroup(name,
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
index 71b18a67..0a2cb5ee 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
@@ -3,7 +3,6 @@ package org.asamk.signal.manager.api;
 import org.asamk.signal.manager.groups.GroupLinkState;
 import org.asamk.signal.manager.groups.GroupPermission;
 
-import java.io.File;
 import java.util.Set;
 
 public class UpdateGroup {
@@ -20,7 +19,7 @@ public class UpdateGroup {
     private final GroupLinkState groupLinkState;
     private final GroupPermission addMemberPermission;
     private final GroupPermission editDetailsPermission;
-    private final File avatarFile;
+    private final String avatarFile;
     private final Integer expirationTimer;
     private final Boolean isAnnouncementGroup;
 
@@ -77,7 +76,7 @@ public class UpdateGroup {
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,
             final GroupPermission editDetailsPermission,
-            final File avatarFile,
+            final String avatarFile,
             final Integer expirationTimer,
             final Boolean isAnnouncementGroup
     ) {
@@ -146,7 +145,7 @@ public class UpdateGroup {
         return editDetailsPermission;
     }
 
-    public File getAvatarFile() {
+    public String getAvatarFile() {
         return avatarFile;
     }
 
@@ -172,7 +171,7 @@ public class UpdateGroup {
         private GroupLinkState groupLinkState;
         private GroupPermission addMemberPermission;
         private GroupPermission editDetailsPermission;
-        private File avatarFile;
+        private String avatarFile;
         private Integer expirationTimer;
         private Boolean isAnnouncementGroup;
 
@@ -192,7 +191,7 @@ public class UpdateGroup {
                 final GroupLinkState groupLinkState,
                 final GroupPermission addMemberPermission,
                 final GroupPermission editDetailsPermission,
-                final File avatarFile,
+                final String avatarFile,
                 final Integer expirationTimer,
                 final Boolean isAnnouncementGroup
         ) {
@@ -273,7 +272,7 @@ public class UpdateGroup {
             return this;
         }
 
-        public Builder withAvatarFile(final File val) {
+        public Builder withAvatarFile(final String val) {
             avatarFile = val;
             return this;
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UpdateProfile.java b/lib/src/main/java/org/asamk/signal/manager/api/UpdateProfile.java
index d5de308e..3cfffe5f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/UpdateProfile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UpdateProfile.java
@@ -1,14 +1,12 @@
 package org.asamk.signal.manager.api;
 
-import java.io.File;
-
 public class UpdateProfile {
 
     private final String givenName;
     private final String familyName;
     private final String about;
     private final String aboutEmoji;
-    private final File avatar;
+    private final String avatar;
     private final boolean deleteAvatar;
     private final byte[] mobileCoinAddress;
 
@@ -54,7 +52,7 @@ public class UpdateProfile {
         return aboutEmoji;
     }
 
-    public File getAvatar() {
+    public String getAvatar() {
         return avatar;
     }
 
@@ -72,7 +70,7 @@ public class UpdateProfile {
         private String familyName;
         private String about;
         private String aboutEmoji;
-        private File avatar;
+        private String avatar;
         private boolean deleteAvatar;
         private byte[] mobileCoinAddress;
 
@@ -99,7 +97,7 @@ public class UpdateProfile {
             return this;
         }
 
-        public Builder withAvatar(final File val) {
+        public Builder withAvatar(final String val) {
             avatar = val;
             return this;
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index a342064c..bb9a3ea4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -26,6 +26,7 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
+import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
@@ -47,7 +48,6 @@ import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.exceptions.ConflictException;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -164,7 +164,7 @@ public class GroupHelper {
     }
 
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientId> members, File avatarFile
+            String name, Set<RecipientId> members, String avatarFile
     ) throws IOException, AttachmentInvalidException {
         final var selfRecipientId = account.getSelfRecipientId();
         if (members != null && members.contains(selfRecipientId)) {
@@ -172,14 +172,15 @@ public class GroupHelper {
             members.remove(selfRecipientId);
         }
 
+        final var avatarBytes = readAvatarBytes(avatarFile);
         var gv2Pair = context.getGroupV2Helper()
-                .createGroup(name == null ? "" : name, members == null ? Set.of() : members, avatarFile);
+                .createGroup(name == null ? "" : name, members == null ? Set.of() : members, avatarBytes);
 
         if (gv2Pair == null) {
             // Failed to create v2 group, creating v1 group instead
             var gv1 = new GroupInfoV1(GroupIdV1.createRandom());
             gv1.addMembers(List.of(selfRecipientId));
-            final var result = updateGroupV1(gv1, name, members, avatarFile);
+            final var result = updateGroupV1(gv1, name, members, avatarBytes);
             return new Pair<>(gv1.getGroupId(), result);
         }
 
@@ -187,10 +188,9 @@ public class GroupHelper {
         final var decryptedGroup = gv2Pair.second();
 
         gv2.setGroup(decryptedGroup);
-        if (avatarFile != null) {
+        if (avatarBytes != null) {
             context.getAvatarStore()
-                    .storeGroupAvatar(gv2.getGroupId(),
-                            outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
+                    .storeGroupAvatar(gv2.getGroupId(), outputStream -> outputStream.write(avatarBytes));
         }
 
         account.getGroupStore().updateGroup(gv2);
@@ -217,11 +217,12 @@ public class GroupHelper {
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,
             final GroupPermission editDetailsPermission,
-            final File avatarFile,
+            final String avatarFile,
             final Integer expirationTimer,
             final Boolean isAnnouncementGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException {
         var group = getGroupForUpdating(groupId);
+        final var avatarBytes = readAvatarBytes(avatarFile);
 
         if (group instanceof GroupInfoV2) {
             try {
@@ -238,7 +239,7 @@ public class GroupHelper {
                         groupLinkState,
                         addMemberPermission,
                         editDetailsPermission,
-                        avatarFile,
+                        avatarBytes,
                         expirationTimer,
                         isAnnouncementGroup);
             } catch (ConflictException e) {
@@ -257,14 +258,14 @@ public class GroupHelper {
                         groupLinkState,
                         addMemberPermission,
                         editDetailsPermission,
-                        avatarFile,
+                        avatarBytes,
                         expirationTimer,
                         isAnnouncementGroup);
             }
         }
 
         final var gv1 = (GroupInfoV1) group;
-        final var result = updateGroupV1(gv1, name, members, avatarFile);
+        final var result = updateGroupV1(gv1, name, members, avatarBytes);
         if (expirationTimer != null) {
             setExpirationTimer(gv1, expirationTimer);
         }
@@ -521,7 +522,7 @@ public class GroupHelper {
     }
 
     private SendGroupMessageResults updateGroupV1(
-            final GroupInfoV1 gv1, final String name, final Set<RecipientId> members, final File avatarFile
+            final GroupInfoV1 gv1, final String name, final Set<RecipientId> members, final byte[] avatarFile
     ) throws IOException, AttachmentInvalidException {
         updateGroupV1Details(gv1, name, members, avatarFile);
 
@@ -534,7 +535,7 @@ public class GroupHelper {
     }
 
     private void updateGroupV1Details(
-            final GroupInfoV1 g, final String name, final Collection<RecipientId> members, final File avatarFile
+            final GroupInfoV1 g, final String name, final Collection<RecipientId> members, final byte[] avatarFile
     ) throws IOException {
         if (name != null) {
             g.name = name;
@@ -545,9 +546,7 @@ public class GroupHelper {
         }
 
         if (avatarFile != null) {
-            context.getAvatarStore()
-                    .storeGroupAvatar(g.getGroupId(),
-                            outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
+            context.getAvatarStore().storeGroupAvatar(g.getGroupId(), outputStream -> outputStream.write(avatarFile));
         }
     }
 
@@ -581,7 +580,7 @@ public class GroupHelper {
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,
             final GroupPermission editDetailsPermission,
-            final File avatarFile,
+            final byte[] avatarFile,
             final Integer expirationTimer,
             final Boolean isAnnouncementGroup
     ) throws IOException {
@@ -716,8 +715,7 @@ public class GroupHelper {
             var groupGroupChangePair = groupV2Helper.updateGroup(group, name, description, avatarFile);
             if (avatarFile != null) {
                 context.getAvatarStore()
-                        .storeGroupAvatar(group.getGroupId(),
-                                outputStream -> IOUtils.copyFileToStream(avatarFile, outputStream));
+                        .storeGroupAvatar(group.getGroupId(), outputStream -> outputStream.write(avatarFile));
             }
             result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
         }
@@ -819,4 +817,13 @@ public class GroupHelper {
                                 account.getRecipientAddressResolver()))
                         .toList());
     }
+
+    private byte[] readAvatarBytes(final String avatarFile) throws IOException {
+        if (avatarFile == null) {
+            return null;
+        }
+        try (final var avatar = Utils.createStreamDetails(avatarFile).first().getStream()) {
+            return IOUtils.readFully(avatar);
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 84747e9c..e410d232 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -12,7 +12,6 @@ import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.VerificationFailedException;
@@ -47,10 +46,7 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -138,10 +134,9 @@ class GroupV2Helper {
     }
 
     Pair<GroupInfoV2, DecryptedGroup> createGroup(
-            String name, Set<RecipientId> members, File avatarFile
-    ) throws IOException {
-        final var avatarBytes = readAvatarBytes(avatarFile);
-        final var newGroup = buildNewGroup(name, members, avatarBytes);
+            String name, Set<RecipientId> members, byte[] avatarFile
+    ) {
+        final var newGroup = buildNewGroup(name, members, avatarFile);
         if (newGroup == null) {
             return null;
         }
@@ -170,14 +165,6 @@ class GroupV2Helper {
         return new Pair<>(g, decryptedGroup);
     }
 
-    private byte[] readAvatarBytes(final File avatarFile) throws IOException {
-        final byte[] avatarBytes;
-        try (InputStream avatar = avatarFile == null ? null : new FileInputStream(avatarFile)) {
-            avatarBytes = avatar == null ? null : IOUtils.readFully(avatar);
-        }
-        return avatarBytes;
-    }
-
     private GroupsV2Operations.NewGroup buildNewGroup(
             String name, Set<RecipientId> members, byte[] avatar
     ) {
@@ -210,7 +197,7 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChange> updateGroup(
-            GroupInfoV2 groupInfoV2, String name, String description, File avatarFile
+            GroupInfoV2 groupInfoV2, String name, String description, byte[] avatarFile
     ) throws IOException {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
@@ -222,9 +209,8 @@ class GroupV2Helper {
         }
 
         if (avatarFile != null) {
-            final var avatarBytes = readAvatarBytes(avatarFile);
             var avatarCdnKey = dependencies.getGroupsV2Api()
-                    .uploadAvatar(avatarBytes, groupSecretParams, getGroupAuthForToday(groupSecretParams));
+                    .uploadAvatar(avatarFile, groupSecretParams, getGroupAuthForToday(groupSecretParams));
             change.setModifyAvatar(GroupChange.Actions.ModifyAvatarAction.newBuilder().setAvatar(avatarCdnKey));
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 8113000b..da7440ed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -30,7 +30,6 @@ import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.util.ExpiringProfileCredentialUtil;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -146,7 +145,7 @@ public final class ProfileHelper {
             final String familyName,
             String about,
             String aboutEmoji,
-            Optional<File> avatar,
+            Optional<String> avatar,
             byte[] mobileCoinAddress
     ) throws IOException {
         setProfile(true, false, givenName, familyName, about, aboutEmoji, avatar, mobileCoinAddress);
@@ -159,7 +158,7 @@ public final class ProfileHelper {
             final String familyName,
             String about,
             String aboutEmoji,
-            Optional<File> avatar,
+            Optional<String> avatar,
             byte[] mobileCoinAddress
     ) throws IOException {
         var profile = getSelfProfile();
@@ -183,7 +182,8 @@ public final class ProfileHelper {
 
         if (uploadProfile) {
             final var streamDetails = avatar != null && avatar.isPresent()
-                    ? Utils.createStreamDetailsFromFile(avatar.get())
+                    ? Utils.createStreamDetails(avatar.get())
+                    .first()
                     : forceUploadAvatar && avatar == null ? context.getAvatarStore()
                             .retrieveProfileAvatar(account.getSelfRecipientAddress()) : null;
             try (streamDetails) {
@@ -212,9 +212,10 @@ public final class ProfileHelper {
 
         if (avatar != null) {
             if (avatar.isPresent()) {
+                final var streamDetails = Utils.createStreamDetails(avatar.get()).first();
                 context.getAvatarStore()
                         .storeProfileAvatar(account.getSelfRecipientAddress(),
-                                outputStream -> IOUtils.copyFileToStream(avatar.get(), outputStream));
+                                outputStream -> IOUtils.copyStream(streamDetails.getStream(), outputStream));
             } else {
                 context.getAvatarStore().deleteProfileAvatar(account.getSelfRecipientAddress());
             }
diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 411ae747..14ad14f8 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -26,7 +26,6 @@ import org.asamk.signal.util.SendMessageResultUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.stream.Stream;
@@ -131,9 +130,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
             SendGroupMessageResults groupMessageResults = null;
             if (groupId == null) {
                 isNewGroup = true;
-                var results = m.createGroup(groupName,
-                        groupMembers,
-                        groupAvatar == null ? null : new File(groupAvatar));
+                var results = m.createGroup(groupName, groupMembers, groupAvatar);
                 groupMessageResults = results.second();
                 groupId = results.first();
                 groupName = null;
@@ -155,7 +152,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
                             .withGroupLinkState(groupLinkState)
                             .withAddMemberPermission(groupAddMemberPermission)
                             .withEditDetailsPermission(groupEditDetailsPermission)
-                            .withAvatarFile(groupAvatar == null ? null : new File(groupAvatar))
+                            .withAvatarFile(groupAvatar)
                             .withExpirationTimer(groupExpiration)
                             .withIsAnnouncementGroup(groupSendMessagesPermission == null
                                     ? null
diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index d8e87430..cea2da0d 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -10,7 +10,6 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.output.OutputWriter;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Base64;
 
@@ -50,7 +49,7 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand {
 
         var avatarPath = ns.getString("avatar");
         boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));
-        File avatarFile = removeAvatar || avatarPath == null ? null : new File(avatarPath);
+        String avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;
 
         try {
             m.updateProfile(UpdateProfile.newBuilder()
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index c0dc1cf8..d2a08131 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -147,7 +147,7 @@ public class DbusManagerImpl implements Manager {
                 emptyIfNull(updateProfile.getFamilyName()),
                 emptyIfNull(updateProfile.getAbout()),
                 emptyIfNull(updateProfile.getAboutEmoji()),
-                updateProfile.getAvatar() == null ? "" : updateProfile.getAvatar().getPath(),
+                updateProfile.getAvatar() == null ? "" : updateProfile.getAvatar(),
                 updateProfile.isDeleteAvatar());
     }
 
@@ -231,11 +231,11 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            final String name, final Set<RecipientIdentifier.Single> members, final File avatarFile
+            final String name, final Set<RecipientIdentifier.Single> members, final String avatarFile
     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),
                 members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(),
-                avatarFile == null ? "" : avatarFile.getPath());
+                avatarFile == null ? "" : avatarFile);
         return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
     }
 
@@ -253,7 +253,7 @@ public class DbusManagerImpl implements Manager {
         if (updateGroup.getAvatarFile() != null) {
             group.Set("org.asamk.Signal.Group",
                     "Avatar",
-                    updateGroup.getAvatarFile() == null ? "" : updateGroup.getAvatarFile().getPath());
+                    updateGroup.getAvatarFile() == null ? "" : updateGroup.getAvatarFile());
         }
         if (updateGroup.getExpirationTimer() != null) {
             group.Set("org.asamk.Signal.Group", "MessageExpirationTimer", updateGroup.getExpirationTimer());
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 1a9118be..2c0c30b2 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -618,7 +618,7 @@ public class DbusSignalImpl implements Signal {
             avatar = nullIfEmpty(avatar);
             final var memberIdentifiers = getSingleRecipientIdentifiers(members, m.getSelfNumber());
             if (groupId == null) {
-                final var results = m.createGroup(name, memberIdentifiers, avatar == null ? null : new File(avatar));
+                final var results = m.createGroup(name, memberIdentifiers, avatar);
                 updateGroups();
                 checkGroupSendMessageResults(results.second().timestamp(), results.second().results());
                 return results.first().serialize();
@@ -627,7 +627,7 @@ public class DbusSignalImpl implements Signal {
                         UpdateGroup.newBuilder()
                                 .withName(name)
                                 .withMembers(memberIdentifiers)
-                                .withAvatarFile(avatar == null ? null : new File(avatar))
+                                .withAvatarFile(avatar)
                                 .build());
                 if (results != null) {
                     checkGroupSendMessageResults(results.timestamp(), results.results());
@@ -687,7 +687,7 @@ public class DbusSignalImpl implements Signal {
             about = nullIfEmpty(about);
             aboutEmoji = nullIfEmpty(aboutEmoji);
             avatarPath = nullIfEmpty(avatarPath);
-            File avatarFile = removeAvatar || avatarPath == null ? null : new File(avatarPath);
+            final var avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;
             m.updateProfile(UpdateProfile.newBuilder()
                     .withGivenName(givenName)
                     .withFamilyName(familyName)
@@ -1270,7 +1270,7 @@ public class DbusSignalImpl implements Signal {
         }
 
         private void setGroupAvatar(final String avatar) {
-            updateGroup(UpdateGroup.newBuilder().withAvatarFile(new File(avatar)).build());
+            updateGroup(UpdateGroup.newBuilder().withAvatarFile(avatar).build());
         }
 
         private void setMessageExpirationTime(final int expirationTime) {

From b6e9dfa97d64fe60be9405f9f714d10eece9673f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 20 Nov 2022 11:27:33 +0100
Subject: [PATCH 046/672] Add fallback locale for voice verification

Fixes #1101
---
 .../asamk/signal/manager/util/NumberVerificationUtils.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 9dcee1fb..280c9fbc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -15,6 +15,7 @@ import org.whispersystems.signalservice.internal.push.RequestVerificationCodeRes
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 
 import java.io.IOException;
+import java.util.Locale;
 import java.util.Optional;
 
 public class NumberVerificationUtils {
@@ -23,10 +24,9 @@ public class NumberVerificationUtils {
             SignalServiceAccountManager accountManager, String captcha, boolean voiceVerification
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
         captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
-
         final ServiceResponse<RequestVerificationCodeResponse> response;
         if (voiceVerification) {
-            response = accountManager.requestVoiceVerificationCode(Utils.getDefaultLocale(null),
+            response = accountManager.requestVoiceVerificationCode(Utils.getDefaultLocale(Locale.US),
                     Optional.ofNullable(captcha),
                     Optional.empty(),
                     Optional.empty());

From 3e60303b90ff8c7c6fad390b45bc9338afdfb1c6 Mon Sep 17 00:00:00 2001
From: ced-b <cedric@cos.flag.org>
Date: Tue, 22 Nov 2022 01:58:34 -0500
Subject: [PATCH 047/672] Add alive check (#1107)

Adds a simple HTTP endpoint that can be used by the container
environment to see if the app is started and available.

Co-authored-by: cedb <cedb@keylimebox.org>
---
 .../org/asamk/signal/http/HttpServerHandler.java   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index f7f2768d..a6213929 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -59,6 +59,7 @@ public class HttpServerHandler {
 
         server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
         server.createContext("/api/v1/events", this::handleEventsEndpoint);
+        server.createContext("/api/v1/check", this::handleCheckEndpoint);
 
         server.start();
     }
@@ -186,6 +187,19 @@ public class HttpServerHandler {
         }
     }
 
+    private void handleCheckEndpoint(HttpExchange httpExchange) throws IOException {
+        if (!"/api/v1/check".equals(httpExchange.getRequestURI().getPath())) {
+            sendResponse(404, null, httpExchange);
+            return;
+        }
+        if (!"GET".equals(httpExchange.getRequestMethod())) {
+            sendResponse(405, null, httpExchange);
+            return;
+        }
+
+        sendResponse(200, null, httpExchange);
+    }
+
     private List<Manager> getManagerFromQuery(final Map<String, String> query) {
         List<Manager> managers;
         if (m != null) {

From 35def4445d13011f4feb9f6422546b88ce32bda0 Mon Sep 17 00:00:00 2001
From: ced-b <cedric@cos.flag.org>
Date: Thu, 24 Nov 2022 11:29:45 -0500
Subject: [PATCH 048/672] Fix handling of attachments in JSON RPC (#1109)

* Fix handling of attachments in JSON RPC

It turns out that using a custom serializer on an
input stream did not work well. For one the stream seems
to be getting closed before the JSON gets written. But
also the method for writing it was throwing an
UnsupportedOperationException further down in Jackson.

The above simplifies the matter by simply outputting the
Base64 string first and then setting it on the model.

* Add missing files to attachment fix

Co-authored-by: cedb <cedb@keylimebox.org>
---
 .../signal/commands/GetAttachmentCommand.java  |  6 +++---
 .../asamk/signal/json/JsonAttachmentData.java  |  6 +-----
 .../signal/json/JsonStreamSerializer.java      | 18 ------------------
 3 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 src/main/java/org/asamk/signal/json/JsonStreamSerializer.java

diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
index 6deed90a..f2f0450c 100644
--- a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
@@ -40,12 +40,12 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
         final var id = ns.getString("id");
 
         try (InputStream attachment = m.retrieveAttachment(id)) {
+            final var bytes = attachment.readAllBytes();
+            final var base64 = Base64.getEncoder().encodeToString(bytes);
             if (outputWriter instanceof PlainTextWriter writer) {
-                final var bytes = attachment.readAllBytes();
-                final var base64 = Base64.getEncoder().encodeToString(bytes);
                 writer.println(base64);
             } else if (outputWriter instanceof JsonWriter writer) {
-                writer.write(new JsonAttachmentData(attachment));
+                writer.write(new JsonAttachmentData(base64));
             }
         } catch (FileNotFoundException ex) {
             throw new UserErrorException("Could not find attachment with ID: " + id, ex);
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
index fd759674..05a90c21 100644
--- a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
@@ -1,9 +1,5 @@
 package org.asamk.signal.json;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-import java.io.InputStream;
-
 public record JsonAttachmentData(
-        @JsonSerialize(using = JsonStreamSerializer.class) InputStream data
+        String data
 ) {}
diff --git a/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java b/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
deleted file mode 100644
index 4cd2797e..00000000
--- a/src/main/java/org/asamk/signal/json/JsonStreamSerializer.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.asamk.signal.json;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class JsonStreamSerializer extends JsonSerializer<InputStream> {
-
-    @Override
-    public void serialize(
-            final InputStream value, final JsonGenerator jsonGenerator, final SerializerProvider serializers
-    ) throws IOException {
-        jsonGenerator.writeBinary(value, -1);
-    }
-}

From 44c945f45d291ea466634ef95262287a2d0480b4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 24 Nov 2022 17:31:11 +0100
Subject: [PATCH 049/672] Update dependencies

---
 build.gradle.kts     | 10 +++++-----
 lib/build.gradle.kts |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 4945b04d..eeec8c02 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.17"
+    id("org.graalvm.buildtools.native") version "0.9.18"
 }
 
 version = "0.11.5.1"
@@ -40,12 +40,12 @@ repositories {
 
 dependencies {
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.0")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1")
     implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
     implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.2.1")
-    implementation("org.slf4j", "slf4j-api", "2.0.3")
-    implementation("ch.qos.logback", "logback-classic", "1.4.4")
-    implementation("org.slf4j", "jul-to-slf4j", "2.0.3")
+    implementation("org.slf4j", "slf4j-api", "2.0.4")
+    implementation("ch.qos.logback", "logback-classic", "1.4.5")
+    implementation("org.slf4j", "jul-to-slf4j", "2.0.4")
     implementation(project(":lib"))
 }
 
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 16837b05..6e398a5a 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -15,11 +15,11 @@ repositories {
 
 dependencies {
     implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_64")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.0")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1")
     implementation("com.google.protobuf", "protobuf-javalite", "3.21.6")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("org.slf4j", "slf4j-api", "2.0.3")
-    implementation("org.xerial", "sqlite-jdbc", "3.39.4.0")
+    implementation("org.slf4j", "slf4j-api", "2.0.4")
+    implementation("org.xerial", "sqlite-jdbc", "3.40.0.0")
     implementation("com.zaxxer", "HikariCP", "5.0.1")
 
     testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.1")

From 47feda6ae4c6d81f494ccecccfdd26c0e3785b38 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 3 Dec 2022 15:17:30 +0100
Subject: [PATCH 050/672] Restrict workflow permissions

---
 .github/workflows/ci.yml              |  3 ++
 .github/workflows/codeql-analysis.yml |  4 ++
 .github/workflows/release.yml         | 68 +++++----------------------
 3 files changed, 18 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3f3e7d8b..c02b0623 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,9 @@ on:
   pull_request:
   workflow_call:
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   build:
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 25bcc265..60c4ef99 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -9,6 +9,10 @@ on:
   schedule:
     - cron: '0 7 * * 4'
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+  security-events: write
+
 jobs:
   analyse:
     name: Analyse
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 117f26ad..84f629b2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,6 +5,9 @@ on:
     tags:
       - v*
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 env:
   IMAGE_NAME: signal-cli
   IMAGE_REGISTRY: ghcr.io/asamk
@@ -20,6 +23,8 @@ jobs:
   lib_to_jar:
     needs: ci_wf
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     outputs:
       signal_cli_version: ${{ steps.cli_ver.outputs.version }}
@@ -141,66 +146,12 @@ jobs:
           asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
           asset_content_type: application/x-compressed-tar  # .tar.gz
 
-
-  run_repackaged:
-
-    needs:
-      - lib_to_jar
-
-    strategy:
-      matrix:
-        runner:
-          - windows-latest
-          - macos-latest
-
-    runs-on: ${{ matrix.runner }}
-
-    defaults:
-      run:
-        shell: bash   # Explicit for windows
-
-    env:
-      JAVA_VERSION: 19
-
-    steps:
-
-      - name: Download the release file
-        env:
-          SIGNAL_CLI_VER: ${{ needs.lib_to_jar.outputs.signal_cli_version }}
-          RELEASE_ID: ${{ needs.lib_to_jar.outputs.release_id }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          file_name=signal-cli-${SIGNAL_CLI_VER}-${RUNNER_OS}.tar.gz
-          echo "$file_name"
-          assets_json=$(curl -s \
-            -H "Authorization: Bearer $GITHUB_TOKEN" \
-            "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets")
-          asset_dl_url=$(echo "$assets_json" | jq -r ".[] | select (.name == \"$file_name\") | .url")
-          echo "$asset_dl_url"
-          curl -sLOJ \
-            -H 'Accept: application/octet-stream' \
-            -H "Authorization: Bearer $GITHUB_TOKEN" \
-            "$asset_dl_url"
-          tar -xzf "$file_name"
-
-      - name: Set up JDK for running signal-cli executable
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: ${{ env.JAVA_VERSION }}
-          java-package: 'jre'
-
-      - name: Run signal-cli
-        run: |
-          cd signal-cli-*/bin
-          if [[ "$RUNNER_OS" == 'Windows' ]]; then
-            EXECUTABLE_SUFFIX=".bat"
-          fi
-          ./signal-cli${EXECUTABLE_SUFFIX} listAccounts
-
   build-container:
     needs: ci_wf
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
       - uses: actions/checkout@v3
@@ -248,6 +199,9 @@ jobs:
   build-container-native:
     needs: ci_wf
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
       - uses: actions/checkout@v3

From 8d7e533196b0806de2fa1ea7003f3ebfcea5c85b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Dec 2022 20:05:53 +0100
Subject: [PATCH 051/672] Update dependencies

---
 build.gradle.kts     | 6 +++---
 lib/build.gradle.kts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index eeec8c02..685c43ef 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.18"
+    id("org.graalvm.buildtools.native") version "0.9.19"
 }
 
 version = "0.11.5.1"
@@ -43,9 +43,9 @@ dependencies {
     implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1")
     implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
     implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.2.1")
-    implementation("org.slf4j", "slf4j-api", "2.0.4")
+    implementation("org.slf4j", "slf4j-api", "2.0.6")
     implementation("ch.qos.logback", "logback-classic", "1.4.5")
-    implementation("org.slf4j", "jul-to-slf4j", "2.0.4")
+    implementation("org.slf4j", "jul-to-slf4j", "2.0.6")
     implementation(project(":lib"))
 }
 
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 6e398a5a..0f91ee7a 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,11 +14,11 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_64")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_65")
     implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1")
-    implementation("com.google.protobuf", "protobuf-javalite", "3.21.6")
+    implementation("com.google.protobuf", "protobuf-javalite", "3.21.12")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("org.slf4j", "slf4j-api", "2.0.4")
+    implementation("org.slf4j", "slf4j-api", "2.0.6")
     implementation("org.xerial", "sqlite-jdbc", "3.40.0.0")
     implementation("com.zaxxer", "HikariCP", "5.0.1")
 

From 0702159596c8dd821bdbf604b81fa33c780531e7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Dec 2022 20:09:15 +0100
Subject: [PATCH 052/672] Bump version

---
 CHANGELOG.md     | 10 ++++++++++
 build.gradle.kts |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 674acf88..4f0dafaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [0.11.6] - 2022-12-18
+
+### Added
+- Allow using data URIs for updateGroup/updateProfile
+- New alive check endpoint for http daemon (Thanks @ced-b)
+
+### Fixed
+- Registration with voice verification now works if no system locale is set
+- Fixed retrieving attachments in JSON RPC mode (Thanks @ced-b)
+
 ## [0.11.5.1] - 2022-11-09
 
 ### Fixed
diff --git a/build.gradle.kts b/build.gradle.kts
index 685c43ef..f79984a4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.19"
 }
 
-version = "0.11.5.1"
+version = "0.11.6"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From 210466e7d9fe589ddfaba6d8ac82948bbea500d5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 30 Dec 2022 13:50:40 +0100
Subject: [PATCH 053/672] Allow JSON-RPC commands without account param if only
 one account exists

---
 .../asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 2249fad6..720f22e6 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -87,7 +87,13 @@ public class SignalJsonRpcCommandHandler {
                 return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
             }
 
-            final var manager = getManagerFromParams(params);
+            var manager = getManagerFromParams(params);
+            if (manager == null) {
+                final var managers = c.getManagers();
+                if (managers.size() == 1) {
+                    manager = managers.get(0);
+                }
+            }
             if (manager != null) {
                 return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
             } else {

From 161ec9f828a88d6cd62d844777aa7a72f2f03d54 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 7 Jan 2023 12:14:47 +0100
Subject: [PATCH 054/672] Update dependencies

---
 client/Cargo.lock | 268 +++++++++++++++++++++++++---------------------
 1 file changed, 144 insertions(+), 124 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 8e4bff27..128b7d0c 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -4,29 +4,18 @@ version = 3
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.65"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "autocfg"
@@ -42,24 +31,25 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bstr"
-version = "0.2.17"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
+checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
 dependencies = [
  "memchr",
+ "serde",
 ]
 
 [[package]]
 name = "bytes"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
 
 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 
 [[package]]
 name = "cfg-if"
@@ -69,14 +59,14 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.0.11"
+version = "4.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ed45cc2c62a3eff523e718d8576ba762c83a3146151093283ac62ae11933a73"
+checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
 dependencies = [
- "atty",
  "bitflags",
  "clap_derive",
  "clap_lex",
+ "is-terminal",
  "once_cell",
  "strsim",
  "termcolor",
@@ -85,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.0.10"
+version = "4.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db342ce9fda24fb191e2ed4e102055a4d381c1086a06630174cd8da8d5d917ce"
+checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -159,9 +149,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -174,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -184,15 +174,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -202,15 +192,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -219,21 +209,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
 
 [[package]]
 name = "futures-task"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
 
 [[package]]
 name = "futures-util"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
 dependencies = [
  "futures 0.1.31",
  "futures-channel",
@@ -261,9 +251,9 @@ dependencies = [
 
 [[package]]
 name = "globset"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
+checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -280,9 +270,9 @@ checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.19"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
 dependencies = [
  "libc",
 ]
@@ -298,15 +288,31 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "0.7.3"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea37f355c05dde75b84bba2d767906ad522e97cd9e2eef2be7a4ab7fb442c06"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+dependencies = [
+ "hermit-abi",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
 
 [[package]]
 name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "jsonrpc-client-transports"
@@ -314,7 +320,7 @@ version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
  "derive_more",
- "futures 0.3.24",
+ "futures 0.3.25",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "jsonrpc-pubsub",
  "jsonrpc-server-utils 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
@@ -331,7 +337,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
 dependencies = [
- "futures 0.3.24",
+ "futures 0.3.25",
  "futures-executor",
  "futures-util",
  "log",
@@ -345,7 +351,7 @@ name = "jsonrpc-core"
 version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
- "futures 0.3.24",
+ "futures 0.3.25",
  "futures-executor",
  "futures-util",
  "log",
@@ -360,7 +366,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
 dependencies = [
- "futures 0.3.24",
+ "futures 0.3.25",
  "jsonrpc-client-transports",
 ]
 
@@ -380,7 +386,7 @@ name = "jsonrpc-pubsub"
 version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
- "futures 0.3.24",
+ "futures 0.3.25",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "lazy_static",
  "log",
@@ -396,7 +402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
 dependencies = [
  "bytes",
- "futures 0.3.24",
+ "futures 0.3.25",
  "globset",
  "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static",
@@ -413,7 +419,7 @@ version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
  "bytes",
- "futures 0.3.24",
+ "futures 0.3.25",
  "globset",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "lazy_static",
@@ -432,15 +438,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.134"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.0.46"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
 name = "lock_api"
@@ -469,9 +475,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "mio"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
  "libc",
  "log",
@@ -481,9 +487,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -491,15 +497,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.15.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
 [[package]]
 name = "os_str_bytes"
-version = "6.3.0"
+version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
 
 [[package]]
 name = "parity-tokio-ipc"
@@ -507,7 +513,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
 dependencies = [
- "futures 0.3.24",
+ "futures 0.3.25",
  "libc",
  "log",
  "rand",
@@ -528,9 +534,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 dependencies = [
  "cfg-if",
  "instant",
@@ -554,9 +560,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro-crate"
@@ -593,18 +599,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.46"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -661,9 +667,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -672,9 +678,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
 [[package]]
 name = "rustc_version"
@@ -687,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.35.11"
+version = "0.36.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb2fda4666def1433b1b05431ab402e42a1084285477222b72d6c564c417cef"
+checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
 dependencies = [
  "bitflags",
  "errno",
@@ -701,9 +707,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 
 [[package]]
 name = "scopeguard"
@@ -713,24 +719,24 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "semver"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
+checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
 
 [[package]]
 name = "serde"
-version = "1.0.145"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.145"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -739,9 +745,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.85"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
  "itoa",
  "ryu",
@@ -798,9 +804,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.102"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -818,9 +824,9 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8440c860cf79def6164e4a0a983bcc2305d82419177a0e0c71930d049e3ac5a1"
+checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
 dependencies = [
  "rustix",
  "windows-sys",
@@ -828,9 +834,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.21.2"
+version = "1.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099"
+checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
 dependencies = [
  "autocfg",
  "bytes",
@@ -841,14 +847,14 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio-macros",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.8.0"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -857,9 +863,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6edf2d6bc038a43d31353570e27270603f4648d18f5ed10c0e179abe43255af"
+checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -882,9 +888,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
+checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
 dependencies = [
  "serde",
 ]
@@ -900,9 +906,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 
 [[package]]
 name = "version_check"
@@ -955,43 +961,57 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
+ "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
  "windows_x86_64_msvc",
 ]
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"

From c100b504dc48e8096675e467be5482497b3e6d92 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 21 Jan 2023 19:42:49 +0100
Subject: [PATCH 055/672] Document submitRateLimitChallenge

---
 man/signal-cli.1.adoc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index ad510dfe..a9ccbad4 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -693,6 +693,18 @@ Don’t print received messages to stdout.
 *--receive-mode*::
 Specify when to start receiving messages (on-start, on-connection, manual)
 
+=== submitRateLimitChallenge
+
+When running into rate limits, sometimes the limit can be lifted, by solving a CAPTCHA.
+To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
+For the staging environment, use: https://signalcaptchas.org/staging/registration/generate.html
+
+*--challenge* CHALLENGE_TOKEN::
+The challenge token from the failed send attempt.
+
+*--captcha* CAPTCHA::
+The captcha result, starting with signalcaptcha://
+
 == Examples
 
 Register a number (with SMS verification)::

From a1b16a9118e812eacd21290c4c93980116aa5fb0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 27 Jan 2023 21:25:40 +0100
Subject: [PATCH 056/672] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e250e745..c18cd8a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,18 @@
 # Question
+
 If you have a question you can ask it in the [GitHub discussions page](https://github.com/AsamK/signal-cli/discussions)
 
 # Report a bug
+
 - Search [existing issues](https://github.com/AsamK/signal-cli/issues?q=is%3Aissue) if it has been reported already
-- If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/AsamK/signal-cli/issues/new).
-  - Be sure to include a **title and clear description**, as much relevant information as possible.
-  - Specify the signal-cli, JDK and OS version you're using. (and libsignal-client version, if self-compiled)
-  - Run the failing command with `--verbose` flag to get a more detailed log output and include that in the bug report
+- If you're unable to find an open issue addressing the
+  problem, [open a new one](https://github.com/AsamK/signal-cli/issues/new).
+    - Be sure to include a **title and clear description**, as much relevant information as possible.
+    - Specify the versions of signal-cli, libsignal-client (if self-compiled), JDK and OS you're using
+    - Specify if it's the normal java or the graalvm native version.
+    - Run the failing command with `--verbose` flag to get a more detailed log output and include that in the bug report
 
 # Pull request
+
 - Code style should match the existing code, IntelliJ users can use the auto formatter
 - Separate PRs should be opened for each implemented feature or bug fix

From a4f7632981526b8adc4c760a15c81fbe08023b58 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 27 Jan 2023 21:26:00 +0100
Subject: [PATCH 057/672] Update dependencies

---
 graalvm-config-dir/reflect-config.json                | 11 +++++++++++
 lib/build.gradle.kts                                  |  4 ++--
 .../java/org/asamk/signal/manager/ManagerImpl.java    |  3 ++-
 .../org/asamk/signal/manager/config/LiveConfig.java   |  3 ++-
 .../asamk/signal/manager/config/ServiceConfig.java    |  1 +
 .../asamk/signal/manager/config/StagingConfig.java    |  3 ++-
 .../signal/manager/util/NumberVerificationUtils.java  |  6 ++++--
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 61a3b144..a8573bf4 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2756,6 +2756,16 @@
     {"name":"width_"}
   ]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$BodyRange",
+  "fields":[
+    {"name":"associatedValueCase_"}, 
+    {"name":"associatedValue_"}, 
+    {"name":"bitField0_"}, 
+    {"name":"length_"}, 
+    {"name":"start_"}
+  ]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage",
   "fields":[
@@ -3190,6 +3200,7 @@
   "fields":[
     {"name":"bitField0_"}, 
     {"name":"blocked_"}, 
+    {"name":"callEvent_"}, 
     {"name":"configuration_"}, 
     {"name":"contacts_"}, 
     {"name":"fetchLatest_"}, 
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 0f91ee7a..0602bc92 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_65")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_66")
     implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1")
     implementation("com.google.protobuf", "protobuf-javalite", "3.21.12")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
@@ -22,7 +22,7 @@ dependencies {
     implementation("org.xerial", "sqlite-jdbc", "3.40.0.0")
     implementation("com.zaxxer", "HikariCP", "5.0.1")
 
-    testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.1")
+    testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.2")
 }
 
 tasks.named<Test>("test") {
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 5191e2d9..bb55746c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -588,7 +588,8 @@ class ManagerImpl implements Manager {
                     quote.message(),
                     List.of(),
                     resolveMentions(quote.mentions()),
-                    SignalServiceDataMessage.Quote.Type.NORMAL));
+                    SignalServiceDataMessage.Quote.Type.NORMAL,
+                    List.of()));
         }
         if (message.sticker().isPresent()) {
             final var sticker = message.sticker().get();
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 977544f2..19fc8873 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -71,7 +71,8 @@ class LiveConfig {
                 interceptors,
                 dns,
                 proxy,
-                zkGroupServerPublicParams);
+                zkGroupServerPublicParams,
+                true);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 72b089f9..1ee72051 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -40,6 +40,7 @@ public class ServiceConfig {
                 true,
                 true,
                 false,
+                false,
                 false);
 
         try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 050726b6..75fda55a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -71,7 +71,8 @@ class StagingConfig {
                 interceptors,
                 dns,
                 proxy,
-                zkGroupServerPublicParams);
+                zkGroupServerPublicParams,
+                true);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 280c9fbc..a4c2ba24 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -25,13 +25,15 @@ public class NumberVerificationUtils {
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
         captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
         final ServiceResponse<RequestVerificationCodeResponse> response;
+        final var locale = Utils.getDefaultLocale(Locale.US);
         if (voiceVerification) {
-            response = accountManager.requestVoiceVerificationCode(Utils.getDefaultLocale(Locale.US),
+            response = accountManager.requestVoiceVerificationCode(locale,
                     Optional.ofNullable(captcha),
                     Optional.empty(),
                     Optional.empty());
         } else {
-            response = accountManager.requestSmsVerificationCode(false,
+            response = accountManager.requestSmsVerificationCode(locale,
+                    false,
                     Optional.ofNullable(captcha),
                     Optional.empty(),
                     Optional.empty());

From 15da210de7d3540fef3603d71514a1283c503450 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 27 Jan 2023 21:46:39 +0100
Subject: [PATCH 058/672] Print text styles in plain text output

---
 .../signal/manager/api/MessageEnvelope.java   | 47 +++++++++++++++++--
 .../asamk/signal/ReceiveMessageHandler.java   | 12 +++++
 .../asamk/signal/dbus/DbusManagerImpl.java    |  2 +
 3 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 9b6a476e..c1726c1a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -39,6 +39,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static org.whispersystems.signalservice.internal.push.SignalServiceProtos.BodyRange;
+
 public record MessageEnvelope(
         Optional<RecipientAddress> sourceAddress,
         int sourceDevice,
@@ -113,7 +115,8 @@ public record MessageEnvelope(
             Optional<Sticker> sticker,
             List<SharedContact> sharedContacts,
             List<Mention> mentions,
-            List<Preview> previews
+            List<Preview> previews,
+            List<TextStyle> textStyles
     ) {
 
         static Data from(
@@ -154,6 +157,9 @@ public record MessageEnvelope(
                             .orElse(List.of()),
                     dataMessage.getPreviews()
                             .map(a -> a.stream().map(preview -> Preview.from(preview, fileProvider)).toList())
+                            .orElse(List.of()),
+                    dataMessage.getBodyRanges()
+                            .map(a -> a.stream().filter(BodyRange::hasStyle).map(TextStyle::from).toList())
                             .orElse(List.of()));
         }
 
@@ -216,7 +222,8 @@ public record MessageEnvelope(
                 RecipientAddress author,
                 Optional<String> text,
                 List<Mention> mentions,
-                List<Attachment> attachments
+                List<Attachment> attachments,
+                List<TextStyle> textStyles
         ) {
 
             static Quote from(
@@ -237,7 +244,14 @@ public record MessageEnvelope(
                                         .toList(),
                         quote.getAttachments() == null
                                 ? List.of()
-                                : quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList());
+                                : quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList(),
+                        quote.getBodyRanges() == null
+                                ? List.of()
+                                : quote.getBodyRanges()
+                                        .stream()
+                                        .filter(BodyRange::hasStyle)
+                                        .map(TextStyle::from)
+                                        .toList());
             }
         }
 
@@ -498,6 +512,33 @@ public record MessageEnvelope(
                         preview.getImage().map(as -> Attachment.from(as, fileProvider)));
             }
         }
+
+        public record TextStyle(Style style, int start, int length) {
+
+            public enum Style {
+                NONE,
+                BOLD,
+                ITALIC,
+                SPOILER,
+                STRIKETHROUGH,
+                MONOSPACE;
+
+                static Style from(BodyRange.Style style) {
+                    return switch (style) {
+                        case NONE -> NONE;
+                        case BOLD -> BOLD;
+                        case ITALIC -> ITALIC;
+                        case SPOILER -> SPOILER;
+                        case STRIKETHROUGH -> STRIKETHROUGH;
+                        case MONOSPACE -> MONOSPACE;
+                    };
+                }
+            }
+
+            static TextStyle from(BodyRange bodyRange) {
+                return new TextStyle(Style.from(bodyRange.getStyle()), bodyRange.getStart(), bodyRange.getLength());
+            }
+        }
     }
 
     public record Sync(
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 87753b05..c5270030 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -177,6 +177,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                 printMention(writer, mention);
             }
         }
+        if (message.textStyles().size() > 0) {
+            writer.println("Text styles:");
+            for (var textStyle : message.textStyles()) {
+                printTextStyle(writer, textStyle);
+            }
+        }
         if (message.attachments().size() > 0) {
             writer.println("Attachments:");
             for (var attachment : message.attachments()) {
@@ -555,6 +561,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         writer.println("- {}: {} (length: {})", formatContact(mention.recipient()), mention.start(), mention.length());
     }
 
+    private void printTextStyle(
+            PlainTextWriter writer, MessageEnvelope.Data.TextStyle textStyle
+    ) {
+        writer.println("- {}: {} (length: {})", textStyle.style().name(), textStyle.start(), textStyle.length());
+    }
+
     private void printAttachment(PlainTextWriter writer, MessageEnvelope.Data.Attachment attachment) {
         writer.println("Content-Type: {}", attachment.contentType());
         writer.println("Type: {}", attachment.id().isPresent() ? "Pointer" : "Stream");
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index d2a08131..0ccff735 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -778,6 +778,7 @@ public class DbusManagerImpl implements Manager {
                                 Optional.empty(),
                                 List.of(),
                                 List.of(),
+                                List.of(),
                                 List.of())),
                         Optional.empty(),
                         Optional.empty(),
@@ -852,6 +853,7 @@ public class DbusManagerImpl implements Manager {
                                         Optional.empty(),
                                         List.of(),
                                         List.of(),
+                                        List.of(),
                                         List.of())),
                                 Optional.empty())),
                                 Optional.empty(),

From 7816325e636287b57d55ecaac98400c653028987 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 5 Feb 2023 12:49:12 +0100
Subject: [PATCH 059/672] Fix issue with missing pni identity key

Fixes #1176
---
 .../asamk/signal/manager/storage/SignalAccount.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 9d44c297..4eea6af0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1378,7 +1378,7 @@ public class SignalAccount implements Closeable {
 
     public void setPniIdentityKeyPair(final IdentityKeyPair identityKeyPair) {
         pniIdentityKeyPair = identityKeyPair;
-        final var pniPublicKey = getPniIdentityKeyPair().getPublicKey();
+        final var pniPublicKey = identityKeyPair.getPublicKey();
         getIdentityKeyStore().saveIdentity(getPni(), pniPublicKey);
         getIdentityKeyStore().setIdentityTrustLevel(getPni(), pniPublicKey, TrustLevel.TRUSTED_VERIFIED);
         save();
@@ -1594,9 +1594,13 @@ public class SignalAccount implements Closeable {
         final var aciPublicKey = getAciIdentityKeyPair().getPublicKey();
         getIdentityKeyStore().saveIdentity(getAci(), aciPublicKey);
         getIdentityKeyStore().setIdentityTrustLevel(getAci(), aciPublicKey, TrustLevel.TRUSTED_VERIFIED);
-        final var pniPublicKey = getPniIdentityKeyPair().getPublicKey();
-        getIdentityKeyStore().saveIdentity(getPni(), pniPublicKey);
-        getIdentityKeyStore().setIdentityTrustLevel(getPni(), pniPublicKey, TrustLevel.TRUSTED_VERIFIED);
+        if (getPniIdentityKeyPair() == null) {
+            setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
+        } else {
+            final var pniPublicKey = getPniIdentityKeyPair().getPublicKey();
+            getIdentityKeyStore().saveIdentity(getPni(), pniPublicKey);
+            getIdentityKeyStore().setIdentityTrustLevel(getPni(), pniPublicKey, TrustLevel.TRUSTED_VERIFIED);
+        }
     }
 
     public void deleteAccountData() throws IOException {

From 4186349bbada033e8946b36d924e813045ec6a02 Mon Sep 17 00:00:00 2001
From: "Marvin A. Ruder" <github@mruder.dev>
Date: Mon, 6 Feb 2023 18:20:32 +0100
Subject: [PATCH 060/672] Bump sqlite-jdbc from 3.40.0.0 to 3.40.1.0 (#1178)

* Should fix #1129
---
 lib/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 0602bc92..b3dffa2f 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     implementation("com.google.protobuf", "protobuf-javalite", "3.21.12")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
     implementation("org.slf4j", "slf4j-api", "2.0.6")
-    implementation("org.xerial", "sqlite-jdbc", "3.40.0.0")
+    implementation("org.xerial", "sqlite-jdbc", "3.40.1.0")
     implementation("com.zaxxer", "HikariCP", "5.0.1")
 
     testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.2")

From d94ec8e144ccea20656d00a24cda70528a7a2825 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 13:28:44 +0100
Subject: [PATCH 061/672] Update dependencies

---
 build.gradle.kts  |   4 +-
 client/Cargo.lock | 208 ++++++++++++++++++++++++++--------------------
 2 files changed, 121 insertions(+), 91 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f79984a4..987ee2a3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.19"
+    id("org.graalvm.buildtools.native") version "0.9.20"
 }
 
 version = "0.11.6"
@@ -40,7 +40,7 @@ repositories {
 
 dependencies {
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1")
+    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.2")
     implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
     implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.2.1")
     implementation("org.slf4j", "slf4j-api", "2.0.6")
diff --git a/client/Cargo.lock b/client/Cargo.lock
index 128b7d0c..4ffb7140 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
 
 [[package]]
 name = "autocfg"
@@ -31,9 +31,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bstr"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
+checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832"
 dependencies = [
  "memchr",
  "serde",
@@ -41,15 +41,15 @@ dependencies = [
 
 [[package]]
 name = "bytes"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "cc"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 
 [[package]]
 name = "cfg-if"
@@ -59,9 +59,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.0.32"
+version = "4.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
 dependencies = [
  "bitflags",
  "clap_derive",
@@ -75,9 +75,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.0.21"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
+checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
 dependencies = [
  "heck",
  "proc-macro-error",
@@ -88,9 +88,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
+checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
 dependencies = [
  "os_str_bytes",
 ]
@@ -149,9 +149,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
+checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -164,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
+checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -174,15 +174,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
+checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -192,15 +192,15 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
+checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
+checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -209,21 +209,21 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
+checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
 
 [[package]]
 name = "futures-task"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
 
 [[package]]
 name = "futures-util"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
 dependencies = [
  "futures 0.1.31",
  "futures-channel",
@@ -264,9 +264,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
@@ -277,6 +277,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -288,24 +294,24 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.3"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.1",
  "io-lifetimes",
  "rustix",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -320,7 +326,7 @@ version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
  "derive_more",
- "futures 0.3.25",
+ "futures 0.3.26",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "jsonrpc-pubsub",
  "jsonrpc-server-utils 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
@@ -337,7 +343,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
 dependencies = [
- "futures 0.3.25",
+ "futures 0.3.26",
  "futures-executor",
  "futures-util",
  "log",
@@ -351,7 +357,7 @@ name = "jsonrpc-core"
 version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
- "futures 0.3.25",
+ "futures 0.3.26",
  "futures-executor",
  "futures-util",
  "log",
@@ -366,7 +372,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
 dependencies = [
- "futures 0.3.25",
+ "futures 0.3.26",
  "jsonrpc-client-transports",
 ]
 
@@ -386,7 +392,7 @@ name = "jsonrpc-pubsub"
 version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
- "futures 0.3.25",
+ "futures 0.3.26",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "lazy_static",
  "log",
@@ -402,7 +408,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
 dependencies = [
  "bytes",
- "futures 0.3.25",
+ "futures 0.3.26",
  "globset",
  "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static",
@@ -419,7 +425,7 @@ version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
  "bytes",
- "futures 0.3.25",
+ "futures 0.3.26",
  "globset",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "lazy_static",
@@ -475,14 +481,14 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "mio"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
+checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
 dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -491,15 +497,15 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.2.6",
  "libc",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.17.0"
+version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
 [[package]]
 name = "os_str_bytes"
@@ -513,7 +519,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
 dependencies = [
- "futures 0.3.25",
+ "futures 0.3.26",
  "libc",
  "log",
  "rand",
@@ -599,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.49"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
+checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
 dependencies = [
  "unicode-ident",
 ]
@@ -667,9 +673,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -693,16 +699,16 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.6"
+version = "0.36.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
+checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -745,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.91"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
+checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
 dependencies = [
  "itoa",
  "ryu",
@@ -815,28 +821,28 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
+checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a"
 dependencies = [
  "rustix",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.24.1"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
+checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
 dependencies = [
  "autocfg",
  "bytes",
@@ -847,7 +853,7 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -888,9 +894,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.10"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
  "serde",
 ]
@@ -975,43 +981,67 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+name = "windows-sys"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"

From 426b59d13e79fbe799f184b8605dfd2d31b34b36 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 13:58:33 +0100
Subject: [PATCH 062/672] Add dependencyResolutionManagement

---
 build.gradle.kts     | 19 +++++++------------
 lib/build.gradle.kts | 21 ++++++++-------------
 settings.gradle.kts  | 27 +++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 987ee2a3..77e6971a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,19 +33,14 @@ graalvmNative {
     }
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
 dependencies {
-    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.2")
-    implementation("net.sourceforge.argparse4j", "argparse4j", "0.9.0")
-    implementation("com.github.hypfvieh", "dbus-java-transport-native-unixsocket", "4.2.1")
-    implementation("org.slf4j", "slf4j-api", "2.0.6")
-    implementation("ch.qos.logback", "logback-classic", "1.4.5")
-    implementation("org.slf4j", "jul-to-slf4j", "2.0.6")
+    implementation(libs.bouncycastle)
+    implementation(libs.jackson.databind)
+    implementation(libs.argparse4j)
+    implementation(libs.dbusjava)
+    implementation(libs.slf4j.api)
+    implementation(libs.slf4j.jul)
+    implementation(libs.logback)
     implementation(project(":lib"))
 }
 
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index b3dffa2f..719f8bb0 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -8,21 +8,16 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_66")
-    implementation("com.fasterxml.jackson.core", "jackson-databind", "2.14.1")
-    implementation("com.google.protobuf", "protobuf-javalite", "3.21.12")
-    implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")
-    implementation("org.slf4j", "slf4j-api", "2.0.6")
-    implementation("org.xerial", "sqlite-jdbc", "3.40.1.0")
-    implementation("com.zaxxer", "HikariCP", "5.0.1")
+    implementation(libs.signalservice)
+    implementation(libs.jackson.databind)
+    implementation(libs.protobuf)
+    implementation(libs.bouncycastle)
+    implementation(libs.slf4j.api)
+    implementation(libs.sqlite)
+    implementation(libs.hikari)
 
-    testImplementation("org.junit.jupiter", "junit-jupiter", "5.9.2")
+    testImplementation(libs.junit)
 }
 
 tasks.named<Test>("test") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index eb34b67b..44ff0fbd 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,2 +1,29 @@
+dependencyResolutionManagement {
+    repositories {
+        mavenLocal()
+        mavenCentral()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            library("bouncycastle", "org.bouncycastle", "bcprov-jdk15on").version("1.70")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.14.2")
+            library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
+            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.2.1")
+            version("slf4j", "2.0.6")
+            library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
+            library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.4.5")
+
+
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_66")
+            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.40.1.0")
+            library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
+            library("junit", "org.junit.jupiter", "junit-jupiter").version("5.9.2")
+        }
+    }
+}
+
 rootProject.name = "signal-cli"
 include("lib")

From 3606fb67bb77feb7ac3ea5d73dc27b5a7abbf52b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 14:06:20 +0100
Subject: [PATCH 063/672] Update libsignal-service-java

---
 graalvm-config-dir/jni-config.json            | 12 ++++++-
 graalvm-config-dir/reflect-config.json        | 13 ++++++++
 .../signal/manager/config/LiveConfig.java     | 15 ++-------
 .../signal/manager/config/ServiceConfig.java  |  2 --
 .../config/ServiceEnvironmentConfig.java      |  7 ----
 .../signal/manager/config/StagingConfig.java  | 15 ++-------
 .../manager/helper/RecipientHelper.java       | 33 ++-----------------
 .../manager/util/MessageCacheUtils.java       |  5 +--
 settings.gradle.kts                           |  2 +-
 9 files changed, 34 insertions(+), 70 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index cad0e096..b168120e 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -1,4 +1,7 @@
 [
+{
+  "name":"[Z"
+},
 {
   "name":"com.sun.security.auth.module.UnixSystem",
   "fields":[
@@ -189,6 +192,10 @@
   "name":"org.signal.libsignal.zkgroup.InvalidInputException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"org.sqlite.BusyHandler",
+  "methods":[{"name":"callback","parameterTypes":["int"] }]
+},
 {
   "name":"org.sqlite.Collation",
   "methods":[{"name":"xCompare","parameterTypes":["java.lang.String","java.lang.String"] }]
@@ -218,11 +225,14 @@
   ]
 },
 {
-  "name":"org.sqlite.ProgressHandler"
+  "name":"org.sqlite.ProgressHandler",
+  "methods":[{"name":"progress","parameterTypes":[] }]
 },
 {
   "name":"org.sqlite.core.DB",
   "methods":[
+    {"name":"onCommit","parameterTypes":["boolean"] }, 
+    {"name":"onUpdate","parameterTypes":["int","java.lang.String","java.lang.String","long"] }, 
     {"name":"throwex","parameterTypes":[] }, 
     {"name":"throwex","parameterTypes":["int"] }
   ]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index a8573bf4..6e46f491 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -3064,6 +3064,7 @@
     {"name":"bitField0_"}, 
     {"name":"content_"}, 
     {"name":"destinationUuid_"}, 
+    {"name":"reportingToken_"}, 
     {"name":"serverGuid_"}, 
     {"name":"serverTimestamp_"}, 
     {"name":"sourceDevice_"}, 
@@ -3228,6 +3229,18 @@
     {"name":"uuids_"}
   ]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$CallEvent",
+  "fields":[
+    {"name":"bitField0_"}, 
+    {"name":"direction_"}, 
+    {"name":"event_"}, 
+    {"name":"id_"}, 
+    {"name":"peerUuid_"}, 
+    {"name":"timestamp_"}, 
+    {"name":"type_"}
+  ]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Configuration",
   "fields":[
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 19fc8873..fc917b2c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -7,7 +7,6 @@ import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
-import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
@@ -27,8 +26,7 @@ class LiveConfig {
 
     private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
-    private final static String CDS_MRENCLAVE = "74778bb0f93ae1f78c26e67152bab0bbeb693cd56d1bb9b4e9244157acc58081";
-    private final static String CDSI_MRENCLAVE = "ef4787a56a154ac6d009138cac17155acd23cfe4329281252365dd7c252e7fbf";
+    private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
 
     private final static String KEY_BACKUP_ENCLAVE_NAME = "e18376436159cda3ad7a45d9320e382e4a497f26b0dca34d8eab0bd0139483b5";
     private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
@@ -42,7 +40,6 @@ class LiveConfig {
     private final static String URL = "https://chat.signal.org";
     private final static String CDN_URL = "https://cdn.signal.org";
     private final static String CDN2_URL = "https://cdn2.signal.org";
-    private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api.directory.signal.org";
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
     private final static String STORAGE_URL = "https://storage.signal.org";
     private final static String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
@@ -62,17 +59,13 @@ class LiveConfig {
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalContactDiscoveryUrl[]{
-                        new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, TRUST_STORE)
-                },
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
                 interceptors,
                 dns,
                 proxy,
-                zkGroupServerPublicParams,
-                true);
+                zkGroupServerPublicParams);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
@@ -93,10 +86,6 @@ class LiveConfig {
                 FALLBACK_KEY_BACKUP_MRENCLAVE));
     }
 
-    static String getCdsMrenclave() {
-        return CDS_MRENCLAVE;
-    }
-
     static String getCdsiMrenclave() {
         return CDSI_MRENCLAVE;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 1ee72051..36bbdb7e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -90,14 +90,12 @@ public class ServiceConfig {
                     LiveConfig.getUnidentifiedSenderTrustRoot(),
                     LiveConfig.createKeyBackupConfig(),
                     LiveConfig.createFallbackKeyBackupConfigs(),
-                    LiveConfig.getCdsMrenclave(),
                     LiveConfig.getCdsiMrenclave());
             case STAGING -> new ServiceEnvironmentConfig(serviceEnvironment,
                     StagingConfig.createDefaultServiceConfiguration(interceptors),
                     StagingConfig.getUnidentifiedSenderTrustRoot(),
                     StagingConfig.createKeyBackupConfig(),
                     StagingConfig.createFallbackKeyBackupConfigs(),
-                    StagingConfig.getCdsMrenclave(),
                     StagingConfig.getCdsiMrenclave());
         };
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index 94169804..0ca2c914 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -15,7 +15,6 @@ public class ServiceEnvironmentConfig {
     private final KeyBackupConfig keyBackupConfig;
     private final Collection<KeyBackupConfig> fallbackKeyBackupConfigs;
 
-    private final String cdsMrenclave;
     private final String cdsiMrenclave;
 
     public ServiceEnvironmentConfig(
@@ -24,7 +23,6 @@ public class ServiceEnvironmentConfig {
             final ECPublicKey unidentifiedSenderTrustRoot,
             final KeyBackupConfig keyBackupConfig,
             final Collection<KeyBackupConfig> fallbackKeyBackupConfigs,
-            final String cdsMrenclave,
             final String cdsiMrenclave
     ) {
         this.type = type;
@@ -32,7 +30,6 @@ public class ServiceEnvironmentConfig {
         this.unidentifiedSenderTrustRoot = unidentifiedSenderTrustRoot;
         this.keyBackupConfig = keyBackupConfig;
         this.fallbackKeyBackupConfigs = fallbackKeyBackupConfigs;
-        this.cdsMrenclave = cdsMrenclave;
         this.cdsiMrenclave = cdsiMrenclave;
     }
 
@@ -56,10 +53,6 @@ public class ServiceEnvironmentConfig {
         return fallbackKeyBackupConfigs;
     }
 
-    public String getCdsMrenclave() {
-        return cdsMrenclave;
-    }
-
     public String getCdsiMrenclave() {
         return cdsiMrenclave;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 75fda55a..0090902e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -7,7 +7,6 @@ import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
-import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
@@ -27,8 +26,7 @@ class StagingConfig {
 
     private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
-    private final static String CDS_MRENCLAVE = "74778bb0f93ae1f78c26e67152bab0bbeb693cd56d1bb9b4e9244157acc58081";
-    private final static String CDSI_MRENCLAVE = "ef4787a56a154ac6d009138cac17155acd23cfe4329281252365dd7c252e7fbf";
+    private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
 
     private final static String KEY_BACKUP_ENCLAVE_NAME = "39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b";
     private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
@@ -42,7 +40,6 @@ class StagingConfig {
     private final static String URL = "https://chat.staging.signal.org";
     private final static String CDN_URL = "https://cdn-staging.signal.org";
     private final static String CDN2_URL = "https://cdn2-staging.signal.org";
-    private final static String SIGNAL_CONTACT_DISCOVERY_URL = "https://api-staging.directory.signal.org";
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
     private final static String STORAGE_URL = "https://storage-staging.signal.org";
     private final static String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
@@ -62,17 +59,13 @@ class StagingConfig {
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalContactDiscoveryUrl[]{
-                        new SignalContactDiscoveryUrl(SIGNAL_CONTACT_DISCOVERY_URL, TRUST_STORE)
-                },
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
                 interceptors,
                 dns,
                 proxy,
-                zkGroupServerPublicParams,
-                true);
+                zkGroupServerPublicParams);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
@@ -93,10 +86,6 @@ class StagingConfig {
                 FALLBACK_KEY_BACKUP_MRENCLAVE));
     }
 
-    static String getCdsMrenclave() {
-        return CDS_MRENCLAVE;
-    }
-
     static String getCdsiMrenclave() {
         return CDSI_MRENCLAVE;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 3a82cf8a..dc442f0e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -3,11 +3,9 @@ package org.asamk.signal.manager.helper;
 import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.ACI;
@@ -15,12 +13,8 @@ import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.CdsiV2Service;
-import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
-import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException;
-import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;
-import java.security.SignatureException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -108,13 +102,7 @@ public class RecipientHelper {
     }
 
     public Map<String, RegisteredUser> getRegisteredUsers(final Set<String> numbers) throws IOException {
-        Map<String, RegisteredUser> registeredUsers;
-        try {
-            registeredUsers = getRegisteredUsersV2(numbers, true);
-        } catch (IOException e) {
-            logger.warn("CDSI request failed, trying fallback to CDS", e);
-            registeredUsers = getRegisteredUsersV1(numbers);
-        }
+        Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, true);
 
         // Store numbers as recipients, so we have the number/uuid association
         registeredUsers.forEach((number, u) -> account.getRecipientTrustedResolver()
@@ -137,23 +125,6 @@ public class RecipientHelper {
         return user.getServiceId();
     }
 
-    private Map<String, RegisteredUser> getRegisteredUsersV1(final Set<String> numbers) throws IOException {
-        final Map<String, ACI> response;
-        try {
-            response = dependencies.getAccountManager()
-                    .getRegisteredUsers(ServiceConfig.getIasKeyStore(),
-                            numbers,
-                            serviceEnvironmentConfig.getCdsMrenclave());
-        } catch (Quote.InvalidQuoteFormatException | UnauthenticatedQuoteException | SignatureException |
-                 UnauthenticatedResponseException | InvalidKeyException | NumberFormatException e) {
-            throw new IOException(e);
-        }
-        final var registeredUsers = new HashMap<String, RegisteredUser>();
-        response.forEach((key, value) -> registeredUsers.put(key,
-                new RegisteredUser(Optional.of(value), Optional.empty())));
-        return registeredUsers;
-    }
-
     private Map<String, RegisteredUser> getRegisteredUsersV2(
             final Set<String> numbers, boolean useCompat
     ) throws IOException {
@@ -183,7 +154,7 @@ public class RecipientHelper {
     }
 
     private ACI getRegisteredUserByUsername(String username) throws IOException {
-        return dependencies.getAccountManager().getAciByUsername(username);
+        return dependencies.getAccountManager().getAciByUsernameHash(username);
     }
 
     public record RegisteredUser(Optional<ACI> aci, Optional<PNI> pni) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
index 3691ef08..d6d8ba44 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -96,8 +96,9 @@ public class MessageCacheUtils {
                     uuid,
                     destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid,
                     isUrgent,
-                    updatedPni == null ? "" : updatedPni,
-                    isStory);
+                    isStory,
+                    null,
+                    updatedPni == null ? "" : updatedPni);
         }
     }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 44ff0fbd..4dd94327 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.5")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_66")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_67")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.40.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From f97543eecd83763cffa243763434f9277b30a07e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 14:07:11 +0100
Subject: [PATCH 064/672] Update gradle

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 60756 -> 61608 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 ++-
 gradlew                                  |  12 ++++++++----
 gradlew.bat                              |   1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832f090a2944b7473328c07c9755baa3196..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
GIT binary patch
delta 39304
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
O;LQ#O9OtPYE&l^NyjRr#

delta 38549
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
ZVC+V^G{B{6>*6I(fn=qi;OgJn`X8G3)Bykh

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661e..fc10b601 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6..79a61d42 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
index 53a6b238..6689b85b 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

From 91e0db185c179a190843b26e661d861329712cde Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 14:20:39 +0100
Subject: [PATCH 065/672] Fix remove recipient method

Fixes #1183
---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 4eea6af0..e80f7901 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -415,9 +415,9 @@ public class SignalAccount implements Closeable {
     }
 
     public void removeRecipient(final RecipientId recipientId) {
+        final var recipientAddress = getRecipientStore().resolveRecipientAddress(recipientId);
         getRecipientStore().deleteRecipientData(recipientId);
         getMessageCache().deleteMessages(recipientId);
-        final var recipientAddress = getRecipientStore().resolveRecipientAddress(recipientId);
         if (recipientAddress.serviceId().isPresent()) {
             final var serviceId = recipientAddress.serviceId().get();
             getAciSessionStore().deleteAllSessions(serviceId);

From d63405d1709571b609883e61b9148f5354e74800 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 14:59:33 +0100
Subject: [PATCH 066/672] Bump version

---
 CHANGELOG.md     | 10 ++++++++++
 build.gradle.kts |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f0dafaa..f11486e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [0.11.7] - 2023-02-19
+
+### Fixed
+- Fix issue with missing pni identity key
+- Fix graalvm sqlite issue (Thanks @Marvin A. Ruder)
+- Fix issue with forgetting recipient
+
+### Changed
+- Allow JSON-RPC commands without account param if only one account exists
+
 ## [0.11.6] - 2022-12-18
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 77e6971a..3c064acd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.20"
 }
 
-version = "0.11.6"
+version = "0.11.7"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From 2e63c3b4f7f9575b972938aea447eee51469e22d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 16:05:14 +0100
Subject: [PATCH 067/672] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f11486e1..cd064695 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased]
 
 ## [0.11.7] - 2023-02-19
+**Attention**: Now requires native libsignal-client version 0.22.0
 
 ### Fixed
 - Fix issue with missing pni identity key

From 3206639778ed265ef42e72c6e89d4ccd43d486b5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Feb 2023 20:18:05 +0100
Subject: [PATCH 068/672] Scrub E164 in dbus path

Related #1189
---
 src/main/java/org/asamk/signal/logging/Scrubber.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/logging/Scrubber.java b/src/main/java/org/asamk/signal/logging/Scrubber.java
index efa196ce..2c60faa5 100644
--- a/src/main/java/org/asamk/signal/logging/Scrubber.java
+++ b/src/main/java/org/asamk/signal/logging/Scrubber.java
@@ -37,7 +37,7 @@ public final class Scrubber {
      * Supposedly, the shortest international phone numbers in use contain seven digits.
      * Handles URL encoded +, %2B
      */
-    private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B)(\\d{5,13})(\\d{2})");
+    private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B|/org/asamk/Signal/_)(\\d{5,13})(\\d{2})");
     private static final String E164_CENSOR = "*************";
 
     /**

From 75d7270d5a538e55d5c6a8b5aa833deba3631ab8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 3 Mar 2023 17:58:02 +0100
Subject: [PATCH 069/672] Add verbose exception log for send error

---
 graalvm-config-dir/reflect-config.json                          | 1 +
 .../main/java/org/asamk/signal/manager/helper/SendHelper.java   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 6e46f491..b9c3c280 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -3192,6 +3192,7 @@
     {"name":"attachmentCase_"}, 
     {"name":"attachment_"}, 
     {"name":"bitField0_"}, 
+    {"name":"bodyRanges_"}, 
     {"name":"group_"}, 
     {"name":"profileKey_"}
   ]
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 6d2021e0..d14c3807 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -200,6 +200,7 @@ public class SendHelper {
         } catch (IOException e) {
             var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
             logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
+            logger.debug("Exception", e);
             return SendMessageResult.networkFailure(address);
         }
     }
@@ -642,6 +643,7 @@ public class SendHelper {
             return SendMessageResult.identityFailure(address, e.getIdentityKey());
         } catch (IOException e) {
             logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
+            logger.debug("Exception", e);
             return SendMessageResult.networkFailure(address);
         }
     }

From f1fd5284838c1f01c8c56fd3aa4291ae6341a626 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 3 Mar 2023 18:06:31 +0100
Subject: [PATCH 070/672] Fix sending large text messages to multiple
 recipients

Fixes #1177
---
 lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index bb55746c..844c3323 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -569,7 +569,7 @@ class ManagerImpl implements Manager {
             final var textAttachment = AttachmentUtils.createAttachmentStream(new StreamDetails(new ByteArrayInputStream(
                     messageBytes), MimeUtils.LONG_TEXT, messageBytes.length), Optional.empty());
             messageBuilder.withBody(message.messageText().substring(0, 2000));
-            messageBuilder.withAttachment(textAttachment);
+            messageBuilder.withAttachment(context.getAttachmentHelper().uploadAttachment(textAttachment));
         } else {
             messageBuilder.withBody(message.messageText());
         }

From 15630356e18f59e8f4d29a5c9f215003ad07402e Mon Sep 17 00:00:00 2001
From: cedb <cedb@keylimebox.org>
Date: Sat, 7 Jan 2023 17:46:07 -0500
Subject: [PATCH 071/672] Change content-type check to check contains

So far it was doing an equals check, but a string like "application/json; charset=utf-8"
is similarly valid. And some clients like OkHttp actually automatically add the
charset.

Closes #1152
---
 src/main/java/org/asamk/signal/http/HttpServerHandler.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index a6213929..f7d06b15 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -89,7 +89,8 @@ public class HttpServerHandler {
             return;
         }
 
-        if (!"application/json".equals(httpExchange.getRequestHeaders().getFirst("Content-Type"))) {
+        final var contentType = httpExchange.getRequestHeaders().getFirst("Content-Type");
+        if (contentType == null || !contentType.startsWith("application/json")) {
             sendResponse(415, null, httpExchange);
             return;
         }

From 20b3563f21c9fe2d4f9ffea5e74da0eb1526aef1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Mar 2023 21:06:59 +0100
Subject: [PATCH 072/672] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc10b601..bdc9a83b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 276ecef3009baecb740f23d53ddaa81f487d57a2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 31 Mar 2023 17:16:59 +0200
Subject: [PATCH 073/672] Update libsignal-service-java

- Use session based number verification and registration
---
 graalvm-config-dir/jni-config.json            |   7 +
 graalvm-config-dir/reflect-config.json        |  89 ++++++-----
 .../signal/manager/RegistrationManager.java   |   3 +-
 .../manager/RegistrationManagerImpl.java      |  64 +++-----
 .../signal/manager/SignalDependencies.java    |   8 +-
 .../manager/api/CaptchaRequiredException.java |  11 ++
 .../manager/api/RateLimitException.java       |  15 ++
 .../signal/manager/helper/AccountHelper.java  |  55 ++++---
 .../signal/manager/helper/IdentityHelper.java |   2 +-
 .../helper/IncomingMessageHandler.java        |   5 +-
 .../signal/manager/helper/ReceiveHelper.java  |  22 ++-
 .../signal/manager/storage/SignalAccount.java |  41 +++++
 .../storage/messageCache/CachedMessage.java   |  19 ++-
 .../storage/messageCache/MessageCache.java    |   2 +-
 .../manager/util/NumberVerificationUtils.java | 143 ++++++++++++++----
 .../org/asamk/signal/manager/util/Utils.java  |  13 ++
 settings.gradle.kts                           |   2 +-
 .../signal/commands/RegisterCommand.java      |  12 ++
 .../signal/dbus/DbusSignalControlImpl.java    |   4 +
 19 files changed, 359 insertions(+), 158 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/RateLimitException.java

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index b168120e..09c4a05a 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -76,6 +76,13 @@
     {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }
   ]
 },
+{
+  "name":"org.asamk.signal.manager.storage.senderKeys.SenderKeyStore",
+  "methods":[
+    {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, 
+    {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }
+  ]
+},
 {
   "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints",
   "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index b9c3c280..d34b2243 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -78,22 +78,10 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true
 },
-{
-  "name":"com.google.protobuf.DescriptorMessageInfoFactory"
-},
-{
-  "name":"com.google.protobuf.ExtensionRegistry"
-},
-{
-  "name":"com.google.protobuf.ExtensionSchemaFull"
-},
 {
   "name":"com.google.protobuf.GeneratedMessageLite",
   "fields":[{"name":"unknownFields"}]
 },
-{
-  "name":"com.google.protobuf.GeneratedMessageV3"
-},
 {
   "name":"com.google.protobuf.Internal$LongList",
   "allDeclaredMethods":true
@@ -108,19 +96,10 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
-{
-  "name":"com.google.protobuf.MapFieldSchemaFull"
-},
-{
-  "name":"com.google.protobuf.NewInstanceSchemaFull"
-},
 {
   "name":"com.google.protobuf.PrimitiveNonBoxingCollection",
   "allDeclaredMethods":true
 },
-{
-  "name":"com.google.protobuf.UnknownFieldSetSchema"
-},
 {
   "name":"com.sun.crypto.provider.AESCipher$General",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -465,9 +444,6 @@
 {
   "name":"javax.smartcardio.CardPermission"
 },
-{
-  "name":"libcore.io.Memory"
-},
 {
   "name":"long",
   "allDeclaredMethods":true,
@@ -982,10 +958,6 @@
     {"name":"startColor","parameterTypes":[] }
   ]
 },
-{
-  "name":"org.asamk.signal.json.JsonStreamSerializer",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
 {
   "name":"org.asamk.signal.json.JsonSyncDataMessage",
   "allDeclaredFields":true,
@@ -1819,9 +1791,6 @@
   "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
   "allPublicConstructors":true
 },
-{
-  "name":"org.robolectric.Robolectric"
-},
 {
   "name":"org.signal.cdsi.proto.ClientRequest",
   "fields":[
@@ -2288,7 +2257,6 @@
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
   "methods":[
-    {"name":"getCode","parameterTypes":[] }, 
     {"name":"getNumber","parameterTypes":[] }, 
     {"name":"getRegistrationLock","parameterTypes":[] }
   ]
@@ -2712,6 +2680,25 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataJson",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.Integer","java.lang.Integer","java.lang.Integer","boolean","java.util.List","boolean"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.RegistrationSessionRequestBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[
+    {"name":"getAccountAttributes","parameterTypes":[] }, 
+    {"name":"getRecoveryPassword","parameterTypes":[] }, 
+    {"name":"getSessionId","parameterTypes":[] }, 
+    {"name":"getSkipDeviceTransfer","parameterTypes":[] }
+  ]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.SendGroupMessageResponse",
   "allDeclaredFields":true,
@@ -2896,16 +2883,6 @@
     {"name":"timestamp_"}
   ]
 },
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$BodyRange",
-  "fields":[
-    {"name":"associatedValueCase_"}, 
-    {"name":"associatedValue_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"length_"}, 
-    {"name":"start_"}
-  ]
-},
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact",
   "fields":[
@@ -3445,6 +3422,33 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.UpdateVerificationSessionRequestBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[
+    {"name":"getCaptcha","parameterTypes":[] }, 
+    {"name":"getMcc","parameterTypes":[] }, 
+    {"name":"getMnc","parameterTypes":[] }, 
+    {"name":"getPushChallenge","parameterTypes":[] }, 
+    {"name":"getPushToken","parameterTypes":[] }, 
+    {"name":"getPushTokenType","parameterTypes":[] }
+  ]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.VerificationSessionMetadataRequestBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[
+    {"name":"getMcc","parameterTypes":[] }, 
+    {"name":"getMnc","parameterTypes":[] }, 
+    {"name":"getNumber","parameterTypes":[] }, 
+    {"name":"getPushToken","parameterTypes":[] }, 
+    {"name":"getPushTokenType","parameterTypes":[] }
+  ]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.VerifyAccountResponse",
   "allDeclaredFields":true,
@@ -3544,6 +3548,7 @@
   "name":"org.whispersystems.signalservice.internal.storage.protos.ManifestRecord",
   "fields":[
     {"name":"identifiers_"}, 
+    {"name":"sourceDevice_"}, 
     {"name":"version_"}
   ]
 },
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index a92792c7..8ba2bf70 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -4,6 +4,7 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -12,7 +13,7 @@ public interface RegistrationManager extends Closeable {
 
     void register(
             boolean voiceVerification, String captcha
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException;
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException;
 
     void verifyAccount(
             String verificationCode, String pin
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
index 4b7c8362..f5bff4d2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
@@ -20,6 +20,7 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
@@ -27,6 +28,7 @@ import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.PinHelper;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
+import org.asamk.signal.manager.util.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
@@ -35,15 +37,13 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.internal.ServiceResponse;
+import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
 import java.io.IOException;
 import java.util.function.Consumer;
 
-import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
-
 class RegistrationManagerImpl implements RegistrationManager {
 
     private final static Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
@@ -106,7 +106,7 @@ class RegistrationManagerImpl implements RegistrationManager {
     @Override
     public void register(
             boolean voiceVerification, String captcha
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException {
         if (account.isRegistered()
                 && account.getServiceEnvironment() != null
                 && account.getServiceEnvironment() != serviceEnvironmentConfig.getType()) {
@@ -117,14 +117,21 @@ class RegistrationManagerImpl implements RegistrationManager {
             return;
         }
 
-        NumberVerificationUtils.requestVerificationCode(accountManager, captcha, voiceVerification);
+        String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
+                account.getSessionId(account.getNumber()),
+                id -> account.setSessionId(account.getNumber(), id),
+                voiceVerification,
+                captcha);
+        NumberVerificationUtils.requestVerificationCode(accountManager, sessionId, voiceVerification);
     }
 
     @Override
     public void verifyAccount(
             String verificationCode, String pin
     ) throws IOException, PinLockedException, IncorrectPinException {
-        final var result = NumberVerificationUtils.verifyNumber(verificationCode,
+        var sessionId = account.getSessionId(account.getNumber());
+        final var result = NumberVerificationUtils.verifyNumber(sessionId,
+                verificationCode,
                 pin,
                 pinHelper,
                 this::verifyAccountWithCode);
@@ -186,17 +193,7 @@ class RegistrationManagerImpl implements RegistrationManager {
                     userAgent,
                     null,
                     ServiceConfig.AUTOMATIC_NETWORK_RETRY);
-            accountManager.setAccountAttributes(null,
-                    account.getLocalRegistrationId(),
-                    true,
-                    null,
-                    account.getRegistrationLock(),
-                    account.getSelfUnidentifiedAccessKey(),
-                    account.isUnrestrictedUnidentifiedAccess(),
-                    capabilities,
-                    account.isDiscoverableByPhoneNumber(),
-                    account.getEncryptedDeviceName(),
-                    account.getLocalPniRegistrationId());
+            accountManager.setAccountAttributes(account.getAccountAttributes(null));
             account.setRegistered(true);
             logger.info("Reactivated existing account, verify is not necessary.");
             if (newManagerListener != null) {
@@ -215,29 +212,18 @@ class RegistrationManagerImpl implements RegistrationManager {
         return false;
     }
 
-    private ServiceResponse<VerifyAccountResponse> verifyAccountWithCode(
-            final String verificationCode, final String registrationLock
-    ) {
-        if (registrationLock == null) {
-            return accountManager.verifyAccount(verificationCode,
-                    account.getLocalRegistrationId(),
-                    true,
-                    account.getSelfUnidentifiedAccessKey(),
-                    account.isUnrestrictedUnidentifiedAccess(),
-                    ServiceConfig.capabilities,
-                    account.isDiscoverableByPhoneNumber(),
-                    account.getLocalPniRegistrationId());
-        } else {
-            return accountManager.verifyAccountWithRegistrationLockPin(verificationCode,
-                    account.getLocalRegistrationId(),
-                    true,
-                    registrationLock,
-                    account.getSelfUnidentifiedAccessKey(),
-                    account.isUnrestrictedUnidentifiedAccess(),
-                    ServiceConfig.capabilities,
-                    account.isDiscoverableByPhoneNumber(),
-                    account.getLocalPniRegistrationId());
+    private VerifyAccountResponse verifyAccountWithCode(
+            final String sessionId, final String verificationCode, final String registrationLock
+    ) throws IOException {
+        try {
+            Utils.handleResponseException(accountManager.verifyAccount(verificationCode, sessionId));
+        } catch (AlreadyVerifiedException e) {
+            // Already verified so can continue registering
         }
+        return Utils.handleResponseException(accountManager.registerAccount(sessionId,
+                null,
+                account.getAccountAttributes(registrationLock),
+                true));
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
index 3b3b375a..f4489ea7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
@@ -88,6 +88,10 @@ public class SignalDependencies {
         return serviceEnvironmentConfig;
     }
 
+    public SignalSessionLock getSessionLock() {
+        return sessionLock;
+    }
+
     public SignalServiceAccountManager getAccountManager() {
         return getOrCreate(() -> accountManager,
                 () -> accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
@@ -115,7 +119,7 @@ public class SignalDependencies {
 
     public GroupsV2Operations getGroupsV2Operations() {
         return getOrCreate(() -> groupsV2Operations,
-                () -> groupsV2Operations = capabilities.isGv2()
+                () -> groupsV2Operations = capabilities.getGv2()
                         ? new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
                         ServiceConfig.GROUP_MAX_SIZE)
                         : null);
@@ -123,7 +127,7 @@ public class SignalDependencies {
 
     private ClientZkOperations getClientZkOperations() {
         return getOrCreate(() -> clientZkOperations,
-                () -> clientZkOperations = capabilities.isGv2()
+                () -> clientZkOperations = capabilities.getGv2()
                         ? ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration())
                         : null);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java b/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java
index 9504d240..86fcdc93 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRequiredException.java
@@ -2,6 +2,13 @@ package org.asamk.signal.manager.api;
 
 public class CaptchaRequiredException extends Exception {
 
+    private long nextAttemptTimestamp;
+
+    public CaptchaRequiredException(final long nextAttemptTimestamp) {
+        super("Captcha required");
+        this.nextAttemptTimestamp = nextAttemptTimestamp;
+    }
+
     public CaptchaRequiredException(final String message) {
         super(message);
     }
@@ -9,4 +16,8 @@ public class CaptchaRequiredException extends Exception {
     public CaptchaRequiredException(final String message, final Throwable cause) {
         super(message, cause);
     }
+
+    public long getNextAttemptTimestamp() {
+        return nextAttemptTimestamp;
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RateLimitException.java b/lib/src/main/java/org/asamk/signal/manager/api/RateLimitException.java
new file mode 100644
index 00000000..54fcbbd1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RateLimitException.java
@@ -0,0 +1,15 @@
+package org.asamk.signal.manager.api;
+
+public class RateLimitException extends Exception {
+
+    private final long nextAttemptTimestamp;
+
+    public RateLimitException(final long nextAttemptTimestamp) {
+        super("Rate limit");
+        this.nextAttemptTimestamp = nextAttemptTimestamp;
+    }
+
+    public long getNextAttemptTimestamp() {
+        return nextAttemptTimestamp;
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 36cd76a3..2b6c812b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -7,10 +7,11 @@ import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
-import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
+import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
@@ -21,6 +22,7 @@ import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
+import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
@@ -128,9 +130,14 @@ public class AccountHelper {
 
     public void startChangeNumber(
             String newNumber, String captcha, boolean voiceVerification
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException {
         final var accountManager = dependencies.createUnauthenticatedAccountManager(newNumber, account.getPassword());
-        NumberVerificationUtils.requestVerificationCode(accountManager, captcha, voiceVerification);
+        String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
+                account.getSessionId(newNumber),
+                id -> account.setSessionId(newNumber, id),
+                voiceVerification,
+                captcha);
+        NumberVerificationUtils.requestVerificationCode(accountManager, sessionId, voiceVerification);
     }
 
     public void finishChangeNumber(
@@ -140,17 +147,28 @@ public class AccountHelper {
         final List<OutgoingPushMessage> deviceMessages = null;
         final Map<String, SignedPreKeyEntity> devicePniSignedPreKeys = null;
         final Map<String, Integer> pniRegistrationIds = null;
-        final var result = NumberVerificationUtils.verifyNumber(verificationCode,
+        var sessionId = account.getSessionId(account.getNumber());
+        final var result = NumberVerificationUtils.verifyNumber(sessionId,
+                verificationCode,
                 pin,
                 context.getPinHelper(),
-                (verificationCode1, registrationLock) -> dependencies.getAccountManager()
-                        .changeNumber(new ChangePhoneNumberRequest(newNumber,
-                                verificationCode1,
-                                registrationLock,
-                                account.getPniIdentityKeyPair().getPublicKey(),
-                                deviceMessages,
-                                devicePniSignedPreKeys,
-                                pniRegistrationIds)));
+                (sessionId1, verificationCode1, registrationLock) -> {
+                    final var accountManager = dependencies.getAccountManager();
+                    try {
+                        Utils.handleResponseException(accountManager.verifyAccount(verificationCode, sessionId1));
+                    } catch (AlreadyVerifiedException e) {
+                        // Already verified so can continue changing number
+                    }
+                    return Utils.handleResponseException(accountManager.changeNumber(new ChangePhoneNumberRequest(
+                            sessionId1,
+                            null,
+                            newNumber,
+                            registrationLock,
+                            account.getPniIdentityKeyPair().getPublicKey(),
+                            deviceMessages,
+                            devicePniSignedPreKeys,
+                            pniRegistrationIds)));
+                });
         // TODO handle response
         updateSelfIdentifiers(newNumber, account.getAci(), PNI.parseOrThrow(result.first().getPni()));
     }
@@ -162,18 +180,7 @@ public class AccountHelper {
     }
 
     public void updateAccountAttributes() throws IOException {
-        dependencies.getAccountManager()
-                .setAccountAttributes(null,
-                        account.getLocalRegistrationId(),
-                        true,
-                        null,
-                        account.getRegistrationLock(),
-                        account.getSelfUnidentifiedAccessKey(),
-                        account.isUnrestrictedUnidentifiedAccess(),
-                        ServiceConfig.capabilities,
-                        account.isDiscoverableByPhoneNumber(),
-                        account.getEncryptedDeviceName(),
-                        account.getLocalPniRegistrationId());
+        dependencies.getAccountManager().setAccountAttributes(account.getAccountAttributes(null));
     }
 
     public void addDevice(DeviceLinkInfo deviceLinkInfo) throws IOException, InvalidDeviceLinkException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index 0efe90a4..b908823a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -80,7 +80,7 @@ public class IdentityHelper {
         final var address = account.getRecipientAddressResolver()
                 .resolveRecipientAddress(account.getRecipientResolver().resolveRecipient(serviceId));
 
-        return Utils.computeSafetyNumber(capabilities.isUuid(),
+        return Utils.computeSafetyNumber(capabilities.getUuid(),
                 account.getSelfRecipientAddress(),
                 account.getAciIdentityKeyPair().getPublicKey(),
                 address.getServiceId().equals(serviceId)
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index bd42ae5f..3a834a70 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -44,12 +44,14 @@ import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
 import org.signal.libsignal.metadata.SelfSendException;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.crypto.SignalGroupSessionBuilder;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
@@ -275,7 +277,8 @@ public final class IncomingMessageHandler {
             logger.debug("Received a sender key distribution message for distributionId {} from {}",
                     message.getDistributionId(),
                     protocolAddress);
-            dependencies.getMessageSender().processSenderKeyDistributionMessage(protocolAddress, message);
+            new SignalGroupSessionBuilder(dependencies.getSessionLock(),
+                    new GroupSessionBuilder(account.getSenderKeyStore())).process(protocolAddress, message);
         }
 
         if (content.getDecryptionErrorMessage().isPresent()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index c15f4f94..2c5dbe69 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -144,22 +144,28 @@ public class ReceiveHelper {
             logger.debug("Checking for new message from server");
             try {
                 isWaitingForMessage = true;
-                var result = signalWebSocket.readOrEmpty(timeout.toMillis(), envelope1 -> {
+                var queueNotEmpty = signalWebSocket.readMessageBatch(timeout.toMillis(), 1, batch -> {
+                    logger.debug("Retrieved {} envelopes!", batch.size());
                     isWaitingForMessage = false;
-                    final var recipientId = envelope1.hasSourceUuid() ? account.getRecipientResolver()
-                            .resolveRecipient(envelope1.getSourceAddress()) : null;
-                    logger.trace("Storing new message from {}", recipientId);
-                    // store message on disk, before acknowledging receipt to the server
-                    cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
+                    for (final var it : batch) {
+                        SignalServiceEnvelope envelope1 = new SignalServiceEnvelope(it.getEnvelope(),
+                                it.getServerDeliveredTimestamp());
+                        final var recipientId = envelope1.hasSourceUuid() ? account.getRecipientResolver()
+                                .resolveRecipient(envelope1.getSourceAddress()) : null;
+                        logger.trace("Storing new message from {}", recipientId);
+                        // store message on disk, before acknowledging receipt to the server
+                        cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
+                    }
+                    return true;
                 });
                 isWaitingForMessage = false;
                 backOffCounter = 0;
 
-                if (result.isPresent()) {
+                if (queueNotEmpty) {
                     if (remainingMessages > 0) {
                         remainingMessages -= 1;
                     }
-                    envelope = result.get();
+                    envelope = cachedMessage[0].loadEnvelope();
                     logger.debug("New message received from server");
                 } else {
                     logger.debug("Received indicator that server queue is empty");
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index e80f7901..25847c6c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -62,6 +62,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
+import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.ACI;
@@ -97,6 +98,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
+
 public class SignalAccount implements Closeable {
 
     private final static Logger logger = LoggerFactory.getLogger(SignalAccount.class);
@@ -119,6 +122,8 @@ public class SignalAccount implements Closeable {
     private String number;
     private ACI aci;
     private PNI pni;
+    private String sessionId;
+    private String sessionNumber;
     private String encryptedDeviceName;
     private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
     private boolean isMultiDevice = false;
@@ -551,6 +556,12 @@ public class SignalAccount implements Closeable {
                 throw new IOException("Config file contains an invalid pni, needs to be a valid UUID", e);
             }
         }
+        if (rootNode.hasNonNull("sessionId")) {
+            sessionId = rootNode.get("sessionId").asText();
+        }
+        if (rootNode.hasNonNull("sessionNumber")) {
+            sessionNumber = rootNode.get("sessionNumber").asText();
+        }
         if (rootNode.hasNonNull("deviceName")) {
             encryptedDeviceName = rootNode.get("deviceName").asText();
         }
@@ -926,6 +937,8 @@ public class SignalAccount implements Closeable {
                     .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
                     .put("uuid", aci == null ? null : aci.toString())
                     .put("pni", pni == null ? null : pni.toString())
+                    .put("sessionId", sessionId)
+                    .put("sessionNumber", sessionNumber)
                     .put("deviceName", encryptedDeviceName)
                     .put("deviceId", deviceId)
                     .put("isMultiDevice", isMultiDevice)
@@ -1293,6 +1306,21 @@ public class SignalAccount implements Closeable {
         save();
     }
 
+    public AccountAttributes getAccountAttributes(String registrationLock) {
+        return new AccountAttributes(null,
+                getLocalRegistrationId(),
+                true,
+                null,
+                registrationLock != null ? registrationLock : getRegistrationLock(),
+                getSelfUnidentifiedAccessKey(),
+                isUnrestrictedUnidentifiedAccess(),
+                capabilities,
+                isDiscoverableByPhoneNumber(),
+                encryptedDeviceName,
+                getLocalPniRegistrationId(),
+                null); // TODO recoveryPassword?
+    }
+
     public ServiceId getAccountId(ServiceIdType serviceIdType) {
         return serviceIdType.equals(ServiceIdType.ACI) ? aci : pni;
     }
@@ -1347,6 +1375,19 @@ public class SignalAccount implements Closeable {
         return getRecipientResolver().resolveRecipient(getSelfRecipientAddress());
     }
 
+    public String getSessionId(final String forNumber) {
+        if (!forNumber.equals(sessionNumber)) {
+            return null;
+        }
+        return sessionId;
+    }
+
+    public void setSessionId(final String sessionNumber, final String sessionId) {
+        this.sessionNumber = sessionNumber;
+        this.sessionId = sessionId;
+        save();
+    }
+
     public byte[] getEncryptedDeviceName() {
         return encryptedDeviceName == null ? null : Base64.getDecoder().decode(encryptedDeviceName);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
index c1f310e8..e053b91f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
@@ -15,21 +15,30 @@ public final class CachedMessage {
 
     private final File file;
 
+    private SignalServiceEnvelope envelope;
+
     CachedMessage(final File file) {
         this.file = file;
     }
 
+    CachedMessage(final File file, SignalServiceEnvelope envelope) {
+        this.file = file;
+        this.envelope = envelope;
+    }
+
     File getFile() {
         return file;
     }
 
     public SignalServiceEnvelope loadEnvelope() {
-        try {
-            return MessageCacheUtils.loadEnvelope(file);
-        } catch (Exception e) {
-            logger.error("Failed to load cached message envelope “{}”: {}", file, e.getMessage(), e);
-            return null;
+        if (envelope == null) {
+            try {
+                envelope = MessageCacheUtils.loadEnvelope(file);
+            } catch (Exception e) {
+                logger.error("Failed to load cached message envelope “{}”: {}", file, e.getMessage(), e);
+            }
         }
+        return envelope;
     }
 
     public void delete() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index 4853b223..083dba06 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -54,7 +54,7 @@ public class MessageCache {
         try {
             var cacheFile = getMessageCacheFile(recipientId, now, envelope.getTimestamp());
             MessageCacheUtils.storeEnvelope(envelope, cacheFile);
-            return new CachedMessage(cacheFile);
+            return new CachedMessage(cacheFile, envelope);
         } catch (IOException e) {
             logger.warn("Failed to store encrypted message in disk cache, ignoring: {}", e.getMessage());
             return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index a4c2ba24..3d733c16 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -5,41 +5,94 @@ import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.helper.PinHelper;
 import org.whispersystems.signalservice.api.KbsPinData;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
+import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.signalservice.api.push.exceptions.PushChallengeRequiredException;
+import org.whispersystems.signalservice.api.push.exceptions.TokenNotAcceptedException;
 import org.whispersystems.signalservice.internal.ServiceResponse;
 import org.whispersystems.signalservice.internal.push.LockedException;
-import org.whispersystems.signalservice.internal.push.RequestVerificationCodeResponse;
+import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 
 import java.io.IOException;
 import java.util.Locale;
-import java.util.Optional;
+import java.util.function.Consumer;
 
 public class NumberVerificationUtils {
 
+    public static String handleVerificationSession(
+            SignalServiceAccountManager accountManager,
+            String sessionId,
+            Consumer<String> sessionIdSaver,
+            boolean voiceVerification,
+            String captcha
+    ) throws CaptchaRequiredException, IOException, RateLimitException {
+        RegistrationSessionMetadataResponse sessionResponse;
+        try {
+            sessionResponse = getValidSession(accountManager, sessionId);
+        } catch (PushChallengeRequiredException |
+                 org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) {
+            if (captcha != null) {
+                sessionResponse = submitCaptcha(accountManager, sessionId, captcha);
+            } else {
+                throw new CaptchaRequiredException("Captcha Required");
+            }
+        }
+
+        sessionId = sessionResponse.getBody().getId();
+        sessionIdSaver.accept(sessionId);
+
+        if (sessionResponse.getBody().getVerified()) {
+            return sessionId;
+        }
+
+        if (sessionResponse.getBody().getAllowedToRequestCode()) {
+            return sessionId;
+        }
+
+        final var nextAttempt = voiceVerification
+                ? sessionResponse.getBody().getNextCall()
+                : sessionResponse.getBody().getNextSms();
+        if (nextAttempt != null && nextAttempt > 0) {
+            final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextAttempt * 1000;
+            throw new RateLimitException(timestamp);
+        }
+
+        final var nextVerificationAttempt = sessionResponse.getBody().getNextVerificationAttempt();
+        if (nextVerificationAttempt != null && nextVerificationAttempt > 0) {
+            final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextVerificationAttempt * 1000;
+            throw new CaptchaRequiredException(timestamp);
+        }
+
+        if (sessionResponse.getBody().getRequestedInformation().contains("captcha")) {
+            if (captcha != null) {
+                sessionResponse = submitCaptcha(accountManager, sessionId, captcha);
+            }
+            if (!sessionResponse.getBody().getAllowedToRequestCode()) {
+                throw new CaptchaRequiredException("Captcha Required");
+            }
+        }
+
+        return sessionId;
+    }
+
     public static void requestVerificationCode(
-            SignalServiceAccountManager accountManager, String captcha, boolean voiceVerification
+            SignalServiceAccountManager accountManager, String sessionId, boolean voiceVerification
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
-        captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
-        final ServiceResponse<RequestVerificationCodeResponse> response;
+        final ServiceResponse<RegistrationSessionMetadataResponse> response;
         final var locale = Utils.getDefaultLocale(Locale.US);
         if (voiceVerification) {
-            response = accountManager.requestVoiceVerificationCode(locale,
-                    Optional.ofNullable(captcha),
-                    Optional.empty(),
-                    Optional.empty());
+            response = accountManager.requestVoiceVerificationCode(sessionId, locale, false);
         } else {
-            response = accountManager.requestSmsVerificationCode(locale,
-                    false,
-                    Optional.ofNullable(captcha),
-                    Optional.empty(),
-                    Optional.empty());
+            response = accountManager.requestSmsVerificationCode(sessionId, locale, false);
         }
         try {
-            handleResponseException(response);
+            Utils.handleResponseException(response);
         } catch (org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) {
             throw new CaptchaRequiredException(e.getMessage(), e);
         } catch (org.whispersystems.signalservice.api.push.exceptions.NonNormalizedPhoneNumberException e) {
@@ -51,11 +104,11 @@ public class NumberVerificationUtils {
     }
 
     public static Pair<VerifyAccountResponse, MasterKey> verifyNumber(
-            String verificationCode, String pin, PinHelper pinHelper, Verifier verifier
+            String sessionId, String verificationCode, String pin, PinHelper pinHelper, Verifier verifier
     ) throws IOException, PinLockedException, IncorrectPinException {
         verificationCode = verificationCode.replace("-", "");
         try {
-            final var response = verifyAccountWithCode(verificationCode, null, verifier);
+            final var response = verifier.verify(sessionId, verificationCode, null);
 
             return new Pair<>(response, null);
         } catch (LockedException e) {
@@ -72,7 +125,7 @@ public class NumberVerificationUtils {
             var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
             VerifyAccountResponse response;
             try {
-                response = verifyAccountWithCode(verificationCode, registrationLock, verifier);
+                response = verifier.verify(sessionId, verificationCode, registrationLock);
             } catch (LockedException _e) {
                 throw new AssertionError("KBS Pin appeared to matched but reg lock still failed!");
             }
@@ -81,29 +134,53 @@ public class NumberVerificationUtils {
         }
     }
 
-    private static VerifyAccountResponse verifyAccountWithCode(
-            final String verificationCode, final String registrationLock, final Verifier verifier
+    private static RegistrationSessionMetadataResponse validateSession(
+            final SignalServiceAccountManager accountManager, final String sessionId
     ) throws IOException {
-        final var response = verifier.verify(verificationCode, registrationLock);
-        handleResponseException(response);
-        return response.getResult().get();
+        if (sessionId == null || sessionId.isEmpty()) {
+            throw new NoSuchSessionException();
+        }
+        return Utils.handleResponseException(accountManager.getRegistrationSession(sessionId));
     }
 
-    private static void handleResponseException(final ServiceResponse<?> response) throws IOException {
-        final var throwableOptional = response.getExecutionError().or(response::getApplicationError);
-        if (throwableOptional.isPresent()) {
-            if (throwableOptional.get() instanceof IOException) {
-                throw (IOException) throwableOptional.get();
-            } else {
-                throw new IOException(throwableOptional.get());
+    private static RegistrationSessionMetadataResponse requestValidSession(
+            final SignalServiceAccountManager accountManager
+    ) throws NoSuchSessionException, IOException {
+        return Utils.handleResponseException(accountManager.createRegistrationSession(null, "", ""));
+    }
+
+    private static RegistrationSessionMetadataResponse getValidSession(
+            final SignalServiceAccountManager accountManager, final String sessionId
+    ) throws IOException {
+        try {
+            return validateSession(accountManager, sessionId);
+        } catch (NoSuchSessionException e) {
+            return requestValidSession(accountManager);
+        }
+    }
+
+    private static RegistrationSessionMetadataResponse submitCaptcha(
+            SignalServiceAccountManager accountManager, String sessionId, String captcha
+    ) throws IOException, CaptchaRequiredException {
+        captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
+        try {
+            return Utils.handleResponseException(accountManager.submitCaptchaToken(sessionId, captcha));
+        } catch (PushChallengeRequiredException |
+                 org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException |
+                 TokenNotAcceptedException _e) {
+            throw new CaptchaRequiredException("Captcha not accepted");
+        } catch (NonSuccessfulResponseCodeException e) {
+            if (e.getCode() == 400) {
+                throw new CaptchaRequiredException("Captcha has invalid format");
             }
+            throw e;
         }
     }
 
     public interface Verifier {
 
-        ServiceResponse<VerifyAccountResponse> verify(
-                String verificationCode, String registrationLock
-        );
+        VerifyAccountResponse verify(
+                String sessionId, String verificationCode, String registrationLock
+        ) throws IOException;
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 792a107d..efa72bf2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -8,6 +8,7 @@ import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.StreamDetails;
+import org.whispersystems.signalservice.internal.ServiceResponse;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -128,4 +129,16 @@ public class Utils {
         }
         return map;
     }
+
+    public static <T> T handleResponseException(final ServiceResponse<T> response) throws IOException {
+        final var throwableOptional = response.getExecutionError().or(response::getApplicationError);
+        if (throwableOptional.isPresent()) {
+            if (throwableOptional.get() instanceof IOException) {
+                throw (IOException) throwableOptional.get();
+            } else {
+                throw new IOException(throwableOptional.get());
+            }
+        }
+        return response.getResult().orElse(null);
+    }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4dd94327..70dc23c1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.5")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_67")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_68")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.40.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 84287877..5ba66d7a 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -13,7 +13,9 @@ import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.util.DateUtils;
 
 import java.io.IOException;
 import java.util.List;
@@ -65,6 +67,12 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
     ) throws UserErrorException, IOErrorException {
         try {
             m.register(voiceVerification, captcha);
+        } catch (RateLimitException e) {
+            String message = "Rate limit reached";
+            if (e.getNextAttemptTimestamp() > 0) {
+                message += "\nNext attempt may be tried at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
+            }
+            throw new UserErrorException(message);
         } catch (CaptchaRequiredException e) {
             String message;
             if (captcha == null) {
@@ -76,6 +84,10 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
             } else {
                 message = "Invalid captcha given.";
             }
+            if (e.getNextAttemptTimestamp() > 0) {
+                message += "\nNext Captcha may be provided at "
+                        + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
+            }
             throw new UserErrorException(message);
         } catch (NonNormalizedPhoneNumberException e) {
             throw new UserErrorException("Failed to register: " + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index 59afebf8..5c4d807e 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -11,6 +11,7 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
 import org.freedesktop.dbus.DBusPath;
 
@@ -59,6 +60,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
         }
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.register(voiceVerification, captcha);
+        } catch (RateLimitException e) {
+            String message = "Rate limit reached";
+            throw new SignalControl.Error.Failure(message);
         } catch (CaptchaRequiredException e) {
             String message = captcha == null ? "Captcha required for verification." : "Invalid captcha given.";
             throw new SignalControl.Error.RequiresCaptcha(message);

From 21aa2b2a7f75787413abe282a1c8711dbc7a846f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 1 Apr 2023 12:35:46 +0200
Subject: [PATCH 074/672] Update dependencies

---
 settings.gradle.kts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 70dc23c1..cade6fe9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,16 +9,16 @@ dependencyResolutionManagement {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk15on").version("1.70")
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.14.2")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
-            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.2.1")
-            version("slf4j", "2.0.6")
+            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.0")
+            version("slf4j", "2.0.7")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.4.5")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.4.6")
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_68")
-            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.0")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.40.1.0")
+            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.2")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.9.2")
         }

From 49591aedb4ecce3a34ee72e4e8e455c1b72358af Mon Sep 17 00:00:00 2001
From: exquo <62397152+exquo@users.noreply.github.com>
Date: Sun, 2 Apr 2023 15:58:54 +0000
Subject: [PATCH 075/672] Document accepting group invitations (#1218)

---
 man/signal-cli-dbus.5.adoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc
index 1d78f7f6..46b11734 100644
--- a/man/signal-cli-dbus.5.adoc
+++ b/man/signal-cli-dbus.5.adoc
@@ -463,6 +463,7 @@ addMembers(recipients<as>) -> <>::
 * recipients : String array of phone numbers
 
 Add recipients to group if they are pending members; otherwise add recipients to list of requesting members.
+This command is also used to accept group invitations by adding yourself to a group.
 
 Exceptions: Failure
 

From db42f61cbb763c6e20ab6dc2fd47ae412b6fe953 Mon Sep 17 00:00:00 2001
From: signals-from-outer-space <signaling@gmx.net>
Date: Sun, 2 Apr 2023 08:34:43 +0200
Subject: [PATCH 076/672] Added missing file attachment attributes in
 JsonAttachment output

Closes #1217
Fixes #1216
---
 .../org/asamk/signal/json/JsonAttachment.java | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java
index 1f6e6510..c75b3987 100644
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -2,12 +2,33 @@ package org.asamk.signal.json;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
-record JsonAttachment(String contentType, String filename, String id, Long size) {
+record JsonAttachment(
+        String contentType,
+        String filename,
+        String id,
+        Long size,
+        Integer width,
+        Integer height,
+        String caption,
+        Long uploadTimestamp
+) {
 
     static JsonAttachment from(MessageEnvelope.Data.Attachment attachment) {
         final var id = attachment.id().orElse(null);
         final var filename = attachment.fileName().orElse(null);
         final var size = attachment.size().orElse(null);
-        return new JsonAttachment(attachment.contentType(), filename, id, size);
+        final var width = attachment.width().orElse(null);
+        final var height = attachment.height().orElse(null);
+        final var caption = attachment.caption().orElse(null);
+        final var uploadTimestamp = attachment.uploadTimestamp().orElse(null);
+
+        return new JsonAttachment(attachment.contentType(),
+                filename,
+                id,
+                size,
+                width,
+                height,
+                caption,
+                uploadTimestamp);
     }
 }

From 03f193b34ca7e2685d0166efe28ac02c0f355932 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 2 Apr 2023 19:25:49 +0200
Subject: [PATCH 077/672] Fix deleting old group in dbus mode

Fixes #1192
---
 src/main/java/org/asamk/Signal.java                    |  7 +++++++
 .../java/org/asamk/signal/dbus/DbusManagerImpl.java    | 10 +++++++++-
 .../java/org/asamk/signal/dbus/DbusSignalImpl.java     |  4 +++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index c65d75c0..bc8bf74e 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -592,6 +592,13 @@ public interface Signal extends DBusInterface {
             }
         }
 
+        class NotAGroupMember extends DBusExecutionException {
+
+            public NotAGroupMember(final String message) {
+                super("Not a group member: " + message);
+            }
+        }
+
         class InvalidGroupId extends DBusExecutionException {
 
             public InvalidGroupId(final String message) {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 0ccff735..3cdce248 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -219,7 +219,15 @@ public class DbusManagerImpl implements Manager {
             throw new UnsupportedOperationException();
         }
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
-        group.quitGroup();
+        try {
+            group.quitGroup();
+        } catch (Signal.Error.GroupNotFound e) {
+            throw new GroupNotFoundException(groupId);
+        } catch (Signal.Error.NotAGroupMember e) {
+            throw new NotAGroupMemberException(groupId, group.Get("org.asamk.Signal.Group", "Name"));
+        } catch (Signal.Error.LastGroupAdmin e) {
+            throw new LastGroupAdminException(groupId, group.Get("org.asamk.Signal.Group", "Name"));
+        }
         return new SendGroupMessageResults(0, List.of());
     }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 2c0c30b2..dafcabab 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1193,8 +1193,10 @@ public class DbusSignalImpl implements Signal {
         public void quitGroup() throws Error.Failure {
             try {
                 m.quitGroup(groupId, Set.of());
-            } catch (GroupNotFoundException | NotAGroupMemberException e) {
+            } catch (GroupNotFoundException e) {
                 throw new Error.GroupNotFound(e.getMessage());
+            } catch (NotAGroupMemberException e) {
+                throw new Error.NotAGroupMember(e.getMessage());
             } catch (IOException e) {
                 throw new Error.Failure(e.getMessage());
             } catch (LastGroupAdminException e) {

From 9f60ed534a6198b231af521932b959685e0b903b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 3 Apr 2023 19:00:05 +0200
Subject: [PATCH 078/672] Implement support for usernames

---
 graalvm-config-dir/jni-config.json            | 16 ++++
 graalvm-config-dir/reflect-config.json        | 33 ++++++++
 .../org/asamk/signal/manager/Manager.java     | 13 +++
 .../org/asamk/signal/manager/ManagerImpl.java | 27 +++++-
 .../manager/api/InvalidUsernameException.java | 12 +++
 .../signal/manager/api/RecipientAddress.java  | 24 ++++--
 .../manager/api/RecipientIdentifier.java      | 19 +++++
 .../signal/manager/helper/AccountHelper.java  | 84 +++++++++++++++++++
 .../manager/helper/RecipientHelper.java       | 40 +++++++--
 .../signal/manager/helper/StorageHelper.java  |  7 +-
 .../manager/storage/AccountDatabase.java      | 10 ++-
 .../signal/manager/storage/SignalAccount.java | 16 +++-
 .../storage/recipients/RecipientAddress.java  | 43 +++++++---
 .../storage/recipients/RecipientStore.java    | 78 ++++++++++++++---
 .../recipients/RecipientTrustedResolver.java  |  8 ++
 .../signal/commands/ListContactsCommand.java  |  6 +-
 .../signal/commands/UpdateAccountCommand.java | 39 +++++++++
 .../asamk/signal/dbus/DbusManagerImpl.java    | 11 +++
 18 files changed, 440 insertions(+), 46 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/InvalidUsernameException.java

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 09c4a05a..9f1cab28 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -195,6 +195,22 @@
 {
   "name":"org.signal.libsignal.protocol.state.SignedPreKeyStore"
 },
+{
+  "name":"org.signal.libsignal.usernames.BadNicknameCharacterException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.CannotBeEmptyException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.NicknameTooLongException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.usernames.NicknameTooShortException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.signal.libsignal.zkgroup.InvalidInputException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index d34b2243..22b58b56 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -672,6 +672,13 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"deviceLinkUri","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.commands.UpdateAccountCommand$JsonAccountResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"username","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.commands.VerifyCommand$VerifyParams",
   "allDeclaredFields":true,
@@ -2535,6 +2542,12 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.ConfirmUsernameRequest",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.DeviceCode",
   "allDeclaredFields":true,
@@ -2553,6 +2566,13 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.GetAciByUsernameResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.GroupMismatchedDevices",
   "allDeclaredFields":true,
@@ -2699,6 +2719,19 @@
     {"name":"getSkipDeviceTransfer","parameterTypes":[] }
   ]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.ReserveUsernameRequest",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.ReserveUsernameResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.SendGroupMessageResponse",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index d4f8b76f..bcb8f348 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -9,6 +9,7 @@ import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
@@ -77,6 +78,18 @@ public interface Manager extends Closeable {
      */
     void updateProfile(UpdateProfile updateProfile) throws IOException;
 
+    /**
+     * Set a username for the account.
+     * If the username is null, it will be deleted.
+     */
+    String setUsername(String username) throws IOException, InvalidUsernameException;
+
+    /**
+     * Set a username for the account.
+     * If the username is null, it will be deleted.
+     */
+    void deleteUsername() throws IOException;
+
     void unregister() throws IOException;
 
     void deleteAccount() throws IOException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 844c3323..451adb59 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -25,6 +25,7 @@ import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
@@ -65,6 +66,7 @@ import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.MimeUtils;
 import org.asamk.signal.manager.util.StickerUtils;
+import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalSessionLock;
@@ -290,6 +292,20 @@ class ManagerImpl implements Manager {
         context.getSyncHelper().sendSyncFetchProfileMessage();
     }
 
+    @Override
+    public String setUsername(final String username) throws IOException, InvalidUsernameException {
+        try {
+            return context.getAccountHelper().reserveUsername(username);
+        } catch (BaseUsernameException e) {
+            throw new InvalidUsernameException(e.getMessage() + " (" + e.getClass().getSimpleName() + ")", e);
+        }
+    }
+
+    @Override
+    public void deleteUsername() throws IOException {
+        context.getAccountHelper().deleteUsername();
+    }
+
     @Override
     public void unregister() throws IOException {
         context.getAccountHelper().unregister();
@@ -737,13 +753,18 @@ class ManagerImpl implements Manager {
 
     @Override
     public void deleteRecipient(final RecipientIdentifier.Single recipient) {
-        account.removeRecipient(account.getRecipientResolver().resolveRecipient(recipient.getIdentifier()));
+        final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
+        if (recipientIdOptional.isPresent()) {
+            account.removeRecipient(recipientIdOptional.get());
+        }
     }
 
     @Override
     public void deleteContact(final RecipientIdentifier.Single recipient) {
-        account.getContactStore()
-                .deleteContact(account.getRecipientResolver().resolveRecipient(recipient.getIdentifier()));
+        final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
+        if (recipientIdOptional.isPresent()) {
+            account.getContactStore().deleteContact(recipientIdOptional.get());
+        }
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/InvalidUsernameException.java b/lib/src/main/java/org/asamk/signal/manager/api/InvalidUsernameException.java
new file mode 100644
index 00000000..2d3b58a7
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/InvalidUsernameException.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.manager.api;
+
+public class InvalidUsernameException extends Exception {
+
+    public InvalidUsernameException(final String message) {
+        super(message);
+    }
+
+    public InvalidUsernameException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
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 920eafc5..ee3bded9 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
@@ -6,7 +6,7 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import java.util.Optional;
 import java.util.UUID;
 
-public record RecipientAddress(Optional<UUID> uuid, Optional<String> number) {
+public record RecipientAddress(Optional<UUID> uuid, Optional<String> number, Optional<String> username) {
 
     public static final UUID UNKNOWN_UUID = ServiceId.UNKNOWN.uuid();
 
@@ -18,21 +18,25 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number) {
      */
     public RecipientAddress {
         uuid = uuid.isPresent() && uuid.get().equals(UNKNOWN_UUID) ? Optional.empty() : uuid;
-        if (uuid.isEmpty() && number.isEmpty()) {
+        if (uuid.isEmpty() && number.isEmpty() && username.isEmpty()) {
             throw new AssertionError("Must have either a UUID or E164 number!");
         }
     }
 
     public RecipientAddress(UUID uuid, String e164) {
-        this(Optional.ofNullable(uuid), Optional.ofNullable(e164));
+        this(Optional.ofNullable(uuid), Optional.ofNullable(e164), Optional.empty());
+    }
+
+    public RecipientAddress(UUID uuid, String e164, String username) {
+        this(Optional.ofNullable(uuid), Optional.ofNullable(e164), Optional.ofNullable(username));
     }
 
     public RecipientAddress(SignalServiceAddress address) {
-        this(Optional.of(address.getServiceId().uuid()), address.getNumber());
+        this(Optional.of(address.getServiceId().uuid()), address.getNumber(), Optional.empty());
     }
 
     public RecipientAddress(UUID uuid) {
-        this(Optional.of(uuid), Optional.empty());
+        this(Optional.of(uuid), Optional.empty(), Optional.empty());
     }
 
     public ServiceId getServiceId() {
@@ -44,6 +48,8 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number) {
             return uuid.get().toString();
         } else if (number.isPresent()) {
             return number.get();
+        } else if (username.isPresent()) {
+            return username.get();
         } else {
             throw new AssertionError("Given the checks in the constructor, this should not be possible.");
         }
@@ -54,14 +60,16 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number) {
             return number.get();
         } else if (uuid.isPresent()) {
             return uuid.get().toString();
+        } else if (username.isPresent()) {
+            return username.get();
         } else {
             throw new AssertionError("Given the checks in the constructor, this should not be possible.");
         }
     }
 
     public boolean matches(RecipientAddress other) {
-        return (uuid.isPresent() && other.uuid.isPresent() && uuid.get().equals(other.uuid.get())) || (
-                number.isPresent() && other.number.isPresent() && number.get().equals(other.number.get())
-        );
+        return (uuid.isPresent() && other.uuid.isPresent() && uuid.get().equals(other.uuid.get()))
+                || (number.isPresent() && other.number.isPresent() && number.get().equals(other.number.get()))
+                || (username.isPresent() && other.username.isPresent() && username.get().equals(other.username.get()));
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
index 70a60d47..d8952ec0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
@@ -30,6 +30,10 @@ public sealed interface RecipientIdentifier {
                     return new Uuid(UUID.fromString(identifier));
                 }
 
+                if (identifier.startsWith("u:")) {
+                    return new Username(identifier.substring(2));
+                }
+
                 final var normalizedNumber = PhoneNumberFormatter.formatNumber(identifier, localNumber);
                 if (!normalizedNumber.equals(identifier)) {
                     final Logger logger = LoggerFactory.getLogger(RecipientIdentifier.class);
@@ -46,6 +50,8 @@ public sealed interface RecipientIdentifier {
                 return new Number(address.number().get());
             } else if (address.uuid().isPresent()) {
                 return new Uuid(address.uuid().get());
+            } else if (address.username().isPresent()) {
+                return new Username(address.username().get());
             }
             throw new AssertionError("RecipientAddress without identifier");
         }
@@ -79,6 +85,19 @@ public sealed interface RecipientIdentifier {
         }
     }
 
+    record Username(String username) implements Single {
+
+        @Override
+        public String getIdentifier() {
+            return "u:" + username;
+        }
+
+        @Override
+        public RecipientAddress toPartialRecipientAddress() {
+            return new RecipientAddress(null, null, username);
+        }
+    }
+
     record Group(GroupId groupId) implements RecipientIdentifier {
 
         @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 2b6c812b..3bff549d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -15,6 +15,8 @@ import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
+import org.signal.libsignal.usernames.BaseUsernameException;
+import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest;
@@ -27,13 +29,18 @@ import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedE
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
+import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
+
 public class AccountHelper {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountHelper.class);
@@ -173,6 +180,83 @@ public class AccountHelper {
         updateSelfIdentifiers(newNumber, account.getAci(), PNI.parseOrThrow(result.first().getPni()));
     }
 
+    public static final int USERNAME_MIN_LENGTH = 3;
+    public static final int USERNAME_MAX_LENGTH = 32;
+
+    public String reserveUsername(String nickname) throws IOException, BaseUsernameException {
+        final var currentUsername = account.getUsername();
+        if (currentUsername != null) {
+            final var currentNickname = currentUsername.substring(0, currentUsername.indexOf('.'));
+            if (currentNickname.equals(nickname)) {
+                refreshCurrentUsername();
+                return currentUsername;
+            }
+        }
+
+        final var candidates = Username.generateCandidates(nickname, USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH);
+        final var candidateHashes = new ArrayList<String>();
+        for (final var candidate : candidates) {
+            candidateHashes.add(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(candidate)));
+        }
+
+        final var response = dependencies.getAccountManager().reserveUsername(candidateHashes);
+        final var hashIndex = candidateHashes.indexOf(response.getUsernameHash());
+        if (hashIndex == -1) {
+            logger.warn("[reserveUsername] The response hash could not be found in our set of candidateHashes.");
+            throw new IOException("Unexpected username response");
+        }
+
+        logger.debug("[reserveUsername] Successfully reserved username.");
+        final var username = candidates.get(hashIndex);
+
+        dependencies.getAccountManager().confirmUsername(username, response);
+        account.setUsername(username);
+        account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
+        logger.debug("[confirmUsername] Successfully confirmed username.");
+
+        return username;
+    }
+
+    public void refreshCurrentUsername() throws IOException, BaseUsernameException {
+        final var localUsername = account.getUsername();
+        if (localUsername == null) {
+            return;
+        }
+
+        final var whoAmIResponse = dependencies.getAccountManager().getWhoAmI();
+        final var serverUsernameHash = whoAmIResponse.getUsernameHash();
+        final var hasServerUsername = !isEmpty(serverUsernameHash);
+        final var localUsernameHash = Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(localUsername));
+
+        if (!hasServerUsername) {
+            logger.debug("No remote username is set.");
+        }
+
+        if (!Objects.equals(localUsernameHash, serverUsernameHash)) {
+            logger.debug("Local username hash does not match server username hash.");
+        }
+
+        if (!hasServerUsername || !Objects.equals(localUsernameHash, serverUsernameHash)) {
+            logger.debug("Attempting to resynchronize username.");
+            tryReserveConfirmUsername(localUsername, localUsernameHash);
+        } else {
+            logger.debug("Username already set, not refreshing.");
+        }
+    }
+
+    private void tryReserveConfirmUsername(final String username, String localUsernameHash) throws IOException {
+        final var response = dependencies.getAccountManager().reserveUsername(List.of(localUsernameHash));
+        logger.debug("[reserveUsername] Successfully reserved existing username.");
+        dependencies.getAccountManager().confirmUsername(username, response);
+        logger.debug("[confirmUsername] Successfully confirmed existing username.");
+    }
+
+    public void deleteUsername() throws IOException {
+        dependencies.getAccountManager().deleteUsername();
+        account.setUsername(null);
+        logger.debug("[deleteUsername] Successfully deleted the username.");
+    }
+
     public void setDeviceName(String deviceName) {
         final var privateKey = account.getAciIdentityKeyPair().getPrivateKey();
         final var encryptedDeviceName = DeviceNameUtil.encryptDeviceName(deviceName, privateKey);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index dc442f0e..9243ceba 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -6,6 +6,8 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.signal.libsignal.usernames.BaseUsernameException;
+import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.ACI;
@@ -13,6 +15,7 @@ import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.CdsiV2Service;
+import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -47,7 +50,7 @@ public class RecipientHelper {
         final var number = address.number().get();
         final ServiceId serviceId;
         try {
-            serviceId = getRegisteredUser(number);
+            serviceId = getRegisteredUserByNumber(number);
         } catch (UnregisteredRecipientException e) {
             logger.warn("Failed to get uuid for e164 number: {}", number);
             // Return SignalServiceAddress with unknown UUID
@@ -78,15 +81,33 @@ public class RecipientHelper {
     public RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) throws UnregisteredRecipientException {
         if (recipient instanceof RecipientIdentifier.Uuid uuidRecipient) {
             return account.getRecipientResolver().resolveRecipient(ServiceId.from(uuidRecipient.uuid()));
-        } else {
-            final var number = ((RecipientIdentifier.Number) recipient).number();
-            return account.getRecipientStore().resolveRecipient(number, () -> {
+        } else if (recipient instanceof RecipientIdentifier.Number numberRecipient) {
+            final var number = numberRecipient.number();
+            return account.getRecipientStore().resolveRecipientByNumber(number, () -> {
                 try {
-                    return getRegisteredUser(number);
+                    return getRegisteredUserByNumber(number);
                 } catch (Exception e) {
                     return null;
                 }
             });
+        } else if (recipient instanceof RecipientIdentifier.Username usernameRecipient) {
+            final var username = usernameRecipient.username();
+            return account.getRecipientStore().resolveRecipientByUsername(username, () -> {
+                try {
+                    return getRegisteredUserByUsername(username);
+                } catch (Exception e) {
+                    return null;
+                }
+            });
+        }
+        throw new AssertionError("Unexpected RecipientIdentifier: " + recipient);
+    }
+
+    public Optional<RecipientId> resolveRecipientOptional(final RecipientIdentifier.Single recipient) {
+        try {
+            return Optional.of(resolveRecipient(recipient));
+        } catch (UnregisteredRecipientException e) {
+            return Optional.empty();
         }
     }
 
@@ -96,7 +117,7 @@ public class RecipientHelper {
             return recipientId;
         }
         final var number = address.getNumber().get();
-        final var serviceId = getRegisteredUser(number);
+        final var serviceId = getRegisteredUserByNumber(number);
         return account.getRecipientTrustedResolver()
                 .resolveRecipientTrusted(new SignalServiceAddress(serviceId, number));
     }
@@ -111,7 +132,7 @@ public class RecipientHelper {
         return registeredUsers;
     }
 
-    private ServiceId getRegisteredUser(final String number) throws IOException, UnregisteredRecipientException {
+    private ServiceId getRegisteredUserByNumber(final String number) throws IOException, UnregisteredRecipientException {
         final Map<String, RegisteredUser> aciMap;
         try {
             aciMap = getRegisteredUsers(Set.of(number));
@@ -153,8 +174,9 @@ public class RecipientHelper {
         return registeredUsers;
     }
 
-    private ACI getRegisteredUserByUsername(String username) throws IOException {
-        return dependencies.getAccountManager().getAciByUsernameHash(username);
+    private ACI getRegisteredUserByUsername(String username) throws IOException, BaseUsernameException {
+        return dependencies.getAccountManager()
+                .getAciByUsernameHash(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username)));
     }
 
     public record RegisteredUser(Optional<ACI> aci, Optional<PNI> pni) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 257cea83..68eab7f0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -102,7 +102,11 @@ public class StorageHelper {
 
         final var contactRecord = record.getContact().get();
         final var address = new RecipientAddress(contactRecord.getServiceId(), contactRecord.getNumber().orElse(null));
-        final var recipientId = account.getRecipientResolver().resolveRecipient(address);
+        var recipientId = account.getRecipientResolver().resolveRecipient(address);
+        if (contactRecord.getUsername().isPresent()) {
+            recipientId = account.getRecipientTrustedResolver()
+                    .resolveRecipientTrusted(contactRecord.getServiceId(), contactRecord.getUsername().get());
+        }
 
         final var contact = account.getContactStore().getContact(recipientId);
         final var blocked = contact != null && contact.isBlocked();
@@ -257,6 +261,7 @@ public class StorageHelper {
                     });
         }
         account.getConfigurationStore().setPhoneNumberUnlisted(accountRecord.isPhoneNumberUnlisted());
+        account.setUsername(accountRecord.getUsername());
 
         if (accountRecord.getProfileKey().isPresent()) {
             ProfileKey profileKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index c13be697..c08036be 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -22,7 +22,7 @@ import java.sql.SQLException;
 public class AccountDatabase extends Database {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 11;
+    private static final long DATABASE_VERSION = 12;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -296,5 +296,13 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 12) {
+            logger.debug("Updating database: Adding username field");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD COLUMN username TEXT;
+                                        """);
+            }
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 25847c6c..b104eb84 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -120,6 +120,7 @@ public class SignalAccount implements Closeable {
     private String accountPath;
     private ServiceEnvironment serviceEnvironment;
     private String number;
+    private String username;
     private ACI aci;
     private PNI pni;
     private String sessionId;
@@ -542,6 +543,9 @@ public class SignalAccount implements Closeable {
             serviceEnvironment = ServiceEnvironment.valueOf(rootNode.get("serviceEnvironment").asText());
         }
         registered = Utils.getNotNullNode(rootNode, "registered").asBoolean();
+        if (rootNode.hasNonNull("usernameIdentifier")) {
+            username = rootNode.get("usernameIdentifier").asText();
+        }
         if (rootNode.hasNonNull("uuid")) {
             try {
                 aci = ACI.parseOrThrow(rootNode.get("uuid").asText());
@@ -935,6 +939,7 @@ public class SignalAccount implements Closeable {
             rootNode.put("version", CURRENT_STORAGE_VERSION)
                     .put("username", number)
                     .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
+                    .put("usernameIdentifier", username)
                     .put("uuid", aci == null ? null : aci.toString())
                     .put("pni", pni == null ? null : pni.toString())
                     .put("sessionId", sessionId)
@@ -1297,6 +1302,15 @@ public class SignalAccount implements Closeable {
         save();
     }
 
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(final String username) {
+        this.username = username;
+        save();
+    }
+
     public ServiceEnvironment getServiceEnvironment() {
         return serviceEnvironment;
     }
@@ -1368,7 +1382,7 @@ public class SignalAccount implements Closeable {
     }
 
     public RecipientAddress getSelfRecipientAddress() {
-        return new RecipientAddress(aci, pni, number);
+        return new RecipientAddress(aci, pni, number, username);
     }
 
     public RecipientId getSelfRecipientId() {
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 6f796b4a..d94a93a3 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
@@ -6,7 +6,9 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Optional;
 
-public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni, Optional<String> number) {
+public record RecipientAddress(
+        Optional<ServiceId> serviceId, Optional<PNI> pni, Optional<String> number, Optional<String> username
+) {
 
     /**
      * Construct a RecipientAddress.
@@ -38,23 +40,30 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
     }
 
     public RecipientAddress(Optional<ServiceId> serviceId, Optional<String> number) {
-        this(serviceId, Optional.empty(), number);
+        this(serviceId, Optional.empty(), number, Optional.empty());
     }
 
     public RecipientAddress(ServiceId serviceId, String e164) {
-        this(Optional.ofNullable(serviceId), Optional.empty(), Optional.ofNullable(e164));
+        this(Optional.ofNullable(serviceId), Optional.empty(), Optional.ofNullable(e164), Optional.empty());
     }
 
     public RecipientAddress(ServiceId serviceId, PNI pni, String e164) {
-        this(Optional.ofNullable(serviceId), Optional.ofNullable(pni), Optional.ofNullable(e164));
+        this(Optional.ofNullable(serviceId), Optional.ofNullable(pni), Optional.ofNullable(e164), Optional.empty());
+    }
+
+    public RecipientAddress(ServiceId serviceId, PNI pni, String e164, String username) {
+        this(Optional.ofNullable(serviceId),
+                Optional.ofNullable(pni),
+                Optional.ofNullable(e164),
+                Optional.ofNullable(username));
     }
 
     public RecipientAddress(SignalServiceAddress address) {
-        this(Optional.of(address.getServiceId()), Optional.empty(), address.getNumber());
+        this(Optional.of(address.getServiceId()), Optional.empty(), address.getNumber(), Optional.empty());
     }
 
     public RecipientAddress(org.asamk.signal.manager.api.RecipientAddress address) {
-        this(address.uuid().map(ServiceId::from), Optional.empty(), address.number());
+        this(address.uuid().map(ServiceId::from), Optional.empty(), address.number(), address.username());
     }
 
     public RecipientAddress(ServiceId serviceId) {
@@ -66,7 +75,8 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
                 this.serviceId.isEmpty() || this.isServiceIdPNI() || this.serviceId.equals(address.pni)
         ) && !address.isServiceIdPNI() ? address.serviceId : this.serviceId,
                 address.pni.or(this::pni),
-                address.number.or(this::number));
+                address.number.or(this::number),
+                address.username.or(this::username));
     }
 
     public RecipientAddress removeIdentifiersFrom(RecipientAddress address) {
@@ -74,7 +84,8 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
                 ? Optional.empty()
                 : this.serviceId,
                 address.pni.equals(this.pni) || address.serviceId.equals(this.pni) ? Optional.empty() : this.pni,
-                address.number.equals(this.number) ? Optional.empty() : this.number);
+                address.number.equals(this.number) ? Optional.empty() : this.number,
+                address.username.equals(this.username) ? Optional.empty() : this.username);
     }
 
     public ServiceId getServiceId() {
@@ -118,13 +129,17 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
     }
 
     public boolean hasSingleIdentifier() {
-        return serviceId().isEmpty() || number.isEmpty();
+        final var identifiersCount = serviceId().map(s -> 1).orElse(0)
+                + number().map(s -> 1).orElse(0)
+                + username().map(s -> 1).orElse(0);
+        return identifiersCount == 1;
     }
 
     public boolean hasIdentifiersOf(RecipientAddress address) {
         return (address.serviceId.isEmpty() || address.serviceId.equals(serviceId) || address.serviceId.equals(pni))
                 && (address.pni.isEmpty() || address.pni.equals(pni))
-                && (address.number.isEmpty() || address.number.equals(number));
+                && (address.number.isEmpty() || address.number.equals(number))
+                && (address.username.isEmpty() || address.username.equals(username));
     }
 
     public boolean hasAdditionalIdentifiersThan(RecipientAddress address) {
@@ -142,6 +157,10 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
                 number.isPresent() && (
                         address.number.isEmpty() || !address.number.equals(number)
                 )
+        ) || (
+                username.isPresent() && (
+                        address.username.isEmpty() || !address.username.equals(username)
+                )
         );
     }
 
@@ -158,6 +177,8 @@ public record RecipientAddress(Optional<ServiceId> serviceId, Optional<PNI> pni,
     }
 
     public org.asamk.signal.manager.api.RecipientAddress toApiRecipientAddress() {
-        return new org.asamk.signal.manager.api.RecipientAddress(serviceId().map(ServiceId::uuid), number());
+        return new org.asamk.signal.manager.api.RecipientAddress(serviceId().map(ServiceId::uuid),
+                number(),
+                username());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 81470e83..d3b949f8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -52,6 +52,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                     CREATE TABLE recipient (
                                       _id INTEGER PRIMARY KEY AUTOINCREMENT,
                                       number TEXT UNIQUE,
+                                      username TEXT UNIQUE,
                                       uuid BLOB UNIQUE,
                                       pni BLOB UNIQUE,
                                       profile_key BLOB,
@@ -93,7 +94,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public RecipientAddress resolveRecipientAddress(RecipientId recipientId) {
         final var sql = (
                 """
-                SELECT r.number, r.uuid, r.pni
+                SELECT r.number, r.uuid, r.pni, r.username
                 FROM %s r
                 WHERE r._id = ?
                 """
@@ -193,7 +194,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return new RecipientId(recipientId, this);
     }
 
-    public RecipientId resolveRecipient(
+    public RecipientId resolveRecipientByNumber(
             final String number, Supplier<ServiceId> serviceIdSupplier
     ) throws UnregisteredRecipientException {
         final Optional<RecipientWithAddress> byNumber;
@@ -214,6 +215,28 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return byNumber.get().id();
     }
 
+    public RecipientId resolveRecipientByUsername(
+            final String username, Supplier<ServiceId> serviceIdSupplier
+    ) throws UnregisteredRecipientException {
+        final Optional<RecipientWithAddress> byUsername;
+        try (final var connection = database.getConnection()) {
+            byUsername = findByUsername(connection, username);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+        if (byUsername.isEmpty() || byUsername.get().address().serviceId().isEmpty()) {
+            final var serviceId = serviceIdSupplier.get();
+            if (serviceId == null) {
+                throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
+                        null,
+                        username));
+            }
+
+            return resolveRecipient(serviceId);
+        }
+        return byUsername.get().id();
+    }
+
     public RecipientId resolveRecipient(RecipientAddress address) {
         synchronized (recipientsLock) {
             final RecipientId recipientId;
@@ -247,7 +270,21 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Optional<ACI> aci, final Optional<PNI> pni, final Optional<String> number
     ) {
         final var serviceId = aci.map(a -> (ServiceId) a).or(() -> pni);
-        return resolveRecipientTrusted(new RecipientAddress(serviceId, pni, number), false);
+        return resolveRecipientTrusted(new RecipientAddress(serviceId, pni, number, Optional.empty()), false);
+    }
+
+    @Override
+    public RecipientId resolveRecipientTrusted(final ServiceId serviceId, final String username) {
+        return resolveRecipientTrusted(new RecipientAddress(serviceId, null, null, username), false);
+    }
+
+    public RecipientId resolveRecipientTrusted(
+            final ACI aci, final String username
+    ) {
+        return resolveRecipientTrusted(new RecipientAddress(Optional.of(aci),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.of(username)), false);
     }
 
     @Override
@@ -309,7 +346,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 SELECT r._id,
-                       r.number, r.uuid, r.pni,
+                       r.number, r.uuid, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
                        r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities
@@ -739,7 +776,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET number = ?, uuid = ?, pni = ?
+                SET number = ?, uuid = ?, pni = ?, username = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -747,7 +784,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setString(1, address.number().orElse(null));
             statement.setBytes(2, address.serviceId().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setBytes(3, address.pni().map(PNI::uuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setLong(4, recipientId.id());
+            statement.setString(4, address.username().orElse(null));
+            statement.setLong(5, recipientId.id());
             statement.executeUpdate();
         }
     }
@@ -800,7 +838,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Connection connection, final String number
     ) throws SQLException {
         final var sql = """
-                        SELECT r._id, r.number, r.uuid, r.pni
+                        SELECT r._id, r.number, r.uuid, r.pni, r.username
                         FROM %s r
                         WHERE r.number = ?
                         LIMIT 1
@@ -811,11 +849,26 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    private Optional<RecipientWithAddress> findByUsername(
+            final Connection connection, final String username
+    ) throws SQLException {
+        final var sql = """
+                        SELECT r._id, r.number, r.uuid, r.pni, r.username
+                        FROM %s r
+                        WHERE r.username = ?
+                        LIMIT 1
+                        """.formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, username);
+            return Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
+        }
+    }
+
     private Optional<RecipientWithAddress> findByServiceId(
             final Connection connection, final ServiceId serviceId
     ) throws SQLException {
         final var sql = """
-                        SELECT r._id, r.number, r.uuid, r.pni
+                        SELECT r._id, r.number, r.uuid, r.pni, r.username
                         FROM %s r
                         WHERE r.uuid = ? OR r.pni = ?
                         LIMIT 1
@@ -830,16 +883,18 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Connection connection, final RecipientAddress address
     ) throws SQLException {
         final var sql = """
-                        SELECT r._id, r.number, r.uuid, r.pni
+                        SELECT r._id, r.number, r.uuid, r.pni, r.username
                         FROM %s r
                         WHERE r.uuid = ?1 OR r.pni = ?1 OR
                               r.uuid = ?2 OR r.pni = ?2 OR
-                              r.number = ?3
+                              r.number = ?3 OR
+                              r.username = ?4
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setBytes(1, address.serviceId().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setBytes(2, address.pni().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setString(3, address.number().orElse(null));
+            statement.setString(4, address.username().orElse(null));
             return Utils.executeQueryForStream(statement, this::getRecipientWithAddressFromResultSet)
                     .collect(Collectors.toSet());
         }
@@ -908,7 +963,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var serviceId = Optional.ofNullable(resultSet.getBytes("uuid")).map(ServiceId::parseOrNull);
         final var pni = Optional.ofNullable(resultSet.getBytes("pni")).map(PNI::parseOrNull);
         final var number = Optional.ofNullable(resultSet.getString("number"));
-        return new RecipientAddress(serviceId, pni, number);
+        final var username = Optional.ofNullable(resultSet.getString("username"));
+        return new RecipientAddress(serviceId, pni, number, username);
     }
 
     private RecipientId getRecipientIdFromResultSet(ResultSet resultSet) throws SQLException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
index 38949c64..9fc46d67 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager.storage.recipients;
 
 import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.PNI;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Optional;
@@ -15,6 +16,8 @@ public interface RecipientTrustedResolver {
 
     RecipientId resolveRecipientTrusted(Optional<ACI> aci, Optional<PNI> pni, Optional<String> number);
 
+    RecipientId resolveRecipientTrusted(ServiceId serviceId, String username);
+
     class RecipientTrustedResolverWrapper implements RecipientTrustedResolver {
 
         private final Supplier<RecipientTrustedResolver> recipientTrustedResolverSupplier;
@@ -39,5 +42,10 @@ public interface RecipientTrustedResolver {
         ) {
             return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(aci, pni, number);
         }
+
+        @Override
+        public RecipientId resolveRecipientTrusted(final ServiceId serviceId, final String username) {
+            return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(serviceId, username);
+        }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index abcfdca3..e3b978b1 100644
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -55,10 +55,12 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
             for (var r : recipients) {
                 final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
                 final var profile = r.getProfile() == null ? Profile.newBuilder().build() : r.getProfile();
-                writer.println("Number: {} Name: {} Profile name: {} Color: {} Blocked: {} Message expiration: {}",
+                writer.println(
+                        "Number: {} Name: {} Profile name: {} Username: {} Color: {} Blocked: {} Message expiration: {}",
                         r.getAddress().getLegacyIdentifier(),
                         contact.getName(),
                         profile.getDisplayName(),
+                        r.getAddress().username().orElse(""),
                         contact.getColor(),
                         contact.isBlocked(),
                         contact.getMessageExpirationTime() == 0
@@ -72,6 +74,7 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                 final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
                 return new JsonContact(address.number().orElse(null),
                         address.uuid().map(UUID::toString).orElse(null),
+                        address.username().orElse(null),
                         contact.getName(),
                         contact.getColor(),
                         contact.isBlocked(),
@@ -96,6 +99,7 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
     private record JsonContact(
             String number,
             String uuid,
+            String username,
             String name,
             String color,
             boolean isBlocked,
diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index 7fe70213..2bb2d110 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -1,12 +1,17 @@
 package org.asamk.signal.commands;
 
+import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
 
 import java.io.IOException;
 
@@ -21,6 +26,11 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Update the account attributes on the signal server.");
         subparser.addArgument("-n", "--device-name").help("Specify a name to describe this device.");
+        var mut = subparser.addMutuallyExclusiveGroup();
+        mut.addArgument("-u", "--username").help("Specify a username that can then be used to contact this account.");
+        mut.addArgument("--delete-username")
+                .action(Arguments.storeTrue())
+                .help("Delete the username associated with this account.");
     }
 
     @Override
@@ -33,5 +43,34 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
         } catch (IOException e) {
             throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e);
         }
+
+        var username = ns.getString("username");
+        if (username != null) {
+            try {
+                final var newUsername = m.setUsername(username);
+                if (outputWriter instanceof PlainTextWriter w) {
+                    w.println("Your new username: {}", newUsername);
+                } else if (outputWriter instanceof JsonWriter w) {
+                    w.write(new JsonAccountResponse(newUsername));
+                }
+            } catch (IOException e) {
+                throw new IOErrorException("Failed to set username: " + e.getMessage(), e);
+            } catch (InvalidUsernameException e) {
+                throw new UserErrorException("Invalid username: " + e.getMessage(), e);
+            }
+        }
+
+        var deleteUsername = Boolean.TRUE.equals(ns.getBoolean("delete-username"));
+        if (deleteUsername) {
+            try {
+                m.deleteUsername();
+            } catch (IOException e) {
+                throw new IOErrorException("Failed to delete username: " + e.getMessage(), e);
+            }
+        }
     }
+
+    private record JsonAccountResponse(
+            String username
+    ) {}
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 3cdce248..cefb7a82 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -10,6 +10,7 @@ import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
@@ -151,6 +152,16 @@ public class DbusManagerImpl implements Manager {
                 updateProfile.isDeleteAvatar());
     }
 
+    @Override
+    public String setUsername(final String username) throws IOException, InvalidUsernameException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void deleteUsername() throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void unregister() throws IOException {
         signal.unregister();

From c788c5a40e6ac57d613c735dd9790de52be47d5f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 3 Apr 2023 19:00:27 +0200
Subject: [PATCH 079/672] Add capabilities and read receipt handling to
 provisioning

---
 .../asamk/signal/manager/ProvisioningManagerImpl.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
index c8df9774..8ae9bb26 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
@@ -41,6 +41,8 @@ import java.nio.channels.OverlappingFileLockException;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
+import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
+
 class ProvisioningManagerImpl implements ProvisioningManager {
 
     private final static Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);
@@ -125,7 +127,12 @@ class ProvisioningManagerImpl implements ProvisioningManager {
 
         logger.debug("Finishing new device registration");
         var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
-                new ConfirmCodeMessage(false, true, registrationId, pniRegistrationId, encryptedDeviceName, null));
+                new ConfirmCodeMessage(false,
+                        true,
+                        registrationId,
+                        pniRegistrationId,
+                        encryptedDeviceName,
+                        capabilities));
 
         // Create new account with the synced identity
         var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();
@@ -147,6 +154,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                     pniRegistrationId,
                     profileKey,
                     Settings.DEFAULT);
+            account.getConfigurationStore().setReadReceipts(ret.isReadReceipts());
 
             ManagerImpl m = null;
             try {

From 6106e1878bcb5ad3c28fd74fdf44c6dde971fff6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 3 Apr 2023 19:00:56 +0200
Subject: [PATCH 080/672] Update README.md

---
 README.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a2799d4a..093b0eef 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,14 @@
 # signal-cli
 
-signal-cli is a commandline interface
-for [libsignal-service-java](https://github.com/WhisperSystems/libsignal-service-java). It supports registering,
-verifying, sending and receiving messages. To be able to link to an existing Signal-Android/signal-cli instance,
-signal-cli uses a [patched libsignal-service-java](https://github.com/AsamK/libsignal-service-java), because
-libsignal-service-java does not yet
-support [provisioning as a linked device](https://github.com/WhisperSystems/libsignal-service-java/pull/21). For
-registering you need a phone number where you can receive SMS or incoming calls.
+signal-cli is a commandline interface for the [Signal messenger](https://signal.org/).
+It supports registering, verifying, sending and receiving messages.
+signal-cli uses a [patched libsignal-service-java](https://github.com/Turasa/libsignal-service-java),
+extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/libsignal/service).
+For registering you need a phone number where you can receive SMS or incoming calls.
 
 signal-cli is primarily intended to be used on servers to notify admins of important events. For this use-case, it has a daemon mode with D-BUS
-interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) and JSON-RPC interface ([documentation](https://github.com/AsamK/signal-cli/wiki/JSON-RPC-service)). For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust.
+interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) and JSON-RPC interface ([documentation](https://github.com/AsamK/signal-cli/wiki/JSON-RPC-service)).
+For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust.
 
 ## Installation
 

From 64436bc9abf1dec634f5fab3fa51b8aeb098bf58 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 4 Apr 2023 11:43:50 +0200
Subject: [PATCH 081/672] Refresh username after registering

---
 .../main/java/org/asamk/signal/manager/ManagerImpl.java    | 4 ++++
 .../org/asamk/signal/manager/RegistrationManagerImpl.java  | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 451adb59..1dbd9bc6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -292,6 +292,10 @@ class ManagerImpl implements Manager {
         context.getSyncHelper().sendSyncFetchProfileMessage();
     }
 
+    void refreshCurrentUsername() throws IOException, BaseUsernameException {
+        context.getAccountHelper().refreshCurrentUsername();
+    }
+
     @Override
     public String setUsername(final String username) throws IOException, InvalidUsernameException {
         try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
index f5bff4d2..2951f1a7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
@@ -29,6 +29,7 @@ import org.asamk.signal.manager.helper.PinHelper;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
 import org.asamk.signal.manager.util.Utils;
+import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
@@ -163,6 +164,12 @@ class RegistrationManagerImpl implements RegistrationManager {
                 logger.warn("Failed to set default profile: {}", e.getMessage());
             }
 
+            try {
+                m.refreshCurrentUsername();
+            } catch (IOException | BaseUsernameException e) {
+                logger.warn("Failed to refresh current username", e);
+            }
+
             if (newManagerListener != null) {
                 newManagerListener.accept(m);
                 m = null;

From 22c948166ad8a4a0866dcf5a996c5230702c3d8d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 4 Apr 2023 12:02:24 +0200
Subject: [PATCH 082/672] Add labels to Containerfile

---
 Containerfile        | 4 ++++
 native.Containerfile | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/Containerfile b/Containerfile
index c7ba8260..1a1167ba 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,5 +1,9 @@
 FROM docker.io/eclipse-temurin:17-jre
 
+LABEL org.opencontainers.image.source=https://github.com/AsamK/signal-cli
+LABEL org.opencontainers.image.description="signal-cli provides an unofficial commandline, dbus and JSON-RPC interface for the Signal messenger."
+LABEL org.opencontainers.image.licenses=GPL-3.0-only
+
 RUN useradd signal-cli --system --create-home --home-dir /var/lib/signal-cli
 ADD build/install/signal-cli /opt/signal-cli
 
diff --git a/native.Containerfile b/native.Containerfile
index 8f52449b..60f89353 100644
--- a/native.Containerfile
+++ b/native.Containerfile
@@ -1,5 +1,9 @@
 FROM docker.io/debian:testing-slim
 
+LABEL org.opencontainers.image.source=https://github.com/AsamK/signal-cli
+LABEL org.opencontainers.image.description="signal-cli provides an unofficial commandline, dbus and JSON-RPC interface for the Signal messenger."
+LABEL org.opencontainers.image.licenses=GPL-3.0-only
+
 RUN useradd signal-cli --system --create-home --home-dir /var/lib/signal-cli
 ADD build/native/nativeCompile/signal-cli /usr/bin/signal-cli
 

From 780c69d80476ced44d643d670f3c3e9359eb26e6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 5 Apr 2023 11:07:53 +0200
Subject: [PATCH 083/672] Reduce use of unknown serviceIds

---
 .../org/asamk/signal/manager/ManagerImpl.java | 30 ++++++----
 .../signal/manager/api/RecipientAddress.java  |  4 --
 .../signal/manager/helper/IdentityHelper.java | 58 +++++++++++--------
 .../signal/manager/helper/ReceiveHelper.java  |  6 +-
 .../manager/helper/RecipientHelper.java       |  4 +-
 .../signal/manager/helper/SendHelper.java     |  6 +-
 .../signal/manager/helper/StorageHelper.java  | 17 +++---
 .../signal/manager/storage/SignalAccount.java |  2 +-
 .../identities/LegacyIdentityKeyStore.java    |  6 +-
 .../storage/recipients/RecipientAddress.java  | 10 +---
 .../org/asamk/signal/manager/util/Utils.java  | 50 ++++++++--------
 11 files changed, 110 insertions(+), 83 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 1dbd9bc6..9696d956 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -676,14 +676,17 @@ class ManagerImpl implements Manager {
         var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete);
         for (final var recipient : recipients) {
-            if (recipient instanceof RecipientIdentifier.Single r) {
+            if (recipient instanceof RecipientIdentifier.Uuid u) {
+                account.getMessageSendLogStore()
+                        .deleteEntryForRecipientNonGroup(targetSentTimestamp, ServiceId.from(u.uuid()));
+            } else if (recipient instanceof RecipientIdentifier.Single r) {
                 try {
                     final var recipientId = context.getRecipientHelper().resolveRecipient(r);
-                    account.getMessageSendLogStore()
-                            .deleteEntryForRecipientNonGroup(targetSentTimestamp,
-                                    account.getRecipientAddressResolver()
-                                            .resolveRecipientAddress(recipientId)
-                                            .getServiceId());
+                    final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+                    if (address.serviceId().isPresent()) {
+                        account.getMessageSendLogStore()
+                                .deleteEntryForRecipientNonGroup(targetSentTimestamp, address.serviceId().get());
+                    }
                 } catch (UnregisteredRecipientException ignored) {
                 }
             } else if (recipient instanceof RecipientIdentifier.Group r) {
@@ -749,8 +752,10 @@ class ManagerImpl implements Manager {
                 final var serviceId = context.getAccount()
                         .getRecipientAddressResolver()
                         .resolveRecipientAddress(recipientId)
-                        .getServiceId();
-                account.getAciSessionStore().deleteAllSessions(serviceId);
+                        .serviceId();
+                if (serviceId.isPresent()) {
+                    account.getAciSessionStore().deleteAllSessions(serviceId.get());
+                }
             }
         }
     }
@@ -1131,9 +1136,12 @@ class ManagerImpl implements Manager {
     public List<Identity> getIdentities(RecipientIdentifier.Single recipient) {
         ServiceId serviceId;
         try {
-            serviceId = account.getRecipientAddressResolver()
-                    .resolveRecipientAddress(context.getRecipientHelper().resolveRecipient(recipient))
-                    .getServiceId();
+            final var address = account.getRecipientAddressResolver()
+                    .resolveRecipientAddress(context.getRecipientHelper().resolveRecipient(recipient));
+            if (address.serviceId().isEmpty()) {
+                return List.of();
+            }
+            serviceId = address.serviceId().get();
         } catch (UnregisteredRecipientException e) {
             return List.of();
         }
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 ee3bded9..f500e3a9 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
@@ -39,10 +39,6 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number, Opt
         this(Optional.of(uuid), Optional.empty(), Optional.empty());
     }
 
-    public ServiceId getServiceId() {
-        return ServiceId.from(uuid.orElse(UNKNOWN_UUID));
-    }
-
     public String getIdentifier() {
         if (uuid.isPresent()) {
             return uuid.get().toString();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index b908823a..df762c91 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -2,7 +2,6 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.protocol.IdentityKey;
@@ -17,7 +16,7 @@ import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.function.Function;
+import java.util.function.BiFunction;
 
 import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
 
@@ -34,22 +33,19 @@ public class IdentityHelper {
     }
 
     public boolean trustIdentityVerified(RecipientId recipientId, byte[] fingerprint) {
-        final var serviceId = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId).getServiceId();
-        return trustIdentity(serviceId,
-                identityKey -> Arrays.equals(identityKey.serialize(), fingerprint),
+        return trustIdentity(recipientId,
+                (serviceId, identityKey) -> Arrays.equals(identityKey.serialize(), fingerprint),
                 TrustLevel.TRUSTED_VERIFIED);
     }
 
     public boolean trustIdentityVerifiedSafetyNumber(RecipientId recipientId, String safetyNumber) {
-        final var serviceId = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId).getServiceId();
-        return trustIdentity(serviceId,
-                identityKey -> safetyNumber.equals(computeSafetyNumber(serviceId, identityKey)),
+        return trustIdentity(recipientId,
+                (serviceId, identityKey) -> safetyNumber.equals(computeSafetyNumber(serviceId, identityKey)),
                 TrustLevel.TRUSTED_VERIFIED);
     }
 
     public boolean trustIdentityVerifiedSafetyNumber(RecipientId recipientId, byte[] safetyNumber) {
-        final var serviceId = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId).getServiceId();
-        return trustIdentity(serviceId, identityKey -> {
+        return trustIdentity(recipientId, (serviceId, identityKey) -> {
             final var fingerprint = computeSafetyNumberForScanning(serviceId, identityKey);
             try {
                 return fingerprint != null && fingerprint.compareTo(safetyNumber);
@@ -60,8 +56,7 @@ public class IdentityHelper {
     }
 
     public boolean trustIdentityAllKeys(RecipientId recipientId) {
-        final var serviceId = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId).getServiceId();
-        return trustIdentity(serviceId, identityKey -> true, TrustLevel.TRUSTED_UNVERIFIED);
+        return trustIdentity(recipientId, (serviceId, identityKey) -> true, TrustLevel.TRUSTED_UNVERIFIED);
     }
 
     public String computeSafetyNumber(ServiceId serviceId, IdentityKey theirIdentityKey) {
@@ -77,35 +72,50 @@ public class IdentityHelper {
     private Fingerprint computeSafetyNumberFingerprint(
             final ServiceId serviceId, final IdentityKey theirIdentityKey
     ) {
-        final var address = account.getRecipientAddressResolver()
-                .resolveRecipientAddress(account.getRecipientResolver().resolveRecipient(serviceId));
+        final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
 
-        return Utils.computeSafetyNumber(capabilities.getUuid(),
-                account.getSelfRecipientAddress(),
+        if (capabilities.getUuid()) {
+            if (serviceId.isUnknown()) {
+                return null;
+            }
+            return Utils.computeSafetyNumberForUuid(account.getAci(),
+                    account.getAciIdentityKeyPair().getPublicKey(),
+                    serviceId,
+                    theirIdentityKey);
+        }
+        if (address.number().isEmpty()) {
+            return null;
+        }
+        return Utils.computeSafetyNumberForNumber(account.getNumber(),
                 account.getAciIdentityKeyPair().getPublicKey(),
-                address.getServiceId().equals(serviceId)
-                        ? address
-                        : new RecipientAddress(serviceId, address.number().orElse(null)),
+                address.number().get(),
                 theirIdentityKey);
     }
 
     private boolean trustIdentity(
-            ServiceId serviceId, Function<IdentityKey, Boolean> verifier, TrustLevel trustLevel
+            RecipientId recipientId, BiFunction<ServiceId, IdentityKey, Boolean> verifier, TrustLevel trustLevel
     ) {
+        final var serviceId = account.getRecipientAddressResolver()
+                .resolveRecipientAddress(recipientId)
+                .serviceId()
+                .orElse(null);
+        if (serviceId == null) {
+            return false;
+        }
         var identity = account.getIdentityKeyStore().getIdentityInfo(serviceId);
         if (identity == null) {
             return false;
         }
 
-        if (!verifier.apply(identity.getIdentityKey())) {
+        if (!verifier.apply(serviceId, identity.getIdentityKey())) {
             return false;
         }
 
         account.getIdentityKeyStore().setIdentityTrustLevel(serviceId, identity.getIdentityKey(), trustLevel);
         try {
-            final var address = account.getRecipientAddressResolver()
-                    .resolveRecipientAddress(account.getRecipientResolver().resolveRecipient(serviceId))
-                    .toSignalServiceAddress();
+            final var address = context.getRecipientHelper()
+                    .resolveSignalServiceAddress(account.getRecipientResolver().resolveRecipient(serviceId));
             context.getSyncHelper().sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
         } catch (IOException e) {
             logger.warn("Failed to send verification sync message: {}", e.getMessage());
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 2c5dbe69..c20fc692 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -12,6 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalWebSocket;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
 import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
 
@@ -225,8 +226,9 @@ public class ReceiveHelper {
                 if (exception instanceof UntrustedIdentityException) {
                     logger.debug("Keeping message with untrusted identity in message cache");
                     final var address = ((UntrustedIdentityException) exception).getSender();
-                    final var recipientId = account.getRecipientResolver().resolveRecipient(address.getServiceId());
-                    if (!envelope.hasSourceUuid()) {
+                    if (!envelope.hasSourceUuid() && address.uuid().isPresent()) {
+                        final var recipientId = account.getRecipientResolver()
+                                .resolveRecipient(ServiceId.from(address.uuid().get()));
                         try {
                             cachedMessage[0] = account.getMessageCache().replaceSender(cachedMessage[0], recipientId);
                         } catch (IOException ioException) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 9243ceba..2a3866a5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -182,8 +182,8 @@ public class RecipientHelper {
     public record RegisteredUser(Optional<ACI> aci, Optional<PNI> pni) {
 
         public RegisteredUser {
-            aci = aci.isPresent() && aci.get().equals(ServiceId.UNKNOWN) ? Optional.empty() : aci;
-            pni = pni.isPresent() && pni.get().equals(ServiceId.UNKNOWN) ? Optional.empty() : pni;
+            aci = aci.isPresent() && aci.get().isUnknown() ? Optional.empty() : aci;
+            pni = pni.isPresent() && pni.get().isUnknown() ? Optional.empty() : pni;
             if (aci.isEmpty() && pni.isEmpty()) {
                 throw new AssertionError("Must have either a ACI or PNI!");
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index d14c3807..0f4d035d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -492,7 +492,11 @@ public class SendHelper {
 
             final var serviceId = account.getRecipientAddressResolver()
                     .resolveRecipientAddress(recipientId)
-                    .getServiceId();
+                    .serviceId()
+                    .orElse(null);
+            if (serviceId == null) {
+                continue;
+            }
             final var identity = account.getIdentityKeyStore().getIdentityInfo(serviceId);
             if (identity == null || !identity.getTrustLevel().isTrusted()) {
                 continue;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 68eab7f0..50eceb67 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -101,11 +101,15 @@ public class StorageHelper {
         }
 
         final var contactRecord = record.getContact().get();
-        final var address = new RecipientAddress(contactRecord.getServiceId(), contactRecord.getNumber().orElse(null));
+        final var serviceId = contactRecord.getServiceId();
+        if (contactRecord.getNumber().isEmpty() && serviceId.isUnknown()) {
+            return;
+        }
+        final var address = new RecipientAddress(serviceId, contactRecord.getNumber().orElse(null));
         var recipientId = account.getRecipientResolver().resolveRecipient(address);
-        if (contactRecord.getUsername().isPresent()) {
+        if (serviceId.isValid() && contactRecord.getUsername().isPresent()) {
             recipientId = account.getRecipientTrustedResolver()
-                    .resolveRecipientTrusted(contactRecord.getServiceId(), contactRecord.getUsername().get());
+                    .resolveRecipientTrusted(serviceId, contactRecord.getUsername().get());
         }
 
         final var contact = account.getContactStore().getContact(recipientId);
@@ -166,16 +170,15 @@ public class StorageHelper {
                 logger.warn("Received invalid contact profile key from storage");
             }
         }
-        if (contactRecord.getIdentityKey().isPresent()) {
+        if (contactRecord.getIdentityKey().isPresent() && serviceId.isValid()) {
             try {
                 logger.trace("Storing identity key {}", recipientId);
                 final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get());
-                account.getIdentityKeyStore().saveIdentity(address.getServiceId(), identityKey);
+                account.getIdentityKeyStore().saveIdentity(serviceId, identityKey);
 
                 final var trustLevel = TrustLevel.fromIdentityState(contactRecord.getIdentityState());
                 if (trustLevel != null) {
-                    account.getIdentityKeyStore()
-                            .setIdentityTrustLevel(address.getServiceId(), identityKey, trustLevel);
+                    account.getIdentityKeyStore().setIdentityTrustLevel(serviceId, identityKey, trustLevel);
                 }
             } catch (InvalidKeyException e) {
                 logger.warn("Received invalid contact identity key from storage");
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index b104eb84..bd892c5d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -813,7 +813,7 @@ public class SignalAccount implements Closeable {
                 if (identity.getAddress().serviceId().isEmpty()) {
                     continue;
                 }
-                final var serviceId = identity.getAddress().getServiceId();
+                final var serviceId = identity.getAddress().serviceId().get();
                 getIdentityKeyStore().saveIdentity(serviceId, identity.getIdentityKey());
                 getIdentityKeyStore().setIdentityTrustLevel(serviceId,
                         identity.getIdentityKey(),
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
index aa800a04..a2f5162e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
@@ -72,6 +72,10 @@ public class LegacyIdentityKeyStore {
         if (!file.exists()) {
             return null;
         }
+        final var address = addressResolver.resolveRecipientAddress(recipientId);
+        if (address.serviceId().isEmpty()) {
+            return null;
+        }
         try (var inputStream = new FileInputStream(file)) {
             var storage = objectMapper.readValue(inputStream, IdentityStorage.class);
 
@@ -79,7 +83,7 @@ public class LegacyIdentityKeyStore {
             var trustLevel = TrustLevel.fromInt(storage.trustLevel());
             var added = storage.addedTimestamp();
 
-            final var serviceId = addressResolver.resolveRecipientAddress(recipientId).getServiceId();
+            final var serviceId = address.serviceId().get();
             return new IdentityInfo(serviceId, id, trustLevel, added);
         } catch (IOException | InvalidKeyException e) {
             logger.warn("Failed to load identity key: {}", e.getMessage());
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 d94a93a3..f323a5cb 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
@@ -17,10 +17,10 @@ public record RecipientAddress(
      * @param number    The phone number of the user, if available.
      */
     public RecipientAddress {
-        if (serviceId.isPresent() && serviceId.get().equals(ServiceId.UNKNOWN)) {
+        if (serviceId.isPresent() && serviceId.get().isUnknown()) {
             serviceId = Optional.empty();
         }
-        if (pni.isPresent() && pni.get().equals(ServiceId.UNKNOWN)) {
+        if (pni.isPresent() && pni.get().isUnknown()) {
             pni = Optional.empty();
         }
         if (serviceId.isEmpty() && pni.isPresent()) {
@@ -88,10 +88,6 @@ public record RecipientAddress(
                 address.username.equals(this.username) ? Optional.empty() : this.username);
     }
 
-    public ServiceId getServiceId() {
-        return serviceId.orElse(ServiceId.UNKNOWN);
-    }
-
     public String getIdentifier() {
         if (serviceId.isPresent()) {
             return serviceId.get().toString();
@@ -173,7 +169,7 @@ public record RecipientAddress(
     }
 
     public SignalServiceAddress toSignalServiceAddress() {
-        return new SignalServiceAddress(getServiceId(), number);
+        return new SignalServiceAddress(serviceId.orElse(ServiceId.UNKNOWN), number);
     }
 
     public org.asamk.signal.manager.api.RecipientAddress toApiRecipientAddress() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index efa72bf2..16e80e45 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -1,12 +1,12 @@
 package org.asamk.signal.manager.util;
 
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.fingerprint.Fingerprint;
 import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.ServiceResponse;
 
@@ -56,31 +56,35 @@ public class Utils {
         }
     }
 
-    public static Fingerprint computeSafetyNumber(
-            boolean isUuidCapable,
-            RecipientAddress ownAddress,
-            IdentityKey ownIdentityKey,
-            RecipientAddress theirAddress,
-            IdentityKey theirIdentityKey
+    public static Fingerprint computeSafetyNumberForNumber(
+            String ownNumber, IdentityKey ownIdentityKey, String theirNumber, IdentityKey theirIdentityKey
     ) {
-        int version;
-        byte[] ownId;
-        byte[] theirId;
+        // Version 1: E164 user
+        final var version = 1;
+        final var ownId = ownNumber.getBytes(StandardCharsets.UTF_8);
+        final var theirId = theirNumber.getBytes(StandardCharsets.UTF_8);
 
-        if (!isUuidCapable && ownAddress.number().isPresent() && theirAddress.number().isPresent()) {
-            // Version 1: E164 user
-            version = 1;
-            ownId = ownAddress.number().get().getBytes();
-            theirId = theirAddress.number().get().getBytes();
-        } else if (isUuidCapable && theirAddress.serviceId().isPresent()) {
-            // Version 2: UUID user
-            version = 2;
-            ownId = ownAddress.getServiceId().toByteArray();
-            theirId = theirAddress.getServiceId().toByteArray();
-        } else {
-            return null;
-        }
+        return getFingerprint(version, ownId, ownIdentityKey, theirId, theirIdentityKey);
+    }
 
+    public static Fingerprint computeSafetyNumberForUuid(
+            ServiceId ownServiceId, IdentityKey ownIdentityKey, ServiceId theirServiceId, IdentityKey theirIdentityKey
+    ) {
+        // Version 2: UUID user
+        final var version = 2;
+        final var ownId = ownServiceId.toByteArray();
+        final var theirId = theirServiceId.toByteArray();
+
+        return getFingerprint(version, ownId, ownIdentityKey, theirId, theirIdentityKey);
+    }
+
+    private static Fingerprint getFingerprint(
+            final int version,
+            final byte[] ownId,
+            final IdentityKey ownIdentityKey,
+            final byte[] theirId,
+            final IdentityKey theirIdentityKey
+    ) {
         return new NumericFingerprintGenerator(5200).createFor(version,
                 ownId,
                 ownIdentityKey,

From 24a8c528d05b8a6e250dc10cac78c4d4afbc34ab Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 5 Apr 2023 11:22:43 +0200
Subject: [PATCH 084/672] Filter null from db result

---
 .../manager/storage/identities/IdentityKeyStore.java      | 5 ++++-
 .../signal/manager/storage/sessions/SessionStore.java     | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index 9ae8dda8..b1d89628 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -15,6 +15,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.subjects.PublishSubject;
@@ -153,7 +154,9 @@ public class IdentityKeyStore {
                     """
             ).formatted(TABLE_IDENTITY);
             try (final var statement = connection.prepareStatement(sql)) {
-                return Utils.executeQueryForStream(statement, this::getIdentityInfoFromResultSet).toList();
+                return Utils.executeQueryForStream(statement, this::getIdentityInfoFromResultSet)
+                        .filter(Objects::nonNull)
+                        .toList();
             }
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from identity store", e);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index 564df1d0..0f267583 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -247,7 +247,9 @@ public class SessionStore implements SignalServiceSessionStore {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
                 records = Utils.executeQueryForStream(statement,
-                        res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res))).toList();
+                                res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
+                        .filter(Objects::nonNull)
+                        .toList();
             }
             for (final var record : records) {
                 record.second().archiveCurrentState();
@@ -274,7 +276,9 @@ public class SessionStore implements SignalServiceSessionStore {
                 statement.setInt(1, accountIdType);
                 statement.setBytes(2, serviceId.toByteArray());
                 records = Utils.executeQueryForStream(statement,
-                        res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res))).toList();
+                                res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
+                        .filter(Objects::nonNull)
+                        .toList();
             }
             for (final var record : records) {
                 record.second().archiveCurrentState();

From 542a3f36a4d3e3560dd00ac702f638671da10144 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 5 Apr 2023 11:25:53 +0200
Subject: [PATCH 085/672] Fix issue with unknown identity serviceId

Fixes #1215
---
 .../manager/storage/AccountDatabase.java      | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index c08036be..a15b4aab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -14,6 +14,7 @@ import org.asamk.signal.manager.storage.sessions.SessionStore;
 import org.asamk.signal.manager.storage.stickers.StickerStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.io.File;
 import java.sql.Connection;
@@ -22,7 +23,7 @@ import java.sql.SQLException;
 public class AccountDatabase extends Database {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 12;
+    private static final long DATABASE_VERSION = 13;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -304,5 +305,28 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 13) {
+            logger.debug("Updating database: Cleanup unknown service ids");
+            {
+                final var sql = """
+                                DELETE FROM identity AS i
+                                WHERE i.uuid = ?
+                                """;
+                try (final var statement = connection.prepareStatement(sql)) {
+                    statement.setBytes(1, ServiceId.UNKNOWN.toByteArray());
+                    statement.executeUpdate();
+                }
+            }
+            {
+                final var sql = """
+                                DELETE FROM sender_key_shared AS i
+                                WHERE i.uuid = ?
+                                """;
+                try (final var statement = connection.prepareStatement(sql)) {
+                    statement.setBytes(1, ServiceId.UNKNOWN.toByteArray());
+                    statement.executeUpdate();
+                }
+            }
+        }
     }
 }

From c93480692c8fa87e0c8c139c4f92295119e8dfed Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 5 Apr 2023 11:40:13 +0200
Subject: [PATCH 086/672] Bump version to 0.11.8

---
 CHANGELOG.md     | 14 ++++++++++++++
 build.gradle.kts |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd064695..ab9ec06d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 ## [Unreleased]
 
+## [0.11.8] - 2023-04-05
+
+### Added
+- Added file attachment attributes to JSON output (Thanks @signals-from-outer-space)
+
+### Fixed
+- Scrub E164 number from dbus paths
+- Fix sending large text messages to multiple recipient
+- Fix deleting old group in dbus mode
+- Fix issue with unknown identity serviceId
+
+### Improved
+- Relaxed Content-Type check in http daemon mode (Thanks @cedb)
+
 ## [0.11.7] - 2023-02-19
 **Attention**: Now requires native libsignal-client version 0.22.0
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 3c064acd..2f98516d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.20"
 }
 
-version = "0.11.7"
+version = "0.11.8"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From ff803eaf4567112dfa980e09c875325f2b03bae2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 13 Apr 2023 17:07:31 +0200
Subject: [PATCH 087/672] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 61608 -> 62076 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   7 ++++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..c1962a79e29d3e0ab67b14947c167a862655af9b 100644
GIT binary patch
delta 8979
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
F{TFmrHLU;u

delta 8469
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bdc9a83b..0c85a1f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d42..aeb74cbb 100755
--- a/gradlew
+++ b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

From 6a3ebfd4c8af35a5174ef325be83fa341bddc42d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 13 Apr 2023 18:08:52 +0200
Subject: [PATCH 088/672] Update graalvm buildtools native

---
 build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2f98516d..6f7d1a39 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.20"
+    id("org.graalvm.buildtools.native") version "0.9.21"
 }
 
 version = "0.11.8"
@@ -23,6 +23,7 @@ graalvmNative {
             resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
             if (System.getenv("GRAALVM_HOME") == null) {
+                toolchainDetection.set(true)
                 javaLauncher.set(javaToolchains.launcherFor {
                     languageVersion.set(JavaLanguageVersion.of(17))
                 })

From d2251ccd14081b80a1c7bcc906ad866502ff921b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 16 Apr 2023 21:09:24 +0200
Subject: [PATCH 089/672] Remove old libzkgroup fallback code

---
 .../org/asamk/signal/manager/SignalDependencies.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
index f4489ea7..7a8ecc4b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
@@ -27,8 +27,6 @@ import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
-import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
-
 public class SignalDependencies {
 
     private final Object LOCK = new Object();
@@ -119,17 +117,13 @@ public class SignalDependencies {
 
     public GroupsV2Operations getGroupsV2Operations() {
         return getOrCreate(() -> groupsV2Operations,
-                () -> groupsV2Operations = capabilities.getGv2()
-                        ? new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
-                        ServiceConfig.GROUP_MAX_SIZE)
-                        : null);
+                () -> groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
+                        ServiceConfig.GROUP_MAX_SIZE));
     }
 
     private ClientZkOperations getClientZkOperations() {
         return getOrCreate(() -> clientZkOperations,
-                () -> clientZkOperations = capabilities.getGv2()
-                        ? ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration())
-                        : null);
+                () -> clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()));
     }
 
     private ClientZkProfileOperations getClientZkProfileOperations() {

From 842f13b2fc78ea0d1fdf7ad439ef4852c66e3fa9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 16 Apr 2023 21:18:54 +0200
Subject: [PATCH 090/672] Update libsignal-service-java

---
 .../signal/manager/helper/SendHelper.java     | 58 +++++++++++--------
 settings.gradle.kts                           |  2 +-
 .../signal/commands/FinishLinkCommand.java    |  6 +-
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 0f4d035d..886c84f9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -345,29 +345,41 @@ public class SendHelper {
                 },
                 () -> false,
                 urgent);
-        final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> {
-            final var res = messageSender.sendGroupDataMessage(distId,
-                    recipients,
-                    unidentifiedAccess,
-                    isRecipientUpdate,
-                    contentHint,
-                    message,
-                    SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY,
-                    urgent,
-                    false);
-            synchronized (entryId) {
-                if (entryId.get() == -1) {
-                    final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
-                            res,
-                            contentHint,
-                            urgent);
-                    entryId.set(newId);
-                } else {
-                    messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), res);
-                }
-            }
-            return res;
-        };
+        final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendGroupDataMessage(
+                distId,
+                recipients,
+                unidentifiedAccess,
+                isRecipientUpdate,
+                contentHint,
+                message,
+                SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY,
+                urgent,
+                false,
+                sendResult -> {
+                    logger.trace("Partial message send results: {}", sendResult.size());
+                    synchronized (entryId) {
+                        if (entryId.get() == -1) {
+                            final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
+                                    sendResult,
+                                    contentHint,
+                                    urgent);
+                            entryId.set(newId);
+                        } else {
+                            messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
+                        }
+                    }
+                    synchronized (entryId) {
+                        if (entryId.get() == -1) {
+                            final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
+                                    sendResult,
+                                    contentHint,
+                                    urgent);
+                            entryId.set(newId);
+                        } else {
+                            messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
+                        }
+                    }
+                });
         final var results = sendGroupMessageInternal(legacySender, senderKeySender, recipientIds, distributionId);
 
         for (var r : results) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cade6fe9..a4c2cc51 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.6")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_68")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_69")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.2")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
diff --git a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
index f49de103..d08520df 100644
--- a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
@@ -55,7 +55,11 @@ public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.
         } catch (TimeoutException e) {
             throw new UserErrorException("Link request timed out, please try again.");
         } catch (IOException e) {
-            throw new IOErrorException("Link request error: " + e.getMessage(), e);
+            throw new IOErrorException("Link request error: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);
         } catch (UserAlreadyExistsException e) {
             throw new UserErrorException("The user "
                     + e.getNumber()

From da4cc7dc6be69491c51d0f414a109b8914d7b291 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 16 Apr 2023 21:17:22 +0200
Subject: [PATCH 091/672] Announce support for gift badges if linked device

Fixes #1226
---
 .../manager/ProvisioningManagerImpl.java      |  4 +--
 .../signal/manager/config/ServiceConfig.java  | 29 ++++++++++---------
 .../signal/manager/helper/IdentityHelper.java |  4 +--
 .../helper/IncomingMessageHandler.java        |  7 +++++
 .../signal/manager/storage/SignalAccount.java |  8 +++--
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
index 8ae9bb26..544032da 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
@@ -41,7 +41,7 @@ import java.nio.channels.OverlappingFileLockException;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
+import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
 
 class ProvisioningManagerImpl implements ProvisioningManager {
 
@@ -132,7 +132,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
                         registrationId,
                         pniRegistrationId,
                         encryptedDeviceName,
-                        capabilities));
+                        getCapabilities(false)));
 
         // Create new account with the synced identity
         var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 36bbdb7e..c56d9e86 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -28,21 +28,7 @@ public class ServiceConfig {
 
     private final static KeyStore iasKeyStore;
 
-    public static final AccountAttributes.Capabilities capabilities;
-
     static {
-        capabilities = new AccountAttributes.Capabilities(false,
-                true,
-                false,
-                true,
-                true,
-                true,
-                true,
-                true,
-                false,
-                false,
-                false);
-
         try {
             TrustStore contactTrustStore = new IasTrustStore();
 
@@ -56,6 +42,21 @@ public class ServiceConfig {
         }
     }
 
+    public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
+        final var giftBadges = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(false,
+                true,
+                false,
+                true,
+                true,
+                true,
+                true,
+                true,
+                giftBadges,
+                false,
+                false);
+    }
+
     public static boolean isSignalClientAvailable() {
         try {
             try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index df762c91..c9cfaedc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -18,8 +18,6 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.function.BiFunction;
 
-import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
-
 public class IdentityHelper {
 
     private final static Logger logger = LoggerFactory.getLogger(IdentityHelper.class);
@@ -75,7 +73,7 @@ public class IdentityHelper {
         final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
         final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
 
-        if (capabilities.getUuid()) {
+        if (account.getAccountCapabilities().getUuid()) {
             if (serviceId.isUnknown()) {
                 return null;
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 3a834a70..4e171326 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -817,6 +817,9 @@ public final class IncomingMessageHandler {
                 }
             }
         }
+        if (message.getGiftBadge().isPresent()) {
+            handleIncomingGiftBadge(message.getGiftBadge().get());
+        }
         if (message.getProfileKey().isPresent()) {
             handleIncomingProfileKey(message.getProfileKey().get(), source.recipientId());
         }
@@ -833,6 +836,10 @@ public final class IncomingMessageHandler {
         return actions;
     }
 
+    private void handleIncomingGiftBadge(final SignalServiceDataMessage.GiftBadge giftBadge) {
+        // TODO
+    }
+
     private List<HandleAction> handleSignalServiceStoryMessage(
             SignalServiceStoryMessage message, RecipientId source, boolean ignoreAttachments
     ) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index bd892c5d..5014ab6d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -98,7 +98,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
+import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
 
 public class SignalAccount implements Closeable {
 
@@ -1328,13 +1328,17 @@ public class SignalAccount implements Closeable {
                 registrationLock != null ? registrationLock : getRegistrationLock(),
                 getSelfUnidentifiedAccessKey(),
                 isUnrestrictedUnidentifiedAccess(),
-                capabilities,
+                getAccountCapabilities(),
                 isDiscoverableByPhoneNumber(),
                 encryptedDeviceName,
                 getLocalPniRegistrationId(),
                 null); // TODO recoveryPassword?
     }
 
+    public AccountAttributes.Capabilities getAccountCapabilities() {
+        return getCapabilities(isPrimaryDevice());
+    }
+
     public ServiceId getAccountId(ServiceIdType serviceIdType) {
         return serviceIdType.equals(ServiceIdType.ACI) ? aci : pni;
     }

From c703644dbe91576f92a17f1c6a72b5415910751f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Apr 2023 12:41:12 +0200
Subject: [PATCH 092/672] Fix build with java 20

---
 buildSrc/build.gradle.kts                | 6 ++++++
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 4516d475..101c307f 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -2,6 +2,12 @@ plugins {
     `kotlin-dsl`
 }
 
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of("17"))
+    }
+}
+
 repositories {
     mavenCentral()
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c85a1f7..37aef8d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From e0ed651e53eff382f3f7561e8c8ef0a1d87a46e9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Apr 2023 17:54:49 +0200
Subject: [PATCH 093/672] Bump version to 0.11.9

---
 CHANGELOG.md     | 6 ++++++
 build.gradle.kts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab9ec06d..d83a93ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.11.9] - 2023-04-22
+
+### Fixed
+- Fix build with Java 20
+- Workaround issue with linking to newer app versions
+
 ## [0.11.8] - 2023-04-05
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 6f7d1a39..e5de61d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.21"
 }
 
-version = "0.11.8"
+version = "0.11.9"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From 3a4ad96a0004c8cc3871a0a666aafc3f98e9f5c0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Apr 2023 19:19:00 +0200
Subject: [PATCH 094/672] Fix build with java 20

- previous fix required a jdk 17 to be installed as well
---
 buildSrc/build.gradle.kts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 101c307f..3e8942b9 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,11 +1,17 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+
 plugins {
     `kotlin-dsl`
 }
 
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of("17"))
-    }
+tasks.named<KotlinCompilationTask<KotlinJvmCompilerOptions>>("compileKotlin").configure {
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
+}
+
+java {
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 repositories {

From f6aebb5917abb7831f399f1e2453a8d5d6c17542 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 23 Apr 2023 10:18:23 +0200
Subject: [PATCH 095/672] Bump version to 0.11.9.1

---
 CHANGELOG.md     | 6 +++++-
 build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d83a93ce..fe40af74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,14 @@
 
 ## [Unreleased]
 
-## [0.11.9] - 2023-04-22
+## [0.11.9.1] - 2023-04-23
 
 ### Fixed
 - Fix build with Java 20
+
+## [0.11.9] - 2023-04-22
+
+### Fixed
 - Workaround issue with linking to newer app versions
 
 ## [0.11.8] - 2023-04-05
diff --git a/build.gradle.kts b/build.gradle.kts
index e5de61d1..1d041d0c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.21"
 }
 
-version = "0.11.9"
+version = "0.11.9.1"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From 60ad58201211403aa79b85e2debc978452d5472d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 23 Apr 2023 19:39:36 +0200
Subject: [PATCH 096/672] Store envelopes using envelope proto

---
 .../manager/util/MessageCacheUtils.java       | 161 ++++++++----------
 1 file changed, 75 insertions(+), 86 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
index d6d8ba44..a7682682 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -6,6 +6,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -19,7 +20,7 @@ public class MessageCacheUtils {
 
     private final static Logger logger = LoggerFactory.getLogger(MessageCacheUtils.class);
 
-    final static int CURRENT_VERSION = 8;
+    final static int CURRENT_VERSION = 9;
 
     public static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
         try (var f = new FileInputStream(file)) {
@@ -31,74 +32,80 @@ public class MessageCacheUtils {
                 // Unsupported envelope version
                 return null;
             }
-            var type = in.readInt();
-            var source = in.readUTF();
-            ServiceId sourceServiceId = null;
-            if (version >= 3) {
-                sourceServiceId = ServiceId.parseOrNull(in.readUTF());
-            }
-            var sourceDevice = in.readInt();
-            if (version == 1) {
-                // read legacy relay field
-                in.readUTF();
-            }
-            String destinationUuid = null;
-            if (version >= 5) {
-                destinationUuid = in.readUTF();
-            }
-            var timestamp = in.readLong();
-            byte[] content = null;
-            var contentLen = in.readInt();
-            if (contentLen > 0) {
-                content = new byte[contentLen];
-                in.readFully(content);
-            }
-            var legacyMessageLen = in.readInt();
-            if (legacyMessageLen > 0) {
-                byte[] legacyMessage = new byte[legacyMessageLen];
-                in.readFully(legacyMessage);
-            }
-            long serverReceivedTimestamp = 0;
-            String uuid = null;
-            if (version >= 2) {
-                serverReceivedTimestamp = in.readLong();
-                uuid = in.readUTF();
-                if ("".equals(uuid)) {
-                    uuid = null;
+            if (version >= 9) {
+                final var serverReceivedTimestamp = in.readLong();
+                final var envelope = SignalServiceProtos.Envelope.parseFrom(in.readAllBytes());
+                return new SignalServiceEnvelope(envelope, serverReceivedTimestamp);
+            } else {
+                var type = in.readInt();
+                var source = in.readUTF();
+                ServiceId sourceServiceId = null;
+                if (version >= 3) {
+                    sourceServiceId = ServiceId.parseOrNull(in.readUTF());
                 }
+                var sourceDevice = in.readInt();
+                if (version == 1) {
+                    // read legacy relay field
+                    in.readUTF();
+                }
+                String destinationUuid = null;
+                if (version >= 5) {
+                    destinationUuid = in.readUTF();
+                }
+                var timestamp = in.readLong();
+                byte[] content = null;
+                var contentLen = in.readInt();
+                if (contentLen > 0) {
+                    content = new byte[contentLen];
+                    in.readFully(content);
+                }
+                var legacyMessageLen = in.readInt();
+                if (legacyMessageLen > 0) {
+                    byte[] legacyMessage = new byte[legacyMessageLen];
+                    in.readFully(legacyMessage);
+                }
+                long serverReceivedTimestamp = 0;
+                String uuid = null;
+                if (version >= 2) {
+                    serverReceivedTimestamp = in.readLong();
+                    uuid = in.readUTF();
+                    if ("".equals(uuid)) {
+                        uuid = null;
+                    }
+                }
+                long serverDeliveredTimestamp = 0;
+                if (version >= 4) {
+                    serverDeliveredTimestamp = in.readLong();
+                }
+                boolean isUrgent = true;
+                if (version >= 6) {
+                    isUrgent = in.readBoolean();
+                }
+                boolean isStory = true;
+                if (version >= 7) {
+                    isStory = in.readBoolean();
+                }
+                String updatedPni = null;
+                if (version >= 8) {
+                    updatedPni = in.readUTF();
+                }
+                Optional<SignalServiceAddress> addressOptional = sourceServiceId == null
+                        ? Optional.empty()
+                        : Optional.of(new SignalServiceAddress(sourceServiceId, source));
+                return new SignalServiceEnvelope(type,
+                        addressOptional,
+                        sourceDevice,
+                        timestamp,
+                        content,
+                        serverReceivedTimestamp,
+                        serverDeliveredTimestamp,
+                        uuid,
+                        destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid,
+                        isUrgent,
+                        isStory,
+                        null,
+                        updatedPni == null ? "" : updatedPni);
             }
-            long serverDeliveredTimestamp = 0;
-            if (version >= 4) {
-                serverDeliveredTimestamp = in.readLong();
-            }
-            boolean isUrgent = true;
-            if (version >= 6) {
-                isUrgent = in.readBoolean();
-            }
-            boolean isStory = true;
-            if (version >= 7) {
-                isStory = in.readBoolean();
-            }
-            String updatedPni = null;
-            if (version >= 8) {
-                updatedPni = in.readUTF();
-            }
-            Optional<SignalServiceAddress> addressOptional = sourceServiceId == null
-                    ? Optional.empty()
-                    : Optional.of(new SignalServiceAddress(sourceServiceId, source));
-            return new SignalServiceEnvelope(type,
-                    addressOptional,
-                    sourceDevice,
-                    timestamp,
-                    content,
-                    serverReceivedTimestamp,
-                    serverDeliveredTimestamp,
-                    uuid,
-                    destinationUuid == null ? UuidUtil.UNKNOWN_UUID.toString() : destinationUuid,
-                    isUrgent,
-                    isStory,
-                    null,
-                    updatedPni == null ? "" : updatedPni);
         }
     }
 
@@ -106,26 +113,8 @@ public class MessageCacheUtils {
         try (var f = new FileOutputStream(file)) {
             try (var out = new DataOutputStream(f)) {
                 out.writeInt(CURRENT_VERSION); // version
-                out.writeInt(envelope.getType());
-                out.writeUTF(""); // legacy number
-                out.writeUTF(envelope.getSourceUuid().isPresent() ? envelope.getSourceUuid().get() : "");
-                out.writeInt(envelope.getSourceDevice());
-                out.writeUTF(envelope.getDestinationUuid() == null ? "" : envelope.getDestinationUuid());
-                out.writeLong(envelope.getTimestamp());
-                if (envelope.hasContent()) {
-                    out.writeInt(envelope.getContent().length);
-                    out.write(envelope.getContent());
-                } else {
-                    out.writeInt(0);
-                }
-                out.writeInt(0); // legacy message
-                out.writeLong(envelope.getServerReceivedTimestamp());
-                var uuid = envelope.getServerGuid();
-                out.writeUTF(uuid == null ? "" : uuid);
                 out.writeLong(envelope.getServerDeliveredTimestamp());
-                out.writeBoolean(envelope.isUrgent());
-                out.writeBoolean(envelope.isStory());
-                out.writeUTF(envelope.getUpdatedPni() == null ? "" : envelope.getUpdatedPni());
+                envelope.getProto().writeTo(out);
             }
         }
     }

From f7f882e834f33702e4cc36d9a20e0a89ed76dec8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 23 Apr 2023 19:55:23 +0200
Subject: [PATCH 097/672] Use modern switch syntax

---
 .../helper/IncomingMessageHandler.java        | 20 ++++++++-----------
 .../helper/UnidentifiedAccessHelper.java      | 17 +++++-----------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 4e171326..18e454e0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -542,10 +542,8 @@ public final class IncomingMessageHandler {
         }
         if (syncMessage.getFetchType().isPresent()) {
             switch (syncMessage.getFetchType().get()) {
-                case LOCAL_PROFILE:
-                    actions.add(new RetrieveProfileAction(account.getSelfRecipientId()));
-                case STORAGE_MANIFEST:
-                    actions.add(RetrieveStorageDataAction.create());
+                case LOCAL_PROFILE -> actions.add(new RetrieveProfileAction(account.getSelfRecipientId()));
+                case STORAGE_MANIFEST -> actions.add(RetrieveStorageDataAction.create());
             }
         }
         if (syncMessage.getKeys().isPresent()) {
@@ -709,7 +707,7 @@ public final class IncomingMessageHandler {
                 if (group == null || group instanceof GroupInfoV1) {
                     var groupV1 = (GroupInfoV1) group;
                     switch (groupInfo.getType()) {
-                        case UPDATE: {
+                        case UPDATE -> {
                             if (groupV1 == null) {
                                 groupV1 = new GroupInfoV1(groupId);
                             }
@@ -732,25 +730,23 @@ public final class IncomingMessageHandler {
                             }
 
                             account.getGroupStore().updateGroup(groupV1);
-                            break;
                         }
-                        case DELIVER:
+                        case DELIVER -> {
                             if (groupV1 == null && !isSync) {
                                 actions.add(new SendGroupInfoRequestAction(source.recipientId(), groupId));
                             }
-                            break;
-                        case QUIT: {
+                        }
+                        case QUIT -> {
                             if (groupV1 != null) {
                                 groupV1.removeMember(source.recipientId());
                                 account.getGroupStore().updateGroup(groupV1);
                             }
-                            break;
                         }
-                        case REQUEST_INFO:
+                        case REQUEST_INFO -> {
                             if (groupV1 != null && !isSync) {
                                 actions.add(new SendGroupInfoAction(source.recipientId(), groupV1.getGroupId()));
                             }
-                            break;
+                        }
                     }
                 } else {
                     // Received a group v1 message for a v2 group
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index b89ed2b7..0f0da15c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -166,18 +166,11 @@ public class UnidentifiedAccessHelper {
     private static byte[] getTargetUnidentifiedAccessKey(
             final Profile targetProfile, final ProfileKey theirProfileKey
     ) {
-        switch (targetProfile.getUnidentifiedAccessMode()) {
-            case ENABLED:
-                if (theirProfileKey == null) {
-                    return null;
-                }
-
-                return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
-            case UNRESTRICTED:
-                return createUnrestrictedUnidentifiedAccess();
-            default:
-                return null;
-        }
+        return switch (targetProfile.getUnidentifiedAccessMode()) {
+            case ENABLED -> theirProfileKey == null ? null : UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
+            case UNRESTRICTED -> createUnrestrictedUnidentifiedAccess();
+            default -> null;
+        };
     }
 
     private static byte[] createUnrestrictedUnidentifiedAccess() {

From e0e8e114435b402221fe0332d8f767eac88f344e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 23 Apr 2023 19:57:06 +0200
Subject: [PATCH 098/672] Validate incoming messages before handling them

---
 .../helper/IncomingMessageHandler.java        | 64 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 18e454e0..5261ad73 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -51,13 +51,17 @@ import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.InvalidMessageStructureException;
 import org.whispersystems.signalservice.api.crypto.SignalGroupSessionBuilder;
+import org.whispersystems.signalservice.api.crypto.SignalServiceCipherResult;
+import org.whispersystems.signalservice.api.messages.EnvelopeContentValidator;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
+import org.whispersystems.signalservice.api.messages.SignalServiceMetadata;
 import org.whispersystems.signalservice.api.messages.SignalServicePniSignatureMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
@@ -67,6 +71,11 @@ import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
+import org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer;
+import org.whispersystems.signalservice.internal.serialize.SignalServiceMetadataProtobufSerializer;
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -101,7 +110,12 @@ public final class IncomingMessageHandler {
         if (!envelope.isReceipt()) {
             account.getIdentityKeyStore().setRetryingDecryption(true);
             try {
-                content = dependencies.getCipher().decrypt(envelope);
+                final var cipherResult = dependencies.getCipher()
+                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
+                content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
+                if (content == null) {
+                    return new Pair<>(List.of(), null);
+                }
             } catch (ProtocolUntrustedIdentityException e) {
                 final var recipientId = account.getRecipientResolver().resolveRecipient(e.getSender());
                 final var exception = new UntrustedIdentityException(account.getRecipientAddressResolver()
@@ -133,7 +147,12 @@ public final class IncomingMessageHandler {
         Exception exception = null;
         if (!envelope.isReceipt()) {
             try {
-                content = dependencies.getCipher().decrypt(envelope);
+                final var cipherResult = dependencies.getCipher()
+                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
+                content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
+                if (content == null) {
+                    return new Pair<>(List.of(), null);
+                }
             } catch (ProtocolUntrustedIdentityException e) {
                 final var recipientId = account.getRecipientResolver().resolveRecipient(e.getSender());
                 actions.add(new RetrieveProfileAction(recipientId));
@@ -189,6 +208,47 @@ public final class IncomingMessageHandler {
         return new Pair<>(actions, exception);
     }
 
+    private SignalServiceContent validate(
+            SignalServiceProtos.Envelope envelope, SignalServiceCipherResult cipherResult, long serverDeliveredTimestamp
+    ) throws ProtocolInvalidKeyException, ProtocolInvalidMessageException, UnsupportedDataMessageException, InvalidMessageStructureException {
+        final var content = cipherResult.getContent();
+        final var envelopeMetadata = cipherResult.getMetadata();
+        final var validationResult = EnvelopeContentValidator.INSTANCE.validate(envelope, content);
+
+        if (validationResult instanceof EnvelopeContentValidator.Result.Invalid v) {
+            logger.warn("Invalid content! {}", v.getReason(), v.getThrowable());
+            return null;
+        }
+
+        if (validationResult instanceof EnvelopeContentValidator.Result.UnsupportedDataMessage v) {
+            logger.warn("Unsupported DataMessage! Our version: {}, their version: {}",
+                    v.getOurVersion(),
+                    v.getTheirVersion());
+            return null;
+        }
+
+        final var localAddress = new SignalServiceAddress(envelopeMetadata.getDestinationServiceId(),
+                Optional.ofNullable(account.getNumber()));
+        final var metadata = new SignalServiceMetadata(new SignalServiceAddress(envelopeMetadata.getSourceServiceId(),
+                Optional.ofNullable(envelopeMetadata.getSourceE164())),
+                envelopeMetadata.getSourceDeviceId(),
+                envelope.getTimestamp(),
+                envelope.getServerTimestamp(),
+                serverDeliveredTimestamp,
+                envelopeMetadata.getSealedSender(),
+                envelope.getServerGuid(),
+                Optional.ofNullable(envelopeMetadata.getGroupId()),
+                envelopeMetadata.getDestinationServiceId().toString());
+
+        final var contentProto = SignalServiceContentProto.newBuilder()
+                .setLocalAddress(SignalServiceAddressProtobufSerializer.toProtobuf(localAddress))
+                .setMetadata(SignalServiceMetadataProtobufSerializer.toProtobuf(metadata))
+                .setContent(content)
+                .build();
+
+        return SignalServiceContent.createFromProto(contentProto);
+    }
+
     private List<HandleAction> checkAndHandleMessage(
             final SignalServiceEnvelope envelope,
             final SignalServiceContent content,

From 72390e595d1646ba8be9f0ed4455e1c8f2b48874 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 11 May 2023 17:45:23 +0200
Subject: [PATCH 099/672] Update libsignal-service-java

---
 graalvm-config-dir/reflect-config.json        | 239 +++++++++++++++---
 .../signal/manager/helper/SendHelper.java     |   4 +-
 settings.gradle.kts                           |   2 +-
 3 files changed, 208 insertions(+), 37 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 22b58b56..70b26757 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -564,7 +564,13 @@
   "name":"org.asamk.signal.commands.GetUserStatusCommand$JsonUserStatus",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"isRegistered","parameterTypes":[] }, 
+    {"name":"number","parameterTypes":[] }, 
+    {"name":"recipient","parameterTypes":[] }, 
+    {"name":"uuid","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.commands.ListAccountsCommand$JsonAccount",
@@ -694,7 +700,17 @@
   "name":"org.asamk.signal.json.JsonAttachment",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"caption","parameterTypes":[] }, 
+    {"name":"contentType","parameterTypes":[] }, 
+    {"name":"filename","parameterTypes":[] }, 
+    {"name":"height","parameterTypes":[] }, 
+    {"name":"id","parameterTypes":[] }, 
+    {"name":"size","parameterTypes":[] }, 
+    {"name":"uploadTimestamp","parameterTypes":[] }, 
+    {"name":"width","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonAttachmentData",
@@ -707,7 +723,14 @@
   "name":"org.asamk.signal.json.JsonCallMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"answerMessage","parameterTypes":[] }, 
+    {"name":"busyMessage","parameterTypes":[] }, 
+    {"name":"hangupMessage","parameterTypes":[] }, 
+    {"name":"iceUpdateMessages","parameterTypes":[] }, 
+    {"name":"offerMessage","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$Answer",
@@ -796,7 +819,24 @@
   "name":"org.asamk.signal.json.JsonDataMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"attachments","parameterTypes":[] }, 
+    {"name":"contacts","parameterTypes":[] }, 
+    {"name":"expiresInSeconds","parameterTypes":[] }, 
+    {"name":"groupInfo","parameterTypes":[] }, 
+    {"name":"mentions","parameterTypes":[] }, 
+    {"name":"message","parameterTypes":[] }, 
+    {"name":"payment","parameterTypes":[] }, 
+    {"name":"previews","parameterTypes":[] }, 
+    {"name":"quote","parameterTypes":[] }, 
+    {"name":"reaction","parameterTypes":[] }, 
+    {"name":"remoteDelete","parameterTypes":[] }, 
+    {"name":"sticker","parameterTypes":[] }, 
+    {"name":"storyContext","parameterTypes":[] }, 
+    {"name":"timestamp","parameterTypes":[] }, 
+    {"name":"viewOnce","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonError",
@@ -808,19 +848,44 @@
   "name":"org.asamk.signal.json.JsonGroupInfo",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"groupId","parameterTypes":[] }, 
+    {"name":"type","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonMention",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"length","parameterTypes":[] }, 
+    {"name":"name","parameterTypes":[] }, 
+    {"name":"number","parameterTypes":[] }, 
+    {"name":"start","parameterTypes":[] }, 
+    {"name":"uuid","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonMessageEnvelope",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"callMessage","parameterTypes":[] }, 
+    {"name":"dataMessage","parameterTypes":[] }, 
+    {"name":"receiptMessage","parameterTypes":[] }, 
+    {"name":"source","parameterTypes":[] }, 
+    {"name":"sourceDevice","parameterTypes":[] }, 
+    {"name":"sourceName","parameterTypes":[] }, 
+    {"name":"sourceNumber","parameterTypes":[] }, 
+    {"name":"sourceUuid","parameterTypes":[] }, 
+    {"name":"storyMessage","parameterTypes":[] }, 
+    {"name":"syncMessage","parameterTypes":[] }, 
+    {"name":"timestamp","parameterTypes":[] }, 
+    {"name":"typingMessage","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonPayment",
@@ -848,25 +913,54 @@
   "name":"org.asamk.signal.json.JsonQuote",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"attachments","parameterTypes":[] }, 
+    {"name":"author","parameterTypes":[] }, 
+    {"name":"authorNumber","parameterTypes":[] }, 
+    {"name":"authorUuid","parameterTypes":[] }, 
+    {"name":"id","parameterTypes":[] }, 
+    {"name":"mentions","parameterTypes":[] }, 
+    {"name":"text","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonQuotedAttachment",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"contentType","parameterTypes":[] }, 
+    {"name":"filename","parameterTypes":[] }, 
+    {"name":"thumbnail","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonReaction",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"emoji","parameterTypes":[] }, 
+    {"name":"isRemove","parameterTypes":[] }, 
+    {"name":"targetAuthor","parameterTypes":[] }, 
+    {"name":"targetAuthorNumber","parameterTypes":[] }, 
+    {"name":"targetAuthorUuid","parameterTypes":[] }, 
+    {"name":"targetSentTimestamp","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonReceiptMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"isDelivery","parameterTypes":[] }, 
+    {"name":"isRead","parameterTypes":[] }, 
+    {"name":"isViewed","parameterTypes":[] }, 
+    {"name":"timestamps","parameterTypes":[] }, 
+    {"name":"when","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonRecipientAddress",
@@ -882,7 +976,8 @@
   "name":"org.asamk.signal.json.JsonRemoteDelete",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"timestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSendMessageResult",
@@ -969,13 +1064,27 @@
   "name":"org.asamk.signal.json.JsonSyncDataMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"dataMessage","parameterTypes":[] }, 
+    {"name":"destination","parameterTypes":[] }, 
+    {"name":"destinationNumber","parameterTypes":[] }, 
+    {"name":"destinationUuid","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"blockedGroupIds","parameterTypes":[] }, 
+    {"name":"blockedNumbers","parameterTypes":[] }, 
+    {"name":"readMessages","parameterTypes":[] }, 
+    {"name":"sentMessage","parameterTypes":[] }, 
+    {"name":"sentStoryMessage","parameterTypes":[] }, 
+    {"name":"type","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncMessageType",
@@ -986,7 +1095,13 @@
   "name":"org.asamk.signal.json.JsonSyncReadMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"sender","parameterTypes":[] }, 
+    {"name":"senderNumber","parameterTypes":[] }, 
+    {"name":"senderUuid","parameterTypes":[] }, 
+    {"name":"timestamp","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncStoryMessage",
@@ -1777,7 +1892,8 @@
 },
 {
   "name":"org.freedesktop.dbus.interfaces.DBus$NameAcquired",
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
 },
 {
   "name":"org.freedesktop.dbus.interfaces.Introspectable",
@@ -2250,13 +2366,42 @@
   "name":"org.whispersystems.signalservice.api.account.AccountAttributes",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"getCapabilities","parameterTypes":[] }, 
+    {"name":"getDiscoverableByPhoneNumber","parameterTypes":[] }, 
+    {"name":"getFetchesMessages","parameterTypes":[] }, 
+    {"name":"getName","parameterTypes":[] }, 
+    {"name":"getPin","parameterTypes":[] }, 
+    {"name":"getPniRegistrationId","parameterTypes":[] }, 
+    {"name":"getRecoveryPassword","parameterTypes":[] }, 
+    {"name":"getRegistrationId","parameterTypes":[] }, 
+    {"name":"getRegistrationLock","parameterTypes":[] }, 
+    {"name":"getSignalingKey","parameterTypes":[] }, 
+    {"name":"getUnidentifiedAccessKey","parameterTypes":[] }, 
+    {"name":"getUnrestrictedUnidentifiedAccess","parameterTypes":[] }, 
+    {"name":"getVideo","parameterTypes":[] }, 
+    {"name":"getVoice","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.AccountAttributes$Capabilities",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"getAnnouncementGroup","parameterTypes":[] }, 
+    {"name":"getChangeNumber","parameterTypes":[] }, 
+    {"name":"getGiftBadges","parameterTypes":[] }, 
+    {"name":"getGv1Migration","parameterTypes":[] }, 
+    {"name":"getGv2","parameterTypes":[] }, 
+    {"name":"getPaymentActivation","parameterTypes":[] }, 
+    {"name":"getPni","parameterTypes":[] }, 
+    {"name":"getSenderKey","parameterTypes":[] }, 
+    {"name":"getStorage","parameterTypes":[] }, 
+    {"name":"getStories","parameterTypes":[] }, 
+    {"name":"getUuid","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest",
@@ -2315,25 +2460,29 @@
   "name":"org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfile",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfile$Badge",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfile$Capabilities",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfileWrite",
@@ -2357,7 +2506,8 @@
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity$ByteArrayDeserializer",
@@ -2378,7 +2528,8 @@
   "name":"org.whispersystems.signalservice.api.storage.StorageAuthResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.crypto.SignatureBodyEntity",
@@ -2564,7 +2715,8 @@
   "name":"org.whispersystems.signalservice.internal.push.DeviceInfoList",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.GetAciByUsernameResponse",
@@ -2591,25 +2743,35 @@
   "name":"org.whispersystems.signalservice.internal.push.MismatchedDevices",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.OutgoingPushMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getDestinationDeviceId","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.OutgoingPushMessageList",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"getDestination","parameterTypes":[] }, 
+    {"name":"getMessages","parameterTypes":[] }, 
+    {"name":"getTimestamp","parameterTypes":[] }, 
+    {"name":"isOnline","parameterTypes":[] }, 
+    {"name":"isUrgent","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyEntity",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyEntity$ECPublicKeyDeserializer",
@@ -2623,13 +2785,15 @@
   "name":"org.whispersystems.signalservice.internal.push.PreKeyResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyResponseItem",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyState",
@@ -2641,7 +2805,8 @@
   "name":"org.whispersystems.signalservice.internal.push.PreKeyStatus",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProfileAvatarUploadAttributes",
@@ -2743,13 +2908,15 @@
   "name":"org.whispersystems.signalservice.internal.push.SendMessageResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SenderCertificate",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SenderCertificate$ByteArrayDesieralizer",
@@ -2880,6 +3047,7 @@
     {"name":"callMessage_"}, 
     {"name":"dataMessage_"}, 
     {"name":"decryptionErrorMessage_"}, 
+    {"name":"editMessage_"}, 
     {"name":"nullMessage_"}, 
     {"name":"pniSignatureMessage_"}, 
     {"name":"receiptMessage_"}, 
@@ -3244,10 +3412,10 @@
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$CallEvent",
   "fields":[
     {"name":"bitField0_"}, 
+    {"name":"conversationId_"}, 
     {"name":"direction_"}, 
     {"name":"event_"}, 
     {"name":"id_"}, 
-    {"name":"peerUuid_"}, 
     {"name":"timestamp_"}, 
     {"name":"type_"}
   ]
@@ -3354,6 +3522,7 @@
     {"name":"bitField0_"}, 
     {"name":"destinationE164_"}, 
     {"name":"destinationUuid_"}, 
+    {"name":"editMessage_"}, 
     {"name":"expirationStartTimestamp_"}, 
     {"name":"isRecipientUpdate_"}, 
     {"name":"message_"}, 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 886c84f9..3dd99d3a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -355,6 +355,7 @@ public class SendHelper {
                 SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY,
                 urgent,
                 false,
+                null,
                 sendResult -> {
                     logger.trace("Partial message send results: {}", sendResult.size());
                     synchronized (entryId) {
@@ -673,7 +674,8 @@ public class SendHelper {
                 Map.of(address.getServiceId(), true),
                 false,
                 Optional.empty(),
-                Set.of());
+                Set.of(),
+                Optional.empty());
         var syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
 
         return sendSyncMessage(syncMessage);
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a4c2cc51..f46f2719 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.6")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_69")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_70")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.2")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From 8a31b7f2c153e89532010b9ab58eb045ddfe43fe Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 11 May 2023 19:10:29 +0200
Subject: [PATCH 100/672] Implement editing of previous messages

---
 graalvm-config-dir/reflect-config.json        | 43 ++++++++++++---
 .../org/asamk/signal/manager/Manager.java     |  4 ++
 .../org/asamk/signal/manager/ManagerImpl.java | 25 +++++++--
 .../signal/manager/api/MessageEnvelope.java   | 22 ++++++++
 .../signal/manager/helper/GroupHelper.java    |  2 +-
 .../signal/manager/helper/SendHelper.java     | 53 ++++++++++++-------
 man/signal-cli.1.adoc                         |  3 ++
 .../asamk/signal/ReceiveMessageHandler.java   | 11 ++++
 .../asamk/signal/commands/SendCommand.java    |  9 +++-
 .../asamk/signal/dbus/DbusManagerImpl.java    | 13 +++++
 .../asamk/signal/json/JsonEditMessage.java    | 10 ++++
 .../signal/json/JsonMessageEnvelope.java      |  3 ++
 .../signal/json/JsonSyncDataMessage.java      | 23 ++++----
 13 files changed, 179 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/json/JsonEditMessage.java

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 70b26757..3bab701f 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -288,7 +288,8 @@
   "name":"java.lang.Long",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.lang.Number",
@@ -838,11 +839,25 @@
     {"name":"viewOnce","parameterTypes":[] }
   ]
 },
+{
+  "name":"org.asamk.signal.json.JsonEditMessage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[
+    {"name":"dataMessage","parameterTypes":[] }, 
+    {"name":"targetSentTimestamp","parameterTypes":[] }
+  ]
+},
 {
   "name":"org.asamk.signal.json.JsonError",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"message","parameterTypes":[] }, 
+    {"name":"type","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonGroupInfo",
@@ -875,6 +890,7 @@
   "methods":[
     {"name":"callMessage","parameterTypes":[] }, 
     {"name":"dataMessage","parameterTypes":[] }, 
+    {"name":"editMessage","parameterTypes":[] }, 
     {"name":"receiptMessage","parameterTypes":[] }, 
     {"name":"source","parameterTypes":[] }, 
     {"name":"sourceDevice","parameterTypes":[] }, 
@@ -1007,7 +1023,11 @@
   "name":"org.asamk.signal.json.JsonSticker",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"packId","parameterTypes":[] }, 
+    {"name":"stickerId","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.json.JsonStoryContext",
@@ -1069,7 +1089,8 @@
     {"name":"dataMessage","parameterTypes":[] }, 
     {"name":"destination","parameterTypes":[] }, 
     {"name":"destinationNumber","parameterTypes":[] }, 
-    {"name":"destinationUuid","parameterTypes":[] }
+    {"name":"destinationUuid","parameterTypes":[] }, 
+    {"name":"editMessage","parameterTypes":[] }
   ]
 },
 {
@@ -2417,13 +2438,15 @@
   "name":"org.whispersystems.signalservice.api.groupsv2.CredentialResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.TemporalCredential",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.TemporalCredential[]"
@@ -3236,6 +3259,14 @@
     {"name":"sentTimestamp_"}
   ]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$EditMessage",
+  "fields":[
+    {"name":"bitField0_"}, 
+    {"name":"dataMessage_"}, 
+    {"name":"targetSentTimestamp_"}
+  ]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Envelope",
   "fields":[
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index bcb8f348..b6602f57 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -142,6 +142,10 @@ public interface Manager extends Closeable {
             Message message, Set<RecipientIdentifier> recipients
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
 
+    SendMessageResults sendEditMessage(
+            Message message, Set<RecipientIdentifier> recipients, long editTargetTimestamp
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
+
     SendMessageResults sendRemoteDeleteMessage(
             long targetSentTimestamp, Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 9696d956..1cc0629b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -466,6 +466,14 @@ class ManagerImpl implements Manager {
 
     private SendMessageResults sendMessage(
             SignalServiceDataMessage.Builder messageBuilder, Set<RecipientIdentifier> recipients
+    ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+        return sendMessage(messageBuilder, recipients, Optional.empty());
+    }
+
+    private SendMessageResults sendMessage(
+            SignalServiceDataMessage.Builder messageBuilder,
+            Set<RecipientIdentifier> recipients,
+            Optional<Long> editTargetTimestamp
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
         long timestamp = System.currentTimeMillis();
@@ -474,17 +482,19 @@ class ManagerImpl implements Manager {
             if (recipient instanceof RecipientIdentifier.Single single) {
                 try {
                     final var recipientId = context.getRecipientHelper().resolveRecipient(single);
-                    final var result = context.getSendHelper().sendMessage(messageBuilder, recipientId);
+                    final var result = context.getSendHelper()
+                            .sendMessage(messageBuilder, recipientId, editTargetTimestamp);
                     results.put(recipient, List.of(toSendMessageResult(result)));
                 } catch (UnregisteredRecipientException e) {
                     results.put(recipient,
                             List.of(SendMessageResult.unregisteredFailure(single.toPartialRecipientAddress())));
                 }
             } else if (recipient instanceof RecipientIdentifier.NoteToSelf) {
-                final var result = context.getSendHelper().sendSelfMessage(messageBuilder);
+                final var result = context.getSendHelper().sendSelfMessage(messageBuilder, editTargetTimestamp);
                 results.put(recipient, List.of(toSendMessageResult(result)));
             } else if (recipient instanceof RecipientIdentifier.Group group) {
-                final var result = context.getSendHelper().sendAsGroupMessage(messageBuilder, group.groupId());
+                final var result = context.getSendHelper()
+                        .sendAsGroupMessage(messageBuilder, group.groupId(), editTargetTimestamp);
                 results.put(recipient, result.stream().map(this::toSendMessageResult).toList());
             }
         }
@@ -581,6 +591,15 @@ class ManagerImpl implements Manager {
         return sendMessage(messageBuilder, recipients);
     }
 
+    @Override
+    public SendMessageResults sendEditMessage(
+            Message message, Set<RecipientIdentifier> recipients, long editTargetTimestamp
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
+        final var messageBuilder = SignalServiceDataMessage.newBuilder();
+        applyMessage(messageBuilder, message);
+        return sendMessage(messageBuilder, recipients, Optional.of(editTargetTimestamp));
+    }
+
     private void applyMessage(
             final SignalServiceDataMessage.Builder messageBuilder, final Message message
     ) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index c1726c1a..a8f00875 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -9,6 +9,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceEditMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
@@ -51,6 +52,7 @@ public record MessageEnvelope(
         Optional<Receipt> receipt,
         Optional<Typing> typing,
         Optional<Data> data,
+        Optional<Edit> edit,
         Optional<Sync> sync,
         Optional<Call> call,
         Optional<Story> story
@@ -541,6 +543,19 @@ public record MessageEnvelope(
         }
     }
 
+    public record Edit(long targetSentTimestamp, Data dataMessage) {
+
+        public static Edit from(
+                final SignalServiceEditMessage editMessage,
+                RecipientResolver recipientResolver,
+                RecipientAddressResolver addressResolver,
+                final AttachmentFileProvider fileProvider
+        ) {
+            return new Edit(editMessage.getTargetSentTimestamp(),
+                    Data.from(editMessage.getDataMessage(), recipientResolver, addressResolver, fileProvider));
+        }
+    }
+
     public record Sync(
             Optional<Sent> sent,
             Optional<Blocked> blocked,
@@ -582,6 +597,7 @@ public record MessageEnvelope(
                 Optional<RecipientAddress> destination,
                 Set<RecipientAddress> recipients,
                 Optional<Data> message,
+                Optional<Edit> editMessage,
                 Optional<Story> story
         ) {
 
@@ -603,6 +619,8 @@ public record MessageEnvelope(
                                 .collect(Collectors.toSet()),
                         sentMessage.getDataMessage()
                                 .map(message -> Data.from(message, recipientResolver, addressResolver, fileProvider)),
+                        sentMessage.getEditMessage()
+                                .map(message -> Edit.from(message, recipientResolver, addressResolver, fileProvider)),
                         sentMessage.getStoryMessage().map(s -> Story.from(s, fileProvider)));
             }
         }
@@ -920,6 +938,7 @@ public record MessageEnvelope(
         Optional<Receipt> receipt;
         Optional<Typing> typing;
         Optional<Data> data;
+        Optional<Edit> edit;
         Optional<Sync> sync;
         Optional<Call> call;
         Optional<Story> story;
@@ -928,6 +947,7 @@ public record MessageEnvelope(
             typing = content.getTypingMessage().map(Typing::from);
             data = content.getDataMessage()
                     .map(dataMessage -> Data.from(dataMessage, recipientResolver, addressResolver, fileProvider));
+            edit = content.getEditMessage().map(s -> Edit.from(s, recipientResolver, addressResolver, fileProvider));
             sync = content.getSyncMessage().map(s -> Sync.from(s, recipientResolver, addressResolver, fileProvider));
             call = content.getCallMessage().map(Call::from);
             story = content.getStoryMessage().map(s -> Story.from(s, fileProvider));
@@ -937,6 +957,7 @@ public record MessageEnvelope(
                     List.of(envelope.getTimestamp()))) : Optional.empty();
             typing = Optional.empty();
             data = Optional.empty();
+            edit = Optional.empty();
             sync = Optional.empty();
             call = Optional.empty();
             story = Optional.empty();
@@ -953,6 +974,7 @@ public record MessageEnvelope(
                 receipt,
                 typing,
                 data,
+                edit,
                 sync,
                 call,
                 story);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index bb9a3ea4..5658dc25 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -563,7 +563,7 @@ public class GroupHelper {
 
     private void sendExpirationTimerUpdate(GroupIdV1 groupId) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
-        context.getSendHelper().sendAsGroupMessage(messageBuilder, groupId);
+        context.getSendHelper().sendAsGroupMessage(messageBuilder, groupId, Optional.empty());
     }
 
     private SendGroupMessageResults updateGroupV2(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 3dd99d3a..a410c2c9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -29,6 +29,7 @@ import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceEditMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
@@ -71,8 +72,10 @@ public class SendHelper {
      * The message is extended with the current expiration timer.
      */
     public SendMessageResult sendMessage(
-            final SignalServiceDataMessage.Builder messageBuilder, final RecipientId recipientId
-    ) throws IOException {
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final RecipientId recipientId,
+            Optional<Long> editTargetTimestamp
+    ) {
         var contact = account.getContactStore().getContact(recipientId);
         if (contact == null || !contact.isProfileSharingEnabled()) {
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
@@ -89,7 +92,7 @@ public class SendHelper {
         }
 
         final var message = messageBuilder.build();
-        return sendMessage(message, recipientId);
+        return sendMessage(message, recipientId, editTargetTimestamp);
     }
 
     /**
@@ -97,10 +100,10 @@ public class SendHelper {
      * The message is extended with the current expiration timer for the group and the group context.
      */
     public List<SendMessageResult> sendAsGroupMessage(
-            SignalServiceDataMessage.Builder messageBuilder, GroupId groupId
+            SignalServiceDataMessage.Builder messageBuilder, GroupId groupId, Optional<Long> editTargetTimestamp
     ) throws IOException, GroupNotFoundException, NotAGroupMemberException, GroupSendingNotAllowedException {
         final var g = getGroupForSending(groupId);
-        return sendAsGroupMessage(messageBuilder, g);
+        return sendAsGroupMessage(messageBuilder, g, editTargetTimestamp);
     }
 
     /**
@@ -112,7 +115,7 @@ public class SendHelper {
             final Set<RecipientId> recipientIds,
             final DistributionId distributionId
     ) throws IOException {
-        return sendGroupMessage(message, recipientIds, distributionId, ContentHint.IMPLICIT);
+        return sendGroupMessage(message, recipientIds, distributionId, ContentHint.IMPLICIT, Optional.empty());
     }
 
     public SendMessageResult sendReceiptMessage(
@@ -169,7 +172,7 @@ public class SendHelper {
     }
 
     public SendMessageResult sendSelfMessage(
-            SignalServiceDataMessage.Builder messageBuilder
+            SignalServiceDataMessage.Builder messageBuilder, Optional<Long> editTargetTimestamp
     ) {
         final var recipientId = account.getSelfRecipientId();
         final var contact = account.getContactStore().getContact(recipientId);
@@ -177,7 +180,7 @@ public class SendHelper {
         messageBuilder.withExpiration(expirationTime);
 
         var message = messageBuilder.build();
-        return sendSelfMessage(message);
+        return sendSelfMessage(message, editTargetTimestamp);
     }
 
     public SendMessageResult sendSyncMessage(SignalServiceSyncMessage message) {
@@ -289,7 +292,7 @@ public class SendHelper {
     }
 
     private List<SendMessageResult> sendAsGroupMessage(
-            final SignalServiceDataMessage.Builder messageBuilder, final GroupInfo g
+            final SignalServiceDataMessage.Builder messageBuilder, final GroupInfo g, Optional<Long> editTargetTimestamp
     ) throws IOException, GroupSendingNotAllowedException {
         GroupUtils.setGroupContext(messageBuilder, g);
         messageBuilder.withExpiration(g.getMessageExpirationTimer());
@@ -308,14 +311,19 @@ public class SendHelper {
             }
         }
 
-        return sendGroupMessage(message, recipients, g.getDistributionId(), ContentHint.RESENDABLE);
+        return sendGroupMessage(message,
+                recipients,
+                g.getDistributionId(),
+                ContentHint.RESENDABLE,
+                editTargetTimestamp);
     }
 
     private List<SendMessageResult> sendGroupMessage(
             final SignalServiceDataMessage message,
             final Set<RecipientId> recipientIds,
             final DistributionId distributionId,
-            final ContentHint contentHint
+            final ContentHint contentHint,
+            final Optional<Long> editTargetTimestamp
     ) throws IOException {
         final var messageSender = dependencies.getMessageSender();
         final var messageSendLogStore = account.getMessageSendLogStore();
@@ -355,7 +363,7 @@ public class SendHelper {
                 SignalServiceMessageSender.SenderKeyGroupEvents.EMPTY,
                 urgent,
                 false,
-                null,
+                editTargetTimestamp.map(timestamp -> new SignalServiceEditMessage(timestamp, message)).orElse(null),
                 sendResult -> {
                     logger.trace("Partial message send results: {}", sendResult.size());
                     synchronized (entryId) {
@@ -613,18 +621,27 @@ public class SendHelper {
     }
 
     private SendMessageResult sendMessage(
-            SignalServiceDataMessage message, RecipientId recipientId
+            SignalServiceDataMessage message, RecipientId recipientId, Optional<Long> editTargetTimestamp
     ) {
         final var messageSendLogStore = account.getMessageSendLogStore();
         final var urgent = true;
+        final var includePniSignature = false;
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendDataMessage(address,
+                editTargetTimestamp.isEmpty()
+                        ? (messageSender, address, unidentifiedAccess) -> messageSender.sendDataMessage(address,
                         unidentifiedAccess,
                         ContentHint.RESENDABLE,
                         message,
                         SignalServiceMessageSender.IndividualSendEvents.EMPTY,
                         urgent,
-                        false));
+                        includePniSignature)
+                        : (messageSender, address, unidentifiedAccess) -> messageSender.sendEditMessage(address,
+                                unidentifiedAccess,
+                                ContentHint.RESENDABLE,
+                                message,
+                                SignalServiceMessageSender.IndividualSendEvents.EMPTY,
+                                urgent,
+                                editTargetTimestamp.get()));
         messageSendLogStore.insertIfPossible(message.getTimestamp(), result, ContentHint.RESENDABLE, urgent);
         handleSendMessageResult(result);
         return result;
@@ -665,17 +682,17 @@ public class SendHelper {
         }
     }
 
-    private SendMessageResult sendSelfMessage(SignalServiceDataMessage message) {
+    private SendMessageResult sendSelfMessage(SignalServiceDataMessage message, Optional<Long> editTargetTimestamp) {
         var address = account.getSelfAddress();
         var transcript = new SentTranscriptMessage(Optional.of(address),
                 message.getTimestamp(),
-                Optional.of(message),
+                editTargetTimestamp.isEmpty() ? Optional.of(message) : Optional.empty(),
                 message.getExpiresInSeconds(),
                 Map.of(address.getServiceId(), true),
                 false,
                 Optional.empty(),
                 Set.of(),
-                Optional.empty());
+                editTargetTimestamp.map((timestamp) -> new SignalServiceEditMessage(timestamp, message)));
         var syncMessage = SignalServiceSyncMessage.forSentTranscript(transcript);
 
         return sendSyncMessage(syncMessage);
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index a9ccbad4..57a10e5a 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -285,6 +285,9 @@ Specify the number of the author of the story.
 *-e*, *--end-session*::
 Clear session state and send end session message.
 
+*--edit-timestamp*::
+Specify the timestamp of a previous message with the recipient or group to send an edited message.
+
 === sendPaymentNotification
 
 Send a payment notification.
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index c5270030..1f4253ac 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -69,6 +69,10 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             var message = envelope.data().get();
             printDataMessage(writer, message);
         }
+        if (envelope.edit().isPresent()) {
+            var message = envelope.edit().get();
+            printEditMessage(writer, message);
+        }
         if (envelope.story().isPresent()) {
             var message = envelope.story().get();
             printStoryMessage(writer.indentedWriter(), message);
@@ -192,6 +196,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
+    private void printEditMessage(
+            PlainTextWriter writer, MessageEnvelope.Edit message
+    ) {
+        writer.println("Edit: Target message timestamp: {}", DateUtils.formatTimestamp(message.targetSentTimestamp()));
+        printDataMessage(writer.indentedWriter(), message.dataMessage());
+    }
+
     private void printStoryMessage(
             PlainTextWriter writer, MessageEnvelope.Story message
     ) {
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 2a47ab8d..9534f182 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -84,6 +84,9 @@ public class SendCommand implements JsonRpcLocalCommand {
                 .type(long.class)
                 .help("Specify the timestamp of a story to reply to.");
         subparser.addArgument("--story-author").help("Specify the number of the author of the story.");
+        subparser.addArgument("--edit-timestamp")
+                .type(long.class)
+                .help("Specify the timestamp of a previous message with the recipient or group to send an edited message.");
     }
 
     @Override
@@ -189,6 +192,8 @@ public class SendCommand implements JsonRpcLocalCommand {
                     "Sending empty message is not allowed, either a message, attachment or sticker must be given.");
         }
 
+        final var editTimestamp = ns.getLong("edit-timestamp");
+
         try {
             final var message = new Message(messageText,
                     attachments,
@@ -197,7 +202,9 @@ public class SendCommand implements JsonRpcLocalCommand {
                     Optional.ofNullable(sticker),
                     previews,
                     Optional.ofNullable((storyReply)));
-            var results = m.sendMessage(message, recipientIdentifiers);
+            var results = editTimestamp != null
+                    ? m.sendEditMessage(message, recipientIdentifiers, editTimestamp)
+                    : m.sendMessage(message, recipientIdentifiers);
             outputResult(outputWriter, results);
         } catch (AttachmentInvalidException | IOException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index cefb7a82..7eca1f20 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -10,6 +10,7 @@ import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
@@ -25,6 +26,7 @@ import org.asamk.signal.manager.api.StickerPack;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
 import org.asamk.signal.manager.api.TypingAction;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
@@ -369,6 +371,13 @@ public class DbusManagerImpl implements Manager {
                 groupId -> signal.sendGroupMessage(message.messageText(), message.attachments(), groupId));
     }
 
+    @Override
+    public SendMessageResults sendEditMessage(
+            final Message message, final Set<RecipientIdentifier> recipients, final long editTargetTimestamp
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public SendMessageResults sendRemoteDeleteMessage(
             final long targetSentTimestamp, final Set<RecipientIdentifier> recipients
@@ -801,6 +810,7 @@ public class DbusManagerImpl implements Manager {
                                 List.of())),
                         Optional.empty(),
                         Optional.empty(),
+                        Optional.empty(),
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
@@ -827,6 +837,7 @@ public class DbusManagerImpl implements Manager {
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
+                        Optional.empty(),
                         Optional.empty());
                 notifyMessageHandlers(envelope);
             };
@@ -844,6 +855,7 @@ public class DbusManagerImpl implements Manager {
                         Optional.empty(),
                         Optional.empty(),
                         Optional.empty(),
+                        Optional.empty(),
                         Optional.of(new MessageEnvelope.Sync(Optional.of(new MessageEnvelope.Sync.Sent(syncReceived.getTimestamp(),
                                 syncReceived.getTimestamp(),
                                 syncReceived.getDestination().isEmpty()
@@ -874,6 +886,7 @@ public class DbusManagerImpl implements Manager {
                                         List.of(),
                                         List.of(),
                                         List.of())),
+                                Optional.empty(),
                                 Optional.empty())),
                                 Optional.empty(),
                                 List.of(),
diff --git a/src/main/java/org/asamk/signal/json/JsonEditMessage.java b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
new file mode 100644
index 00000000..193bd16a
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
@@ -0,0 +1,10 @@
+package org.asamk.signal.json;
+
+import org.asamk.signal.manager.api.MessageEnvelope;
+
+record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
+
+    static JsonEditMessage from(MessageEnvelope.Edit editMessage) {
+        return new JsonEditMessage(editMessage.targetSentTimestamp(), JsonDataMessage.from(editMessage.dataMessage()));
+    }
+}
diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index c32de61a..bafa97e7 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -18,6 +18,7 @@ public record JsonMessageEnvelope(
         Integer sourceDevice,
         long timestamp,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonDataMessage dataMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryMessage storyMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessage syncMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonCallMessage callMessage,
@@ -61,6 +62,7 @@ public record JsonMessageEnvelope(
         final var typingMessage = envelope.typing().map(JsonTypingMessage::from).orElse(null);
 
         final var dataMessage = envelope.data().map(JsonDataMessage::from).orElse(null);
+        final var editMessage = envelope.edit().map(JsonEditMessage::from).orElse(null);
         final var storyMessage = envelope.story().map(JsonStoryMessage::from).orElse(null);
         final var syncMessage = envelope.sync().map(JsonSyncMessage::from).orElse(null);
         final var callMessage = envelope.call().map(JsonCallMessage::from).orElse(null);
@@ -72,6 +74,7 @@ public record JsonMessageEnvelope(
                 sourceDevice,
                 timestamp,
                 dataMessage,
+                editMessage,
                 storyMessage,
                 syncMessage,
                 callMessage,
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index fc84b088..fe427ef1 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -1,8 +1,10 @@
 package org.asamk.signal.json;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.UUID;
 
@@ -10,22 +12,17 @@ record JsonSyncDataMessage(
         @Deprecated String destination,
         String destinationNumber,
         String destinationUuid,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,
         @JsonUnwrapped JsonDataMessage dataMessage
 ) {
 
     static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage) {
-        if (transcriptMessage.destination().isPresent()) {
-            final var address = transcriptMessage.destination().get();
-            return new JsonSyncDataMessage(address.getLegacyIdentifier(),
-                    address.number().orElse(null),
-                    address.uuid().map(UUID::toString).orElse(null),
-                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
-
-        } else {
-            return new JsonSyncDataMessage(null,
-                    null,
-                    null,
-                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
-        }
+        return new JsonSyncDataMessage(transcriptMessage.destination()
+                .map(RecipientAddress::getLegacyIdentifier)
+                .orElse(null),
+                transcriptMessage.destination().flatMap(RecipientAddress::number).orElse(null),
+                transcriptMessage.destination().flatMap(address -> address.uuid().map(UUID::toString)).orElse(null),
+                transcriptMessage.editMessage().map(JsonEditMessage::from).orElse(null),
+                transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
     }
 }

From 5f0c49d65366c8034fca883df24436508c8bd003 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 11 May 2023 19:18:48 +0200
Subject: [PATCH 101/672] Update dependencies

---
 settings.gradle.kts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index f46f2719..5bf0bc99 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,20 +7,20 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk15on").version("1.70")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.14.2")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.0")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.0")
             version("slf4j", "2.0.7")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.4.6")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.4.7")
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_70")
-            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.22.2")
+            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
-            library("junit", "org.junit.jupiter", "junit-jupiter").version("5.9.2")
+            library("junit", "org.junit.jupiter", "junit-jupiter").version("5.9.3")
         }
     }
 }

From ee63a27fe91569f81fb7e0f2f036821a083e2010 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 11 May 2023 19:19:09 +0200
Subject: [PATCH 102/672] Use Java 20 in CI build

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c02b0623..71e6e15e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '19' ]
+        java: [ '17', '20' ]
 
     steps:
       - uses: actions/checkout@v3

From 6b0b36a55566691dd96fb142b810ec3b63007660 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 11 May 2023 19:36:26 +0200
Subject: [PATCH 103/672] Bump version to 0.11.10

---
 CHANGELOG.md     | 6 ++++++
 build.gradle.kts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe40af74..011fedc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.11.10] - 2023-05-11
+**Attention**: Now requires native libsignal-client version 0.23.1
+
+### Added
+- Support for receiving and sending edit messages with `--edit-timestamp`
+
 ## [0.11.9.1] - 2023-04-23
 
 ### Fixed
diff --git a/build.gradle.kts b/build.gradle.kts
index 1d041d0c..c17dea6d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.21"
 }
 
-version = "0.11.9.1"
+version = "0.11.10"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From ab0186723518c7c3b0ce62581ebe282bd7bb7b74 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 11 May 2023 20:20:51 +0200
Subject: [PATCH 104/672] Switch CI to temurin distribution

---
 .github/workflows/ci.yml              | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 71e6e15e..8ffd7b48 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: ${{ matrix.java }}
           cache: 'gradle'
       - name: Build with Gradle
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 60c4ef99..f0ddd463 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Java JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: 17
 
       - name: Checkout repository

From ae652b1294cc89ea19966595b7e54f216788064e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 16 May 2023 22:49:59 +0200
Subject: [PATCH 105/672] Update graalvm buildtools

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c17dea6d..038b216d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.21"
+    id("org.graalvm.buildtools.native") version "0.9.22"
 }
 
 version = "0.11.10"

From a3bc754e8077549c75cc75c5b4dd2aeb1237cec8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 16 May 2023 22:50:27 +0200
Subject: [PATCH 106/672] Fix migration of legacy recipient storage

---
 graalvm-config-dir/reflect-config.json                    | 3 +++
 .../manager/storage/recipients/LegacyRecipientStore2.java | 8 ++++----
 .../storage/senderKeys/LegacySenderKeySharedStore.java    | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 3bab701f..f4a975bc 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -18,6 +18,9 @@
 {
   "name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
 },
+{
+  "name":"[Ljava.lang.Object;"
+},
 {
   "name":"[Ljava.lang.String;"
 },
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index 57a60674..bd7605db 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -98,9 +98,9 @@ public class LegacyRecipientStore2 {
         }
     }
 
-    private record Storage(List<Recipient> recipients, long lastId) {
+    public record Storage(List<Recipient> recipients, long lastId) {
 
-        private record Recipient(
+        public record Recipient(
                 long id,
                 String number,
                 String uuid,
@@ -110,7 +110,7 @@ public class LegacyRecipientStore2 {
                 Profile profile
         ) {
 
-            private record Contact(
+            public record Contact(
                     String name,
                     String color,
                     int messageExpirationTime,
@@ -119,7 +119,7 @@ public class LegacyRecipientStore2 {
                     boolean profileSharingEnabled
             ) {}
 
-            private record Profile(
+            public record Profile(
                     long lastUpdateTimestamp,
                     String givenName,
                     String familyName,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
index cfc36539..b46f8506 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
@@ -61,8 +61,8 @@ public class LegacySenderKeySharedStore {
         }
     }
 
-    private record Storage(List<SharedSenderKey> sharedSenderKeys) {
+    public record Storage(List<SharedSenderKey> sharedSenderKeys) {
 
-        private record SharedSenderKey(long recipientId, int deviceId, String distributionId) {}
+        public record SharedSenderKey(long recipientId, int deviceId, String distributionId) {}
     }
 }

From 760934d5a511afd7f0d6b728e70f5758058f0521 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 16 May 2023 23:09:07 +0200
Subject: [PATCH 107/672] Fix deleting old unregistered recipient

Fixes #1242
---
 .../asamk/signal/manager/helper/RecipientHelper.java   |  6 +++++-
 .../manager/storage/recipients/RecipientStore.java     | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 2a3866a5..f614d7ec 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -107,7 +107,11 @@ public class RecipientHelper {
         try {
             return Optional.of(resolveRecipient(recipient));
         } catch (UnregisteredRecipientException e) {
-            return Optional.empty();
+            if (recipient instanceof RecipientIdentifier.Number r) {
+                return account.getRecipientStore().resolveRecipientByNumberOptional(r.number());
+            } else {
+                return Optional.empty();
+            }
         }
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index d3b949f8..b8a4b39b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -215,6 +215,16 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return byNumber.get().id();
     }
 
+    public Optional<RecipientId> resolveRecipientByNumberOptional(final String number) {
+        final Optional<RecipientWithAddress> byNumber;
+        try (final var connection = database.getConnection()) {
+            byNumber = findByNumber(connection, number);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+        return byNumber.map(RecipientWithAddress::id);
+    }
+
     public RecipientId resolveRecipientByUsername(
             final String username, Supplier<ServiceId> serviceIdSupplier
     ) throws UnregisteredRecipientException {

From 9da6f3a702b76eb69738e338f6cbb39e9736e09c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 17 May 2023 19:51:34 +0200
Subject: [PATCH 108/672] Include all libsignal-client libs in native build

Fixes #1237
---
 graalvm-config-dir/resource-config.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 13566304..bd88f0bc 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -214,6 +214,12 @@
     {
       "pattern":"\\Qlibsignal_jni.so\\E"
     }, 
+    {
+      "pattern":"\\Qlibsignal_jni.dylib\\E"
+    }, 
+    {
+      "pattern":"\\Qsignal_jni.dll\\E"
+    }, 
     {
       "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
     }, 

From 6e61bc2000a587a542427fc05f15142c6e0e2d5c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 18 May 2023 11:00:22 +0200
Subject: [PATCH 109/672] Update dependencies

---
 CHANGELOG.md                                  |  1 +
 graalvm-config-dir/jni-config.json            |  3 ++
 graalvm-config-dir/reflect-config.json        |  7 ++++-
 graalvm-config-dir/resource-config.json       |  8 ++---
 .../actions/SendPniIdentityKeyAction.java     | 20 ------------
 .../signal/manager/config/ServiceConfig.java  | 12 +------
 .../signal/manager/helper/IdentityHelper.java |  2 +-
 .../helper/IncomingMessageHandler.java        | 11 -------
 .../signal/manager/helper/PinHelper.java      |  6 ++--
 .../signal/manager/helper/SyncHelper.java     | 11 -------
 .../helper/UnidentifiedAccessHelper.java      |  8 +++--
 .../storage/protocol/SignalProtocolStore.java | 29 +++++++++++++++++
 .../asamk/signal/manager/util/PinHashing.java | 31 -------------------
 settings.gradle.kts                           |  4 +--
 14 files changed, 55 insertions(+), 98 deletions(-)
 delete mode 100644 lib/src/main/java/org/asamk/signal/manager/actions/SendPniIdentityKeyAction.java
 delete mode 100644 lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 011fedc5..fe72cadf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## [Unreleased]
+**Attention**: Now requires native libsignal-client version 0.24.0
 
 ## [0.11.10] - 2023-05-11
 **Attention**: Now requires native libsignal-client version 0.23.1
diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 9f1cab28..98c05c7c 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -170,6 +170,9 @@
     {"name":"SENDING"}
   ]
 },
+{
+  "name":"org.signal.libsignal.protocol.state.KyberPreKeyStore"
+},
 {
   "name":"org.signal.libsignal.protocol.state.PreKeyRecord",
   "fields":[{"name":"unsafeHandle"}]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index f4a975bc..5ace3d39 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1142,7 +1142,12 @@
   "name":"org.asamk.signal.json.JsonTypingMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"action","parameterTypes":[] }, 
+    {"name":"groupId","parameterTypes":[] }, 
+    {"name":"timestamp","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcBatchMessage",
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index bd88f0bc..2ebe8973 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -211,14 +211,11 @@
     {
       "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
     }, 
-    {
-      "pattern":"\\Qlibsignal_jni.so\\E"
-    }, 
     {
       "pattern":"\\Qlibsignal_jni.dylib\\E"
     }, 
     {
-      "pattern":"\\Qsignal_jni.dll\\E"
+      "pattern":"\\Qlibsignal_jni.so\\E"
     }, 
     {
       "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
@@ -232,6 +229,9 @@
     {
       "pattern":"\\Qorg/sqlite/native/Linux/x86_64/libsqlitejdbc.so\\E"
     }, 
+    {
+      "pattern":"\\Qsignal_jni.dll\\E"
+    }, 
     {
       "pattern":"\\Qsqlite-jdbc.properties\\E"
     }, 
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendPniIdentityKeyAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendPniIdentityKeyAction.java
deleted file mode 100644
index fe70a661..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendPniIdentityKeyAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.asamk.signal.manager.actions;
-
-import org.asamk.signal.manager.helper.Context;
-
-public class SendPniIdentityKeyAction implements HandleAction {
-
-    private static final SendPniIdentityKeyAction INSTANCE = new SendPniIdentityKeyAction();
-
-    private SendPniIdentityKeyAction() {
-    }
-
-    public static SendPniIdentityKeyAction create() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void execute(Context context) throws Throwable {
-        context.getSyncHelper().sendPniIdentity();
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index c56d9e86..7100c326 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -44,17 +44,7 @@ public class ServiceConfig {
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var giftBadges = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(false,
-                true,
-                false,
-                true,
-                true,
-                true,
-                true,
-                true,
-                giftBadges,
-                false,
-                false);
+        return new AccountAttributes.Capabilities(false, true, true, true, true, giftBadges, false, false);
     }
 
     public static boolean isSignalClientAvailable() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index c9cfaedc..c150abed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -73,7 +73,7 @@ public class IdentityHelper {
         final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
         final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
 
-        if (account.getAccountCapabilities().getUuid()) {
+        if (false) {
             if (serviceId.isUnknown()) {
                 return null;
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 5261ad73..d0a6a5c0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -10,7 +10,6 @@ import org.asamk.signal.manager.actions.RetrieveProfileAction;
 import org.asamk.signal.manager.actions.RetrieveStorageDataAction;
 import org.asamk.signal.manager.actions.SendGroupInfoAction;
 import org.asamk.signal.manager.actions.SendGroupInfoRequestAction;
-import org.asamk.signal.manager.actions.SendPniIdentityKeyAction;
 import org.asamk.signal.manager.actions.SendProfileKeyAction;
 import org.asamk.signal.manager.actions.SendReceiptAction;
 import org.asamk.signal.manager.actions.SendRetryMessageRequestAction;
@@ -35,7 +34,6 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.stickers.StickerPack;
-import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.metadata.ProtocolInvalidKeyException;
 import org.signal.libsignal.metadata.ProtocolInvalidKeyIdException;
 import org.signal.libsignal.metadata.ProtocolInvalidMessageException;
@@ -525,9 +523,6 @@ public final class IncomingMessageHandler {
             if (rm.isConfigurationRequest()) {
                 actions.add(SendSyncConfigurationAction.create());
             }
-            if (rm.isPniIdentityRequest()) {
-                actions.add(SendPniIdentityKeyAction.create());
-            }
         }
         if (syncMessage.getGroups().isPresent()) {
             try {
@@ -631,12 +626,6 @@ public final class IncomingMessageHandler {
                         .get());
             }
         }
-        if (syncMessage.getPniIdentity().isPresent()) {
-            final var pniIdentity = syncMessage.getPniIdentity().get();
-            account.setPniIdentityKeyPair(KeyUtils.getIdentityKeyPair(pniIdentity.getPublicKey().toByteArray(),
-                    pniIdentity.getPrivateKey().toByteArray()));
-            actions.add(RefreshPreKeysAction.create());
-        }
         if (syncMessage.getPniChangeNumber().isPresent()) {
             final var pniChangeNumber = syncMessage.getPniChangeNumber().get();
             logger.debug("Received PNI change number sync message, applying.");
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 6b925c69..6bc3978f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -2,7 +2,6 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.util.PinHashing;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,6 +10,7 @@ import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.KeyBackupServicePinException;
 import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
+import org.whispersystems.signalservice.api.kbs.PinHashUtil;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
 import org.whispersystems.signalservice.internal.push.LockedException;
@@ -37,7 +37,7 @@ public class PinHelper {
             String pin, MasterKey masterKey
     ) throws IOException {
         final var pinChangeSession = keyBackupService.newPinChangeSession();
-        final var hashedPin = PinHashing.hashPin(pin, pinChangeSession);
+        final var hashedPin = PinHashUtil.hashPin(pin, pinChangeSession.hashSalt());
 
         try {
             pinChangeSession.setPin(hashedPin, masterKey);
@@ -128,7 +128,7 @@ public class PinHelper {
         var session = keyBackupService.newRegistrationSession(basicStorageCredentials, tokenResponse);
 
         try {
-            var hashedPin = PinHashing.hashPin(pin, session);
+            var hashedPin = PinHashUtil.hashPin(pin, session.hashSalt());
             var kbsData = session.restorePin(hashedPin);
             if (kbsData == null) {
                 throw new AssertionError("Null not expected");
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index bad2efce..a005f07d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.helper;
 
-import com.google.protobuf.ByteString;
-
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.storage.SignalAccount;
@@ -233,15 +231,6 @@ public class SyncHelper {
         context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forConfiguration(configurationMessage));
     }
 
-    public void sendPniIdentity() {
-        final var pniIdentityKeyPair = account.getPniIdentityKeyPair();
-        var pniIdentity = SignalServiceProtos.SyncMessage.PniIdentity.newBuilder()
-                .setPrivateKey(ByteString.copyFrom(pniIdentityKeyPair.getPrivateKey().serialize()))
-                .setPublicKey(ByteString.copyFrom(pniIdentityKeyPair.getPublicKey().serialize()))
-                .build();
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forPniIdentity(pniIdentity));
-    }
-
     public void handleSyncDeviceGroups(final InputStream input) {
         final var s = new DeviceGroupsInputStream(input);
         DeviceGroup g;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index 0f0da15c..92031576 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -71,7 +71,8 @@ public class UnidentifiedAccessHelper {
 
         try {
             return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(recipientUnidentifiedAccessKey,
-                    senderCertificate), new UnidentifiedAccess(selfUnidentifiedAccessKey, senderCertificate)));
+                    senderCertificate,
+                    false), new UnidentifiedAccess(selfUnidentifiedAccessKey, senderCertificate, false)));
         } catch (InvalidCertificateException e) {
             return Optional.empty();
         }
@@ -87,8 +88,9 @@ public class UnidentifiedAccessHelper {
 
         try {
             return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(selfUnidentifiedAccessKey,
-                    selfUnidentifiedAccessCertificate),
-                    new UnidentifiedAccess(selfUnidentifiedAccessKey, selfUnidentifiedAccessCertificate)));
+                    selfUnidentifiedAccessCertificate,
+                    false),
+                    new UnidentifiedAccess(selfUnidentifiedAccessKey, selfUnidentifiedAccessCertificate, false)));
         } catch (InvalidCertificateException e) {
             return Optional.empty();
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index f804bc6d..223f39fc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -7,6 +7,7 @@ import org.signal.libsignal.protocol.NoSessionException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
 import org.signal.libsignal.protocol.state.IdentityKeyStore;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyStore;
 import org.signal.libsignal.protocol.state.SessionRecord;
@@ -197,4 +198,32 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     public boolean isMultiDevice() {
         return isMultiDevice.get();
     }
+
+    @Override
+    public KyberPreKeyRecord loadKyberPreKey(final int kyberPreKeyId) throws InvalidKeyIdException {
+        // TODO
+        throw new InvalidKeyIdException("Missing kyber prekey with ID: $kyberPreKeyId");
+    }
+
+    @Override
+    public List<KyberPreKeyRecord> loadKyberPreKeys() {
+        // TODO
+        return List.of();
+    }
+
+    @Override
+    public void storeKyberPreKey(final int kyberPreKeyId, final KyberPreKeyRecord record) {
+        // TODO
+    }
+
+    @Override
+    public boolean containsKyberPreKey(final int kyberPreKeyId) {
+        // TODO
+        return false;
+    }
+
+    @Override
+    public void markKyberPreKeyUsed(final int kyberPreKeyId) {
+        // TODO
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java b/lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java
deleted file mode 100644
index 5dc5a5bc..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/util/PinHashing.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.asamk.signal.manager.util;
-
-import org.bouncycastle.crypto.generators.Argon2BytesGenerator;
-import org.bouncycastle.crypto.params.Argon2Parameters;
-import org.whispersystems.signalservice.api.KeyBackupService;
-import org.whispersystems.signalservice.api.kbs.HashedPin;
-import org.whispersystems.signalservice.internal.registrationpin.PinHasher;
-
-public final class PinHashing {
-
-    private PinHashing() {
-    }
-
-    public static HashedPin hashPin(String pin, KeyBackupService.HashSession hashSession) {
-        final var params = new Argon2Parameters.Builder(Argon2Parameters.ARGON2_id).withParallelism(1)
-                .withIterations(32)
-                .withVersion(Argon2Parameters.ARGON2_VERSION_13)
-                .withMemoryAsKB(16 * 1024)
-                .withSalt(hashSession.hashSalt())
-                .build();
-
-        final var generator = new Argon2BytesGenerator();
-        generator.init(params);
-
-        return PinHasher.hashPin(PinHasher.normalize(pin), password -> {
-            var output = new byte[64];
-            generator.generateBytes(password, output);
-            return output;
-        });
-    }
-}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5bf0bc99..45a40d11 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk15on").version("1.70")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.0")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.1")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.0")
             version("slf4j", "2.0.7")
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.7")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_70")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_71")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From 145a2f1179e4e51bdb292f2f2b5622d73c3834a5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 18 May 2023 11:08:57 +0200
Subject: [PATCH 110/672] Fix json deserialization in legacy stores

Fixes #1248
---
 .../signal/manager/storage/groups/LegacyGroupStore.java   | 8 ++++----
 .../storage/identities/LegacyIdentityKeyStore.java        | 2 +-
 .../manager/storage/stickers/LegacyStickerStore.java      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index ad42984f..b6205c97 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -129,7 +129,7 @@ public class LegacyGroupStore {
 
     public record Storage(@JsonDeserialize(using = GroupsDeserializer.class) List<Record> groups) {
 
-        private record GroupV1(
+        public record GroupV1(
                 String groupId,
                 String expectedV2Id,
                 String name,
@@ -140,9 +140,9 @@ public class LegacyGroupStore {
                 @JsonDeserialize(using = MembersDeserializer.class) List<Member> members
         ) {
 
-            private record Member(Long recipientId, String uuid, String number) {}
+            public record Member(Long recipientId, String uuid, String number) {}
 
-            private record JsonRecipientAddress(String uuid, String number) {}
+            public record JsonRecipientAddress(String uuid, String number) {}
 
             private static class MembersDeserializer extends JsonDeserializer<List<Member>> {
 
@@ -168,7 +168,7 @@ public class LegacyGroupStore {
             }
         }
 
-        private record GroupV2(
+        public record GroupV2(
                 String groupId,
                 String masterKey,
                 String distributionId,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
index a2f5162e..88e23e75 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
@@ -111,5 +111,5 @@ public class LegacyIdentityKeyStore {
         }
     }
 
-    private record IdentityStorage(String identityKey, int trustLevel, long addedTimestamp) {}
+    public record IdentityStorage(String identityKey, int trustLevel, long addedTimestamp) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java
index dd044536..16836d58 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/LegacyStickerStore.java
@@ -28,7 +28,7 @@ public class LegacyStickerStore {
 
     public record Storage(List<Sticker> stickers) {
 
-        private record Sticker(String packId, String packKey, boolean installed) {
+        public record Sticker(String packId, String packKey, boolean installed) {
 
         }
     }

From 91700ce995ae381dd97b246ea3ff11afb748e421 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 20 May 2023 12:47:35 +0200
Subject: [PATCH 111/672] Implement textStyles for sending and receiving

Fixes #1250
---
 CHANGELOG.md                                  |  3 +
 graalvm-config-dir/reflect-config.json        | 15 ++++-
 .../org/asamk/signal/manager/ManagerImpl.java |  6 +-
 .../org/asamk/signal/manager/api/Message.java | 11 +++-
 .../signal/manager/api/MessageEnvelope.java   | 26 --------
 .../asamk/signal/manager/api/TextStyle.java   | 61 +++++++++++++++++++
 man/signal-cli.1.adoc                         |  9 +++
 .../asamk/signal/ReceiveMessageHandler.java   |  3 +-
 .../asamk/signal/commands/SendCommand.java    | 44 ++++++++++++-
 .../org/asamk/signal/dbus/DbusSignalImpl.java |  9 ++-
 .../asamk/signal/json/JsonDataMessage.java    |  8 ++-
 .../java/org/asamk/signal/json/JsonQuote.java | 10 ++-
 .../org/asamk/signal/json/JsonTextStyle.java  | 10 +++
 13 files changed, 176 insertions(+), 39 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java
 create mode 100644 src/main/java/org/asamk/signal/json/JsonTextStyle.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe72cadf..6419350e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## [Unreleased]
 **Attention**: Now requires native libsignal-client version 0.24.0
 
+### Added
+- New `--text-style` and `--quote-text-style` flags for `send` command
+
 ## [0.11.10] - 2023-05-11
 **Attention**: Now requires native libsignal-client version 0.23.1
 
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 5ace3d39..240edebd 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -838,6 +838,7 @@
     {"name":"remoteDelete","parameterTypes":[] }, 
     {"name":"sticker","parameterTypes":[] }, 
     {"name":"storyContext","parameterTypes":[] }, 
+    {"name":"textStyles","parameterTypes":[] }, 
     {"name":"timestamp","parameterTypes":[] }, 
     {"name":"viewOnce","parameterTypes":[] }
   ]
@@ -940,7 +941,8 @@
     {"name":"authorUuid","parameterTypes":[] }, 
     {"name":"id","parameterTypes":[] }, 
     {"name":"mentions","parameterTypes":[] }, 
-    {"name":"text","parameterTypes":[] }
+    {"name":"text","parameterTypes":[] }, 
+    {"name":"textStyles","parameterTypes":[] }
   ]
 },
 {
@@ -1138,6 +1140,17 @@
     {"name":"destinationUuid","parameterTypes":[] }
   ]
 },
+{
+  "name":"org.asamk.signal.json.JsonTextStyle",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[
+    {"name":"length","parameterTypes":[] }, 
+    {"name":"start","parameterTypes":[] }, 
+    {"name":"style","parameterTypes":[] }
+  ]
+},
 {
   "name":"org.asamk.signal.json.JsonTypingMessage",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 1cc0629b..6895da63 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -40,6 +40,7 @@ import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
+import org.asamk.signal.manager.api.TextStyle;
 import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
@@ -618,6 +619,9 @@ class ManagerImpl implements Manager {
         if (message.mentions().size() > 0) {
             messageBuilder.withMentions(resolveMentions(message.mentions()));
         }
+        if (message.textStyles().size() > 0) {
+            messageBuilder.withBodyRanges(message.textStyles().stream().map(TextStyle::toBodyRange).toList());
+        }
         if (message.quote().isPresent()) {
             final var quote = message.quote().get();
             messageBuilder.withQuote(new SignalServiceDataMessage.Quote(quote.timestamp(),
@@ -628,7 +632,7 @@ class ManagerImpl implements Manager {
                     List.of(),
                     resolveMentions(quote.mentions()),
                     SignalServiceDataMessage.Quote.Type.NORMAL,
-                    List.of()));
+                    quote.textStyles().stream().map(TextStyle::toBodyRange).toList()));
         }
         if (message.sticker().isPresent()) {
             final var sticker = message.sticker().get();
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Message.java b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
index aba79cc5..ac9e4999 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Message.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
@@ -10,12 +10,19 @@ public record Message(
         Optional<Quote> quote,
         Optional<Sticker> sticker,
         List<Preview> previews,
-        Optional<StoryReply> storyReply
+        Optional<StoryReply> storyReply,
+        List<TextStyle> textStyles
 ) {
 
     public record Mention(RecipientIdentifier.Single recipient, int start, int length) {}
 
-    public record Quote(long timestamp, RecipientIdentifier.Single author, String message, List<Mention> mentions) {}
+    public record Quote(
+            long timestamp,
+            RecipientIdentifier.Single author,
+            String message,
+            List<Mention> mentions,
+            List<TextStyle> textStyles
+    ) {}
 
     public record Sticker(byte[] packId, int stickerId) {}
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index a8f00875..aba52179 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -515,32 +515,6 @@ public record MessageEnvelope(
             }
         }
 
-        public record TextStyle(Style style, int start, int length) {
-
-            public enum Style {
-                NONE,
-                BOLD,
-                ITALIC,
-                SPOILER,
-                STRIKETHROUGH,
-                MONOSPACE;
-
-                static Style from(BodyRange.Style style) {
-                    return switch (style) {
-                        case NONE -> NONE;
-                        case BOLD -> BOLD;
-                        case ITALIC -> ITALIC;
-                        case SPOILER -> SPOILER;
-                        case STRIKETHROUGH -> STRIKETHROUGH;
-                        case MONOSPACE -> MONOSPACE;
-                    };
-                }
-            }
-
-            static TextStyle from(BodyRange bodyRange) {
-                return new TextStyle(Style.from(bodyRange.getStyle()), bodyRange.getStart(), bodyRange.getLength());
-            }
-        }
     }
 
     public record Edit(long targetSentTimestamp, Data dataMessage) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java b/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java
new file mode 100644
index 00000000..48316308
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java
@@ -0,0 +1,61 @@
+package org.asamk.signal.manager.api;
+
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+
+public record TextStyle(Style style, int start, int length) {
+
+    public enum Style {
+        NONE,
+        BOLD,
+        ITALIC,
+        SPOILER,
+        STRIKETHROUGH,
+        MONOSPACE;
+
+        static Style fromInternal(SignalServiceProtos.BodyRange.Style style) {
+            return switch (style) {
+                case NONE -> NONE;
+                case BOLD -> BOLD;
+                case ITALIC -> ITALIC;
+                case SPOILER -> SPOILER;
+                case STRIKETHROUGH -> STRIKETHROUGH;
+                case MONOSPACE -> MONOSPACE;
+            };
+        }
+
+        public static Style from(String style) {
+            return switch (style) {
+                case "NONE" -> NONE;
+                case "BOLD" -> BOLD;
+                case "ITALIC" -> ITALIC;
+                case "SPOILER" -> SPOILER;
+                case "STRIKETHROUGH" -> STRIKETHROUGH;
+                case "MONOSPACE" -> MONOSPACE;
+                default -> null;
+            };
+        }
+
+        SignalServiceProtos.BodyRange.Style toBodyRangeStyle() {
+            return switch (this) {
+                case NONE -> SignalServiceProtos.BodyRange.Style.NONE;
+                case BOLD -> SignalServiceProtos.BodyRange.Style.BOLD;
+                case ITALIC -> SignalServiceProtos.BodyRange.Style.ITALIC;
+                case SPOILER -> SignalServiceProtos.BodyRange.Style.SPOILER;
+                case STRIKETHROUGH -> SignalServiceProtos.BodyRange.Style.STRIKETHROUGH;
+                case MONOSPACE -> SignalServiceProtos.BodyRange.Style.MONOSPACE;
+            };
+        }
+    }
+
+    static TextStyle from(SignalServiceProtos.BodyRange bodyRange) {
+        return new TextStyle(Style.fromInternal(bodyRange.getStyle()), bodyRange.getStart(), bodyRange.getLength());
+    }
+
+    public SignalServiceProtos.BodyRange toBodyRange() {
+        return SignalServiceProtos.BodyRange.newBuilder()
+                .setStart(this.start())
+                .setLength(this.length())
+                .setStyle(this.style().toBodyRangeStyle())
+                .build();
+    }
+}
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 57a10e5a..56787aee 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -251,6 +251,12 @@ e.g.: `--sticker 00abac3bc18d7f599bff2325dc306d43:2`
 Mention another group member (syntax: start:length:recipientNumber) In the apps the mention replaces part of the message text, which is specified by the start and length values.
 e.g.: `-m "Hi X!" --mention "3:1:+123456789"`
 
+*--text-style*::
+Style parts of the message text (syntax: start:length:STYLE).
+Where STYLE is one of: BOLD, ITALIC, SPOILER, STRIKETHROUGH, MONOSPACE
+
+e.g.: `-m "Something BIG!" --mention "10:3:BOLD"`
+
 *--quote-timestamp*::
 Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.
 
@@ -263,6 +269,9 @@ Specify the message of the original message.
 *--quote-mention*::
 Specify the mentions of the original message (same format as `--mention`).
 
+*--quote-text-style*::
+Style parts of the original message text (same format as `--text-style`).
+
 *--preview-url*::
 Specify the url for the link preview.
 The same url must also appear in the message body, otherwise the preview won't be displayed by the apps.
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 1f4253ac..c299ae38 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -4,6 +4,7 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.TextStyle;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.output.PlainTextWriter;
@@ -573,7 +574,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
     }
 
     private void printTextStyle(
-            PlainTextWriter writer, MessageEnvelope.Data.TextStyle textStyle
+            PlainTextWriter writer, TextStyle textStyle
     ) {
         writer.println("- {}: {} (length: {})", textStyle.style().name(), textStyle.start(), textStyle.length());
     }
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 9534f182..c1081717 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -12,6 +12,7 @@ import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.TextStyle;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
@@ -66,6 +67,9 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--mention")
                 .nargs("*")
                 .help("Mention another group member (syntax: start:length:recipientNumber)");
+        subparser.addArgument("--text-style")
+                .nargs("*")
+                .help("Style parts of the message text (syntax: start:length:STYLE)");
         subparser.addArgument("--quote-timestamp")
                 .type(long.class)
                 .help("Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.");
@@ -74,6 +78,9 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--quote-mention")
                 .nargs("*")
                 .help("Quote with mention of another group member (syntax: start:length:recipientNumber)");
+        subparser.addArgument("--quote-text-style")
+                .nargs("*")
+                .help("Quote with style parts of the message text (syntax: start:length:STYLE)");
         subparser.addArgument("--sticker").help("Send a sticker (syntax: stickerPackId:stickerId)");
         subparser.addArgument("--preview-url")
                 .help("Specify the url for the link preview (the same url must also appear in the message body).");
@@ -146,6 +153,9 @@ public class SendCommand implements JsonRpcLocalCommand {
         List<String> mentionStrings = ns.getList("mention");
         final var mentions = mentionStrings == null ? List.<Message.Mention>of() : parseMentions(m, mentionStrings);
 
+        List<String> textStyleStrings = ns.getList("text-style");
+        final var textStyles = textStyleStrings == null ? List.<TextStyle>of() : parseTextStyles(textStyleStrings);
+
         final Message.Quote quote;
         final var quoteTimestamp = ns.getLong("quote-timestamp");
         if (quoteTimestamp != null) {
@@ -155,10 +165,15 @@ public class SendCommand implements JsonRpcLocalCommand {
             final var quoteMentions = quoteMentionStrings == null
                     ? List.<Message.Mention>of()
                     : parseMentions(m, quoteMentionStrings);
+            List<String> quoteTextStyleStrings = ns.getList("quote-text-style");
+            final var quoteTextStyles = quoteTextStyleStrings == null
+                    ? List.<TextStyle>of()
+                    : parseTextStyles(quoteTextStyleStrings);
             quote = new Message.Quote(quoteTimestamp,
                     CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),
                     quoteMessage == null ? "" : quoteMessage,
-                    quoteMentions);
+                    quoteMentions,
+                    quoteTextStyles);
         } else {
             quote = null;
         }
@@ -201,7 +216,8 @@ public class SendCommand implements JsonRpcLocalCommand {
                     Optional.ofNullable(quote),
                     Optional.ofNullable(sticker),
                     previews,
-                    Optional.ofNullable((storyReply)));
+                    Optional.ofNullable((storyReply)),
+                    textStyles);
             var results = editTimestamp != null
                     ? m.sendEditMessage(message, recipientIdentifiers, editTimestamp)
                     : m.sendMessage(message, recipientIdentifiers);
@@ -237,6 +253,30 @@ public class SendCommand implements JsonRpcLocalCommand {
         return mentions;
     }
 
+    private List<TextStyle> parseTextStyles(
+            final List<String> textStylesStrings
+    ) throws UserErrorException {
+        List<TextStyle> textStyles;
+        final Pattern textStylePattern = Pattern.compile("(\\d+):(\\d+):(.+)");
+        textStyles = new ArrayList<>();
+        for (final var textStyle : textStylesStrings) {
+            final var matcher = textStylePattern.matcher(textStyle);
+            if (!matcher.matches()) {
+                throw new UserErrorException("Invalid textStyle syntax ("
+                        + textStyle
+                        + ") expected 'start:length:STYLE'");
+            }
+            final var style = TextStyle.Style.from(matcher.group(3));
+            if (style == null) {
+                throw new UserErrorException("Invalid style: " + matcher.group(3));
+            }
+            textStyles.add(new TextStyle(style,
+                    Integer.parseInt(matcher.group(1)),
+                    Integer.parseInt(matcher.group(2))));
+        }
+        return textStyles;
+    }
+
     private Message.Sticker parseSticker(final String stickerString) throws UserErrorException {
         final Pattern stickerPattern = Pattern.compile("([\\da-f]+):(\\d+)");
         final var matcher = stickerPattern.matcher(stickerString);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index dafcabab..f91f8001 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -219,7 +219,8 @@ public class DbusSignalImpl implements Signal {
                             Optional.empty(),
                             Optional.empty(),
                             List.of(),
-                            Optional.empty()),
+                            Optional.empty(),
+                            List.of()),
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
                             .map(RecipientIdentifier.class::cast)
                             .collect(Collectors.toSet()));
@@ -388,7 +389,8 @@ public class DbusSignalImpl implements Signal {
                     Optional.empty(),
                     Optional.empty(),
                     List.of(),
-                    Optional.empty()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+                    Optional.empty(),
+                    List.of()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (AttachmentInvalidException e) {
@@ -431,7 +433,8 @@ public class DbusSignalImpl implements Signal {
                     Optional.empty(),
                     Optional.empty(),
                     List.of(),
-                    Optional.empty()), Set.of(getGroupRecipientIdentifier(groupId)));
+                    Optional.empty(),
+                    List.of()), Set.of(getGroupRecipientIdentifier(groupId)));
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException | InvalidStickerException e) {
diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 5511f531..6da7145a 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -20,6 +20,7 @@ record JsonDataMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSticker sticker,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonRemoteDelete remoteDelete,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonSharedContact> contacts,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonTextStyle> textStyles,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonGroupInfo groupInfo,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryContext storyContext
 ) {
@@ -53,11 +54,15 @@ record JsonDataMessage(
                 .map(JsonAttachment::from)
                 .toList() : null;
         final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
-
         final var contacts = dataMessage.sharedContacts().size() > 0 ? dataMessage.sharedContacts()
                 .stream()
                 .map(JsonSharedContact::from)
                 .toList() : null;
+        final var textStyles = dataMessage.textStyles().size() > 0 ? dataMessage.textStyles()
+                .stream()
+                .map(JsonTextStyle::from)
+                .toList() : null;
+
         return new JsonDataMessage(timestamp,
                 message,
                 expiresInSeconds,
@@ -71,6 +76,7 @@ record JsonDataMessage(
                 sticker,
                 remoteDelete,
                 contacts,
+                textStyles,
                 groupInfo,
                 storyContext);
     }
diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index 01e35eb7..94f3f52c 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -14,7 +14,8 @@ public record JsonQuote(
         String authorUuid,
         String text,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonMention> mentions,
-        List<JsonQuotedAttachment> attachments
+        List<JsonQuotedAttachment> attachments,
+        @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonTextStyle> textStyles
 ) {
 
     static JsonQuote from(MessageEnvelope.Data.Quote quote) {
@@ -34,6 +35,11 @@ public record JsonQuote(
                 .map(JsonQuotedAttachment::from)
                 .toList() : List.<JsonQuotedAttachment>of();
 
-        return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments);
+        final var textStyles = quote.textStyles().size() > 0 ? quote.textStyles()
+                .stream()
+                .map(JsonTextStyle::from)
+                .toList() : null;
+
+        return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments, textStyles);
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonTextStyle.java b/src/main/java/org/asamk/signal/json/JsonTextStyle.java
new file mode 100644
index 00000000..898e7db6
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonTextStyle.java
@@ -0,0 +1,10 @@
+package org.asamk.signal.json;
+
+import org.asamk.signal.manager.api.TextStyle;
+
+public record JsonTextStyle(String style, int start, int length) {
+
+    static JsonTextStyle from(TextStyle textStyle) {
+        return new JsonTextStyle(textStyle.style().name(), textStyle.start(), textStyle.length());
+    }
+}

From 314b3cafbba0cbea4a49c1d0b1f657a22366cfb2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 20 May 2023 13:01:54 +0200
Subject: [PATCH 112/672] Refactor selfNumber in send command

---
 CHANGELOG.md                                  |  3 +++
 .../asamk/signal/commands/SendCommand.java    | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6419350e..df52b7ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@
 ### Added
 - New `--text-style` and `--quote-text-style` flags for `send` command
 
+### Fixed
+- Fixed migration of older account files
+
 ## [0.11.10] - 2023-05-11
 **Attention**: Now requires native libsignal-client version 0.23.1
 
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index c1081717..33777167 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -150,8 +150,12 @@ public class SendCommand implements JsonRpcLocalCommand {
             attachments = List.of();
         }
 
+        final var selfNumber = m.getSelfNumber();
+
         List<String> mentionStrings = ns.getList("mention");
-        final var mentions = mentionStrings == null ? List.<Message.Mention>of() : parseMentions(m, mentionStrings);
+        final var mentions = mentionStrings == null
+                ? List.<Message.Mention>of()
+                : parseMentions(selfNumber, mentionStrings);
 
         List<String> textStyleStrings = ns.getList("text-style");
         final var textStyles = textStyleStrings == null ? List.<TextStyle>of() : parseTextStyles(textStyleStrings);
@@ -164,13 +168,13 @@ public class SendCommand implements JsonRpcLocalCommand {
             List<String> quoteMentionStrings = ns.getList("quote-mention");
             final var quoteMentions = quoteMentionStrings == null
                     ? List.<Message.Mention>of()
-                    : parseMentions(m, quoteMentionStrings);
+                    : parseMentions(selfNumber, quoteMentionStrings);
             List<String> quoteTextStyleStrings = ns.getList("quote-text-style");
             final var quoteTextStyles = quoteTextStyleStrings == null
                     ? List.<TextStyle>of()
                     : parseTextStyles(quoteTextStyleStrings);
             quote = new Message.Quote(quoteTimestamp,
-                    CommandUtil.getSingleRecipientIdentifier(quoteAuthor, m.getSelfNumber()),
+                    CommandUtil.getSingleRecipientIdentifier(quoteAuthor, selfNumber),
                     quoteMessage == null ? "" : quoteMessage,
                     quoteMentions,
                     quoteTextStyles);
@@ -197,7 +201,7 @@ public class SendCommand implements JsonRpcLocalCommand {
         if (storyReplyTimestamp != null) {
             final var storyAuthor = ns.getString("story-author");
             storyReply = new Message.StoryReply(storyReplyTimestamp,
-                    CommandUtil.getSingleRecipientIdentifier(storyAuthor, m.getSelfNumber()));
+                    CommandUtil.getSingleRecipientIdentifier(storyAuthor, selfNumber));
         } else {
             storyReply = null;
         }
@@ -235,7 +239,7 @@ public class SendCommand implements JsonRpcLocalCommand {
     }
 
     private List<Message.Mention> parseMentions(
-            final Manager m, final List<String> mentionStrings
+            final String selfNumber, final List<String> mentionStrings
     ) throws UserErrorException {
         List<Message.Mention> mentions;
         final Pattern mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
@@ -245,10 +249,11 @@ public class SendCommand implements JsonRpcLocalCommand {
             if (!matcher.matches()) {
                 throw new UserErrorException("Invalid mention syntax ("
                         + mention
-                        + ") expected 'start:end:recipientNumber'");
+                        + ") expected 'start:length:recipientNumber'");
             }
-            mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3),
-                    m.getSelfNumber()), Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2))));
+            mentions.add(new Message.Mention(CommandUtil.getSingleRecipientIdentifier(matcher.group(3), selfNumber),
+                    Integer.parseInt(matcher.group(1)),
+                    Integer.parseInt(matcher.group(2))));
         }
         return mentions;
     }

From c9082a63f002dcd1fea1c67d7626784a186d425b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 21 May 2023 11:05:59 +0200
Subject: [PATCH 113/672] Update user agent version

---
 src/main/java/org/asamk/signal/BaseConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 338873f2..7d2ac4b3 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -5,7 +5,7 @@ public class BaseConfig {
     public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
     public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/5.52.1";
+    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.21.2";
     final static String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From a754eb6fafb568ef8904bf8b9276856e3dfd36e2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 21 May 2023 11:15:49 +0200
Subject: [PATCH 114/672] Better logging for registration failure

---
 .../manager/RegistrationManagerImpl.java      | 24 ++++++++++++-------
 .../signal/commands/RegisterCommand.java      |  3 ++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
index 2951f1a7..0e3c9af0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
@@ -39,6 +39,7 @@ import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
+import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
@@ -114,16 +115,21 @@ class RegistrationManagerImpl implements RegistrationManager {
             throw new IOException("Account is registered in another environment: " + account.getServiceEnvironment());
         }
 
-        if (account.getAci() != null && attemptReactivateAccount()) {
-            return;
-        }
+        try {
+            if (account.getAci() != null && attemptReactivateAccount()) {
+                return;
+            }
 
-        String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
-                account.getSessionId(account.getNumber()),
-                id -> account.setSessionId(account.getNumber(), id),
-                voiceVerification,
-                captcha);
-        NumberVerificationUtils.requestVerificationCode(accountManager, sessionId, voiceVerification);
+            String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
+                    account.getSessionId(account.getNumber()),
+                    id -> account.setSessionId(account.getNumber(), id),
+                    voiceVerification,
+                    captcha);
+            NumberVerificationUtils.requestVerificationCode(accountManager, sessionId, voiceVerification);
+        } catch (DeprecatedVersionException e) {
+            logger.debug("Signal-Server returned deprecated version exception", e);
+            throw e;
+        }
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 5ba66d7a..3ff6dc09 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -92,7 +92,8 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
         } catch (NonNormalizedPhoneNumberException e) {
             throw new UserErrorException("Failed to register: " + e.getMessage(), e);
         } catch (IOException e) {
-            throw new IOErrorException("Failed to register: " + e.getMessage(), e);
+            throw new IOErrorException("Failed to register: %s (%s)".formatted(e.getMessage(),
+                    e.getClass().getSimpleName()), e);
         }
     }
 

From 8a0005d900d03ab631f45aa4abb594653b0c1720 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 21 May 2023 11:18:18 +0200
Subject: [PATCH 115/672] Remove unused code

---
 .../main/java/org/asamk/signal/manager/Manager.java   |  7 +------
 .../java/org/asamk/signal/manager/ManagerImpl.java    | 10 ----------
 .../asamk/signal/manager/helper/ReceiveHelper.java    |  4 ----
 .../java/org/asamk/signal/dbus/DbusManagerImpl.java   | 11 -----------
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index b6602f57..6a5e43f5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -34,7 +34,6 @@ import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.LastGroupAdminException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.Closeable;
@@ -104,8 +103,6 @@ public interface Manager extends Closeable {
 
     void setRegistrationLockPin(Optional<String> pin) throws IOException, NotPrimaryDeviceException;
 
-    Profile getRecipientProfile(RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException;
-
     List<Group> getGroups();
 
     SendGroupMessageResults quitGroup(
@@ -221,14 +218,12 @@ public interface Manager extends Closeable {
     /**
      * Receive new messages from server, returns if no new message arrive in a timespan of timeout.
      */
-    public void receiveMessages(
+    void receiveMessages(
             Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
     ) throws IOException, AlreadyReceivingException;
 
     void setReceiveConfig(ReceiveConfig receiveConfig);
 
-    boolean hasCaughtUpWithOldMessages();
-
     boolean isContactBlocked(RecipientIdentifier.Single recipient);
 
     void sendContacts() throws IOException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 6895da63..1db3cbc7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -377,11 +377,6 @@ class ManagerImpl implements Manager {
         context.getPreKeyHelper().refreshPreKeys();
     }
 
-    @Override
-    public Profile getRecipientProfile(RecipientIdentifier.Single recipient) throws UnregisteredRecipientException {
-        return context.getProfileHelper().getRecipientProfile(context.getRecipientHelper().resolveRecipient(recipient));
-    }
-
     @Override
     public List<Group> getGroups() {
         return account.getGroupStore().getGroups().stream().map(this::toGroup).toList();
@@ -1053,11 +1048,6 @@ class ManagerImpl implements Manager {
         context.getReceiveHelper().setReceiveConfig(receiveConfig);
     }
 
-    @Override
-    public boolean hasCaughtUpWithOldMessages() {
-        return context.getReceiveHelper().hasCaughtUpWithOldMessages();
-    }
-
     @Override
     public boolean isContactBlocked(final RecipientIdentifier.Single recipient) {
         final RecipientId recipientId;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index c20fc692..d0ebbc95 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -61,10 +61,6 @@ public class ReceiveHelper {
         this.needsToRetryFailedMessages = needsToRetryFailedMessages;
     }
 
-    public boolean hasCaughtUpWithOldMessages() {
-        return hasCaughtUpWithOldMessages;
-    }
-
     public void setAuthenticationFailureListener(final Callable authenticationFailureListener) {
         this.authenticationFailureListener = authenticationFailureListener;
     }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 7eca1f20..e5f64ab3 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -38,7 +38,6 @@ import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.LastGroupAdminException;
 import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -213,11 +212,6 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
-    @Override
-    public Profile getRecipientProfile(final RecipientIdentifier.Single recipient) {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public List<Group> getGroups() {
         final var groups = signal.listGroups();
@@ -574,11 +568,6 @@ public class DbusManagerImpl implements Manager {
     public void setReceiveConfig(final ReceiveConfig receiveConfig) {
     }
 
-    @Override
-    public boolean hasCaughtUpWithOldMessages() {
-        return true;
-    }
-
     @Override
     public boolean isContactBlocked(final RecipientIdentifier.Single recipient) {
         return signal.isContactBlocked(recipient.getIdentifier());

From 8c1b5d54f7f5ea0844391df4464a2210b101c019 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 21 May 2023 11:49:26 +0200
Subject: [PATCH 116/672] Reduce log output of third party libs

Fixes #1064
---
 .../org/asamk/signal/logging/LogConfigurator.java   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 39b2315b..83646d7e 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -37,7 +37,7 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
     public ExecutionStatus configure(LoggerContext lc) {
         final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
-        final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO;
+        final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN;
         rootLogger.setLevel(defaultLevel);
 
         final var consoleLayout = verboseLevel == 0 || logFile != null
@@ -46,18 +46,15 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         final var consoleAppender = createLoggingConsoleAppender(lc, createLayoutWrappingEncoder(consoleLayout));
         rootLogger.addAppender(consoleAppender);
 
-        lc.getLogger("com.zaxxer.hikari")
-                .setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN);
+        lc.getLogger("org.asamk").setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO);
 
         if (logFile != null) {
             consoleAppender.addFilter(new Filter<>() {
                 @Override
                 public FilterReply decide(final ILoggingEvent event) {
-                    return event.getLevel().isGreaterOrEqual(Level.INFO)
-                            && !"LibSignal".equals(event.getLoggerName())
-                            && (
-                            event.getLevel().isGreaterOrEqual(Level.WARN) || !event.getLoggerName()
-                                    .startsWith("com.zaxxer.hikari")
+                    return event.getLevel().isGreaterOrEqual(Level.WARN) || (
+                            event.getLevel().isGreaterOrEqual(Level.INFO) && event.getLoggerName()
+                                    .startsWith("org.asamk")
                     )
 
                             ? FilterReply.NEUTRAL : FilterReply.DENY;

From 5197212d3f04bac3b2d74645f83417bd579ac712 Mon Sep 17 00:00:00 2001
From: exquo <62397152+exquo@users.noreply.github.com>
Date: Mon, 22 May 2023 15:35:34 +0000
Subject: [PATCH 117/672] Fix TextStyle doc example typo (#1251)

---
 man/signal-cli.1.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 56787aee..64e73380 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -255,7 +255,7 @@ e.g.: `-m "Hi X!" --mention "3:1:+123456789"`
 Style parts of the message text (syntax: start:length:STYLE).
 Where STYLE is one of: BOLD, ITALIC, SPOILER, STRIKETHROUGH, MONOSPACE
 
-e.g.: `-m "Something BIG!" --mention "10:3:BOLD"`
+e.g.: `-m "Something BIG!" --text-style "10:3:BOLD"`
 
 *--quote-timestamp*::
 Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.

From e5a67d6ce1312fe118e99b8bc8fb2f55ed1dbcf2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 21 May 2023 22:40:30 +0200
Subject: [PATCH 118/672] Refactor manager lib package structure

---
 .../org/asamk/signal/manager/Manager.java     | 29 +++++++++++++++----
 .../asamk/signal/manager/ManagerLogger.java   |  2 ++
 .../org/asamk/signal/manager/Settings.java    |  2 +-
 .../signal/manager/SignalAccountFiles.java    |  8 ++++-
 .../manager/actions/SendGroupInfoAction.java  |  2 +-
 .../actions/SendGroupInfoRequestAction.java   |  2 +-
 .../SendRetryMessageRequestAction.java        |  2 +-
 .../{storage/recipients => api}/Contact.java  |  2 +-
 .../org/asamk/signal/manager/api/Group.java   |  3 --
 .../manager/{groups => api}/GroupId.java      |  2 +-
 .../GroupIdFormatException.java               |  2 +-
 .../manager/{groups => api}/GroupIdV1.java    |  2 +-
 .../manager/{groups => api}/GroupIdV2.java    |  2 +-
 .../{groups => api}/GroupInviteLinkUrl.java   |  3 +-
 .../{groups => api}/GroupLinkState.java       |  2 +-
 .../GroupNotFoundException.java               |  2 +-
 .../{groups => api}/GroupPermission.java      |  2 +-
 .../GroupSendingNotAllowedException.java      |  2 +-
 .../LastGroupAdminException.java              |  2 +-
 .../signal/manager/api/MessageEnvelope.java   |  1 -
 .../NotAGroupMemberException.java             |  2 +-
 .../{storage/recipients => api}/Profile.java  |  6 ++--
 .../asamk/signal/manager/api/Recipient.java   |  2 --
 .../manager/api/RecipientIdentifier.java      |  1 -
 .../{config => api}/ServiceEnvironment.java   |  2 +-
 .../identities => api}/TrustNewIdentity.java  |  2 +-
 .../asamk/signal/manager/api/UpdateGroup.java |  3 --
 .../signal/manager/config/ServiceConfig.java  | 19 +-----------
 .../config/ServiceEnvironmentConfig.java      |  1 +
 .../signal/manager/groups/GroupUtils.java     |  3 ++
 .../signal/manager/helper/AccountHelper.java  |  4 +--
 .../manager/helper/AttachmentHelper.java      |  4 +--
 .../signal/manager/helper/ContactHelper.java  |  2 +-
 .../asamk/signal/manager/helper/Context.java  |  8 ++---
 .../signal/manager/helper/GroupHelper.java    | 22 +++++++-------
 .../signal/manager/helper/GroupV2Helper.java  |  8 ++---
 .../helper/IncomingMessageHandler.java        |  8 ++---
 .../signal/manager/helper/PreKeyHelper.java   |  2 +-
 .../signal/manager/helper/ProfileHelper.java  |  8 ++---
 .../signal/manager/helper/ReceiveHelper.java  |  2 +-
 .../manager/helper/RecipientHelper.java       |  2 +-
 .../signal/manager/helper/SendHelper.java     | 14 ++++-----
 .../signal/manager/helper/StickerHelper.java  |  2 +-
 .../signal/manager/helper/StorageHelper.java  |  8 ++---
 .../signal/manager/helper/SyncHelper.java     |  4 +--
 .../helper/UnidentifiedAccessHelper.java      |  4 +--
 .../AccountFileUpdaterImpl.java               |  4 +--
 .../{ => internal}/DeviceLinkInfo.java        |  2 +-
 .../manager/{ => internal}/JobExecutor.java   |  2 +-
 .../{ => internal}/LibSignalLogger.java       |  4 +--
 .../manager/{ => internal}/ManagerImpl.java   | 25 +++++++++-------
 .../MultiAccountManagerImpl.java              |  9 ++++--
 .../manager/{ => internal}/PathConfig.java    |  6 ++--
 .../ProvisioningManagerImpl.java              |  9 ++++--
 .../RegistrationManagerImpl.java              |  8 +++--
 .../{ => internal}/SignalDependencies.java    |  2 +-
 .../SignalWebSocketHealthMonitor.java         |  2 +-
 .../{ => storage}/AttachmentStore.java        |  2 +-
 .../manager/{ => storage}/AvatarStore.java    |  4 +--
 .../signal/manager/storage/SignalAccount.java |  8 ++---
 .../storage/accounts/AccountsStore.java       |  2 +-
 .../storage/contacts/ContactsStore.java       |  2 +-
 .../manager/storage/groups/GroupInfo.java     |  6 ++--
 .../manager/storage/groups/GroupInfoV1.java   |  8 ++---
 .../manager/storage/groups/GroupInfoV2.java   |  6 ++--
 .../manager/storage/groups/GroupStore.java    |  6 ++--
 .../storage/groups/LegacyGroupStore.java      |  6 ++--
 .../storage/identities/IdentityKeyStore.java  |  1 +
 .../storage/profiles/ProfileStore.java        |  2 +-
 .../recipients/LegacyRecipientStore2.java     |  2 ++
 .../manager/storage/recipients/Recipient.java |  2 ++
 .../storage/recipients/RecipientStore.java    |  2 ++
 .../storage/sendLog/MessageSendLogEntry.java  |  2 +-
 .../storage/sendLog/MessageSendLogStore.java  |  2 +-
 .../signal/manager/util/ProfileUtils.java     |  2 +-
 src/main/java/org/asamk/signal/App.java       |  7 ++---
 .../asamk/signal/ReceiveMessageHandler.java   |  2 +-
 .../asamk/signal/commands/BlockCommand.java   |  2 +-
 .../signal/commands/JoinGroupCommand.java     |  2 +-
 .../signal/commands/ListContactsCommand.java  |  4 +--
 .../signal/commands/QuitGroupCommand.java     |  6 ++--
 .../signal/commands/RemoteDeleteCommand.java  |  6 ++--
 .../asamk/signal/commands/SendCommand.java    |  6 ++--
 .../signal/commands/SendReactionCommand.java  |  6 ++--
 .../signal/commands/SendTypingCommand.java    |  6 ++--
 .../asamk/signal/commands/UnblockCommand.java |  2 +-
 .../signal/commands/UpdateGroupCommand.java   | 12 ++++----
 .../asamk/signal/dbus/DbusManagerImpl.java    | 16 +++++-----
 .../dbus/DbusReceiveMessageHandler.java       |  2 +-
 .../org/asamk/signal/dbus/DbusSignalImpl.java | 16 +++++-----
 .../asamk/signal/http/HttpServerHandler.java  |  3 +-
 .../signal/json/JsonSendMessageResult.java    |  2 +-
 .../asamk/signal/json/JsonStoryMessage.java   |  2 +-
 .../asamk/signal/json/JsonSyncMessage.java    |  2 +-
 .../asamk/signal/json/JsonTypingMessage.java  |  2 +-
 .../org/asamk/signal/util/CommandUtil.java    |  4 +--
 src/main/java/org/asamk/signal/util/Util.java | 17 +++++++++++
 97 files changed, 260 insertions(+), 222 deletions(-)
 rename lib/src/main/java/org/asamk/signal/manager/{storage/recipients => api}/Contact.java (98%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupId.java (97%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupIdFormatException.java (85%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupIdV1.java (91%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupIdV2.java (86%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupInviteLinkUrl.java (98%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupLinkState.java (67%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupNotFoundException.java (81%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupPermission.java (62%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/GroupSendingNotAllowedException.java (86%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/LastGroupAdminException.java (85%)
 rename lib/src/main/java/org/asamk/signal/manager/{groups => api}/NotAGroupMemberException.java (85%)
 rename lib/src/main/java/org/asamk/signal/manager/{storage/recipients => api}/Profile.java (97%)
 rename lib/src/main/java/org/asamk/signal/manager/{config => api}/ServiceEnvironment.java (59%)
 rename lib/src/main/java/org/asamk/signal/manager/{storage/identities => api}/TrustNewIdentity.java (58%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/AccountFileUpdaterImpl.java (86%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/DeviceLinkInfo.java (98%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/JobExecutor.java (87%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/LibSignalLogger.java (92%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/ManagerImpl.java (98%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/MultiAccountManagerImpl.java (91%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/PathConfig.java (71%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/ProvisioningManagerImpl.java (97%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/RegistrationManagerImpl.java (97%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/SignalDependencies.java (99%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => internal}/SignalWebSocketHealthMonitor.java (99%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => storage}/AttachmentStore.java (98%)
 rename lib/src/main/java/org/asamk/signal/manager/{ => storage}/AvatarStore.java (97%)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 6a5e43f5..2e23564b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -5,13 +5,19 @@ import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.Group;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
@@ -28,12 +34,8 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.Closeable;
@@ -54,6 +56,21 @@ public interface Manager extends Closeable {
         return PhoneNumberFormatter.isValidNumber(e164Number, countryCode);
     }
 
+    static boolean isSignalClientAvailable() {
+        final Logger logger = LoggerFactory.getLogger(Manager.class);
+        try {
+            try {
+                org.signal.libsignal.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
+            } catch (Exception e) {
+                logger.trace("Expected exception when checking libsignal-client: {}", e.getMessage());
+            }
+            return true;
+        } catch (UnsatisfiedLinkError e) {
+            logger.warn("Failed to call libsignal-client: {}", e.getMessage());
+            return false;
+        }
+    }
+
     String getSelfNumber();
 
     /**
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java b/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java
index e5dc2c0d..c8437882 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerLogger.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.manager;
 
+import org.asamk.signal.manager.internal.LibSignalLogger;
+
 public class ManagerLogger {
 
     public static void initLogger() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/Settings.java b/lib/src/main/java/org/asamk/signal/manager/Settings.java
index e4f4554b..87854514 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Settings.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Settings.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager;
 
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.manager.api.TrustNewIdentity;
 
 public record Settings(TrustNewIdentity trustNewIdentity, boolean disableMessageSendLog) {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
index 12eb3d99..da8a3f3a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
@@ -2,9 +2,15 @@ package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;
+import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironment;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.internal.AccountFileUpdaterImpl;
+import org.asamk.signal.manager.internal.ManagerImpl;
+import org.asamk.signal.manager.internal.MultiAccountManagerImpl;
+import org.asamk.signal.manager.internal.PathConfig;
+import org.asamk.signal.manager.internal.ProvisioningManagerImpl;
+import org.asamk.signal.manager.internal.RegistrationManagerImpl;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.asamk.signal.manager.util.KeyUtils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java
index 1f76f13e..2a39a38a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoAction.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV1;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java
index 19bf8193..e9dc2528 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendGroupInfoRequestAction.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.groups.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV1;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
index 7c0562cc..2300eae9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.actions;
 
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.metadata.ProtocolException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
similarity index 98%
rename from lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java
rename to lib/src/main/java/org/asamk/signal/manager/api/Contact.java
index a1091b45..27c2d4da 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.storage.recipients;
+package org.asamk.signal.manager.api;
 
 import org.whispersystems.signalservice.internal.util.Util;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Group.java b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
index 62f39290..5e7e36f8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Group.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
@@ -1,8 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupPermission;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupId.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupId.java
similarity index 97%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupId.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupId.java
index 38ddd4b6..3095392f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupId.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupId.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 import java.util.Arrays;
 import java.util.Base64;
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdFormatException.java
similarity index 85%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupIdFormatException.java
index 8050da22..c76a7ef1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdFormatException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdFormatException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class GroupIdFormatException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdV1.java
similarity index 91%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupIdV1.java
index acec587b..90e5dde4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV1.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdV1.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 import java.util.Base64;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdV2.java
similarity index 86%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupIdV2.java
index 35aac330..44cda276 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupIdV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupIdV2.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 import java.util.Base64;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
similarity index 98%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
index 3425d95e..b21aeb97 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
@@ -1,7 +1,8 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 import com.google.protobuf.ByteString;
 
+import org.asamk.signal.manager.groups.GroupLinkPassword;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.storageservice.protos.groups.GroupInviteLink;
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupLinkState.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupLinkState.java
similarity index 67%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupLinkState.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupLinkState.java
index ad567fbf..899e8587 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupLinkState.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupLinkState.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public enum GroupLinkState {
     ENABLED,
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupNotFoundException.java
similarity index 81%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupNotFoundException.java
index 0fc0c444..052354a3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupNotFoundException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupNotFoundException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class GroupNotFoundException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupPermission.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupPermission.java
similarity index 62%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupPermission.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupPermission.java
index 00366497..db6f2ecd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupPermission.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupPermission.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public enum GroupPermission {
     EVERY_MEMBER,
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupSendingNotAllowedException.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupSendingNotAllowedException.java
similarity index 86%
rename from lib/src/main/java/org/asamk/signal/manager/groups/GroupSendingNotAllowedException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/GroupSendingNotAllowedException.java
index 1a2fa432..e328e341 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupSendingNotAllowedException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupSendingNotAllowedException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class GroupSendingNotAllowedException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/LastGroupAdminException.java b/lib/src/main/java/org/asamk/signal/manager/api/LastGroupAdminException.java
similarity index 85%
rename from lib/src/main/java/org/asamk/signal/manager/groups/LastGroupAdminException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/LastGroupAdminException.java
index 28c52fad..69d2ffb7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/LastGroupAdminException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/LastGroupAdminException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class LastGroupAdminException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index aba52179..9cc34aba 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -1,6 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java b/lib/src/main/java/org/asamk/signal/manager/api/NotAGroupMemberException.java
similarity index 85%
rename from lib/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java
rename to lib/src/main/java/org/asamk/signal/manager/api/NotAGroupMemberException.java
index 08cbcacd..6c188da3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/NotAGroupMemberException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/NotAGroupMemberException.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.groups;
+package org.asamk.signal.manager.api;
 
 public class NotAGroupMemberException extends Exception {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
similarity index 97%
rename from lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java
rename to lib/src/main/java/org/asamk/signal/manager/api/Profile.java
index 909337b7..3eb58a55 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Profile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.storage.recipients;
+package org.asamk.signal.manager.api;
 
 import org.whispersystems.signalservice.internal.util.Util;
 
@@ -142,7 +142,7 @@ public class Profile {
         ENABLED,
         UNRESTRICTED;
 
-        static UnidentifiedAccessMode valueOfOrUnknown(String value) {
+        public static UnidentifiedAccessMode valueOfOrUnknown(String value) {
             try {
                 return valueOf(value);
             } catch (IllegalArgumentException ignored) {
@@ -157,7 +157,7 @@ public class Profile {
         senderKey,
         announcementGroup;
 
-        static Capability valueOfOrNull(String value) {
+        public static Capability valueOfOrNull(String value) {
             try {
                 return valueOf(value);
             } catch (IllegalArgumentException ignored) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java b/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java
index 1aea3c45..52b68e58 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java
@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
index d8952ec0..fc822058 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
@@ -1,6 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.groups.GroupId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java b/lib/src/main/java/org/asamk/signal/manager/api/ServiceEnvironment.java
similarity index 59%
rename from lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java
rename to lib/src/main/java/org/asamk/signal/manager/api/ServiceEnvironment.java
index d83bf7d2..e3499827 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironment.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/ServiceEnvironment.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.config;
+package org.asamk.signal.manager.api;
 
 public enum ServiceEnvironment {
     LIVE,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/TrustNewIdentity.java b/lib/src/main/java/org/asamk/signal/manager/api/TrustNewIdentity.java
similarity index 58%
rename from lib/src/main/java/org/asamk/signal/manager/storage/identities/TrustNewIdentity.java
rename to lib/src/main/java/org/asamk/signal/manager/api/TrustNewIdentity.java
index b2db73a3..e86c11d9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/TrustNewIdentity.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TrustNewIdentity.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager.storage.identities;
+package org.asamk.signal.manager.api;
 
 public enum TrustNewIdentity {
     ALWAYS,
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
index 0a2cb5ee..c1ba4270 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
@@ -1,8 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupPermission;
-
 import java.util.Set;
 
 public class UpdateGroup {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 7100c326..b2b45a9c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -1,7 +1,6 @@
 package org.asamk.signal.manager.config;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.push.TrustStore;
 
@@ -16,8 +15,6 @@ import okhttp3.Interceptor;
 
 public class ServiceConfig {
 
-    private final static Logger logger = LoggerFactory.getLogger(ServiceConfig.class);
-
     public final static int PREKEY_MINIMUM_COUNT = 20;
     public final static int PREKEY_BATCH_SIZE = 100;
     public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
@@ -47,20 +44,6 @@ public class ServiceConfig {
         return new AccountAttributes.Capabilities(false, true, true, true, true, giftBadges, false, false);
     }
 
-    public static boolean isSignalClientAvailable() {
-        try {
-            try {
-                org.signal.libsignal.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
-            } catch (Exception e) {
-                logger.trace("Expected exception when checking libsignal-client: {}", e.getMessage());
-            }
-            return true;
-        } catch (UnsatisfiedLinkError e) {
-            logger.warn("Failed to call libsignal-client: {}", e.getMessage());
-            return false;
-        }
-    }
-
     public static KeyStore getIasKeyStore() {
         return iasKeyStore;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index 0ca2c914..2a95f34f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -1,5 +1,6 @@
 package org.asamk.signal.manager.config;
 
+import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
index 356fb984..b73be0ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
@@ -1,5 +1,8 @@
 package org.asamk.signal.manager.groups;
 
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 3bff549d..286e477e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -1,13 +1,13 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.DeviceLinkInfo;
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.internal.DeviceLinkInfo;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 9250927d..7c2d9089 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.AttachmentStore;
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
 import org.signal.libsignal.protocol.InvalidMessageException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index f43d083c..80df9447 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.helper;
 
+import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
 public class ContactHelper {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index 7ff8bd64..2caeb0fb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.AttachmentStore;
-import org.asamk.signal.manager.AvatarStore;
-import org.asamk.signal.manager.JobExecutor;
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.internal.JobExecutor;
+import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.storage.AttachmentStore;
+import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 5658dc25..d987d3d1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -1,24 +1,24 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResult;
 import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdV1;
-import org.asamk.signal.manager.groups.GroupIdV2;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index e410d232..85462e19 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -3,13 +3,13 @@ package org.asamk.signal.manager.helper;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.groups.GroupLinkPassword;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupPermission;
 import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.Utils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index d0a6a5c0..3b616644 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -1,7 +1,6 @@
 package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.actions.HandleAction;
 import org.asamk.signal.manager.actions.RefreshPreKeysAction;
 import org.asamk.signal.manager.actions.RenewSessionAction;
@@ -19,19 +18,20 @@ import org.asamk.signal.manager.actions.SendSyncContactsAction;
 import org.asamk.signal.manager.actions.SendSyncGroupsAction;
 import org.asamk.signal.manager.actions.SendSyncKeysAction;
 import org.asamk.signal.manager.actions.UpdateAccountAttributesAction;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.manager.groups.GroupUtils;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.jobs.RetrieveStickerPackJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.signal.libsignal.metadata.ProtocolInvalidKeyException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 30ab919e..24cd675c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.config.ServiceConfig;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index da7440ed..6d5f2aa1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -1,12 +1,12 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.IOUtils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index d0ebbc95..b2262223 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -1,10 +1,10 @@
 package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.actions.HandleAction;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.messageCache.CachedMessage;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index f614d7ec..384d1fa0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.usernames.BaseUsernameException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index a410c2c9..36c4f0d5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -2,17 +2,17 @@ package org.asamk.signal.manager.helper;
 
 import com.google.protobuf.ByteString;
 
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
-import org.asamk.signal.manager.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogEntry;
 import org.signal.libsignal.protocol.InvalidKeyException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
index c67a6573..915f3d71 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack;
 import org.asamk.signal.manager.util.IOUtils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 50eceb67..fc084f28 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -1,12 +1,12 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.TrustLevel;
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index a005f07d..f015cb1f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -1,10 +1,10 @@
 package org.asamk.signal.manager.helper;
 
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.TrustLevel;
-import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
-import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index 92031576..bc02e319 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
 import org.signal.libsignal.metadata.certificate.SenderCertificate;
diff --git a/lib/src/main/java/org/asamk/signal/manager/AccountFileUpdaterImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
similarity index 86%
rename from lib/src/main/java/org/asamk/signal/manager/AccountFileUpdaterImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
index af0008c3..5c99d0c1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AccountFileUpdaterImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
@@ -1,10 +1,10 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.whispersystems.signalservice.api.push.ACI;
 
-class AccountFileUpdaterImpl implements AccountFileUpdater {
+public class AccountFileUpdaterImpl implements AccountFileUpdater {
 
     private final AccountsStore accountsStore;
     private final String accountPath;
diff --git a/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java b/lib/src/main/java/org/asamk/signal/manager/internal/DeviceLinkInfo.java
similarity index 98%
rename from lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/DeviceLinkInfo.java
index 356cb47d..50f04026 100644
--- a/lib/src/main/java/org/asamk/signal/manager/DeviceLinkInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/DeviceLinkInfo.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.util.Utils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/JobExecutor.java b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
similarity index 87%
rename from lib/src/main/java/org/asamk/signal/manager/JobExecutor.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
index 12ade9ca..8a3e815f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/JobExecutor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.jobs.Job;
diff --git a/lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java b/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
similarity index 92%
rename from lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
index 7942c194..66a480e9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/LibSignalLogger.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import org.signal.libsignal.protocol.logging.SignalProtocolLogger;
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
@@ -9,7 +9,7 @@ public class LibSignalLogger implements SignalProtocolLogger {
 
     private final static Logger logger = LoggerFactory.getLogger("LibSignal");
 
-    static void initLogger() {
+    public static void initLogger() {
         SignalProtocolLoggerProvider.setProvider(new LibSignalLogger());
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
similarity index 98%
rename from lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 1db3cbc7..7e6a3972 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -14,23 +14,31 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.Group;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.Recipient;
 import org.asamk.signal.manager.api.RecipientIdentifier;
@@ -47,18 +55,13 @@ import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.storage.AttachmentStore;
+import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.identities.IdentityInfo;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack;
 import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
@@ -110,7 +113,7 @@ import java.util.stream.Stream;
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
-class ManagerImpl implements Manager {
+public class ManagerImpl implements Manager {
 
     private final static Logger logger = LoggerFactory.getLogger(ManagerImpl.class);
 
@@ -128,7 +131,7 @@ class ManagerImpl implements Manager {
     private final List<Runnable> addressChangedListeners = new ArrayList<>();
     private final CompositeDisposable disposable = new CompositeDisposable();
 
-    ManagerImpl(
+    public ManagerImpl(
             SignalAccount account,
             PathConfig pathConfig,
             AccountFileUpdater accountFileUpdater,
@@ -200,7 +203,7 @@ class ManagerImpl implements Manager {
         return account.getNumber();
     }
 
-    void checkAccountState() throws IOException {
+    public void checkAccountState() throws IOException {
         context.getAccountHelper().checkAccountState();
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
similarity index 91%
rename from lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
index 072e965b..0461254a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/MultiAccountManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
@@ -1,5 +1,10 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.manager.SignalAccountFiles;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,7 +20,7 @@ import java.util.Set;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-class MultiAccountManagerImpl implements MultiAccountManager {
+public class MultiAccountManagerImpl implements MultiAccountManager {
 
     private final static Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/PathConfig.java b/lib/src/main/java/org/asamk/signal/manager/internal/PathConfig.java
similarity index 71%
rename from lib/src/main/java/org/asamk/signal/manager/PathConfig.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/PathConfig.java
index f3bacdc3..1c7a80f3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/PathConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/PathConfig.java
@@ -1,12 +1,12 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import java.io.File;
 
-record PathConfig(
+public record PathConfig(
         File dataPath, File attachmentsPath, File avatarsPath, File stickerPacksPath
 ) {
 
-    static PathConfig createDefault(final File settingsPath) {
+    public static PathConfig createDefault(final File settingsPath) {
         return new PathConfig(new File(settingsPath, "data"),
                 new File(settingsPath, "attachments"),
                 new File(settingsPath, "avatars"),
diff --git a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
similarity index 97%
rename from lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 544032da..d372a27e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -14,8 +14,11 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.Settings;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
@@ -43,7 +46,7 @@ import java.util.function.Consumer;
 
 import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
 
-class ProvisioningManagerImpl implements ProvisioningManager {
+public class ProvisioningManagerImpl implements ProvisioningManager {
 
     private final static Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);
 
@@ -59,7 +62,7 @@ class ProvisioningManagerImpl implements ProvisioningManager {
     private final int pniRegistrationId;
     private final String password;
 
-    ProvisioningManagerImpl(
+    public ProvisioningManagerImpl(
             PathConfig pathConfig,
             ServiceEnvironmentConfig serviceEnvironmentConfig,
             String userAgent,
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
similarity index 97%
rename from lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 0e3c9af0..eb51b715 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -14,8 +14,10 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
@@ -46,7 +48,7 @@ import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider
 import java.io.IOException;
 import java.util.function.Consumer;
 
-class RegistrationManagerImpl implements RegistrationManager {
+public class RegistrationManagerImpl implements RegistrationManager {
 
     private final static Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
 
@@ -60,7 +62,7 @@ class RegistrationManagerImpl implements RegistrationManager {
     private final PinHelper pinHelper;
     private final AccountFileUpdater accountFileUpdater;
 
-    RegistrationManagerImpl(
+    public RegistrationManagerImpl(
             SignalAccount account,
             PathConfig pathConfig,
             ServiceEnvironmentConfig serviceEnvironmentConfig,
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
similarity index 99%
rename from lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 7a8ecc4b..bf2f76df 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
similarity index 99%
rename from lib/src/main/java/org/asamk/signal/manager/SignalWebSocketHealthMonitor.java
rename to lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index 95d12674..f4ac35e2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.internal;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
similarity index 98%
rename from lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
rename to lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
index e95c2069..5e734174 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AttachmentStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
@@ -1,4 +1,4 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.storage;
 
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.MimeUtils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/AvatarStore.java
similarity index 97%
rename from lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
rename to lib/src/main/java/org/asamk/signal/manager/storage/AvatarStore.java
index b4bd188c..e4475b6e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/AvatarStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AvatarStore.java
@@ -1,6 +1,6 @@
-package org.asamk.signal.manager;
+package org.asamk.signal.manager.storage;
 
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.Utils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 5014ab6d..850b264f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -4,10 +4,12 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.asamk.signal.manager.Settings;
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.api.TrustLevel;
-import org.asamk.signal.manager.config.ServiceEnvironment;
-import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.configuration.ConfigurationStore;
 import org.asamk.signal.manager.storage.contacts.ContactsStore;
@@ -27,10 +29,8 @@ import org.asamk.signal.manager.storage.profiles.LegacyProfileStore;
 import org.asamk.signal.manager.storage.profiles.ProfileStore;
 import org.asamk.signal.manager.storage.protocol.LegacyJsonSignalProtocolStore;
 import org.asamk.signal.manager.storage.protocol.SignalProtocolStore;
-import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.LegacyRecipientStore;
 import org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2;
-import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientIdCreator;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
index d708a41c..e7297c6b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
@@ -3,7 +3,7 @@ package org.asamk.signal.manager.storage.accounts;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.config.ServiceEnvironment;
+import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.util.IOUtils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactsStore.java
index 2435c4e9..05bc4e27 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/ContactsStore.java
@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.storage.contacts;
 
+import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 
 import java.util.List;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
index 3816dcc6..a16af0ff 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.storage.groups;
 
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupPermission;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.whispersystems.signalservice.api.push.DistributionId;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
index ea5ae7be..ba09337c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.storage.groups;
 
-import org.asamk.signal.manager.groups.GroupIdV1;
-import org.asamk.signal.manager.groups.GroupIdV2;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupPermission;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.whispersystems.signalservice.api.push.DistributionId;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index fca71f10..3e5eac7a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.storage.groups;
 
-import org.asamk.signal.manager.groups.GroupIdV2;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupPermission;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index ece7cde2..0b190105 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -2,9 +2,9 @@ package org.asamk.signal.manager.storage.groups;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdV1;
-import org.asamk.signal.manager.groups.GroupIdV2;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index b6205c97..f004ae69 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -7,9 +7,9 @@ import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdV1;
-import org.asamk.signal.manager.groups.GroupIdV2;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.zkgroup.InvalidInputException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index b1d89628..2f8b4dac 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager.storage.identities;
 
 import org.asamk.signal.manager.api.TrustLevel;
+import org.asamk.signal.manager.api.TrustNewIdentity;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
 import org.signal.libsignal.protocol.IdentityKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
index 9e36bf85..8128435d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.storage.profiles;
 
-import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index bd7605db..f1b77180 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.manager.storage.recipients;
 
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.storage.Utils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
index 2d3c8430..3790ecde 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.manager.storage.recipients;
 
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.Profile;
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index b8a4b39b..9c13459b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -1,6 +1,8 @@
 package org.asamk.signal.manager.storage.recipients;
 
+import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
index 67ca5cd4..c7f37396 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.storage.sendLog;
 
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupId;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index bab0aa4f..d8c8f5aa 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.storage.sendLog;
 
-import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 5d61cab3..cfbfc3cc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -3,7 +3,7 @@ package org.asamk.signal.manager.util;
 import com.google.protobuf.InvalidProtocolBufferException;
 
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.api.Profile;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 058ae6bb..e8c30a97 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -27,9 +27,8 @@ import org.asamk.signal.manager.Settings;
 import org.asamk.signal.manager.SignalAccountFiles;
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;
-import org.asamk.signal.manager.config.ServiceConfig;
-import org.asamk.signal.manager.config.ServiceEnvironment;
-import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
+import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.asamk.signal.manager.api.TrustNewIdentity;
 import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriterImpl;
@@ -150,7 +149,7 @@ public class App {
             return;
         }
 
-        if (!ServiceConfig.isSignalClientAvailable()) {
+        if (!Manager.isSignalClientAvailable()) {
             throw new UserErrorException("Missing required native library dependency: libsignal-client");
         }
 
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index c299ae38..faea75dc 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -1,12 +1,12 @@
 package org.asamk.signal;
 
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.TextStyle;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
-import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.Hex;
diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 682ff63f..2a8c4f50 100644
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -7,9 +7,9 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index 5e3461b7..3c3562ae 100644
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -8,9 +8,9 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index e3b978b1..997e31dd 100644
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -6,8 +6,8 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.storage.recipients.Contact;
-import org.asamk.signal.manager.storage.recipients.Profile;
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index 201451ee..ca745b32 100644
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -8,10 +8,10 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
index 85d2dcd4..294fd7c5 100644
--- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
@@ -8,9 +8,9 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 33777167..56a26253 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -9,14 +9,14 @@ import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.TextStyle;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.asamk.signal.util.Hex;
diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index a844fabf..0eafc2fd 100644
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -8,10 +8,10 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
index 4a2a038c..9293ec6a 100644
--- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
@@ -7,11 +7,11 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.TypingAction;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index 9ff018bb..a7a8b6d7 100644
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -7,9 +7,9 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 14ad14f8..1f7825fb 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -9,15 +9,15 @@ import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index e5f64ab3..1873bfd0 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -5,15 +5,23 @@ import org.asamk.signal.DbusConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
+import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.Group;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.ReceiveConfig;
@@ -30,14 +38,6 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
-import org.asamk.signal.manager.storage.recipients.Contact;
 import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
index 66c1fd65..3176620d 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
@@ -2,9 +2,9 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.RecipientAddress;
-import org.asamk.signal.manager.groups.GroupId;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.types.Variant;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index f91f8001..db7253bd 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -4,11 +4,19 @@ import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidNumberException;
 import org.asamk.signal.manager.api.InvalidStickerException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
 import org.asamk.signal.manager.api.RecipientAddress;
@@ -21,14 +29,6 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
-import org.asamk.signal.manager.groups.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
 import org.asamk.signal.util.SendMessageResultUtils;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index f7d06b15..39e7f51e 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -13,7 +13,6 @@ import org.asamk.signal.jsonrpc.SignalJsonRpcCommandHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.util.Utils;
 import org.asamk.signal.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -138,7 +137,7 @@ public class HttpServerHandler {
 
         try {
             final var queryString = httpExchange.getRequestURI().getQuery();
-            final var query = queryString == null ? Map.<String, String>of() : Utils.getQueryMap(queryString);
+            final var query = queryString == null ? Map.<String, String>of() : Util.getQueryMap(queryString);
 
             List<Manager> managers = getManagerFromQuery(query);
             if (managers == null) {
diff --git a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
index dd7f235f..13b953fc 100644
--- a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
+++ b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
@@ -2,8 +2,8 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.SendMessageResult;
-import org.asamk.signal.manager.groups.GroupId;
 
 public record JsonSendMessageResult(
         JsonRecipientAddress recipientAddress,
diff --git a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
index 012df53d..c1ca6144 100644
--- a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
@@ -3,8 +3,8 @@ package org.asamk.signal.json;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import org.asamk.signal.manager.api.Color;
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
-import org.asamk.signal.manager.groups.GroupId;
 
 import java.util.List;
 
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 802c07d5..98c3571e 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -2,9 +2,9 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.RecipientAddress;
-import org.asamk.signal.manager.groups.GroupId;
 
 import java.util.List;
 
diff --git a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
index 0df82b1c..79a66d34 100644
--- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
@@ -2,8 +2,8 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
-import org.asamk.signal.manager.groups.GroupId;
 
 record JsonTypingMessage(
         String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId
diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java
index b86a9989..311b78af 100644
--- a/src/main/java/org/asamk/signal/util/CommandUtil.java
+++ b/src/main/java/org/asamk/signal/util/CommandUtil.java
@@ -2,10 +2,10 @@ package org.asamk.signal.util;
 
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdFormatException;
 import org.asamk.signal.manager.api.InvalidNumberException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdFormatException;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index c844e2ea..338c986a 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,9 +5,13 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -63,4 +67,17 @@ public class Util {
         objectMapper.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
         return objectMapper;
     }
+
+    public static Map<String, String> getQueryMap(String query) {
+        var params = query.split("&");
+        var map = new HashMap<String, String>();
+        for (var param : params) {
+            final var paramParts = param.split("=");
+            var name = URLDecoder.decode(paramParts[0], StandardCharsets.UTF_8);
+            var value = paramParts.length == 1 ? null : URLDecoder.decode(paramParts[1], StandardCharsets.UTF_8);
+            map.put(name, value);
+        }
+        return map;
+    }
+
 }

From ff162cb44d1c5ea784d584a5fff03c4de8b2b5c8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 21 May 2023 22:54:51 +0200
Subject: [PATCH 119/672] Refactor addDeviceLink method

---
 graalvm-config-dir/reflect-config.json                   | 3 ++-
 lib/src/main/java/org/asamk/signal/manager/Manager.java  | 4 ++--
 .../DeviceLinkInfo.java => api/DeviceLinkUrl.java}       | 9 ++++-----
 .../org/asamk/signal/manager/helper/AccountHelper.java   | 4 ++--
 .../org/asamk/signal/manager/internal/ManagerImpl.java   | 7 +++----
 .../signal/manager/internal/ProvisioningManagerImpl.java | 3 ++-
 .../java/org/asamk/signal/commands/AddDeviceCommand.java | 4 +++-
 src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java | 5 +++--
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java  | 4 +++-
 9 files changed, 24 insertions(+), 19 deletions(-)
 rename lib/src/main/java/org/asamk/signal/manager/{internal/DeviceLinkInfo.java => api/DeviceLinkUrl.java} (84%)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 240edebd..32827631 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2747,7 +2747,8 @@
   "name":"org.whispersystems.signalservice.internal.push.DeviceCode",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.DeviceId",
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 2e23564b..884871c6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -4,6 +4,7 @@ import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
@@ -42,7 +43,6 @@ import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import java.time.Duration;
 import java.util.Collection;
 import java.util.List;
@@ -116,7 +116,7 @@ public interface Manager extends Closeable {
 
     void removeLinkedDevices(int deviceId) throws IOException;
 
-    void addDeviceLink(URI linkUri) throws IOException, InvalidDeviceLinkException;
+    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException;
 
     void setRegistrationLockPin(Optional<String> pin) throws IOException, NotPrimaryDeviceException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/DeviceLinkInfo.java b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
similarity index 84%
rename from lib/src/main/java/org/asamk/signal/manager/internal/DeviceLinkInfo.java
rename to lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
index 50f04026..54271dac 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/DeviceLinkInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
@@ -1,6 +1,5 @@
-package org.asamk.signal.manager.internal;
+package org.asamk.signal.manager.api;
 
-import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
@@ -14,9 +13,9 @@ import java.util.Base64;
 
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
-public record DeviceLinkInfo(String deviceIdentifier, ECPublicKey deviceKey) {
+public record DeviceLinkUrl(String deviceIdentifier, ECPublicKey deviceKey) {
 
-    public static DeviceLinkInfo parseDeviceLinkUri(URI linkUri) throws InvalidDeviceLinkException {
+    public static DeviceLinkUrl parseDeviceLinkUri(URI linkUri) throws InvalidDeviceLinkException {
         final var rawQuery = linkUri.getRawQuery();
         if (isEmpty(rawQuery)) {
             throw new RuntimeException("Invalid device link uri");
@@ -43,7 +42,7 @@ public record DeviceLinkInfo(String deviceIdentifier, ECPublicKey deviceKey) {
             throw new InvalidDeviceLinkException("Invalid device link", e);
         }
 
-        return new DeviceLinkInfo(deviceIdentifier, deviceKey);
+        return new DeviceLinkUrl(deviceIdentifier, deviceKey);
     }
 
     public URI createDeviceLinkUri() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 286e477e..edca4f97 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -1,12 +1,12 @@
 package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
-import org.asamk.signal.manager.internal.DeviceLinkInfo;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
@@ -267,7 +267,7 @@ public class AccountHelper {
         dependencies.getAccountManager().setAccountAttributes(account.getAccountAttributes(null));
     }
 
-    public void addDevice(DeviceLinkInfo deviceLinkInfo) throws IOException, InvalidDeviceLinkException {
+    public void addDevice(DeviceLinkUrl deviceLinkInfo) throws IOException, InvalidDeviceLinkException {
         var verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
 
         try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 7e6a3972..9147eae1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -21,6 +21,7 @@ import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
@@ -91,7 +92,6 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -359,9 +359,8 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void addDeviceLink(URI linkUri) throws IOException, InvalidDeviceLinkException {
-        var deviceLinkInfo = DeviceLinkInfo.parseDeviceLinkUri(linkUri);
-        context.getAccountHelper().addDevice(deviceLinkInfo);
+    public void addDeviceLink(DeviceLinkUrl linkUrl) throws IOException, InvalidDeviceLinkException {
+        context.getAccountHelper().addDevice(linkUrl);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index d372a27e..113c2856 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -19,6 +19,7 @@ package org.asamk.signal.manager.internal;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.Settings;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
@@ -97,7 +98,7 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
     public URI getDeviceLinkUri() throws TimeoutException, IOException {
         var deviceUuid = accountManager.getNewDeviceUuid();
 
-        return new DeviceLinkInfo(deviceUuid, tempIdentityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
+        return new DeviceLinkUrl(deviceUuid, tempIdentityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index eb218c70..0895601a 100644
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -7,6 +7,7 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
@@ -45,7 +46,8 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
         }
 
         try {
-            m.addDeviceLink(linkUri);
+            var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(linkUri);
+            m.addDeviceLink(deviceLinkUrl);
         } catch (IOException e) {
             logger.error("Add device link failed", e);
             throw new IOErrorException("Add device link failed", e);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 1873bfd0..2871ad5d 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -7,6 +7,7 @@ import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
@@ -199,8 +200,8 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public void addDeviceLink(final URI linkUri) throws IOException, InvalidDeviceLinkException {
-        signal.addDevice(linkUri.toString());
+    public void addDeviceLink(final DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException {
+        signal.addDevice(linkUri.createDeviceLinkUri().toString());
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index db7253bd..afc4e03d 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -4,6 +4,7 @@ import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
 import org.asamk.signal.manager.api.GroupLinkState;
@@ -173,7 +174,8 @@ public class DbusSignalImpl implements Signal {
     @Override
     public void addDevice(String uri) {
         try {
-            m.addDeviceLink(new URI(uri));
+            var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(new URI(uri));
+            m.addDeviceLink(deviceLinkUrl);
         } catch (IOException | InvalidDeviceLinkException e) {
             throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
         } catch (URISyntaxException e) {

From 83c75acd0a52518fba5db1b4735f2dba8b5e746e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 23 May 2023 19:13:59 +0200
Subject: [PATCH 120/672] Log signal-cli version on startup

---
 src/main/java/org/asamk/signal/App.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index e8c30a97..a791941c 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -120,6 +120,7 @@ public class App {
     }
 
     public void init() throws CommandException {
+        logger.debug("Starting {}", BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
         var commandKey = ns.getString("command");
         var command = Commands.getCommand(commandKey);
         if (command == null) {

From 227f87e1ceac926ef62700cf6579c842a3b05470 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 23 May 2023 19:15:04 +0200
Subject: [PATCH 121/672] Fallback to legacy send if group send fails due to
 invalid prekey

---
 .../java/org/asamk/signal/manager/helper/SendHelper.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 36c4f0d5..666867fe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -617,6 +617,13 @@ public class SendHelper {
         } catch (NotFoundException e) {
             logger.warn("Someone was unregistered. Falling back to legacy sends.", e);
             return null;
+        } catch (IOException e) {
+            if (e.getCause() instanceof InvalidKeyException) {
+                logger.warn("Invalid key. Falling back to legacy sends.", e);
+                return null;
+            } else {
+                throw e;
+            }
         }
     }
 

From 90f82b6d4c9761c21651e359038f9f6a4a2b0dc0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 24 May 2023 22:29:46 +0200
Subject: [PATCH 122/672] Update libsignal-service

---
 CHANGELOG.md                                         |  2 +-
 graalvm-config-dir/reflect-config.json               |  1 +
 .../org/asamk/signal/manager/config/LiveConfig.java  |  8 +++++++-
 .../asamk/signal/manager/config/StagingConfig.java   |  8 +++++++-
 .../asamk/signal/manager/helper/GroupV2Helper.java   | 12 ++++++++----
 settings.gradle.kts                                  |  2 +-
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df52b7ef..043bb418 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 
 ## [Unreleased]
-**Attention**: Now requires native libsignal-client version 0.24.0
+**Attention**: Now requires native libsignal-client version 0.25.0
 
 ### Added
 - New `--text-style` and `--quote-text-style` flags for `send` command
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 32827631..5b0a7682 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -3434,6 +3434,7 @@
     {"name":"bitField0_"}, 
     {"name":"blocked_"}, 
     {"name":"callEvent_"}, 
+    {"name":"callLinkUpdate_"}, 
     {"name":"configuration_"}, 
     {"name":"contacts_"}, 
     {"name":"fetchLatest_"}, 
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index fc917b2c..80322b8b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -12,6 +12,7 @@ import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;
 
 import java.util.Base64;
 import java.util.Collection;
@@ -43,6 +44,7 @@ class LiveConfig {
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
     private final static String STORAGE_URL = "https://storage.signal.org";
     private final static String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
+    private final static String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.empty();
@@ -50,6 +52,8 @@ class LiveConfig {
 
     private final static byte[] zkGroupServerPublicParams = Base64.getDecoder()
             .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P");
+    private final static byte[] genericServerPublicParams = Base64.getDecoder()
+            .decode("AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN");
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
@@ -62,10 +66,12 @@ class LiveConfig {
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
+                new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)},
                 interceptors,
                 dns,
                 proxy,
-                zkGroupServerPublicParams);
+                zkGroupServerPublicParams,
+                genericServerPublicParams);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 0090902e..95a3dd96 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -12,6 +12,7 @@ import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;
 
 import java.util.Base64;
 import java.util.Collection;
@@ -43,6 +44,7 @@ class StagingConfig {
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
     private final static String STORAGE_URL = "https://storage-staging.signal.org";
     private final static String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
+    private final static String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.empty();
@@ -50,6 +52,8 @@ class StagingConfig {
 
     private final static byte[] zkGroupServerPublicParams = Base64.getDecoder()
             .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj");
+    private final static byte[] genericServerPublicParams = Base64.getDecoder()
+            .decode("AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N");
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
@@ -62,10 +66,12 @@ class StagingConfig {
                 new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
+                new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)},
                 interceptors,
                 dns,
                 proxy,
-                zkGroupServerPublicParams);
+                zkGroupServerPublicParams,
+                genericServerPublicParams);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 85462e19..7cc28d6a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -49,8 +49,8 @@ import org.whispersystems.signalservice.api.util.UuidUtil;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -66,7 +66,7 @@ class GroupV2Helper {
     private final SignalDependencies dependencies;
     private final Context context;
 
-    private HashMap<Long, AuthCredentialWithPniResponse> groupApiCredentials;
+    private Map<Long, AuthCredentialWithPniResponse> groupApiCredentials;
 
     GroupV2Helper(final Context context) {
         this.dependencies = context.getDependencies();
@@ -646,7 +646,9 @@ class GroupV2Helper {
         final var todaySeconds = currentDaySeconds();
         if (groupApiCredentials == null || !groupApiCredentials.containsKey(todaySeconds)) {
             // Returns credentials for the next 7 days
-            groupApiCredentials = dependencies.getGroupsV2Api().getCredentials(todaySeconds);
+            groupApiCredentials = dependencies.getGroupsV2Api()
+                    .getCredentials(todaySeconds)
+                    .getAuthCredentialWithPniResponseHashMap();
             // TODO cache credentials on disk until they expire
         }
         try {
@@ -656,7 +658,9 @@ class GroupV2Helper {
             groupApiCredentials.clear();
         }
 
-        groupApiCredentials = dependencies.getGroupsV2Api().getCredentials(todaySeconds);
+        groupApiCredentials = dependencies.getGroupsV2Api()
+                .getCredentials(todaySeconds)
+                .getAuthCredentialWithPniResponseHashMap();
         try {
             return getAuthorizationString(groupSecretParams, todaySeconds);
         } catch (VerificationFailedException e) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 45a40d11..24992a4d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.7")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_71")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_72")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From dacb48b4f4a584f904439c98b8fae538397f34e2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 24 May 2023 23:05:49 +0200
Subject: [PATCH 123/672] Update sqlite-jdbc

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 24992a4d..edf8c13d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_72")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.41.2.1")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.9.3")
         }

From ee12805d05f821780d5e9eec874f8c8081021934 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 24 May 2023 23:05:36 +0200
Subject: [PATCH 124/672] Bump version to 0.11.11

---
 CHANGELOG.md                                   | 3 +++
 build.gradle.kts                               | 2 +-
 src/main/java/org/asamk/signal/BaseConfig.java | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 043bb418..d8cbe4fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+
+## [0.11.11] - 2023-05-24
 **Attention**: Now requires native libsignal-client version 0.25.0
 
 ### Added
@@ -8,6 +10,7 @@
 
 ### Fixed
 - Fixed migration of older account files
+- Fix deleting old unregistered recipient
 
 ## [0.11.10] - 2023-05-11
 **Attention**: Now requires native libsignal-client version 0.23.1
diff --git a/build.gradle.kts b/build.gradle.kts
index 038b216d..9c436568 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.22"
 }
 
-version = "0.11.10"
+version = "0.11.11"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 7d2ac4b3..547e80a8 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -5,7 +5,7 @@ public class BaseConfig {
     public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
     public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.21.2";
+    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.22.0";
     final static String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 7499b41d6b66ad315eed24c203151d0c2f07c500 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 30 May 2023 13:02:09 +0200
Subject: [PATCH 125/672] Remove old methods/classes from graalvm config

---
 graalvm-config-dir/reflect-config.json | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 5b0a7682..a3f29024 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2435,14 +2435,11 @@
     {"name":"getAnnouncementGroup","parameterTypes":[] }, 
     {"name":"getChangeNumber","parameterTypes":[] }, 
     {"name":"getGiftBadges","parameterTypes":[] }, 
-    {"name":"getGv1Migration","parameterTypes":[] }, 
-    {"name":"getGv2","parameterTypes":[] }, 
     {"name":"getPaymentActivation","parameterTypes":[] }, 
     {"name":"getPni","parameterTypes":[] }, 
     {"name":"getSenderKey","parameterTypes":[] }, 
     {"name":"getStorage","parameterTypes":[] }, 
-    {"name":"getStories","parameterTypes":[] }, 
-    {"name":"getUuid","parameterTypes":[] }
+    {"name":"getStories","parameterTypes":[] }
   ]
 },
 {
@@ -3444,7 +3441,6 @@
     {"name":"outgoingPayment_"}, 
     {"name":"padding_"}, 
     {"name":"pniChangeNumber_"}, 
-    {"name":"pniIdentity_"}, 
     {"name":"read_"}, 
     {"name":"request_"}, 
     {"name":"sent_"}, 
@@ -3547,14 +3543,6 @@
     {"name":"spentKeyImages_"}
   ]
 },
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$PniIdentity",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"privateKey_"}, 
-    {"name":"publicKey_"}
-  ]
-},
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Read",
   "fields":[

From c852bd8a85f93385d34df634e680704ec68d5b00 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 30 May 2023 13:03:00 +0200
Subject: [PATCH 126/672] Remove libsignal logs on console, when log-file is
 given

---
 .../java/org/asamk/signal/logging/LogConfigurator.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 83646d7e..114ad5ff 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -52,9 +52,11 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
             consoleAppender.addFilter(new Filter<>() {
                 @Override
                 public FilterReply decide(final ILoggingEvent event) {
-                    return event.getLevel().isGreaterOrEqual(Level.WARN) || (
-                            event.getLevel().isGreaterOrEqual(Level.INFO) && event.getLoggerName()
-                                    .startsWith("org.asamk")
+                    return !"LibSignal".equals(event.getLoggerName()) && (
+                            event.getLevel().isGreaterOrEqual(Level.WARN) || (
+                                    event.getLevel().isGreaterOrEqual(Level.INFO) && event.getLoggerName()
+                                            .startsWith("org.asamk")
+                            )
                     )
 
                             ? FilterReply.NEUTRAL : FilterReply.DENY;

From d0d3e207135f8625d20461b4444e12d6baa1b6b6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 2 Jun 2023 21:29:58 +0200
Subject: [PATCH 127/672] Add helper method to create valid dbus object path

---
 src/main/java/org/asamk/signal/DbusConfig.java       |  4 +++-
 .../java/org/asamk/signal/dbus/DbusSignalImpl.java   |  8 +++-----
 src/main/java/org/asamk/signal/dbus/DbusUtils.java   | 12 ++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/dbus/DbusUtils.java

diff --git a/src/main/java/org/asamk/signal/DbusConfig.java b/src/main/java/org/asamk/signal/DbusConfig.java
index ddd534c4..c4c923cf 100644
--- a/src/main/java/org/asamk/signal/DbusConfig.java
+++ b/src/main/java/org/asamk/signal/DbusConfig.java
@@ -1,5 +1,7 @@
 package org.asamk.signal;
 
+import org.asamk.signal.dbus.DbusUtils;
+
 public class DbusConfig {
 
     private static final String SIGNAL_BUSNAME = "org.asamk.Signal";
@@ -18,6 +20,6 @@ public class DbusConfig {
             return SIGNAL_OBJECT_BASE_PATH;
         }
 
-        return SIGNAL_OBJECT_BASE_PATH + "/" + account.replace('+', '_');
+        return SIGNAL_OBJECT_BASE_PATH + "/" + DbusUtils.makeValidObjectPathElement(account);
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index afc4e03d..b1d64886 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -56,6 +56,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
+
 public class DbusSignalImpl implements Signal {
 
     private final Manager m;
@@ -980,11 +982,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     private static String getGroupObjectPath(String basePath, byte[] groupId) {
-        return basePath + "/Groups/" + Base64.getEncoder()
-                .encodeToString(groupId)
-                .replace("+", "_")
-                .replace("/", "_")
-                .replace("=", "_");
+        return basePath + "/Groups/" + makeValidObjectPathElement(Base64.getEncoder().encodeToString(groupId));
     }
 
     private void updateGroups() {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusUtils.java b/src/main/java/org/asamk/signal/dbus/DbusUtils.java
new file mode 100644
index 00000000..eba0cccf
--- /dev/null
+++ b/src/main/java/org/asamk/signal/dbus/DbusUtils.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.dbus;
+
+public final class DbusUtils {
+
+    private DbusUtils() {
+
+    }
+
+    public static String makeValidObjectPathElement(String pathElement) {
+        return pathElement.replaceAll("[^A-Za-z0-9_]", "_");
+    }
+}

From a7db3a5610db2cf718030fbe06e5ebb8531459c8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 2 Jun 2023 22:43:18 +0200
Subject: [PATCH 128/672] Extract dbus client command handling

---
 src/main/java/org/asamk/signal/App.java       | 161 +++---------------
 .../asamk/signal/commands/CommandHandler.java |  43 +++++
 .../asamk/signal/dbus/DbusCommandHandler.java | 130 ++++++++++++++
 3 files changed, 198 insertions(+), 136 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/commands/CommandHandler.java
 create mode 100644 src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index a791941c..c31e6f49 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -5,9 +5,8 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.Namespace;
 
-import org.asamk.Signal;
-import org.asamk.SignalControl;
 import org.asamk.signal.commands.Command;
+import org.asamk.signal.commands.CommandHandler;
 import org.asamk.signal.commands.Commands;
 import org.asamk.signal.commands.LocalCommand;
 import org.asamk.signal.commands.MultiLocalCommand;
@@ -17,10 +16,7 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
-import org.asamk.signal.dbus.DbusManagerImpl;
-import org.asamk.signal.dbus.DbusMultiAccountManagerImpl;
-import org.asamk.signal.dbus.DbusProvisioningManagerImpl;
-import org.asamk.signal.dbus.DbusRegistrationManagerImpl;
+import org.asamk.signal.dbus.DbusCommandHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.Settings;
@@ -30,13 +26,11 @@ import org.asamk.signal.manager.api.NotRegisteredException;
 import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.api.TrustNewIdentity;
 import org.asamk.signal.output.JsonWriterImpl;
-import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriterImpl;
 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
 import org.freedesktop.dbus.errors.ServiceUnknown;
-import org.freedesktop.dbus.errors.UnknownMethod;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
@@ -140,13 +134,15 @@ public class App {
             throw new UserErrorException("Command doesn't support output type " + outputType);
         }
 
+        final var commandHandler = new CommandHandler(ns, outputWriter);
+
         var account = ns.getString("account");
 
         final var useDbus = Boolean.TRUE.equals(ns.getBoolean("global-dbus"));
         final var useDbusSystem = Boolean.TRUE.equals(ns.getBoolean("global-dbus-system"));
         if (useDbus || useDbusSystem) {
             // If account is null, it will connect to the default object path
-            initDbusClient(command, account, useDbusSystem, outputWriter);
+            initDbusClient(command, account, useDbusSystem, commandHandler);
             return;
         }
 
@@ -189,17 +185,17 @@ public class App {
                 throw new UserErrorException("You cannot specify a account (phone number) when linking");
             }
 
-            handleProvisioningCommand(provisioningCommand, signalAccountFiles, outputWriter);
+            handleProvisioningCommand(provisioningCommand, signalAccountFiles, commandHandler);
             return;
         }
 
         if (account == null) {
             if (command instanceof MultiLocalCommand multiLocalCommand) {
-                handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, outputWriter);
+                handleMultiLocalCommand(multiLocalCommand, signalAccountFiles, commandHandler);
                 return;
             }
 
-            Set<String> accounts = null;
+            Set<String> accounts;
             try {
                 accounts = signalAccountFiles.getAllLocalAccountNumbers();
             } catch (IOException e) {
@@ -218,7 +214,7 @@ public class App {
         }
 
         if (command instanceof RegistrationCommand registrationCommand) {
-            handleRegistrationCommand(registrationCommand, account, signalAccountFiles);
+            handleRegistrationCommand(registrationCommand, account, signalAccountFiles, commandHandler);
             return;
         }
 
@@ -226,113 +222,56 @@ public class App {
             throw new UserErrorException("Command only works in multi-account mode");
         }
 
-        handleLocalCommand((LocalCommand) command, account, signalAccountFiles, outputWriter);
+        handleLocalCommand((LocalCommand) command, account, signalAccountFiles, commandHandler);
     }
 
     private void handleProvisioningCommand(
             final ProvisioningCommand command,
             final SignalAccountFiles signalAccountFiles,
-            final OutputWriter outputWriter
+            final CommandHandler commandHandler
     ) throws CommandException {
         var pm = signalAccountFiles.initProvisioningManager();
-        command.handleCommand(ns, pm, outputWriter);
-    }
-
-    private void handleProvisioningCommand(
-            final ProvisioningCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter
-    ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        final var provisioningManager = new DbusProvisioningManagerImpl(signalControl, dBusConn);
-        try {
-            c.handleCommand(ns, provisioningManager, outputWriter);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Command is not yet implemented via dbus", e);
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException(e.getMessage(), e);
-        }
+        commandHandler.handleProvisioningCommand(command, pm);
     }
 
     private void handleRegistrationCommand(
-            final RegistrationCommand command, final String account, final SignalAccountFiles signalAccountFiles
+            final RegistrationCommand command,
+            final String account,
+            final SignalAccountFiles signalAccountFiles,
+            final CommandHandler commandHandler
     ) throws CommandException {
-        try (final var manager = loadRegistrationManager(account, signalAccountFiles)) {
-            command.handleCommand(ns, manager);
+        try (final var rm = loadRegistrationManager(account, signalAccountFiles)) {
+            commandHandler.handleRegistrationCommand(command, rm);
         } catch (IOException e) {
             logger.warn("Cleanup failed", e);
         }
     }
 
-    private void handleRegistrationCommand(
-            final RegistrationCommand c, String account, final DBusConnection dBusConn, final OutputWriter outputWriter
-    ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        try (final var registrationManager = new DbusRegistrationManagerImpl(account, signalControl, dBusConn)) {
-            c.handleCommand(ns, registrationManager);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Command is not yet implemented via dbus", e);
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException(e.getMessage(), e);
-        }
-    }
-
     private void handleLocalCommand(
             final LocalCommand command,
             final String account,
             final SignalAccountFiles signalAccountFiles,
-            final OutputWriter outputWriter
+            final CommandHandler commandHandler
     ) throws CommandException {
         try (var m = loadManager(account, signalAccountFiles)) {
-            command.handleCommand(ns, m, outputWriter);
+            commandHandler.handleLocalCommand(command, m);
         } catch (IOException e) {
             logger.warn("Cleanup failed", e);
         }
     }
 
-    private void handleLocalCommand(
-            final LocalCommand c,
-            String accountObjectPath,
-            final DBusConnection dBusConn,
-            final OutputWriter outputWriter
-    ) throws CommandException, DBusException {
-        var signal = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class);
-        try (final var m = new DbusManagerImpl(signal, dBusConn)) {
-            c.handleCommand(ns, m, outputWriter);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Command is not yet implemented via dbus", e);
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException(e.getMessage(), e);
-        }
-    }
-
     private void handleMultiLocalCommand(
             final MultiLocalCommand command,
             final SignalAccountFiles signalAccountFiles,
-            final OutputWriter outputWriter
+            final CommandHandler commandHandler
     ) throws CommandException {
         try (var multiAccountManager = signalAccountFiles.initMultiAccountManager()) {
-            command.handleCommand(ns, multiAccountManager, outputWriter);
+            commandHandler.handleMultiLocalCommand(command, multiAccountManager);
         } catch (IOException e) {
             throw new IOErrorException("Failed to load local accounts file", e);
         }
     }
 
-    private void handleMultiLocalCommand(
-            final MultiLocalCommand c, final DBusConnection dBusConn, final OutputWriter outputWriter
-    ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn)) {
-            c.handleCommand(ns, multiAccountManager, outputWriter);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Command is not yet implemented via dbus", e);
-        }
-    }
-
     private RegistrationManager loadRegistrationManager(
             final String account, final SignalAccountFiles signalAccountFiles
     ) throws UnexpectedErrorException {
@@ -374,42 +313,12 @@ public class App {
     }
 
     private void initDbusClient(
-            final Command command, final String account, final boolean systemBus, final OutputWriter outputWriter
+            final Command command, final String account, final boolean systemBus, final CommandHandler commandHandler
     ) throws CommandException {
         try {
-            DBusConnection.DBusBusType busType;
-            if (systemBus) {
-                busType = DBusConnection.DBusBusType.SYSTEM;
-            } else {
-                busType = DBusConnection.DBusBusType.SESSION;
-            }
+            final var busType = systemBus ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
             try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) {
-                if (command instanceof ProvisioningCommand c) {
-                    if (account != null) {
-                        throw new UserErrorException("You cannot specify a account (phone number) when linking");
-                    }
-
-                    handleProvisioningCommand(c, dBusConn, outputWriter);
-                    return;
-                }
-
-                if (account == null && command instanceof MultiLocalCommand c) {
-                    handleMultiLocalCommand(c, dBusConn, outputWriter);
-                    return;
-                }
-                if (account != null && command instanceof RegistrationCommand c) {
-                    handleRegistrationCommand(c, account, dBusConn, outputWriter);
-                    return;
-                }
-                if (!(command instanceof LocalCommand localCommand)) {
-                    throw new UserErrorException("Command only works in multi-account mode");
-                }
-
-                var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null;
-                if (accountObjectPath == null) {
-                    accountObjectPath = DbusConfig.getObjectPath(account);
-                }
-                handleLocalCommand(localCommand, accountObjectPath, dBusConn, outputWriter);
+                DbusCommandHandler.handleCommand(command, account, dBusConn, commandHandler);
             }
         } catch (ServiceUnknown e) {
             throw new UserErrorException("signal-cli DBus daemon not running on "
@@ -421,26 +330,6 @@ public class App {
         }
     }
 
-    private String tryGetSingleAccountObjectPath(final DBusConnection dBusConn) throws DBusException, CommandException {
-        var control = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        try {
-            final var accounts = control.listAccounts();
-            if (accounts.size() == 0) {
-                throw new UserErrorException("No local users found, you first need to register or link an account");
-            } else if (accounts.size() > 1) {
-                throw new UserErrorException(
-                        "Multiple users found, you need to specify an account (phone number) with -a");
-            }
-
-            return accounts.get(0).getPath();
-        } catch (UnknownMethod e) {
-            // dbus daemon not running in multi-account mode
-            return null;
-        }
-    }
-
     /**
      * @return the default data directory to be used by signal-cli.
      */
diff --git a/src/main/java/org/asamk/signal/commands/CommandHandler.java b/src/main/java/org/asamk/signal/commands/CommandHandler.java
new file mode 100644
index 00000000..8e138b3f
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/CommandHandler.java
@@ -0,0 +1,43 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.manager.ProvisioningManager;
+import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.output.OutputWriter;
+
+public class CommandHandler {
+
+    final Namespace ns;
+    final OutputWriter outputWriter;
+
+    public CommandHandler(final Namespace ns, final OutputWriter outputWriter) {
+        this.ns = ns;
+        this.outputWriter = outputWriter;
+    }
+
+    public void handleProvisioningCommand(
+            final ProvisioningCommand command, final ProvisioningManager provisioningManager
+    ) throws CommandException {
+        command.handleCommand(ns, provisioningManager, outputWriter);
+    }
+
+    public void handleRegistrationCommand(
+            final RegistrationCommand command, final RegistrationManager registrationManager
+    ) throws CommandException {
+        command.handleCommand(ns, registrationManager);
+    }
+
+    public void handleLocalCommand(final LocalCommand command, final Manager manager) throws CommandException {
+        command.handleCommand(ns, manager, outputWriter);
+    }
+
+    public void handleMultiLocalCommand(
+            final MultiLocalCommand command, MultiAccountManager multiAccountManager
+    ) throws CommandException {
+        command.handleCommand(ns, multiAccountManager, outputWriter);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
new file mode 100644
index 00000000..1ab7cb22
--- /dev/null
+++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
@@ -0,0 +1,130 @@
+package org.asamk.signal.dbus;
+
+import org.asamk.Signal;
+import org.asamk.SignalControl;
+import org.asamk.signal.DbusConfig;
+import org.asamk.signal.commands.Command;
+import org.asamk.signal.commands.CommandHandler;
+import org.asamk.signal.commands.LocalCommand;
+import org.asamk.signal.commands.MultiLocalCommand;
+import org.asamk.signal.commands.ProvisioningCommand;
+import org.asamk.signal.commands.RegistrationCommand;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.errors.UnknownMethod;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
+
+public class DbusCommandHandler {
+
+    public static void handleCommand(
+            final Command command,
+            final String account,
+            final DBusConnection dBusConn,
+            final CommandHandler commandHandler
+    ) throws CommandException, DBusException {
+        try {
+            if (command instanceof ProvisioningCommand c) {
+                if (account != null) {
+                    throw new UserErrorException("You cannot specify a account (phone number) when linking");
+                }
+
+                handleProvisioningCommand(c, dBusConn, commandHandler);
+                return;
+            }
+
+            if (account == null && command instanceof MultiLocalCommand c) {
+                handleMultiLocalCommand(c, dBusConn, commandHandler);
+                return;
+            }
+            if (account != null && command instanceof RegistrationCommand c) {
+                handleRegistrationCommand(c, account, dBusConn, commandHandler);
+                return;
+            }
+            if (!(command instanceof LocalCommand localCommand)) {
+                throw new UserErrorException("Command only works in multi-account mode");
+            }
+
+            var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null;
+            if (accountObjectPath == null) {
+                accountObjectPath = DbusConfig.getObjectPath(account);
+            }
+            handleLocalCommand(localCommand, accountObjectPath, dBusConn, commandHandler);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Command is not yet implemented via dbus", e);
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException(e.getMessage(), e);
+        }
+    }
+
+    private static String tryGetSingleAccountObjectPath(final DBusConnection dBusConn) throws DBusException, CommandException {
+        var control = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        try {
+            final var accounts = control.listAccounts();
+            if (accounts.size() == 0) {
+                throw new UserErrorException("No local users found, you first need to register or link an account");
+            } else if (accounts.size() > 1) {
+                throw new UserErrorException(
+                        "Multiple users found, you need to specify an account (phone number) with -a");
+            }
+
+            return accounts.get(0).getPath();
+        } catch (UnknownMethod e) {
+            // dbus daemon not running in multi-account mode
+            return null;
+        }
+    }
+
+    private static void handleMultiLocalCommand(
+            final MultiLocalCommand c, final DBusConnection dBusConn, final CommandHandler commandHandler
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn)) {
+            commandHandler.handleMultiLocalCommand(c, multiAccountManager);
+        }
+    }
+
+    private static void handleLocalCommand(
+            final LocalCommand c,
+            String accountObjectPath,
+            final DBusConnection dBusConn,
+            final CommandHandler commandHandler
+    ) throws CommandException, DBusException {
+        var signal = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class);
+        try (final var manager = new DbusManagerImpl(signal, dBusConn)) {
+            commandHandler.handleLocalCommand(c, manager);
+        }
+    }
+
+    private static void handleRegistrationCommand(
+            final RegistrationCommand c,
+            String account,
+            final DBusConnection dBusConn,
+            final CommandHandler commandHandler
+
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        try (final var registrationManager = new DbusRegistrationManagerImpl(account, signalControl, dBusConn)) {
+            commandHandler.handleRegistrationCommand(c, registrationManager);
+        }
+    }
+
+    private static void handleProvisioningCommand(
+            final ProvisioningCommand c, final DBusConnection dBusConn, final CommandHandler commandHandler
+
+    ) throws CommandException, DBusException {
+        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
+                DbusConfig.getObjectPath(),
+                SignalControl.class);
+        final var provisioningManager = new DbusProvisioningManagerImpl(signalControl, dBusConn);
+        commandHandler.handleProvisioningCommand(c, provisioningManager);
+    }
+}

From 2ae5297f7db07cae8c708cceac33481b7b13ddab Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 2 Jun 2023 22:52:45 +0200
Subject: [PATCH 129/672] Refactor App init method

---
 src/main/java/org/asamk/signal/App.java | 106 ++++++++++++++----------
 1 file changed, 62 insertions(+), 44 deletions(-)

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index c31e6f49..fdd88e7c 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -26,6 +26,7 @@ import org.asamk.signal.manager.api.NotRegisteredException;
 import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.api.TrustNewIdentity;
 import org.asamk.signal.output.JsonWriterImpl;
+import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriterImpl;
 import org.asamk.signal.util.IOUtils;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -121,19 +122,7 @@ public class App {
             throw new UserErrorException("Command not implemented!");
         }
 
-        var outputTypeInput = ns.<OutputType>get("output");
-        var outputType = outputTypeInput == null
-                ? command.getSupportedOutputTypes().stream().findFirst().orElse(null)
-                : outputTypeInput;
-        var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset()));
-        var outputWriter = outputType == null
-                ? null
-                : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer);
-
-        if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) {
-            throw new UserErrorException("Command doesn't support output type " + outputType);
-        }
-
+        final var outputWriter = getOutputWriter(command);
         final var commandHandler = new CommandHandler(ns, outputWriter);
 
         var account = ns.getString("account");
@@ -150,36 +139,17 @@ public class App {
             throw new UserErrorException("Missing required native library dependency: libsignal-client");
         }
 
-        final File configPath;
-        var config = ns.getString("config");
-        if (config != null) {
-            configPath = new File(config);
-        } else {
-            configPath = getDefaultConfigPath();
-        }
+        final var signalAccountFiles = loadSignalAccountFiles();
 
-        final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
-        final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
-                ? ServiceEnvironment.LIVE
-                : ServiceEnvironment.STAGING;
-
-        final var trustNewIdentityCli = ns.<TrustNewIdentityCli>get("trust-new-identities");
-        final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE
-                ? TrustNewIdentity.ON_FIRST_USE
-                : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
-
-        final var disableSendLog = Boolean.TRUE.equals(ns.getBoolean("disable-send-log"));
-
-        final SignalAccountFiles signalAccountFiles;
-        try {
-            signalAccountFiles = new SignalAccountFiles(configPath,
-                    serviceEnvironment,
-                    BaseConfig.USER_AGENT,
-                    new Settings(trustNewIdentity, disableSendLog));
-        } catch (IOException e) {
-            throw new IOErrorException("Failed to read local accounts list", e);
-        }
+        handleCommand(command, commandHandler, account, signalAccountFiles);
+    }
 
+    private void handleCommand(
+            final Command command,
+            final CommandHandler commandHandler,
+            String account,
+            final SignalAccountFiles signalAccountFiles
+    ) throws CommandException {
         if (command instanceof ProvisioningCommand provisioningCommand) {
             if (account != null) {
                 throw new UserErrorException("You cannot specify a account (phone number) when linking");
@@ -218,11 +188,59 @@ public class App {
             return;
         }
 
-        if (!(command instanceof LocalCommand)) {
-            throw new UserErrorException("Command only works in multi-account mode");
+        if (command instanceof LocalCommand localCommand) {
+            handleLocalCommand(localCommand, account, signalAccountFiles, commandHandler);
         }
 
-        handleLocalCommand((LocalCommand) command, account, signalAccountFiles, commandHandler);
+        throw new UserErrorException("Command only works in multi-account mode");
+    }
+
+    private OutputWriter getOutputWriter(final Command command) throws UserErrorException {
+        final var outputTypeInput = ns.<OutputType>get("output");
+        final var outputType = outputTypeInput == null ? command.getSupportedOutputTypes()
+                .stream()
+                .findFirst()
+                .orElse(null) : outputTypeInput;
+        final var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset()));
+        final var outputWriter = outputType == null
+                ? null
+                : outputType == OutputType.JSON ? new JsonWriterImpl(writer) : new PlainTextWriterImpl(writer);
+
+        if (outputWriter != null && !command.getSupportedOutputTypes().contains(outputType)) {
+            throw new UserErrorException("Command doesn't support output type " + outputType);
+        }
+        return outputWriter;
+    }
+
+    private SignalAccountFiles loadSignalAccountFiles() throws IOErrorException {
+        final File configPath;
+        final var config = ns.getString("config");
+        if (config != null) {
+            configPath = new File(config);
+        } else {
+            configPath = getDefaultConfigPath();
+        }
+
+        final var serviceEnvironmentCli = ns.<ServiceEnvironmentCli>get("service-environment");
+        final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE
+                ? ServiceEnvironment.LIVE
+                : ServiceEnvironment.STAGING;
+
+        final var trustNewIdentityCli = ns.<TrustNewIdentityCli>get("trust-new-identities");
+        final var trustNewIdentity = trustNewIdentityCli == TrustNewIdentityCli.ON_FIRST_USE
+                ? TrustNewIdentity.ON_FIRST_USE
+                : trustNewIdentityCli == TrustNewIdentityCli.ALWAYS ? TrustNewIdentity.ALWAYS : TrustNewIdentity.NEVER;
+
+        final var disableSendLog = Boolean.TRUE.equals(ns.getBoolean("disable-send-log"));
+
+        try {
+            return new SignalAccountFiles(configPath,
+                    serviceEnvironment,
+                    BaseConfig.USER_AGENT,
+                    new Settings(trustNewIdentity, disableSendLog));
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to read local accounts list", e);
+        }
     }
 
     private void handleProvisioningCommand(

From 106af6a801ad12045c3c98f235d5c9176784748f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 3 Jun 2023 16:10:47 +0200
Subject: [PATCH 130/672] Refactor trust command implementation

---
 .../org/asamk/signal/manager/Manager.java     | 28 ++-------
 .../manager/api/IdentityVerificationCode.java | 28 +++++++++
 .../signal/manager/internal/ManagerImpl.java  | 32 +++++-----
 .../asamk/signal/commands/TrustCommand.java   | 63 +++++--------------
 .../asamk/signal/dbus/DbusManagerImpl.java    | 18 ++----
 5 files changed, 64 insertions(+), 105 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/IdentityVerificationCode.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 884871c6..38d9e12c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -11,6 +11,7 @@ import org.asamk.signal.manager.api.GroupInviteLinkUrl;
 import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
@@ -261,33 +262,12 @@ public interface Manager extends Closeable {
     List<Identity> getIdentities(RecipientIdentifier.Single recipient);
 
     /**
-     * Trust this the identity with this fingerprint
+     * Trust this the identity with this fingerprint/safetyNumber
      *
-     * @param recipient   account of the identity
-     * @param fingerprint Fingerprint
+     * @param recipient account of the identity
      */
     boolean trustIdentityVerified(
-            RecipientIdentifier.Single recipient, byte[] fingerprint
-    ) throws UnregisteredRecipientException;
-
-    /**
-     * Trust this the identity with this safety number
-     *
-     * @param recipient    account of the identity
-     * @param safetyNumber Safety number
-     */
-    boolean trustIdentityVerifiedSafetyNumber(
-            RecipientIdentifier.Single recipient, String safetyNumber
-    ) throws UnregisteredRecipientException;
-
-    /**
-     * Trust this the identity with this scannable safety number
-     *
-     * @param recipient    account of the identity
-     * @param safetyNumber Scannable safety number
-     */
-    boolean trustIdentityVerifiedSafetyNumber(
-            RecipientIdentifier.Single recipient, byte[] safetyNumber
+            RecipientIdentifier.Single recipient, IdentityVerificationCode verificationCode
     ) throws UnregisteredRecipientException;
 
     /**
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/IdentityVerificationCode.java b/lib/src/main/java/org/asamk/signal/manager/api/IdentityVerificationCode.java
new file mode 100644
index 00000000..0f05b480
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/IdentityVerificationCode.java
@@ -0,0 +1,28 @@
+package org.asamk.signal.manager.api;
+
+import org.signal.libsignal.protocol.util.Hex;
+
+import java.util.Base64;
+import java.util.Locale;
+
+public sealed interface IdentityVerificationCode {
+
+    record Fingerprint(byte[] fingerprint) implements IdentityVerificationCode {}
+
+    record SafetyNumber(String safetyNumber) implements IdentityVerificationCode {}
+
+    record ScannableSafetyNumber(byte[] safetyNumber) implements IdentityVerificationCode {}
+
+    static IdentityVerificationCode parse(String code) throws Exception {
+        code = code.replaceAll(" ", "");
+        if (code.length() == 66) {
+            final var fingerprintBytes = Hex.fromStringCondensed(code.toLowerCase(Locale.ROOT));
+            return new Fingerprint(fingerprintBytes);
+        } else if (code.length() == 60) {
+            return new SafetyNumber(code);
+        } else {
+            final var scannableSafetyNumber = Base64.getDecoder().decode(code);
+            return new ScannableSafetyNumber(scannableSafetyNumber);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 9147eae1..90b2f6a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -28,6 +28,7 @@ import org.asamk.signal.manager.api.GroupInviteLinkUrl;
 import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
@@ -1166,25 +1167,20 @@ public class ManagerImpl implements Manager {
 
     @Override
     public boolean trustIdentityVerified(
-            RecipientIdentifier.Single recipient, byte[] fingerprint
+            RecipientIdentifier.Single recipient, IdentityVerificationCode verificationCode
     ) throws UnregisteredRecipientException {
-        return trustIdentity(recipient, r -> context.getIdentityHelper().trustIdentityVerified(r, fingerprint));
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            RecipientIdentifier.Single recipient, String safetyNumber
-    ) throws UnregisteredRecipientException {
-        return trustIdentity(recipient,
-                r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber));
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            RecipientIdentifier.Single recipient, byte[] safetyNumber
-    ) throws UnregisteredRecipientException {
-        return trustIdentity(recipient,
-                r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber));
+        if (verificationCode instanceof IdentityVerificationCode.Fingerprint fingerprint) {
+            return trustIdentity(recipient,
+                    r -> context.getIdentityHelper().trustIdentityVerified(r, fingerprint.fingerprint()));
+        } else if (verificationCode instanceof IdentityVerificationCode.SafetyNumber safetyNumber) {
+            return trustIdentity(recipient,
+                    r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber()));
+        } else if (verificationCode instanceof IdentityVerificationCode.ScannableSafetyNumber safetyNumber) {
+            return trustIdentity(recipient,
+                    r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber()));
+        } else {
+            throw new AssertionError("Invalid verification code type");
+        }
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 618655be..7d1dd632 100644
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -7,13 +7,10 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
-import org.asamk.signal.util.Hex;
-
-import java.util.Base64;
-import java.util.Locale;
 
 public class TrustCommand implements JsonRpcLocalCommand {
 
@@ -57,54 +54,22 @@ public class TrustCommand implements JsonRpcLocalCommand {
                         "You need to specify the fingerprint/safety number you have verified with -v SAFETY_NUMBER");
             }
 
-            safetyNumber = safetyNumber.replaceAll(" ", "");
-            if (safetyNumber.length() == 66) {
-                byte[] fingerprintBytes;
-                try {
-                    fingerprintBytes = Hex.toByteArray(safetyNumber.toLowerCase(Locale.ROOT));
-                } catch (Exception e) {
-                    throw new UserErrorException(
-                            "Failed to parse the fingerprint, make sure the fingerprint is a correctly encoded hex string without additional characters.");
-                }
-                boolean res;
-                try {
-                    res = m.trustIdentityVerified(recipient, fingerprintBytes);
-                } catch (UnregisteredRecipientException e) {
-                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
-                }
+            final IdentityVerificationCode verificationCode;
+            try {
+                verificationCode = IdentityVerificationCode.parse(safetyNumber);
+            } catch (Exception e) {
+                throw new UserErrorException(
+                        "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
+            }
+
+            try {
+                final var res = m.trustIdentityVerified(recipient, verificationCode);
                 if (!res) {
                     throw new UserErrorException(
-                            "Failed to set the trust for the fingerprint of this number, make sure the number and the fingerprint are correct.");
-                }
-            } else if (safetyNumber.length() == 60) {
-                boolean res;
-                try {
-                    res = m.trustIdentityVerifiedSafetyNumber(recipient, safetyNumber);
-                } catch (UnregisteredRecipientException e) {
-                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
-                }
-                if (!res) {
-                    throw new UserErrorException(
-                            "Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
-                }
-            } else {
-                final byte[] scannableSafetyNumber;
-                try {
-                    scannableSafetyNumber = Base64.getDecoder().decode(safetyNumber);
-                } catch (IllegalArgumentException e) {
-                    throw new UserErrorException(
-                            "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
-                }
-                boolean res;
-                try {
-                    res = m.trustIdentityVerifiedSafetyNumber(recipient, scannableSafetyNumber);
-                } catch (UnregisteredRecipientException e) {
-                    throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
-                }
-                if (!res) {
-                    throw new UserErrorException(
-                            "Failed to set the trust for the safety number of this phone number, make sure the phone number and the safety number are correct.");
+                            "Failed to set the trust for this number, make sure the number and the fingerprint/safety number are correct.");
                 }
+            } catch (UnregisteredRecipientException e) {
+                throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 2871ad5d..0e81e578 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -15,6 +15,7 @@ import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.GroupPermission;
 import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
@@ -667,20 +668,9 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public boolean trustIdentityVerified(final RecipientIdentifier.Single recipient, final byte[] fingerprint) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            final RecipientIdentifier.Single recipient, final String safetyNumber
-    ) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean trustIdentityVerifiedSafetyNumber(
-            final RecipientIdentifier.Single recipient, final byte[] safetyNumber
+    public boolean trustIdentityVerified(
+            final RecipientIdentifier.Single recipient,
+            final IdentityVerificationCode verificationCode
     ) {
         throw new UnsupportedOperationException();
     }

From c62a1e829fc394fa1d00e04c717b43ae8896a6ee Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 3 Jun 2023 16:11:21 +0200
Subject: [PATCH 131/672] Remove duplicate address resolving

---
 graalvm-config-dir/reflect-config.json                | 11 ++++++++++-
 .../asamk/signal/manager/helper/IdentityHelper.java   | 11 ++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index a3f29024..9da72883 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -625,7 +625,16 @@
   "name":"org.asamk.signal.commands.ListIdentitiesCommand$JsonIdentity",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[
+    {"name":"addedTimestamp","parameterTypes":[] }, 
+    {"name":"fingerprint","parameterTypes":[] }, 
+    {"name":"number","parameterTypes":[] }, 
+    {"name":"safetyNumber","parameterTypes":[] }, 
+    {"name":"scannableSafetyNumber","parameterTypes":[] }, 
+    {"name":"trustLevel","parameterTypes":[] }, 
+    {"name":"uuid","parameterTypes":[] }
+  ]
 },
 {
   "name":"org.asamk.signal.commands.ListStickerPacksCommand$JsonStickerPack",
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index c150abed..61973f33 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -94,10 +94,8 @@ public class IdentityHelper {
     private boolean trustIdentity(
             RecipientId recipientId, BiFunction<ServiceId, IdentityKey, Boolean> verifier, TrustLevel trustLevel
     ) {
-        final var serviceId = account.getRecipientAddressResolver()
-                .resolveRecipientAddress(recipientId)
-                .serviceId()
-                .orElse(null);
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+        final var serviceId = address.serviceId().orElse(null);
         if (serviceId == null) {
             return false;
         }
@@ -112,9 +110,8 @@ public class IdentityHelper {
 
         account.getIdentityKeyStore().setIdentityTrustLevel(serviceId, identity.getIdentityKey(), trustLevel);
         try {
-            final var address = context.getRecipientHelper()
-                    .resolveSignalServiceAddress(account.getRecipientResolver().resolveRecipient(serviceId));
-            context.getSyncHelper().sendVerifiedMessage(address, identity.getIdentityKey(), trustLevel);
+            context.getSyncHelper()
+                    .sendVerifiedMessage(address.toSignalServiceAddress(), identity.getIdentityKey(), trustLevel);
         } catch (IOException e) {
             logger.warn("Failed to send verification sync message: {}", e.getMessage());
         }

From a96c4938b15f3006efa6fc9dc1199c0ab6207e00 Mon Sep 17 00:00:00 2001
From: Adimarantis <joerg.bublath@intel.com>
Date: Mon, 5 Jun 2023 19:26:00 +0200
Subject: [PATCH 132/672] Dbus identities (#1259)

* Dbus Identities and Trust

* Update src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java

* PR feedback updates

* Documentation and consistent case sensitivity

* doc for listIdentities and getIdentity
---
 man/signal-cli-dbus.5.adoc                    |  54 +++++++++
 src/main/java/org/asamk/Signal.java           |  48 ++++++++
 .../org/asamk/signal/dbus/DbusSignalImpl.java | 108 ++++++++++++++++++
 3 files changed, 210 insertions(+)

diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc
index 46b11734..0f11ef9d 100644
--- a/man/signal-cli-dbus.5.adoc
+++ b/man/signal-cli-dbus.5.adoc
@@ -416,6 +416,24 @@ Only works if sent from a secondary device.
 
 Exceptions: Failure
 
+==== Identity related methods
+
+listIdentities() -> identities<a(oss)>::
+* identities : Array of structs (objectPath, id, name)
+** objectPath : DBusPath representing the identity object path
+** uuid : Internal uuid of the identity
+** number : Phone number of the identity (or uuid if not known)
+
+Lists all know identities
+
+getIdentity(Number<s>) -> identityPath<o>::
+* Number : Phone number 
+* identityPath : DBusPath object for the identity
+
+Gets the identity Dbus path for a given phone number
+
+Exceptions: Failure
+
 === Signal.Group interface
 
 The following methods listen to the group's object path, which can be obtained from the listGroups() method and is constructed as follows:
@@ -531,6 +549,42 @@ removeDevice() -> <>::
 
 Exceptions: Failure
 
+=== Signal.Identity interface
+
+The following methods listen to the Identities object path, which is constructed as follows:
+
+<ACCOUNT_PATH> + "/Identities/" + identity
+
+identity : Either the phone number of a contact with underscore (_) replacing plus (+) , or if not known its uuid
+
+Identities have the following (case-sensitive) properties:
+
+* Number<s> (read-only) : Phone number of the contact
+* Uuid<x> (read-only) : Internal uuid representing the contact
+* Fingerprint<x> (read-only) : Byte array representing the fingerprint
+* SafetyNumber<s> (read-only) : String representation of the safety number used to verify trust
+* TrustLevel<s> (read-only) : Current trust level (UNSTRUSTED, TRUSTED_UNVERIFIED, TRUSTED_VERIFIED)
+* AddedDate<x> (read-only) : Long representing the number of milliseconds since the Unix epoch
+* ScannableSafetyNumber<x> (read-only) : Byte array representation of the safety number
+
+To get a property, use (replacing `--session` with `--system` if needed):
+`dbus-send --session --dest=org.asamk.Signal --print-reply $OBJECT_PATH org.freedesktop.DBus.Properties.Get string:org.asamk.Signal.Identity string:$PROPERTY_NAME`
+
+To get all properties, use:
+`dbus-send --session --dest=org.asamk.Signal --print-reply $OBJECT_PATH org.freedesktop.DBus.Properties.GetAll string:org.asamk.Signal.Identity`
+
+trust() -> <>::
+
+Establish trust with the given identity. TrustLevel will become TRUSTED_UNVERFIED
+
+Exceptions: Failure
+
+trustVerified(SafetyNumber<s>) -> <>::
+
+Establish trust with the given identity using their safety number. TrustLevel will become TRUSTED_VERIFIED
+
+Exceptions: Failure
+
 === Signal.Configuration interface
 
 The configuration's object path, which exists only for primary devices, is constructed as follows:
diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index bc8bf74e..2ca23dfb 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -138,6 +138,10 @@ public interface Signal extends DBusInterface {
 
     DBusPath getDevice(long deviceId);
 
+    public DBusPath getIdentity(String number);
+    
+    public List<StructIdentity> listIdentities();
+
     List<StructDevice> listDevices() throws Error.Failure;
 
     DBusPath getThisDevice();
@@ -551,6 +555,50 @@ public interface Signal extends DBusInterface {
         void enableLink(boolean requiresApproval) throws Error.Failure;
     }
 
+    class StructIdentity extends Struct {
+
+        @Position(0)
+        DBusPath objectPath;
+
+        @Position(1)
+        String uuid;
+
+        @Position(2)
+        String name;
+
+        public StructIdentity(final DBusPath objectPath, final String uuid, final String name) {
+            this.objectPath = objectPath;
+            this.uuid = uuid;
+            this.name = name;
+        }
+
+        public DBusPath getObjectPath() {
+            return objectPath;
+        }
+
+        public String getUuid() {
+            return uuid;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    @DBusProperty(name = "Number", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "Uuid", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "Fingerprint", type = Byte[].class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "SafetyNumber", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "TrustLevel", type = String.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "AddedDate", type = Integer.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "ScannableSafetyNumber", type = Byte[].class, access = DBusProperty.Access.READ)
+    interface Identity extends DBusInterface, Properties {
+
+        void trust() throws Error.Failure;
+
+        void trustVerified(String safetyNumber) throws Error.Failure;
+    }
+
     interface Error {
 
         class AttachmentInvalid extends DBusExecutionException {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index b1d64886..6a44ff97 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -30,6 +30,7 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.util.SendMessageResultUtils;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -55,6 +56,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.UUID;
 
 import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
 
@@ -68,6 +70,7 @@ public class DbusSignalImpl implements Signal {
     private DBusPath thisDevice;
     private final List<StructDevice> devices = new ArrayList<>();
     private final List<StructGroup> groups = new ArrayList<>();
+    private final List<StructIdentity> identities = new ArrayList<>();
     private DbusReceiveMessageHandler dbusMessageHandler;
     private int subscriberCount;
 
@@ -100,6 +103,7 @@ public class DbusSignalImpl implements Signal {
         updateDevices();
         updateGroups();
         updateConfiguration();
+        updateIdentities();
     }
 
     public void close() {
@@ -114,6 +118,7 @@ public class DbusSignalImpl implements Signal {
         unExportDevices();
         unExportGroups();
         unExportConfiguration();
+        unExportIdentities();
         connection.unExportObject(this.objectPath);
     }
 
@@ -1029,6 +1034,109 @@ public class DbusSignalImpl implements Signal {
         }
     }
 
+    private void updateIdentities() {
+        List<org.asamk.signal.manager.api.Identity> identities;
+        identities = m.getIdentities();
+
+        unExportIdentities();
+
+        identities.forEach(i -> {
+            final var object = new DbusSignalIdentityImpl(i);
+            exportObject(object);
+            this.identities.add(new StructIdentity(new DBusPath(object.getObjectPath()),
+                emptyIfNull(i.recipient().getIdentifier()),
+                i.recipient().getLegacyIdentifier()));
+        });
+    }
+
+    private static String getIdentityObjectPath(String basePath, String id) {
+        return basePath + "/Identities/" + makeValidObjectPathElement(id);
+    }
+
+    private void unExportIdentities() {
+        this.identities.stream().map(StructIdentity::getObjectPath).map(DBusPath::getPath).forEach(connection::unExportObject);
+        this.identities.clear();
+    }
+
+    @Override
+    public DBusPath getIdentity(String number) throws Error.Failure {
+
+        final var found = identities.stream()
+                            .filter(identity -> identity.getName().equals(number))
+                            .findFirst();
+        
+        if (found.isEmpty()) {
+            throw new Error.Failure("Identity for " + number + " unkown");
+        }
+        return found.get().getObjectPath();
+    }
+
+    @Override
+    public List<StructIdentity> listIdentities() {
+        updateIdentities();
+        return this.identities;
+    }
+
+    public class DbusSignalIdentityImpl extends DbusProperties implements Signal.Identity {
+
+        private final org.asamk.signal.manager.api.Identity identity;
+
+        public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) {
+            this.identity=identity;
+            super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity",
+                    List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
+                            new DbusProperty<>("Uuid", () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
+                            new DbusProperty<>("Fingerprint", () -> identity.getFingerprint()),
+                            new DbusProperty<>("SafetyNumber", identity::safetyNumber),
+                            new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
+                            new DbusProperty<>("TrustLevel", identity::trustLevel),
+                            new DbusProperty<>("AddedDate", identity::dateAddedTimestamp)
+                            )));
+        }
+
+        @Override
+        public String getObjectPath() {
+            return getIdentityObjectPath(objectPath, identity.recipient().getLegacyIdentifier());
+        }
+
+        @Override
+        public void trust() throws Error.Failure  {
+            var recipient=RecipientIdentifier.Single.fromAddress(identity.recipient());
+            try {
+                m.trustIdentityAllKeys(recipient);
+            } catch (UnregisteredRecipientException e) {
+                throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
+            }
+        };
+
+        @Override
+        public void trustVerified(String safetyNumber) throws Error.Failure {
+             var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
+ 
+            if (safetyNumber == null) {
+                throw new Error.Failure(
+                    "You need to specify a fingerprint/safety number");
+            }
+            final IdentityVerificationCode verificationCode;
+            try {
+                verificationCode = IdentityVerificationCode.parse(safetyNumber);
+            } catch (Exception e) {
+                throw new Error.Failure(
+                        "Safety number has invalid format, either specify the old hex fingerprint or the new safety number");
+            }
+
+            try {
+                final var res = m.trustIdentityVerified(recipient, verificationCode);
+                if (!res) {
+                    throw new Error.Failure(
+                            "Failed to set the trust for this number, make sure the number and the fingerprint/safety number are correct.");
+                }
+            } catch (UnregisteredRecipientException e) {
+                throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
+            }
+        }
+    }
+
     public class DbusSignalDeviceImpl extends DbusProperties implements Signal.Device {
 
         private final org.asamk.signal.manager.api.Device device;

From 4f8da7819e080382ffea7754e4fa5f29177d102f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 5 Jun 2023 19:30:18 +0200
Subject: [PATCH 133/672] Reformat code

---
 src/main/java/org/asamk/Signal.java           |  2 +-
 .../asamk/signal/commands/TrustCommand.java   | 10 ++---
 .../asamk/signal/dbus/DbusManagerImpl.java    |  3 +-
 .../org/asamk/signal/dbus/DbusSignalImpl.java | 40 +++++++++----------
 4 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index 2ca23dfb..0a508548 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -139,7 +139,7 @@ public interface Signal extends DBusInterface {
     DBusPath getDevice(long deviceId);
 
     public DBusPath getIdentity(String number);
-    
+
     public List<StructIdentity> listIdentities();
 
     List<StructDevice> listDevices() throws Error.Failure;
diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 7d1dd632..9b9735d3 100644
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -38,15 +38,15 @@ public class TrustCommand implements JsonRpcLocalCommand {
         var recipentString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
         if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
-            boolean res;
             try {
-                res = m.trustIdentityAllKeys(recipient);
+                final var res = m.trustIdentityAllKeys(recipient);
+                if (!res) {
+                    throw new UserErrorException(
+                            "Failed to set the trust for this number, make sure the number is correct.");
+                }
             } catch (UnregisteredRecipientException e) {
                 throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
-            if (!res) {
-                throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct.");
-            }
         } else {
             var safetyNumber = ns.getString("verified-safety-number");
             if (safetyNumber == null) {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 0e81e578..f87eded6 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -669,8 +669,7 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public boolean trustIdentityVerified(
-            final RecipientIdentifier.Single recipient,
-            final IdentityVerificationCode verificationCode
+            final RecipientIdentifier.Single recipient, final IdentityVerificationCode verificationCode
     ) {
         throw new UnsupportedOperationException();
     }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 6a44ff97..f6ea4eef 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -11,6 +11,7 @@ import org.asamk.signal.manager.api.GroupLinkState;
 import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.GroupPermission;
 import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidNumberException;
@@ -30,7 +31,6 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
-import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.util.SendMessageResultUtils;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -55,8 +55,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
 
@@ -1044,8 +1044,8 @@ public class DbusSignalImpl implements Signal {
             final var object = new DbusSignalIdentityImpl(i);
             exportObject(object);
             this.identities.add(new StructIdentity(new DBusPath(object.getObjectPath()),
-                emptyIfNull(i.recipient().getIdentifier()),
-                i.recipient().getLegacyIdentifier()));
+                    emptyIfNull(i.recipient().getIdentifier()),
+                    i.recipient().getLegacyIdentifier()));
         });
     }
 
@@ -1054,17 +1054,18 @@ public class DbusSignalImpl implements Signal {
     }
 
     private void unExportIdentities() {
-        this.identities.stream().map(StructIdentity::getObjectPath).map(DBusPath::getPath).forEach(connection::unExportObject);
+        this.identities.stream()
+                .map(StructIdentity::getObjectPath)
+                .map(DBusPath::getPath)
+                .forEach(connection::unExportObject);
         this.identities.clear();
     }
 
     @Override
     public DBusPath getIdentity(String number) throws Error.Failure {
 
-        final var found = identities.stream()
-                            .filter(identity -> identity.getName().equals(number))
-                            .findFirst();
-        
+        final var found = identities.stream().filter(identity -> identity.getName().equals(number)).findFirst();
+
         if (found.isEmpty()) {
             throw new Error.Failure("Identity for " + number + " unkown");
         }
@@ -1082,16 +1083,16 @@ public class DbusSignalImpl implements Signal {
         private final org.asamk.signal.manager.api.Identity identity;
 
         public DbusSignalIdentityImpl(final org.asamk.signal.manager.api.Identity identity) {
-            this.identity=identity;
+            this.identity = identity;
             super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Identity",
                     List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
-                            new DbusProperty<>("Uuid", () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
+                            new DbusProperty<>("Uuid",
+                                    () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
                             new DbusProperty<>("Fingerprint", () -> identity.getFingerprint()),
                             new DbusProperty<>("SafetyNumber", identity::safetyNumber),
                             new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
                             new DbusProperty<>("TrustLevel", identity::trustLevel),
-                            new DbusProperty<>("AddedDate", identity::dateAddedTimestamp)
-                            )));
+                            new DbusProperty<>("AddedDate", identity::dateAddedTimestamp))));
         }
 
         @Override
@@ -1100,22 +1101,21 @@ public class DbusSignalImpl implements Signal {
         }
 
         @Override
-        public void trust() throws Error.Failure  {
-            var recipient=RecipientIdentifier.Single.fromAddress(identity.recipient());
+        public void trust() throws Error.Failure {
+            var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
             try {
                 m.trustIdentityAllKeys(recipient);
             } catch (UnregisteredRecipientException e) {
                 throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
-        };
+        }
 
         @Override
         public void trustVerified(String safetyNumber) throws Error.Failure {
-             var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
- 
+            var recipient = RecipientIdentifier.Single.fromAddress(identity.recipient());
+
             if (safetyNumber == null) {
-                throw new Error.Failure(
-                    "You need to specify a fingerprint/safety number");
+                throw new Error.Failure("You need to specify a fingerprint/safety number");
             }
             final IdentityVerificationCode verificationCode;
             try {

From 3d5c440aa24227f7a9a387dd675c6f5844d9c293 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 11 Jun 2023 16:39:54 +0200
Subject: [PATCH 134/672] Improve uuid/number handling

---
 man/signal-cli-dbus.5.adoc                       | 10 ++++++----
 src/main/java/org/asamk/Signal.java              | 10 +++++-----
 .../org/asamk/signal/dbus/DbusSignalImpl.java    | 16 ++++++++--------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc
index 0f11ef9d..1f2caa18 100644
--- a/man/signal-cli-dbus.5.adoc
+++ b/man/signal-cli-dbus.5.adoc
@@ -422,12 +422,12 @@ listIdentities() -> identities<a(oss)>::
 * identities : Array of structs (objectPath, id, name)
 ** objectPath : DBusPath representing the identity object path
 ** uuid : Internal uuid of the identity
-** number : Phone number of the identity (or uuid if not known)
+** number : Phone number of the identity
 
 Lists all know identities
 
 getIdentity(Number<s>) -> identityPath<o>::
-* Number : Phone number 
+* Number : Phone number
 * identityPath : DBusPath object for the identity
 
 Gets the identity Dbus path for a given phone number
@@ -575,13 +575,15 @@ To get all properties, use:
 
 trust() -> <>::
 
-Establish trust with the given identity. TrustLevel will become TRUSTED_UNVERFIED
+Establish trust with the given identity.
+TrustLevel will become TRUSTED_UNVERFIED
 
 Exceptions: Failure
 
 trustVerified(SafetyNumber<s>) -> <>::
 
-Establish trust with the given identity using their safety number. TrustLevel will become TRUSTED_VERIFIED
+Establish trust with the given identity using their safety number.
+TrustLevel will become TRUSTED_VERIFIED
 
 Exceptions: Failure
 
diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index 0a508548..9bffd6af 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -564,12 +564,12 @@ public interface Signal extends DBusInterface {
         String uuid;
 
         @Position(2)
-        String name;
+        String number;
 
-        public StructIdentity(final DBusPath objectPath, final String uuid, final String name) {
+        public StructIdentity(final DBusPath objectPath, final String uuid, final String number) {
             this.objectPath = objectPath;
             this.uuid = uuid;
-            this.name = name;
+            this.number = number;
         }
 
         public DBusPath getObjectPath() {
@@ -580,8 +580,8 @@ public interface Signal extends DBusInterface {
             return uuid;
         }
 
-        public String getName() {
-            return name;
+        public String getNumber() {
+            return number;
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index f6ea4eef..fef6821a 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1044,8 +1044,8 @@ public class DbusSignalImpl implements Signal {
             final var object = new DbusSignalIdentityImpl(i);
             exportObject(object);
             this.identities.add(new StructIdentity(new DBusPath(object.getObjectPath()),
-                    emptyIfNull(i.recipient().getIdentifier()),
-                    i.recipient().getLegacyIdentifier()));
+                    i.recipient().uuid().map(UUID::toString).orElse(""),
+                    i.recipient().number().orElse("")));
         });
     }
 
@@ -1063,11 +1063,12 @@ public class DbusSignalImpl implements Signal {
 
     @Override
     public DBusPath getIdentity(String number) throws Error.Failure {
-
-        final var found = identities.stream().filter(identity -> identity.getName().equals(number)).findFirst();
+        final var found = identities.stream()
+                .filter(identity -> identity.getNumber().equals(number) || identity.getUuid().equals(number))
+                .findFirst();
 
         if (found.isEmpty()) {
-            throw new Error.Failure("Identity for " + number + " unkown");
+            throw new Error.Failure("Identity for " + number + " unknown");
         }
         return found.get().getObjectPath();
     }
@@ -1088,7 +1089,7 @@ public class DbusSignalImpl implements Signal {
                     List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
                             new DbusProperty<>("Uuid",
                                     () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
-                            new DbusProperty<>("Fingerprint", () -> identity.getFingerprint()),
+                            new DbusProperty<>("Fingerprint", identity::getFingerprint),
                             new DbusProperty<>("SafetyNumber", identity::safetyNumber),
                             new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
                             new DbusProperty<>("TrustLevel", identity::trustLevel),
@@ -1181,8 +1182,7 @@ public class DbusSignalImpl implements Signal {
 
     public class DbusSignalConfigurationImpl extends DbusProperties implements Signal.Configuration {
 
-        public DbusSignalConfigurationImpl(
-        ) {
+        public DbusSignalConfigurationImpl() {
             super.addPropertiesHandler(new DbusInterfacePropertiesHandler("org.asamk.Signal.Configuration",
                     List.of(new DbusProperty<>("ReadReceipts", this::getReadReceipts, this::setReadReceipts),
                             new DbusProperty<>("UnidentifiedDeliveryIndicators",

From aad4b535249cd8f8c4588e931850b5b2ffb0b6ca Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 11 Jun 2023 17:16:38 +0200
Subject: [PATCH 135/672] Update dependencies

---
 graalvm-config-dir/reflect-config.json        | 30 +++++++++++++++++++
 .../signal/manager/helper/AccountHelper.java  | 11 ++++---
 .../signal/manager/helper/PreKeyHelper.java   | 14 +++++++--
 .../signal/manager/helper/ReceiveHelper.java  |  6 +++-
 .../manager/helper/RecipientHelper.java       |  2 +-
 .../storage/protocol/SignalProtocolStore.java | 16 ++++++++++
 settings.gradle.kts                           |  4 +--
 7 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 9da72883..f1d57669 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -492,6 +492,11 @@
   "allDeclaredMethods":true,
   "allDeclaredClasses":true
 },
+{
+  "name":"org.asamk.Signal$Identity",
+  "allDeclaredClasses":true,
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"org.asamk.Signal$MessageReceived",
   "allDeclaredConstructors":true,
@@ -526,6 +531,10 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":["org.freedesktop.dbus.DBusPath","byte[]","java.lang.String"] }]
 },
+{
+  "name":"org.asamk.Signal$StructIdentity",
+  "allDeclaredFields":true
+},
 {
   "name":"org.asamk.Signal$SyncMessageReceived",
   "allDeclaredConstructors":true,
@@ -2790,6 +2799,20 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$ByteArrayDeserializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$KEMPublicKeyDeserializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.MismatchedDevices",
   "allDeclaredFields":true,
@@ -2797,6 +2820,13 @@
   "allDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.OutgoingPushMessage",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index edca4f97..16ab92bd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -28,6 +28,7 @@ import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedExcep
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
 import org.whispersystems.util.Base64UrlSafe;
 
@@ -153,6 +154,7 @@ public class AccountHelper {
         // TODO create new PNI identity key
         final List<OutgoingPushMessage> deviceMessages = null;
         final Map<String, SignedPreKeyEntity> devicePniSignedPreKeys = null;
+        final Map<String, KyberPreKeyEntity> devicePniLastResortKyberPrekeys = null;
         final Map<String, Integer> pniRegistrationIds = null;
         var sessionId = account.getSessionId(account.getNumber());
         final var result = NumberVerificationUtils.verifyNumber(sessionId,
@@ -174,6 +176,7 @@ public class AccountHelper {
                             account.getPniIdentityKeyPair().getPublicKey(),
                             deviceMessages,
                             devicePniSignedPreKeys,
+                            devicePniLastResortKyberPrekeys,
                             pniRegistrationIds)));
                 });
         // TODO handle response
@@ -193,10 +196,10 @@ public class AccountHelper {
             }
         }
 
-        final var candidates = Username.generateCandidates(nickname, USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH);
+        final var candidates = Username.candidatesFrom(nickname, USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH);
         final var candidateHashes = new ArrayList<String>();
         for (final var candidate : candidates) {
-            candidateHashes.add(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(candidate)));
+            candidateHashes.add(Base64UrlSafe.encodeBytesWithoutPadding(candidate.getHash()));
         }
 
         final var response = dependencies.getAccountManager().reserveUsername(candidateHashes);
@@ -207,7 +210,7 @@ public class AccountHelper {
         }
 
         logger.debug("[reserveUsername] Successfully reserved username.");
-        final var username = candidates.get(hashIndex);
+        final var username = candidates.get(hashIndex).getUsername();
 
         dependencies.getAccountManager().confirmUsername(username, response);
         account.setUsername(username);
@@ -226,7 +229,7 @@ public class AccountHelper {
         final var whoAmIResponse = dependencies.getAccountManager().getWhoAmI();
         final var serverUsernameHash = whoAmIResponse.getUsernameHash();
         final var hasServerUsername = !isEmpty(serverUsernameHash);
-        final var localUsernameHash = Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(localUsername));
+        final var localUsernameHash = Base64UrlSafe.encodeBytesWithoutPadding(new Username(localUsername).getHash());
 
         if (!hasServerUsername) {
             logger.debug("No remote username is set.");
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 24cd675c..06dc31b9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -9,6 +9,7 @@ import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.account.PreKeyUpload;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 
 import java.io.IOException;
@@ -34,9 +35,11 @@ public class PreKeyHelper {
     }
 
     public void refreshPreKeysIfNecessary(ServiceIdType serviceIdType) throws IOException {
-        if (dependencies.getAccountManager().getPreKeysCount(serviceIdType) < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+        final var preKeyCounts = dependencies.getAccountManager().getPreKeyCounts(serviceIdType);
+        if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
             refreshPreKeys(serviceIdType);
         }
+        // TODO kyber pre keys
     }
 
     public void refreshPreKeys() throws IOException {
@@ -68,8 +71,13 @@ public class PreKeyHelper {
         final var oneTimePreKeys = generatePreKeys(serviceIdType);
         final var signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
 
-        dependencies.getAccountManager()
-                .setPreKeys(serviceIdType, identityKeyPair.getPublicKey(), signedPreKeyRecord, oneTimePreKeys);
+        final var preKeyUpload = new PreKeyUpload(serviceIdType,
+                identityKeyPair.getPublicKey(),
+                signedPreKeyRecord,
+                oneTimePreKeys,
+                null,
+                null);
+        dependencies.getAccountManager().setPreKeys(preKeyUpload);
     }
 
     private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index b2262223..3d4ca38d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -152,8 +152,12 @@ public class ReceiveHelper {
                         logger.trace("Storing new message from {}", recipientId);
                         // store message on disk, before acknowledging receipt to the server
                         cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
+                        try {
+                            signalWebSocket.sendAck(it);
+                        } catch (IOException e) {
+                            logger.warn("Failed to ack envelope to server after storing it: {}", e.getMessage());
+                        }
                     }
-                    return true;
                 });
                 isWaitingForMessage = false;
                 backOffCounter = 0;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 384d1fa0..8f100612 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -180,7 +180,7 @@ public class RecipientHelper {
 
     private ACI getRegisteredUserByUsername(String username) throws IOException, BaseUsernameException {
         return dependencies.getAccountManager()
-                .getAciByUsernameHash(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username)));
+                .getAciByUsernameHash(Base64UrlSafe.encodeBytesWithoutPadding(new Username(username).getHash()));
     }
 
     public record RegisteredUser(Optional<ACI> aci, Optional<PNI> pni) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index 223f39fc..b4e27afc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -226,4 +226,20 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     public void markKyberPreKeyUsed(final int kyberPreKeyId) {
         // TODO
     }
+
+    @Override
+    public List<KyberPreKeyRecord> loadLastResortKyberPreKeys() {
+        // TODO
+        return List.of();
+    }
+
+    @Override
+    public void removeKyberPreKey(final int i) {
+        // TODO
+    }
+
+    @Override
+    public void storeLastResortKyberPreKey(final int i, final KyberPreKeyRecord kyberPreKeyRecord) {
+        // TODO
+    }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index edf8c13d..f21554e4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk15on").version("1.70")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.1")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.2")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.0")
             version("slf4j", "2.0.7")
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.7")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_72")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_73")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From da25b2a7637754c0bb708d51561b26deb69c1271 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 11 Jun 2023 17:17:04 +0200
Subject: [PATCH 136/672] Add missing return to app command handling

---
 src/main/java/org/asamk/signal/App.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index fdd88e7c..9ac4b190 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -190,6 +190,7 @@ public class App {
 
         if (command instanceof LocalCommand localCommand) {
             handleLocalCommand(localCommand, account, signalAccountFiles, commandHandler);
+            return;
         }
 
         throw new UserErrorException("Command only works in multi-account mode");

From 0c5993c0adde6b64206ba4f328a5b74e296791f3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 11 Jun 2023 17:47:48 +0200
Subject: [PATCH 137/672] Add support for invalid pre key failure when sending
 message

---
 .../signal/manager/api/SendMessageResult.java | 27 ++++---------------
 .../signal/json/JsonSendMessageResult.java    |  5 +++-
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
index 1507390b..4158b60e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
@@ -2,7 +2,6 @@ package org.asamk.signal.manager.api;
 
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.signal.libsignal.protocol.IdentityKey;
 
 public record SendMessageResult(
         RecipientAddress address,
@@ -11,29 +10,12 @@ public record SendMessageResult(
         boolean isUnregisteredFailure,
         boolean isIdentityFailure,
         boolean isRateLimitFailure,
-        ProofRequiredException proofRequiredFailure
+        ProofRequiredException proofRequiredFailure,
+        boolean isInvalidPreKeyFailure
 ) {
 
-    public static SendMessageResult success(RecipientAddress address) {
-        return new SendMessageResult(address, true, false, false, false, false, null);
-    }
-
-    public static SendMessageResult networkFailure(RecipientAddress address) {
-        return new SendMessageResult(address, false, true, false, false, false, null);
-    }
-
     public static SendMessageResult unregisteredFailure(RecipientAddress address) {
-        return new SendMessageResult(address, false, false, true, false, false, null);
-    }
-
-    public static SendMessageResult identityFailure(RecipientAddress address, IdentityKey identityKey) {
-        return new SendMessageResult(address, false, false, false, true, false, null);
-    }
-
-    public static SendMessageResult proofRequiredFailure(
-            RecipientAddress address, ProofRequiredException proofRequiredException
-    ) {
-        return new SendMessageResult(address, false, true, false, false, false, proofRequiredException);
+        return new SendMessageResult(address, false, false, true, false, false, null, false);
     }
 
     public static SendMessageResult from(
@@ -50,6 +32,7 @@ public record SendMessageResult(
                 sendMessageResult.getRateLimitFailure() != null || sendMessageResult.getProofRequiredFailure() != null,
                 sendMessageResult.getProofRequiredFailure() == null
                         ? null
-                        : new ProofRequiredException(sendMessageResult.getProofRequiredFailure()));
+                        : new ProofRequiredException(sendMessageResult.getProofRequiredFailure()),
+                sendMessageResult.isInvalidPreKeyFailure());
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
index 13b953fc..f9ca8f86 100644
--- a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
+++ b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
@@ -28,7 +28,9 @@ public record JsonSendMessageResult(
                                         ? Type.NETWORK_FAILURE
                                         : result.isUnregisteredFailure()
                                                 ? Type.UNREGISTERED_FAILURE
-                                                : Type.IDENTITY_FAILURE,
+                                                : result.isInvalidPreKeyFailure()
+                                                        ? Type.INVALID_PRE_KEY_FAILURE
+                                                        : Type.IDENTITY_FAILURE,
                 result.proofRequiredFailure() != null ? result.proofRequiredFailure().getToken() : null,
                 result.proofRequiredFailure() != null ? result.proofRequiredFailure().getRetryAfterSeconds() : null);
     }
@@ -39,5 +41,6 @@ public record JsonSendMessageResult(
         UNREGISTERED_FAILURE,
         IDENTITY_FAILURE,
         RATE_LIMIT_FAILURE,
+        INVALID_PRE_KEY_FAILURE,
     }
 }

From 8726c4ede0cee0e44d43631b5676e87eb6cb0175 Mon Sep 17 00:00:00 2001
From: Adimarantis <joerg.bublath@intel.com>
Date: Sat, 17 Jun 2023 09:21:28 +0200
Subject: [PATCH 138/672] Update identities after trust (#1264)

---
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index fef6821a..a2fd25e0 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1109,6 +1109,7 @@ public class DbusSignalImpl implements Signal {
             } catch (UnregisteredRecipientException e) {
                 throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
+            updateIdentities();
         }
 
         @Override
@@ -1135,6 +1136,7 @@ public class DbusSignalImpl implements Signal {
             } catch (UnregisteredRecipientException e) {
                 throw new Error.Failure("The user " + e.getSender().getIdentifier() + " is not registered.");
             }
+            updateIdentities();
         }
     }
 

From b70a43aeb50902b403e866c45bfb148d648f4afa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 15 Jun 2023 19:50:15 +0200
Subject: [PATCH 139/672] Update graalvm config

---
 graalvm-config-dir/jni-config.json      |  101 +-
 graalvm-config-dir/reflect-config.json  | 1669 +++--------------------
 graalvm-config-dir/resource-config.json |  410 +++---
 3 files changed, 385 insertions(+), 1795 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 98c05c7c..f5051e5b 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -4,12 +4,7 @@
 },
 {
   "name":"com.sun.security.auth.module.UnixSystem",
-  "fields":[
-    {"name":"gid"}, 
-    {"name":"groups"}, 
-    {"name":"uid"}, 
-    {"name":"username"}
-  ]
+  "fields":[{"name":"gid"}, {"name":"groups"}, {"name":"uid"}, {"name":"username"}]
 },
 {
   "name":"java.lang.Boolean",
@@ -21,10 +16,7 @@
 },
 {
   "name":"java.lang.ClassLoader",
-  "methods":[
-    {"name":"getPlatformClassLoader","parameterTypes":[] }, 
-    {"name":"loadClass","parameterTypes":["java.lang.String"] }
-  ]
+  "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }, {"name":"loadClass","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.lang.IllegalArgumentException",
@@ -39,10 +31,7 @@
 },
 {
   "name":"java.lang.Throwable",
-  "methods":[
-    {"name":"getMessage","parameterTypes":[] }, 
-    {"name":"toString","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getMessage","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]
 },
 {
   "name":"java.lang.UnsatisfiedLinkError",
@@ -50,38 +39,18 @@
 },
 {
   "name":"java.util.UUID",
-  "methods":[
-    {"name":"<init>","parameterTypes":["long","long"] }, 
-    {"name":"getLeastSignificantBits","parameterTypes":[] }, 
-    {"name":"getMostSignificantBits","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }]
 },
 {
   "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"
 },
 {
   "name":"org.asamk.signal.manager.storage.protocol.SignalProtocolStore",
-  "methods":[
-    {"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, 
-    {"name":"getIdentityKeyPair","parameterTypes":[] }, 
-    {"name":"getLocalRegistrationId","parameterTypes":[] }, 
-    {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, 
-    {"name":"loadPreKey","parameterTypes":["int"] }, 
-    {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, 
-    {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, 
-    {"name":"loadSignedPreKey","parameterTypes":["int"] }, 
-    {"name":"removePreKey","parameterTypes":["int"] }, 
-    {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, 
-    {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, 
-    {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }
-  ]
+  "methods":[{"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"getIdentityKeyPair","parameterTypes":[] }, {"name":"getLocalRegistrationId","parameterTypes":[] }, {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, {"name":"loadPreKey","parameterTypes":["int"] }, {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"loadSignedPreKey","parameterTypes":["int"] }, {"name":"removePreKey","parameterTypes":["int"] }, {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.senderKeys.SenderKeyStore",
-  "methods":[
-    {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, 
-    {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }
-  ]
+  "methods":[{"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }]
 },
 {
   "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints",
@@ -93,11 +62,7 @@
 },
 {
   "name":"org.signal.libsignal.protocol.IdentityKey",
-  "methods":[
-    {"name":"<init>","parameterTypes":["long"] }, 
-    {"name":"<init>","parameterTypes":["byte[]"] }, 
-    {"name":"serialize","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["byte[]"] }, {"name":"serialize","parameterTypes":[] }]
 },
 {
   "name":"org.signal.libsignal.protocol.IdentityKeyPair",
@@ -120,10 +85,7 @@
 },
 {
   "name":"org.signal.libsignal.protocol.SignalProtocolAddress",
-  "methods":[
-    {"name":"<init>","parameterTypes":["long"] }, 
-    {"name":"<init>","parameterTypes":["java.lang.String","int"] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["java.lang.String","int"] }]
 },
 {
   "name":"org.signal.libsignal.protocol.UntrustedIdentityException",
@@ -165,10 +127,7 @@
 },
 {
   "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$Direction",
-  "fields":[
-    {"name":"RECEIVING"}, 
-    {"name":"SENDING"}
-  ]
+  "fields":[{"name":"RECEIVING"}, {"name":"SENDING"}]
 },
 {
   "name":"org.signal.libsignal.protocol.state.KyberPreKeyStore"
@@ -183,10 +142,7 @@
 {
   "name":"org.signal.libsignal.protocol.state.SessionRecord",
   "fields":[{"name":"unsafeHandle"}],
-  "methods":[
-    {"name":"<init>","parameterTypes":["long"] }, 
-    {"name":"<init>","parameterTypes":["byte[]"] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long"] }, {"name":"<init>","parameterTypes":["byte[]"] }]
 },
 {
   "name":"org.signal.libsignal.protocol.state.SessionStore"
@@ -228,27 +184,16 @@
 },
 {
   "name":"org.sqlite.Function",
-  "fields":[
-    {"name":"args"}, 
-    {"name":"context"}, 
-    {"name":"value"}
-  ],
+  "fields":[{"name":"args"}, {"name":"context"}, {"name":"value"}],
   "methods":[{"name":"xFunc","parameterTypes":[] }]
 },
 {
   "name":"org.sqlite.Function$Aggregate",
-  "methods":[
-    {"name":"clone","parameterTypes":[] }, 
-    {"name":"xFinal","parameterTypes":[] }, 
-    {"name":"xStep","parameterTypes":[] }
-  ]
+  "methods":[{"name":"clone","parameterTypes":[] }, {"name":"xFinal","parameterTypes":[] }, {"name":"xStep","parameterTypes":[] }]
 },
 {
   "name":"org.sqlite.Function$Window",
-  "methods":[
-    {"name":"xInverse","parameterTypes":[] }, 
-    {"name":"xValue","parameterTypes":[] }
-  ]
+  "methods":[{"name":"xInverse","parameterTypes":[] }, {"name":"xValue","parameterTypes":[] }]
 },
 {
   "name":"org.sqlite.ProgressHandler",
@@ -256,12 +201,7 @@
 },
 {
   "name":"org.sqlite.core.DB",
-  "methods":[
-    {"name":"onCommit","parameterTypes":["boolean"] }, 
-    {"name":"onUpdate","parameterTypes":["int","java.lang.String","java.lang.String","long"] }, 
-    {"name":"throwex","parameterTypes":[] }, 
-    {"name":"throwex","parameterTypes":["int"] }
-  ]
+  "methods":[{"name":"onCommit","parameterTypes":["boolean"] }, {"name":"onUpdate","parameterTypes":["int","java.lang.String","java.lang.String","long"] }, {"name":"throwex","parameterTypes":[] }, {"name":"throwex","parameterTypes":["int"] }]
 },
 {
   "name":"org.sqlite.core.DB$ProgressObserver",
@@ -269,16 +209,7 @@
 },
 {
   "name":"org.sqlite.core.NativeDB",
-  "fields":[
-    {"name":"busyHandler"}, 
-    {"name":"commitListener"}, 
-    {"name":"pointer"}, 
-    {"name":"progressHandler"}, 
-    {"name":"updateListener"}
-  ],
-  "methods":[
-    {"name":"stringToUtf8ByteArray","parameterTypes":["java.lang.String"] }, 
-    {"name":"throwex","parameterTypes":["java.lang.String"] }
-  ]
+  "fields":[{"name":"busyHandler"}, {"name":"commitListener"}, {"name":"pointer"}, {"name":"progressHandler"}, {"name":"updateListener"}],
+  "methods":[{"name":"stringToUtf8ByteArray","parameterTypes":["java.lang.String"] }, {"name":"throwex","parameterTypes":["java.lang.String"] }]
 }
 ]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index f1d57669..f053cead 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -155,78 +155,7 @@
   "name":"com.zaxxer.hikari.HikariConfig",
   "allDeclaredFields":true,
   "queryAllPublicMethods":true,
-  "methods":[
-    {"name":"getCatalog","parameterTypes":[] }, 
-    {"name":"getConnectionInitSql","parameterTypes":[] }, 
-    {"name":"getConnectionTestQuery","parameterTypes":[] }, 
-    {"name":"getConnectionTimeout","parameterTypes":[] }, 
-    {"name":"getDataSource","parameterTypes":[] }, 
-    {"name":"getDataSourceClassName","parameterTypes":[] }, 
-    {"name":"getDataSourceJNDI","parameterTypes":[] }, 
-    {"name":"getDataSourceProperties","parameterTypes":[] }, 
-    {"name":"getDriverClassName","parameterTypes":[] }, 
-    {"name":"getExceptionOverrideClassName","parameterTypes":[] }, 
-    {"name":"getHealthCheckProperties","parameterTypes":[] }, 
-    {"name":"getHealthCheckRegistry","parameterTypes":[] }, 
-    {"name":"getIdleTimeout","parameterTypes":[] }, 
-    {"name":"getInitializationFailTimeout","parameterTypes":[] }, 
-    {"name":"getJdbcUrl","parameterTypes":[] }, 
-    {"name":"getKeepaliveTime","parameterTypes":[] }, 
-    {"name":"getLeakDetectionThreshold","parameterTypes":[] }, 
-    {"name":"getMaxLifetime","parameterTypes":[] }, 
-    {"name":"getMaximumPoolSize","parameterTypes":[] }, 
-    {"name":"getMetricRegistry","parameterTypes":[] }, 
-    {"name":"getMetricsTrackerFactory","parameterTypes":[] }, 
-    {"name":"getMinimumIdle","parameterTypes":[] }, 
-    {"name":"getPassword","parameterTypes":[] }, 
-    {"name":"getPoolName","parameterTypes":[] }, 
-    {"name":"getScheduledExecutor","parameterTypes":[] }, 
-    {"name":"getSchema","parameterTypes":[] }, 
-    {"name":"getThreadFactory","parameterTypes":[] }, 
-    {"name":"getTransactionIsolation","parameterTypes":[] }, 
-    {"name":"getUsername","parameterTypes":[] }, 
-    {"name":"getValidationTimeout","parameterTypes":[] }, 
-    {"name":"isAllowPoolSuspension","parameterTypes":[] }, 
-    {"name":"isAutoCommit","parameterTypes":[] }, 
-    {"name":"isIsolateInternalQueries","parameterTypes":[] }, 
-    {"name":"isReadOnly","parameterTypes":[] }, 
-    {"name":"isRegisterMbeans","parameterTypes":[] }, 
-    {"name":"setAllowPoolSuspension","parameterTypes":["boolean"] }, 
-    {"name":"setAutoCommit","parameterTypes":["boolean"] }, 
-    {"name":"setCatalog","parameterTypes":["java.lang.String"] }, 
-    {"name":"setConnectionInitSql","parameterTypes":["java.lang.String"] }, 
-    {"name":"setConnectionTestQuery","parameterTypes":["java.lang.String"] }, 
-    {"name":"setConnectionTimeout","parameterTypes":["long"] }, 
-    {"name":"setDataSource","parameterTypes":["javax.sql.DataSource"] }, 
-    {"name":"setDataSourceClassName","parameterTypes":["java.lang.String"] }, 
-    {"name":"setDataSourceJNDI","parameterTypes":["java.lang.String"] }, 
-    {"name":"setDataSourceProperties","parameterTypes":["java.util.Properties"] }, 
-    {"name":"setDriverClassName","parameterTypes":["java.lang.String"] }, 
-    {"name":"setExceptionOverrideClassName","parameterTypes":["java.lang.String"] }, 
-    {"name":"setHealthCheckProperties","parameterTypes":["java.util.Properties"] }, 
-    {"name":"setHealthCheckRegistry","parameterTypes":["java.lang.Object"] }, 
-    {"name":"setIdleTimeout","parameterTypes":["long"] }, 
-    {"name":"setInitializationFailTimeout","parameterTypes":["long"] }, 
-    {"name":"setIsolateInternalQueries","parameterTypes":["boolean"] }, 
-    {"name":"setJdbcUrl","parameterTypes":["java.lang.String"] }, 
-    {"name":"setKeepaliveTime","parameterTypes":["long"] }, 
-    {"name":"setLeakDetectionThreshold","parameterTypes":["long"] }, 
-    {"name":"setMaxLifetime","parameterTypes":["long"] }, 
-    {"name":"setMaximumPoolSize","parameterTypes":["int"] }, 
-    {"name":"setMetricRegistry","parameterTypes":["java.lang.Object"] }, 
-    {"name":"setMetricsTrackerFactory","parameterTypes":["com.zaxxer.hikari.metrics.MetricsTrackerFactory"] }, 
-    {"name":"setMinimumIdle","parameterTypes":["int"] }, 
-    {"name":"setPassword","parameterTypes":["java.lang.String"] }, 
-    {"name":"setPoolName","parameterTypes":["java.lang.String"] }, 
-    {"name":"setReadOnly","parameterTypes":["boolean"] }, 
-    {"name":"setRegisterMbeans","parameterTypes":["boolean"] }, 
-    {"name":"setScheduledExecutor","parameterTypes":["java.util.concurrent.ScheduledExecutorService"] }, 
-    {"name":"setSchema","parameterTypes":["java.lang.String"] }, 
-    {"name":"setThreadFactory","parameterTypes":["java.util.concurrent.ThreadFactory"] }, 
-    {"name":"setTransactionIsolation","parameterTypes":["java.lang.String"] }, 
-    {"name":"setUsername","parameterTypes":["java.lang.String"] }, 
-    {"name":"setValidationTimeout","parameterTypes":["long"] }
-  ]
+  "methods":[{"name":"getCatalog","parameterTypes":[] }, {"name":"getConnectionInitSql","parameterTypes":[] }, {"name":"getConnectionTestQuery","parameterTypes":[] }, {"name":"getConnectionTimeout","parameterTypes":[] }, {"name":"getDataSource","parameterTypes":[] }, {"name":"getDataSourceClassName","parameterTypes":[] }, {"name":"getDataSourceJNDI","parameterTypes":[] }, {"name":"getDataSourceProperties","parameterTypes":[] }, {"name":"getDriverClassName","parameterTypes":[] }, {"name":"getExceptionOverrideClassName","parameterTypes":[] }, {"name":"getHealthCheckProperties","parameterTypes":[] }, {"name":"getHealthCheckRegistry","parameterTypes":[] }, {"name":"getIdleTimeout","parameterTypes":[] }, {"name":"getInitializationFailTimeout","parameterTypes":[] }, {"name":"getJdbcUrl","parameterTypes":[] }, {"name":"getKeepaliveTime","parameterTypes":[] }, {"name":"getLeakDetectionThreshold","parameterTypes":[] }, {"name":"getMaxLifetime","parameterTypes":[] }, {"name":"getMaximumPoolSize","parameterTypes":[] }, {"name":"getMetricRegistry","parameterTypes":[] }, {"name":"getMetricsTrackerFactory","parameterTypes":[] }, {"name":"getMinimumIdle","parameterTypes":[] }, {"name":"getPassword","parameterTypes":[] }, {"name":"getPoolName","parameterTypes":[] }, {"name":"getScheduledExecutor","parameterTypes":[] }, {"name":"getSchema","parameterTypes":[] }, {"name":"getThreadFactory","parameterTypes":[] }, {"name":"getTransactionIsolation","parameterTypes":[] }, {"name":"getUsername","parameterTypes":[] }, {"name":"getValidationTimeout","parameterTypes":[] }, {"name":"isAllowPoolSuspension","parameterTypes":[] }, {"name":"isAutoCommit","parameterTypes":[] }, {"name":"isIsolateInternalQueries","parameterTypes":[] }, {"name":"isReadOnly","parameterTypes":[] }, {"name":"isRegisterMbeans","parameterTypes":[] }, {"name":"setAllowPoolSuspension","parameterTypes":["boolean"] }, {"name":"setAutoCommit","parameterTypes":["boolean"] }, {"name":"setCatalog","parameterTypes":["java.lang.String"] }, {"name":"setConnectionInitSql","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTestQuery","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTimeout","parameterTypes":["long"] }, {"name":"setDataSource","parameterTypes":["javax.sql.DataSource"] }, {"name":"setDataSourceClassName","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceJNDI","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceProperties","parameterTypes":["java.util.Properties"] }, {"name":"setDriverClassName","parameterTypes":["java.lang.String"] }, {"name":"setExceptionOverrideClassName","parameterTypes":["java.lang.String"] }, {"name":"setHealthCheckProperties","parameterTypes":["java.util.Properties"] }, {"name":"setHealthCheckRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setIdleTimeout","parameterTypes":["long"] }, {"name":"setInitializationFailTimeout","parameterTypes":["long"] }, {"name":"setIsolateInternalQueries","parameterTypes":["boolean"] }, {"name":"setJdbcUrl","parameterTypes":["java.lang.String"] }, {"name":"setKeepaliveTime","parameterTypes":["long"] }, {"name":"setLeakDetectionThreshold","parameterTypes":["long"] }, {"name":"setMaxLifetime","parameterTypes":["long"] }, {"name":"setMaximumPoolSize","parameterTypes":["int"] }, {"name":"setMetricRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setMetricsTrackerFactory","parameterTypes":["com.zaxxer.hikari.metrics.MetricsTrackerFactory"] }, {"name":"setMinimumIdle","parameterTypes":["int"] }, {"name":"setPassword","parameterTypes":["java.lang.String"] }, {"name":"setPoolName","parameterTypes":["java.lang.String"] }, {"name":"setReadOnly","parameterTypes":["boolean"] }, {"name":"setRegisterMbeans","parameterTypes":["boolean"] }, {"name":"setScheduledExecutor","parameterTypes":["java.util.concurrent.ScheduledExecutorService"] }, {"name":"setSchema","parameterTypes":["java.lang.String"] }, {"name":"setThreadFactory","parameterTypes":["java.util.concurrent.ThreadFactory"] }, {"name":"setTransactionIsolation","parameterTypes":["java.lang.String"] }, {"name":"setUsername","parameterTypes":["java.lang.String"] }, {"name":"setValidationTimeout","parameterTypes":["long"] }]
 },
 {
   "name":"int",
@@ -314,10 +243,7 @@
 {
   "name":"java.lang.Throwable",
   "queryAllPublicMethods":true,
-  "methods":[
-    {"name":"addSuppressed","parameterTypes":["java.lang.Throwable"] }, 
-    {"name":"getSuppressed","parameterTypes":[] }
-  ]
+  "methods":[{"name":"addSuppressed","parameterTypes":["java.lang.Throwable"] }, {"name":"getSuppressed","parameterTypes":[] }]
 },
 {
   "name":"java.lang.constant.Constable",
@@ -333,10 +259,7 @@
 },
 {
   "name":"java.lang.reflect.RecordComponent",
-  "methods":[
-    {"name":"getName","parameterTypes":[] }, 
-    {"name":"getType","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getName","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
 },
 {
   "name":"java.net.NetPermission"
@@ -441,6 +364,18 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"java.util.concurrent.ForkJoinTask",
+  "fields":[{"name":"aux"}, {"name":"status"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicBoolean",
+  "fields":[{"name":"value"}]
+},
+{
+  "name":"java.util.concurrent.atomic.AtomicReference",
+  "fields":[{"name":"value"}]
+},
 {
   "name":"javax.security.auth.x500.X500Principal",
   "methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
@@ -560,11 +495,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, 
-    {"name":"deviceLinkUri","parameterTypes":[] }, 
-    {"name":"deviceName","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"deviceLinkUri","parameterTypes":[] }, {"name":"deviceName","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.FinishLinkCommand$JsonFinishLink",
@@ -578,12 +509,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"isRegistered","parameterTypes":[] }, 
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"recipient","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"isRegistered","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"recipient","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListAccountsCommand$JsonAccount",
@@ -603,14 +529,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"about","parameterTypes":[] }, 
-    {"name":"aboutEmoji","parameterTypes":[] }, 
-    {"name":"familyName","parameterTypes":[] }, 
-    {"name":"givenName","parameterTypes":[] }, 
-    {"name":"lastUpdateTimestamp","parameterTypes":[] }, 
-    {"name":"mobileCoinAddress","parameterTypes":[] }
-  ]
+  "methods":[{"name":"about","parameterTypes":[] }, {"name":"aboutEmoji","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"lastUpdateTimestamp","parameterTypes":[] }, {"name":"mobileCoinAddress","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListDevicesCommand$JsonDevice",
@@ -635,63 +554,35 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"addedTimestamp","parameterTypes":[] }, 
-    {"name":"fingerprint","parameterTypes":[] }, 
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"safetyNumber","parameterTypes":[] }, 
-    {"name":"scannableSafetyNumber","parameterTypes":[] }, 
-    {"name":"trustLevel","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"addedTimestamp","parameterTypes":[] }, {"name":"fingerprint","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"safetyNumber","parameterTypes":[] }, {"name":"scannableSafetyNumber","parameterTypes":[] }, {"name":"trustLevel","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListStickerPacksCommand$JsonStickerPack",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"author","parameterTypes":[] }, 
-    {"name":"cover","parameterTypes":[] }, 
-    {"name":"installed","parameterTypes":[] }, 
-    {"name":"packId","parameterTypes":[] }, 
-    {"name":"stickers","parameterTypes":[] }, 
-    {"name":"title","parameterTypes":[] }, 
-    {"name":"url","parameterTypes":[] }
-  ]
+  "methods":[{"name":"author","parameterTypes":[] }, {"name":"cover","parameterTypes":[] }, {"name":"installed","parameterTypes":[] }, {"name":"packId","parameterTypes":[] }, {"name":"stickers","parameterTypes":[] }, {"name":"title","parameterTypes":[] }, {"name":"url","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListStickerPacksCommand$JsonStickerPack$JsonSticker",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"contentType","parameterTypes":[] }, 
-    {"name":"emoji","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }
-  ]
+  "methods":[{"name":"contentType","parameterTypes":[] }, {"name":"emoji","parameterTypes":[] }, {"name":"id","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ReceiveCommand$ReceiveParams",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.Double","java.lang.Integer"] }, 
-    {"name":"maxMessages","parameterTypes":[] }, 
-    {"name":"timeout","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Double","java.lang.Integer"] }, {"name":"maxMessages","parameterTypes":[] }, {"name":"timeout","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.RegisterCommand$RegistrationParams",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.String"] }, 
-    {"name":"captcha","parameterTypes":[] }, 
-    {"name":"voice","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.String"] }, {"name":"captcha","parameterTypes":[] }, {"name":"voice","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.StartLinkCommand$JsonLink",
@@ -712,27 +603,14 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, 
-    {"name":"pin","parameterTypes":[] }, 
-    {"name":"verificationCode","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"pin","parameterTypes":[] }, {"name":"verificationCode","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonAttachment",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"caption","parameterTypes":[] }, 
-    {"name":"contentType","parameterTypes":[] }, 
-    {"name":"filename","parameterTypes":[] }, 
-    {"name":"height","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"size","parameterTypes":[] }, 
-    {"name":"uploadTimestamp","parameterTypes":[] }, 
-    {"name":"width","parameterTypes":[] }
-  ]
+  "methods":[{"name":"caption","parameterTypes":[] }, {"name":"contentType","parameterTypes":[] }, {"name":"filename","parameterTypes":[] }, {"name":"height","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"size","parameterTypes":[] }, {"name":"uploadTimestamp","parameterTypes":[] }, {"name":"width","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonAttachmentData",
@@ -746,24 +624,14 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"answerMessage","parameterTypes":[] }, 
-    {"name":"busyMessage","parameterTypes":[] }, 
-    {"name":"hangupMessage","parameterTypes":[] }, 
-    {"name":"iceUpdateMessages","parameterTypes":[] }, 
-    {"name":"offerMessage","parameterTypes":[] }
-  ]
+  "methods":[{"name":"answerMessage","parameterTypes":[] }, {"name":"busyMessage","parameterTypes":[] }, {"name":"hangupMessage","parameterTypes":[] }, {"name":"iceUpdateMessages","parameterTypes":[] }, {"name":"offerMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$Answer",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"opaque","parameterTypes":[] }, 
-    {"name":"sdp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"id","parameterTypes":[] }, {"name":"opaque","parameterTypes":[] }, {"name":"sdp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$Busy",
@@ -777,35 +645,21 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"deviceId","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"isLegacy","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"deviceId","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"isLegacy","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$IceUpdate",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"opaque","parameterTypes":[] }, 
-    {"name":"sdp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"id","parameterTypes":[] }, {"name":"opaque","parameterTypes":[] }, {"name":"sdp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonCallMessage$Offer",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"opaque","parameterTypes":[] }, 
-    {"name":"sdp","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"id","parameterTypes":[] }, {"name":"opaque","parameterTypes":[] }, {"name":"sdp","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactAddress",
@@ -842,174 +696,91 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"attachments","parameterTypes":[] }, 
-    {"name":"contacts","parameterTypes":[] }, 
-    {"name":"expiresInSeconds","parameterTypes":[] }, 
-    {"name":"groupInfo","parameterTypes":[] }, 
-    {"name":"mentions","parameterTypes":[] }, 
-    {"name":"message","parameterTypes":[] }, 
-    {"name":"payment","parameterTypes":[] }, 
-    {"name":"previews","parameterTypes":[] }, 
-    {"name":"quote","parameterTypes":[] }, 
-    {"name":"reaction","parameterTypes":[] }, 
-    {"name":"remoteDelete","parameterTypes":[] }, 
-    {"name":"sticker","parameterTypes":[] }, 
-    {"name":"storyContext","parameterTypes":[] }, 
-    {"name":"textStyles","parameterTypes":[] }, 
-    {"name":"timestamp","parameterTypes":[] }, 
-    {"name":"viewOnce","parameterTypes":[] }
-  ]
+  "methods":[{"name":"attachments","parameterTypes":[] }, {"name":"contacts","parameterTypes":[] }, {"name":"expiresInSeconds","parameterTypes":[] }, {"name":"groupInfo","parameterTypes":[] }, {"name":"mentions","parameterTypes":[] }, {"name":"message","parameterTypes":[] }, {"name":"payment","parameterTypes":[] }, {"name":"previews","parameterTypes":[] }, {"name":"quote","parameterTypes":[] }, {"name":"reaction","parameterTypes":[] }, {"name":"remoteDelete","parameterTypes":[] }, {"name":"sticker","parameterTypes":[] }, {"name":"storyContext","parameterTypes":[] }, {"name":"textStyles","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"viewOnce","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonEditMessage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"dataMessage","parameterTypes":[] }, 
-    {"name":"targetSentTimestamp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"dataMessage","parameterTypes":[] }, {"name":"targetSentTimestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonError",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"message","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"message","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonGroupInfo",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"groupId","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"groupId","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonMention",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"length","parameterTypes":[] }, 
-    {"name":"name","parameterTypes":[] }, 
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"start","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"length","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"start","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonMessageEnvelope",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"callMessage","parameterTypes":[] }, 
-    {"name":"dataMessage","parameterTypes":[] }, 
-    {"name":"editMessage","parameterTypes":[] }, 
-    {"name":"receiptMessage","parameterTypes":[] }, 
-    {"name":"source","parameterTypes":[] }, 
-    {"name":"sourceDevice","parameterTypes":[] }, 
-    {"name":"sourceName","parameterTypes":[] }, 
-    {"name":"sourceNumber","parameterTypes":[] }, 
-    {"name":"sourceUuid","parameterTypes":[] }, 
-    {"name":"storyMessage","parameterTypes":[] }, 
-    {"name":"syncMessage","parameterTypes":[] }, 
-    {"name":"timestamp","parameterTypes":[] }, 
-    {"name":"typingMessage","parameterTypes":[] }
-  ]
+  "methods":[{"name":"callMessage","parameterTypes":[] }, {"name":"dataMessage","parameterTypes":[] }, {"name":"editMessage","parameterTypes":[] }, {"name":"receiptMessage","parameterTypes":[] }, {"name":"source","parameterTypes":[] }, {"name":"sourceDevice","parameterTypes":[] }, {"name":"sourceName","parameterTypes":[] }, {"name":"sourceNumber","parameterTypes":[] }, {"name":"sourceUuid","parameterTypes":[] }, {"name":"storyMessage","parameterTypes":[] }, {"name":"syncMessage","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"typingMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonPayment",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"note","parameterTypes":[] }, 
-    {"name":"receipt","parameterTypes":[] }
-  ]
+  "methods":[{"name":"note","parameterTypes":[] }, {"name":"receipt","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonPreview",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"description","parameterTypes":[] }, 
-    {"name":"image","parameterTypes":[] }, 
-    {"name":"title","parameterTypes":[] }, 
-    {"name":"url","parameterTypes":[] }
-  ]
+  "methods":[{"name":"description","parameterTypes":[] }, {"name":"image","parameterTypes":[] }, {"name":"title","parameterTypes":[] }, {"name":"url","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonQuote",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"attachments","parameterTypes":[] }, 
-    {"name":"author","parameterTypes":[] }, 
-    {"name":"authorNumber","parameterTypes":[] }, 
-    {"name":"authorUuid","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"mentions","parameterTypes":[] }, 
-    {"name":"text","parameterTypes":[] }, 
-    {"name":"textStyles","parameterTypes":[] }
-  ]
+  "methods":[{"name":"attachments","parameterTypes":[] }, {"name":"author","parameterTypes":[] }, {"name":"authorNumber","parameterTypes":[] }, {"name":"authorUuid","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"mentions","parameterTypes":[] }, {"name":"text","parameterTypes":[] }, {"name":"textStyles","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonQuotedAttachment",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"contentType","parameterTypes":[] }, 
-    {"name":"filename","parameterTypes":[] }, 
-    {"name":"thumbnail","parameterTypes":[] }
-  ]
+  "methods":[{"name":"contentType","parameterTypes":[] }, {"name":"filename","parameterTypes":[] }, {"name":"thumbnail","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonReaction",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"emoji","parameterTypes":[] }, 
-    {"name":"isRemove","parameterTypes":[] }, 
-    {"name":"targetAuthor","parameterTypes":[] }, 
-    {"name":"targetAuthorNumber","parameterTypes":[] }, 
-    {"name":"targetAuthorUuid","parameterTypes":[] }, 
-    {"name":"targetSentTimestamp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"emoji","parameterTypes":[] }, {"name":"isRemove","parameterTypes":[] }, {"name":"targetAuthor","parameterTypes":[] }, {"name":"targetAuthorNumber","parameterTypes":[] }, {"name":"targetAuthorUuid","parameterTypes":[] }, {"name":"targetSentTimestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonReceiptMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"isDelivery","parameterTypes":[] }, 
-    {"name":"isRead","parameterTypes":[] }, 
-    {"name":"isViewed","parameterTypes":[] }, 
-    {"name":"timestamps","parameterTypes":[] }, 
-    {"name":"when","parameterTypes":[] }
-  ]
+  "methods":[{"name":"isDelivery","parameterTypes":[] }, {"name":"isRead","parameterTypes":[] }, {"name":"isViewed","parameterTypes":[] }, {"name":"timestamps","parameterTypes":[] }, {"name":"when","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonRecipientAddress",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"number","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonRemoteDelete",
@@ -1023,13 +794,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"groupId","parameterTypes":[] }, 
-    {"name":"recipientAddress","parameterTypes":[] }, 
-    {"name":"retryAfterSeconds","parameterTypes":[] }, 
-    {"name":"token","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"groupId","parameterTypes":[] }, {"name":"recipientAddress","parameterTypes":[] }, {"name":"retryAfterSeconds","parameterTypes":[] }, {"name":"token","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSendMessageResult$Type",
@@ -1047,88 +812,49 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"packId","parameterTypes":[] }, 
-    {"name":"stickerId","parameterTypes":[] }
-  ]
+  "methods":[{"name":"packId","parameterTypes":[] }, {"name":"stickerId","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonStoryContext",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"authorNumber","parameterTypes":[] }, 
-    {"name":"authorUuid","parameterTypes":[] }, 
-    {"name":"sentTimestamp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"authorNumber","parameterTypes":[] }, {"name":"authorUuid","parameterTypes":[] }, {"name":"sentTimestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonStoryMessage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"allowsReplies","parameterTypes":[] }, 
-    {"name":"fileAttachment","parameterTypes":[] }, 
-    {"name":"groupId","parameterTypes":[] }, 
-    {"name":"textAttachment","parameterTypes":[] }
-  ]
+  "methods":[{"name":"allowsReplies","parameterTypes":[] }, {"name":"fileAttachment","parameterTypes":[] }, {"name":"groupId","parameterTypes":[] }, {"name":"textAttachment","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonStoryMessage$TextAttachment",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"backgroundColor","parameterTypes":[] }, 
-    {"name":"backgroundGradient","parameterTypes":[] }, 
-    {"name":"preview","parameterTypes":[] }, 
-    {"name":"style","parameterTypes":[] }, 
-    {"name":"text","parameterTypes":[] }, 
-    {"name":"textBackgroundColor","parameterTypes":[] }, 
-    {"name":"textForegroundColor","parameterTypes":[] }
-  ]
+  "methods":[{"name":"backgroundColor","parameterTypes":[] }, {"name":"backgroundGradient","parameterTypes":[] }, {"name":"preview","parameterTypes":[] }, {"name":"style","parameterTypes":[] }, {"name":"text","parameterTypes":[] }, {"name":"textBackgroundColor","parameterTypes":[] }, {"name":"textForegroundColor","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonStoryMessage$TextAttachment$Gradient",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"angle","parameterTypes":[] }, 
-    {"name":"colors","parameterTypes":[] }, 
-    {"name":"endColor","parameterTypes":[] }, 
-    {"name":"positions","parameterTypes":[] }, 
-    {"name":"startColor","parameterTypes":[] }
-  ]
+  "methods":[{"name":"angle","parameterTypes":[] }, {"name":"colors","parameterTypes":[] }, {"name":"endColor","parameterTypes":[] }, {"name":"positions","parameterTypes":[] }, {"name":"startColor","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncDataMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"dataMessage","parameterTypes":[] }, 
-    {"name":"destination","parameterTypes":[] }, 
-    {"name":"destinationNumber","parameterTypes":[] }, 
-    {"name":"destinationUuid","parameterTypes":[] }, 
-    {"name":"editMessage","parameterTypes":[] }
-  ]
+  "methods":[{"name":"dataMessage","parameterTypes":[] }, {"name":"destination","parameterTypes":[] }, {"name":"destinationNumber","parameterTypes":[] }, {"name":"destinationUuid","parameterTypes":[] }, {"name":"editMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"blockedGroupIds","parameterTypes":[] }, 
-    {"name":"blockedNumbers","parameterTypes":[] }, 
-    {"name":"readMessages","parameterTypes":[] }, 
-    {"name":"sentMessage","parameterTypes":[] }, 
-    {"name":"sentStoryMessage","parameterTypes":[] }, 
-    {"name":"type","parameterTypes":[] }
-  ]
+  "methods":[{"name":"blockedGroupIds","parameterTypes":[] }, {"name":"blockedNumbers","parameterTypes":[] }, {"name":"readMessages","parameterTypes":[] }, {"name":"sentMessage","parameterTypes":[] }, {"name":"sentStoryMessage","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncMessageType",
@@ -1140,45 +866,28 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"sender","parameterTypes":[] }, 
-    {"name":"senderNumber","parameterTypes":[] }, 
-    {"name":"senderUuid","parameterTypes":[] }, 
-    {"name":"timestamp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"sender","parameterTypes":[] }, {"name":"senderNumber","parameterTypes":[] }, {"name":"senderUuid","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSyncStoryMessage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"dataMessage","parameterTypes":[] }, 
-    {"name":"destinationNumber","parameterTypes":[] }, 
-    {"name":"destinationUuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"dataMessage","parameterTypes":[] }, {"name":"destinationNumber","parameterTypes":[] }, {"name":"destinationUuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonTextStyle",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"length","parameterTypes":[] }, 
-    {"name":"start","parameterTypes":[] }, 
-    {"name":"style","parameterTypes":[] }
-  ]
+  "methods":[{"name":"length","parameterTypes":[] }, {"name":"start","parameterTypes":[] }, {"name":"style","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonTypingMessage",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"action","parameterTypes":[] }, 
-    {"name":"groupId","parameterTypes":[] }, 
-    {"name":"timestamp","parameterTypes":[] }
-  ]
+  "methods":[{"name":"action","parameterTypes":[] }, {"name":"groupId","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcBatchMessage",
@@ -1226,39 +935,21 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.util.List","java.lang.Integer"] }, 
-    {"name":"accounts","parameterTypes":[] }, 
-    {"name":"version","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List","java.lang.Integer"] }, {"name":"accounts","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.accounts.AccountsStorage$Account",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, 
-    {"name":"environment","parameterTypes":[] }, 
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"path","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"environment","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"path","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.configuration.ConfigurationStore$Storage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }, 
-    {"name":"linkPreviews","parameterTypes":[] }, 
-    {"name":"phoneNumberSharingMode","parameterTypes":[] }, 
-    {"name":"phoneNumberUnlisted","parameterTypes":[] }, 
-    {"name":"readReceipts","parameterTypes":[] }, 
-    {"name":"typingIndicators","parameterTypes":[] }, 
-    {"name":"unidentifiedDeliveryIndicators","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }, {"name":"linkPreviews","parameterTypes":[] }, {"name":"phoneNumberSharingMode","parameterTypes":[] }, {"name":"phoneNumberUnlisted","parameterTypes":[] }, {"name":"readReceipts","parameterTypes":[] }, {"name":"typingIndicators","parameterTypes":[] }, {"name":"unidentifiedDeliveryIndicators","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.contacts.LegacyContactInfo",
@@ -1293,38 +984,21 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.util.List"] }, 
-    {"name":"groups","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List"] }, {"name":"groups","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$Storage$GroupV1",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","int","boolean","boolean","java.util.List"] }, 
-    {"name":"archived","parameterTypes":[] }, 
-    {"name":"blocked","parameterTypes":[] }, 
-    {"name":"color","parameterTypes":[] }, 
-    {"name":"expectedV2Id","parameterTypes":[] }, 
-    {"name":"groupId","parameterTypes":[] }, 
-    {"name":"members","parameterTypes":[] }, 
-    {"name":"messageExpirationTime","parameterTypes":[] }, 
-    {"name":"name","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","int","boolean","boolean","java.util.List"] }, {"name":"archived","parameterTypes":[] }, {"name":"blocked","parameterTypes":[] }, {"name":"color","parameterTypes":[] }, {"name":"expectedV2Id","parameterTypes":[] }, {"name":"groupId","parameterTypes":[] }, {"name":"members","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$Storage$GroupV1$JsonRecipientAddress",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, 
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"number","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.groups.LegacyGroupStore$Storage$GroupV1$MembersDeserializer",
@@ -1335,26 +1009,14 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","boolean","boolean"] }, 
-    {"name":"blocked","parameterTypes":[] }, 
-    {"name":"distributionId","parameterTypes":[] }, 
-    {"name":"groupId","parameterTypes":[] }, 
-    {"name":"masterKey","parameterTypes":[] }, 
-    {"name":"permissionDenied","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","boolean","boolean"] }, {"name":"blocked","parameterTypes":[] }, {"name":"distributionId","parameterTypes":[] }, {"name":"groupId","parameterTypes":[] }, {"name":"masterKey","parameterTypes":[] }, {"name":"permissionDenied","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.identities.LegacyIdentityKeyStore$IdentityStorage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","int","long"] }, 
-    {"name":"addedTimestamp","parameterTypes":[] }, 
-    {"name":"identityKey","parameterTypes":[] }, 
-    {"name":"trustLevel","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","int","long"] }, {"name":"addedTimestamp","parameterTypes":[] }, {"name":"identityKey","parameterTypes":[] }, {"name":"trustLevel","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.profiles.LegacyProfileStore",
@@ -1417,130 +1079,70 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.util.List","long"] }, 
-    {"name":"lastId","parameterTypes":[] }, 
-    {"name":"recipients","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List","long"] }, {"name":"lastId","parameterTypes":[] }, {"name":"recipients","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["long","java.lang.String","java.lang.String","java.lang.String","java.lang.String","org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Contact","org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Profile"] }, 
-    {"name":"contact","parameterTypes":[] }, 
-    {"name":"expiringProfileKeyCredential","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }, 
-    {"name":"number","parameterTypes":[] }, 
-    {"name":"profile","parameterTypes":[] }, 
-    {"name":"profileKey","parameterTypes":[] }, 
-    {"name":"uuid","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long","java.lang.String","java.lang.String","java.lang.String","java.lang.String","org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Contact","org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Profile"] }, {"name":"contact","parameterTypes":[] }, {"name":"expiringProfileKeyCredential","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"profile","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Contact",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","int","boolean","boolean","boolean"] }, 
-    {"name":"archived","parameterTypes":[] }, 
-    {"name":"blocked","parameterTypes":[] }, 
-    {"name":"color","parameterTypes":[] }, 
-    {"name":"messageExpirationTime","parameterTypes":[] }, 
-    {"name":"name","parameterTypes":[] }, 
-    {"name":"profileSharingEnabled","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","int","boolean","boolean","boolean"] }, {"name":"archived","parameterTypes":[] }, {"name":"blocked","parameterTypes":[] }, {"name":"color","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"profileSharingEnabled","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2$Storage$Recipient$Profile",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["long","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.util.Set"] }, 
-    {"name":"about","parameterTypes":[] }, 
-    {"name":"aboutEmoji","parameterTypes":[] }, 
-    {"name":"avatarUrlPath","parameterTypes":[] }, 
-    {"name":"capabilities","parameterTypes":[] }, 
-    {"name":"familyName","parameterTypes":[] }, 
-    {"name":"givenName","parameterTypes":[] }, 
-    {"name":"lastUpdateTimestamp","parameterTypes":[] }, 
-    {"name":"mobileCoinAddress","parameterTypes":[] }, 
-    {"name":"unidentifiedAccessMode","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.util.Set"] }, {"name":"about","parameterTypes":[] }, {"name":"aboutEmoji","parameterTypes":[] }, {"name":"avatarUrlPath","parameterTypes":[] }, {"name":"capabilities","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"lastUpdateTimestamp","parameterTypes":[] }, {"name":"mobileCoinAddress","parameterTypes":[] }, {"name":"unidentifiedAccessMode","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.senderKeys.LegacySenderKeySharedStore$Storage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.util.List"] }, 
-    {"name":"sharedSenderKeys","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List"] }, {"name":"sharedSenderKeys","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.senderKeys.LegacySenderKeySharedStore$Storage$SharedSenderKey",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["long","int","java.lang.String"] }, 
-    {"name":"deviceId","parameterTypes":[] }, 
-    {"name":"distributionId","parameterTypes":[] }, 
-    {"name":"recipientId","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["long","int","java.lang.String"] }, {"name":"deviceId","parameterTypes":[] }, {"name":"distributionId","parameterTypes":[] }, {"name":"recipientId","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack$JsonSticker","java.util.List"] }, 
-    {"name":"author","parameterTypes":[] }, 
-    {"name":"cover","parameterTypes":[] }, 
-    {"name":"stickers","parameterTypes":[] }, 
-    {"name":"title","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack$JsonSticker","java.util.List"] }, {"name":"author","parameterTypes":[] }, {"name":"cover","parameterTypes":[] }, {"name":"stickers","parameterTypes":[] }, {"name":"title","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack$JsonSticker",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.Integer","java.lang.String","java.lang.String","java.lang.String"] }, 
-    {"name":"contentType","parameterTypes":[] }, 
-    {"name":"emoji","parameterTypes":[] }, 
-    {"name":"file","parameterTypes":[] }, 
-    {"name":"id","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Integer","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"contentType","parameterTypes":[] }, {"name":"emoji","parameterTypes":[] }, {"name":"file","parameterTypes":[] }, {"name":"id","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.stickers.LegacyStickerStore$Storage",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.util.List"] }, 
-    {"name":"stickers","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List"] }, {"name":"stickers","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.stickers.LegacyStickerStore$Storage$Sticker",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","boolean"] }, 
-    {"name":"installed","parameterTypes":[] }, 
-    {"name":"packId","parameterTypes":[] }, 
-    {"name":"packKey","parameterTypes":[] }
-  ]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","boolean"] }, {"name":"installed","parameterTypes":[] }, {"name":"packId","parameterTypes":[] }, {"name":"packKey","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.util.SecurityProvider$DefaultRandom",
@@ -1976,24 +1578,11 @@
 },
 {
   "name":"org.signal.cdsi.proto.ClientRequest",
-  "fields":[
-    {"name":"aciUakPairs_"}, 
-    {"name":"discardE164S_"}, 
-    {"name":"newE164S_"}, 
-    {"name":"prevE164S_"}, 
-    {"name":"returnAcisWithoutUaks_"}, 
-    {"name":"tokenAck_"}, 
-    {"name":"token_"}
-  ]
+  "fields":[{"name":"aciUakPairs_"}, {"name":"discardE164S_"}, {"name":"newE164S_"}, {"name":"prevE164S_"}, {"name":"returnAcisWithoutUaks_"}, {"name":"tokenAck_"}, {"name":"token_"}]
 },
 {
   "name":"org.signal.cdsi.proto.ClientResponse",
-  "fields":[
-    {"name":"debugPermitsUsed_"}, 
-    {"name":"e164PniAciTriples_"}, 
-    {"name":"retryAfterSecs_"}, 
-    {"name":"token_"}
-  ]
+  "fields":[{"name":"debugPermitsUsed_"}, {"name":"e164PniAciTriples_"}, {"name":"retryAfterSecs_"}, {"name":"token_"}]
 },
 {
   "name":"org.signal.libsignal.protocol.state.IdentityKeyStore",
@@ -2034,92 +1623,31 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.AccessControl",
-  "fields":[
-    {"name":"addFromInviteLink_"}, 
-    {"name":"attributes_"}, 
-    {"name":"members_"}
-  ]
+  "fields":[{"name":"addFromInviteLink_"}, {"name":"attributes_"}, {"name":"members_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.AvatarUploadAttributes",
-  "fields":[
-    {"name":"acl_"}, 
-    {"name":"algorithm_"}, 
-    {"name":"credential_"}, 
-    {"name":"date_"}, 
-    {"name":"key_"}, 
-    {"name":"policy_"}, 
-    {"name":"signature_"}
-  ]
+  "fields":[{"name":"acl_"}, {"name":"algorithm_"}, {"name":"credential_"}, {"name":"date_"}, {"name":"key_"}, {"name":"policy_"}, {"name":"signature_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.BannedMember",
-  "fields":[
-    {"name":"timestamp_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"timestamp_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.Group",
-  "fields":[
-    {"name":"accessControl_"}, 
-    {"name":"announcementsOnly_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bannedMembers_"}, 
-    {"name":"description_"}, 
-    {"name":"disappearingMessagesTimer_"}, 
-    {"name":"inviteLinkPassword_"}, 
-    {"name":"members_"}, 
-    {"name":"pendingMembers_"}, 
-    {"name":"publicKey_"}, 
-    {"name":"requestingMembers_"}, 
-    {"name":"revision_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"accessControl_"}, {"name":"announcementsOnly_"}, {"name":"avatar_"}, {"name":"bannedMembers_"}, {"name":"description_"}, {"name":"disappearingMessagesTimer_"}, {"name":"inviteLinkPassword_"}, {"name":"members_"}, {"name":"pendingMembers_"}, {"name":"publicKey_"}, {"name":"requestingMembers_"}, {"name":"revision_"}, {"name":"title_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupAttributeBlob",
-  "fields":[
-    {"name":"contentCase_"}, 
-    {"name":"content_"}
-  ]
+  "fields":[{"name":"contentCase_"}, {"name":"content_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange",
-  "fields":[
-    {"name":"actions_"}, 
-    {"name":"changeEpoch_"}, 
-    {"name":"serverSignature_"}
-  ]
+  "fields":[{"name":"actions_"}, {"name":"changeEpoch_"}, {"name":"serverSignature_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions",
-  "fields":[
-    {"name":"addBannedMembers_"}, 
-    {"name":"addMembers_"}, 
-    {"name":"addPendingMembers_"}, 
-    {"name":"addRequestingMembers_"}, 
-    {"name":"deleteBannedMembers_"}, 
-    {"name":"deleteMembers_"}, 
-    {"name":"deletePendingMembers_"}, 
-    {"name":"deleteRequestingMembers_"}, 
-    {"name":"modifyAddFromInviteLinkAccess_"}, 
-    {"name":"modifyAnnouncementsOnly_"}, 
-    {"name":"modifyAttributesAccess_"}, 
-    {"name":"modifyAvatar_"}, 
-    {"name":"modifyDescription_"}, 
-    {"name":"modifyDisappearingMessagesTimer_"}, 
-    {"name":"modifyInviteLinkPassword_"}, 
-    {"name":"modifyMemberAccess_"}, 
-    {"name":"modifyMemberProfileKeys_"}, 
-    {"name":"modifyMemberRoles_"}, 
-    {"name":"modifyTitle_"}, 
-    {"name":"promotePendingMembers_"}, 
-    {"name":"promotePendingPniAciMembers_"}, 
-    {"name":"promoteRequestingMembers_"}, 
-    {"name":"revision_"}, 
-    {"name":"sourceUuid_"}
-  ]
+  "fields":[{"name":"addBannedMembers_"}, {"name":"addMembers_"}, {"name":"addPendingMembers_"}, {"name":"addRequestingMembers_"}, {"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"modifyAddFromInviteLinkAccess_"}, {"name":"modifyAnnouncementsOnly_"}, {"name":"modifyAttributesAccess_"}, {"name":"modifyAvatar_"}, {"name":"modifyDescription_"}, {"name":"modifyDisappearingMessagesTimer_"}, {"name":"modifyInviteLinkPassword_"}, {"name":"modifyMemberAccess_"}, {"name":"modifyMemberProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"modifyTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}, {"name":"sourceUuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddBannedMemberAction",
@@ -2127,10 +1655,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddMemberAction",
-  "fields":[
-    {"name":"added_"}, 
-    {"name":"joinFromInviteLink_"}
-  ]
+  "fields":[{"name":"added_"}, {"name":"joinFromInviteLink_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddPendingMemberAction",
@@ -2186,18 +1711,11 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$ModifyMemberProfileKeyAction",
-  "fields":[
-    {"name":"presentation_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"presentation_"}, {"name":"profileKey_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$ModifyMemberRoleAction",
-  "fields":[
-    {"name":"role_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"role_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$ModifyMembersAccessControlAction",
@@ -2209,27 +1727,15 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromotePendingMemberAction",
-  "fields":[
-    {"name":"presentation_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"presentation_"}, {"name":"profileKey_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromotePendingPniAciMemberProfileKeyAction",
-  "fields":[
-    {"name":"pni_"}, 
-    {"name":"presentation_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"pni_"}, {"name":"presentation_"}, {"name":"profileKey_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$PromoteRequestingMemberAction",
-  "fields":[
-    {"name":"role_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"role_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChanges",
@@ -2237,179 +1743,71 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChanges$GroupChangeState",
-  "fields":[
-    {"name":"groupChange_"}, 
-    {"name":"groupState_"}
-  ]
+  "fields":[{"name":"groupChange_"}, {"name":"groupState_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupInviteLink",
-  "fields":[
-    {"name":"contentsCase_"}, 
-    {"name":"contents_"}
-  ]
+  "fields":[{"name":"contentsCase_"}, {"name":"contents_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupInviteLink$GroupInviteLinkContentsV1",
-  "fields":[
-    {"name":"groupMasterKey_"}, 
-    {"name":"inviteLinkPassword_"}
-  ]
+  "fields":[{"name":"groupMasterKey_"}, {"name":"inviteLinkPassword_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupJoinInfo",
-  "fields":[
-    {"name":"addFromInviteLink_"}, 
-    {"name":"avatar_"}, 
-    {"name":"description_"}, 
-    {"name":"memberCount_"}, 
-    {"name":"pendingAdminApproval_"}, 
-    {"name":"publicKey_"}, 
-    {"name":"revision_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"addFromInviteLink_"}, {"name":"avatar_"}, {"name":"description_"}, {"name":"memberCount_"}, {"name":"pendingAdminApproval_"}, {"name":"publicKey_"}, {"name":"revision_"}, {"name":"title_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.Member",
-  "fields":[
-    {"name":"joinedAtRevision_"}, 
-    {"name":"presentation_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"role_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"joinedAtRevision_"}, {"name":"presentation_"}, {"name":"profileKey_"}, {"name":"role_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.PendingMember",
-  "fields":[
-    {"name":"addedByUserId_"}, 
-    {"name":"member_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"addedByUserId_"}, {"name":"member_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.RequestingMember",
-  "fields":[
-    {"name":"presentation_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"userId_"}
-  ]
+  "fields":[{"name":"presentation_"}, {"name":"profileKey_"}, {"name":"timestamp_"}, {"name":"userId_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedApproveMember",
-  "fields":[
-    {"name":"role_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"role_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedBannedMember",
-  "fields":[
-    {"name":"timestamp_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"timestamp_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroup",
-  "fields":[
-    {"name":"accessControl_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bannedMembers_"}, 
-    {"name":"description_"}, 
-    {"name":"disappearingMessagesTimer_"}, 
-    {"name":"inviteLinkPassword_"}, 
-    {"name":"isAnnouncementGroup_"}, 
-    {"name":"members_"}, 
-    {"name":"pendingMembers_"}, 
-    {"name":"requestingMembers_"}, 
-    {"name":"revision_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"accessControl_"}, {"name":"avatar_"}, {"name":"bannedMembers_"}, {"name":"description_"}, {"name":"disappearingMessagesTimer_"}, {"name":"inviteLinkPassword_"}, {"name":"isAnnouncementGroup_"}, {"name":"members_"}, {"name":"pendingMembers_"}, {"name":"requestingMembers_"}, {"name":"revision_"}, {"name":"title_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupChange",
-  "fields":[
-    {"name":"deleteBannedMembers_"}, 
-    {"name":"deleteMembers_"}, 
-    {"name":"deletePendingMembers_"}, 
-    {"name":"deleteRequestingMembers_"}, 
-    {"name":"editor_"}, 
-    {"name":"modifiedProfileKeys_"}, 
-    {"name":"modifyMemberRoles_"}, 
-    {"name":"newAttributeAccess_"}, 
-    {"name":"newAvatar_"}, 
-    {"name":"newBannedMembers_"}, 
-    {"name":"newDescription_"}, 
-    {"name":"newInviteLinkAccess_"}, 
-    {"name":"newInviteLinkPassword_"}, 
-    {"name":"newIsAnnouncementGroup_"}, 
-    {"name":"newMemberAccess_"}, 
-    {"name":"newMembers_"}, 
-    {"name":"newPendingMembers_"}, 
-    {"name":"newRequestingMembers_"}, 
-    {"name":"newTimer_"}, 
-    {"name":"newTitle_"}, 
-    {"name":"promotePendingMembers_"}, 
-    {"name":"promotePendingPniAciMembers_"}, 
-    {"name":"promoteRequestingMembers_"}, 
-    {"name":"revision_"}
-  ]
+  "fields":[{"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"editor_"}, {"name":"modifiedProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"newAttributeAccess_"}, {"name":"newAvatar_"}, {"name":"newBannedMembers_"}, {"name":"newDescription_"}, {"name":"newInviteLinkAccess_"}, {"name":"newInviteLinkPassword_"}, {"name":"newIsAnnouncementGroup_"}, {"name":"newMemberAccess_"}, {"name":"newMembers_"}, {"name":"newPendingMembers_"}, {"name":"newRequestingMembers_"}, {"name":"newTimer_"}, {"name":"newTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo",
-  "fields":[
-    {"name":"addFromInviteLink_"}, 
-    {"name":"avatar_"}, 
-    {"name":"description_"}, 
-    {"name":"isAnnouncementGroup_"}, 
-    {"name":"memberCount_"}, 
-    {"name":"pendingAdminApproval_"}, 
-    {"name":"revision_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"addFromInviteLink_"}, {"name":"avatar_"}, {"name":"description_"}, {"name":"isAnnouncementGroup_"}, {"name":"memberCount_"}, {"name":"pendingAdminApproval_"}, {"name":"revision_"}, {"name":"title_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedMember",
-  "fields":[
-    {"name":"joinedAtRevision_"}, 
-    {"name":"pni_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"role_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"joinedAtRevision_"}, {"name":"pni_"}, {"name":"profileKey_"}, {"name":"role_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedModifyMemberRole",
-  "fields":[
-    {"name":"role_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"role_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMember",
-  "fields":[
-    {"name":"addedByUuid_"}, 
-    {"name":"role_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"uuidCipherText_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"addedByUuid_"}, {"name":"role_"}, {"name":"timestamp_"}, {"name":"uuidCipherText_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval",
-  "fields":[
-    {"name":"uuidCipherText_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"uuidCipherText_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedRequestingMember",
-  "fields":[
-    {"name":"profileKey_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"profileKey_"}, {"name":"timestamp_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedString",
@@ -2427,48 +1825,21 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"getCapabilities","parameterTypes":[] }, 
-    {"name":"getDiscoverableByPhoneNumber","parameterTypes":[] }, 
-    {"name":"getFetchesMessages","parameterTypes":[] }, 
-    {"name":"getName","parameterTypes":[] }, 
-    {"name":"getPin","parameterTypes":[] }, 
-    {"name":"getPniRegistrationId","parameterTypes":[] }, 
-    {"name":"getRecoveryPassword","parameterTypes":[] }, 
-    {"name":"getRegistrationId","parameterTypes":[] }, 
-    {"name":"getRegistrationLock","parameterTypes":[] }, 
-    {"name":"getSignalingKey","parameterTypes":[] }, 
-    {"name":"getUnidentifiedAccessKey","parameterTypes":[] }, 
-    {"name":"getUnrestrictedUnidentifiedAccess","parameterTypes":[] }, 
-    {"name":"getVideo","parameterTypes":[] }, 
-    {"name":"getVoice","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getCapabilities","parameterTypes":[] }, {"name":"getDiscoverableByPhoneNumber","parameterTypes":[] }, {"name":"getFetchesMessages","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getPin","parameterTypes":[] }, {"name":"getPniRegistrationId","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getRegistrationId","parameterTypes":[] }, {"name":"getRegistrationLock","parameterTypes":[] }, {"name":"getSignalingKey","parameterTypes":[] }, {"name":"getUnidentifiedAccessKey","parameterTypes":[] }, {"name":"getUnrestrictedUnidentifiedAccess","parameterTypes":[] }, {"name":"getVideo","parameterTypes":[] }, {"name":"getVoice","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.AccountAttributes$Capabilities",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"getAnnouncementGroup","parameterTypes":[] }, 
-    {"name":"getChangeNumber","parameterTypes":[] }, 
-    {"name":"getGiftBadges","parameterTypes":[] }, 
-    {"name":"getPaymentActivation","parameterTypes":[] }, 
-    {"name":"getPni","parameterTypes":[] }, 
-    {"name":"getSenderKey","parameterTypes":[] }, 
-    {"name":"getStorage","parameterTypes":[] }, 
-    {"name":"getStories","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"getNumber","parameterTypes":[] }, 
-    {"name":"getRegistrationLock","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getNumber","parameterTypes":[] }, {"name":"getRegistrationLock","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.CredentialResponse",
@@ -2652,80 +2023,35 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.devices.DeviceNameProtos$DeviceName",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"ciphertext_"}, 
-    {"name":"ephemeralPublic_"}, 
-    {"name":"syntheticIv_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"ciphertext_"}, {"name":"ephemeralPublic_"}, {"name":"syntheticIv_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.BackupRequest",
-  "fields":[
-    {"name":"backupId_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"data_"}, 
-    {"name":"pin_"}, 
-    {"name":"serviceId_"}, 
-    {"name":"token_"}, 
-    {"name":"tries_"}, 
-    {"name":"validFrom_"}
-  ]
+  "fields":[{"name":"backupId_"}, {"name":"bitField0_"}, {"name":"data_"}, {"name":"pin_"}, {"name":"serviceId_"}, {"name":"token_"}, {"name":"tries_"}, {"name":"validFrom_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.BackupResponse",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"status_"}, 
-    {"name":"token_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"status_"}, {"name":"token_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.DeleteRequest",
-  "fields":[
-    {"name":"backupId_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"serviceId_"}
-  ]
+  "fields":[{"name":"backupId_"}, {"name":"bitField0_"}, {"name":"serviceId_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.Request",
-  "fields":[
-    {"name":"backup_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"delete_"}, 
-    {"name":"restore_"}
-  ]
+  "fields":[{"name":"backup_"}, {"name":"bitField0_"}, {"name":"delete_"}, {"name":"restore_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.Response",
-  "fields":[
-    {"name":"backup_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"delete_"}, 
-    {"name":"restore_"}
-  ]
+  "fields":[{"name":"backup_"}, {"name":"bitField0_"}, {"name":"delete_"}, {"name":"restore_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.RestoreRequest",
-  "fields":[
-    {"name":"backupId_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"pin_"}, 
-    {"name":"serviceId_"}, 
-    {"name":"token_"}, 
-    {"name":"validFrom_"}
-  ]
+  "fields":[{"name":"backupId_"}, {"name":"bitField0_"}, {"name":"pin_"}, {"name":"serviceId_"}, {"name":"token_"}, {"name":"validFrom_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.RestoreResponse",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"data_"}, 
-    {"name":"status_"}, 
-    {"name":"token_"}, 
-    {"name":"tries_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"data_"}, {"name":"status_"}, {"name":"token_"}, {"name":"tries_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.AttachmentV2UploadAttributes",
@@ -2839,13 +2165,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[
-    {"name":"getDestination","parameterTypes":[] }, 
-    {"name":"getMessages","parameterTypes":[] }, 
-    {"name":"getTimestamp","parameterTypes":[] }, 
-    {"name":"isOnline","parameterTypes":[] }, 
-    {"name":"isUrgent","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getDestination","parameterTypes":[] }, {"name":"getMessages","parameterTypes":[] }, {"name":"getTimestamp","parameterTypes":[] }, {"name":"isOnline","parameterTypes":[] }, {"name":"isUrgent","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyEntity",
@@ -2903,36 +2223,15 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningProtos$ProvisionEnvelope",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"body_"}, 
-    {"name":"publicKey_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"body_"}, {"name":"publicKey_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningProtos$ProvisionMessage",
-  "fields":[
-    {"name":"aciIdentityKeyPrivate_"}, 
-    {"name":"aciIdentityKeyPublic_"}, 
-    {"name":"aci_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"number_"}, 
-    {"name":"pniIdentityKeyPrivate_"}, 
-    {"name":"pniIdentityKeyPublic_"}, 
-    {"name":"pni_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"provisioningCode_"}, 
-    {"name":"provisioningVersion_"}, 
-    {"name":"readReceipts_"}, 
-    {"name":"userAgent_"}
-  ]
+  "fields":[{"name":"aciIdentityKeyPrivate_"}, {"name":"aciIdentityKeyPublic_"}, {"name":"aci_"}, {"name":"bitField0_"}, {"name":"number_"}, {"name":"pniIdentityKeyPrivate_"}, {"name":"pniIdentityKeyPublic_"}, {"name":"pni_"}, {"name":"profileKey_"}, {"name":"provisioningCode_"}, {"name":"provisioningVersion_"}, {"name":"readReceipts_"}, {"name":"userAgent_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningProtos$ProvisioningUuid",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PushServiceSocket$RegistrationLockFailure",
@@ -2958,12 +2257,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"getAccountAttributes","parameterTypes":[] }, 
-    {"name":"getRecoveryPassword","parameterTypes":[] }, 
-    {"name":"getSessionId","parameterTypes":[] }, 
-    {"name":"getSkipDeviceTransfer","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getAccountAttributes","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getSessionId","parameterTypes":[] }, {"name":"getSkipDeviceTransfer","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ReserveUsernameRequest",
@@ -3005,698 +2299,267 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$AttachmentPointer",
-  "fields":[
-    {"name":"attachmentIdentifierCase_"}, 
-    {"name":"attachmentIdentifier_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"blurHash_"}, 
-    {"name":"caption_"}, 
-    {"name":"cdnNumber_"}, 
-    {"name":"contentType_"}, 
-    {"name":"digest_"}, 
-    {"name":"fileName_"}, 
-    {"name":"flags_"}, 
-    {"name":"height_"}, 
-    {"name":"key_"}, 
-    {"name":"size_"}, 
-    {"name":"thumbnail_"}, 
-    {"name":"uploadTimestamp_"}, 
-    {"name":"width_"}
-  ]
+  "fields":[{"name":"attachmentIdentifierCase_"}, {"name":"attachmentIdentifier_"}, {"name":"bitField0_"}, {"name":"blurHash_"}, {"name":"caption_"}, {"name":"cdnNumber_"}, {"name":"contentType_"}, {"name":"digest_"}, {"name":"fileName_"}, {"name":"flags_"}, {"name":"height_"}, {"name":"key_"}, {"name":"size_"}, {"name":"thumbnail_"}, {"name":"uploadTimestamp_"}, {"name":"width_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$BodyRange",
-  "fields":[
-    {"name":"associatedValueCase_"}, 
-    {"name":"associatedValue_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"length_"}, 
-    {"name":"start_"}
-  ]
+  "fields":[{"name":"associatedValueCase_"}, {"name":"associatedValue_"}, {"name":"bitField0_"}, {"name":"length_"}, {"name":"start_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage",
-  "fields":[
-    {"name":"answer_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"busy_"}, 
-    {"name":"destinationDeviceId_"}, 
-    {"name":"hangup_"}, 
-    {"name":"iceUpdate_"}, 
-    {"name":"legacyHangup_"}, 
-    {"name":"multiRing_"}, 
-    {"name":"offer_"}, 
-    {"name":"opaque_"}
-  ]
+  "fields":[{"name":"answer_"}, {"name":"bitField0_"}, {"name":"busy_"}, {"name":"destinationDeviceId_"}, {"name":"hangup_"}, {"name":"iceUpdate_"}, {"name":"legacyHangup_"}, {"name":"multiRing_"}, {"name":"offer_"}, {"name":"opaque_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Answer",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"id_"}, 
-    {"name":"opaque_"}, 
-    {"name":"sdp_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"id_"}, {"name":"opaque_"}, {"name":"sdp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Hangup",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"deviceId_"}, 
-    {"name":"id_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"deviceId_"}, {"name":"id_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$IceUpdate",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"id_"}, 
-    {"name":"line_"}, 
-    {"name":"mid_"}, 
-    {"name":"opaque_"}, 
-    {"name":"sdp_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"id_"}, {"name":"line_"}, {"name":"mid_"}, {"name":"opaque_"}, {"name":"sdp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Offer",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"id_"}, 
-    {"name":"opaque_"}, 
-    {"name":"sdp_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"id_"}, {"name":"opaque_"}, {"name":"sdp_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Opaque",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"data_"}, 
-    {"name":"urgency_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"data_"}, {"name":"urgency_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails",
-  "fields":[
-    {"name":"archived_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"blocked_"}, 
-    {"name":"color_"}, 
-    {"name":"expireTimer_"}, 
-    {"name":"inboxPosition_"}, 
-    {"name":"name_"}, 
-    {"name":"number_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"uuid_"}, 
-    {"name":"verified_"}
-  ]
+  "fields":[{"name":"archived_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"color_"}, {"name":"expireTimer_"}, {"name":"inboxPosition_"}, {"name":"name_"}, {"name":"number_"}, {"name":"profileKey_"}, {"name":"uuid_"}, {"name":"verified_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails$Avatar",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"contentType_"}, 
-    {"name":"length_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"contentType_"}, {"name":"length_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Content",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"callMessage_"}, 
-    {"name":"dataMessage_"}, 
-    {"name":"decryptionErrorMessage_"}, 
-    {"name":"editMessage_"}, 
-    {"name":"nullMessage_"}, 
-    {"name":"pniSignatureMessage_"}, 
-    {"name":"receiptMessage_"}, 
-    {"name":"senderKeyDistributionMessage_"}, 
-    {"name":"storyMessage_"}, 
-    {"name":"syncMessage_"}, 
-    {"name":"typingMessage_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"callMessage_"}, {"name":"dataMessage_"}, {"name":"decryptionErrorMessage_"}, {"name":"editMessage_"}, {"name":"nullMessage_"}, {"name":"pniSignatureMessage_"}, {"name":"receiptMessage_"}, {"name":"senderKeyDistributionMessage_"}, {"name":"storyMessage_"}, {"name":"syncMessage_"}, {"name":"typingMessage_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage",
-  "fields":[
-    {"name":"attachments_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"bodyRanges_"}, 
-    {"name":"body_"}, 
-    {"name":"contact_"}, 
-    {"name":"delete_"}, 
-    {"name":"expireTimer_"}, 
-    {"name":"flags_"}, 
-    {"name":"giftBadge_"}, 
-    {"name":"groupCallUpdate_"}, 
-    {"name":"groupV2_"}, 
-    {"name":"group_"}, 
-    {"name":"isViewOnce_"}, 
-    {"name":"payment_"}, 
-    {"name":"preview_"}, 
-    {"name":"profileKey_"}, 
-    {"name":"quote_"}, 
-    {"name":"reaction_"}, 
-    {"name":"requiredProtocolVersion_"}, 
-    {"name":"sticker_"}, 
-    {"name":"storyContext_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"attachments_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"body_"}, {"name":"contact_"}, {"name":"delete_"}, {"name":"expireTimer_"}, {"name":"flags_"}, {"name":"giftBadge_"}, {"name":"groupCallUpdate_"}, {"name":"groupV2_"}, {"name":"group_"}, {"name":"isViewOnce_"}, {"name":"payment_"}, {"name":"preview_"}, {"name":"profileKey_"}, {"name":"quote_"}, {"name":"reaction_"}, {"name":"requiredProtocolVersion_"}, {"name":"sticker_"}, {"name":"storyContext_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact",
-  "fields":[
-    {"name":"address_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"email_"}, 
-    {"name":"name_"}, 
-    {"name":"number_"}, 
-    {"name":"organization_"}
-  ]
+  "fields":[{"name":"address_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"email_"}, {"name":"name_"}, {"name":"number_"}, {"name":"organization_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Avatar",
-  "fields":[
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"isProfile_"}
-  ]
+  "fields":[{"name":"avatar_"}, {"name":"bitField0_"}, {"name":"isProfile_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Email",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"label_"}, 
-    {"name":"type_"}, 
-    {"name":"value_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"label_"}, {"name":"type_"}, {"name":"value_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Name",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"displayName_"}, 
-    {"name":"familyName_"}, 
-    {"name":"givenName_"}, 
-    {"name":"middleName_"}, 
-    {"name":"prefix_"}, 
-    {"name":"suffix_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"displayName_"}, {"name":"familyName_"}, {"name":"givenName_"}, {"name":"middleName_"}, {"name":"prefix_"}, {"name":"suffix_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Phone",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"label_"}, 
-    {"name":"type_"}, 
-    {"name":"value_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"label_"}, {"name":"type_"}, {"name":"value_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$PostalAddress",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"city_"}, 
-    {"name":"country_"}, 
-    {"name":"label_"}, 
-    {"name":"neighborhood_"}, 
-    {"name":"pobox_"}, 
-    {"name":"postcode_"}, 
-    {"name":"region_"}, 
-    {"name":"street_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"city_"}, {"name":"country_"}, {"name":"label_"}, {"name":"neighborhood_"}, {"name":"pobox_"}, {"name":"postcode_"}, {"name":"region_"}, {"name":"street_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Delete",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"targetSentTimestamp_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"targetSentTimestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$GroupCallUpdate",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"eraId_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"eraId_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment",
-  "fields":[
-    {"name":"itemCase_"}, 
-    {"name":"item_"}
-  ]
+  "fields":[{"name":"itemCase_"}, {"name":"item_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment$Notification",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"note_"}, 
-    {"name":"transactionCase_"}, 
-    {"name":"transaction_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"note_"}, {"name":"transactionCase_"}, {"name":"transaction_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment$Notification$MobileCoin",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"receipt_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"receipt_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote",
-  "fields":[
-    {"name":"attachments_"}, 
-    {"name":"authorUuid_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"bodyRanges_"}, 
-    {"name":"id_"}, 
-    {"name":"text_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"attachments_"}, {"name":"authorUuid_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"id_"}, {"name":"text_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote$QuotedAttachment",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"contentType_"}, 
-    {"name":"fileName_"}, 
-    {"name":"thumbnail_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"contentType_"}, {"name":"fileName_"}, {"name":"thumbnail_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Reaction",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"emoji_"}, 
-    {"name":"remove_"}, 
-    {"name":"targetAuthorUuid_"}, 
-    {"name":"targetSentTimestamp_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"emoji_"}, {"name":"remove_"}, {"name":"targetAuthorUuid_"}, {"name":"targetSentTimestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Sticker",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"data_"}, 
-    {"name":"emoji_"}, 
-    {"name":"packId_"}, 
-    {"name":"packKey_"}, 
-    {"name":"stickerId_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"data_"}, {"name":"emoji_"}, {"name":"packId_"}, {"name":"packKey_"}, {"name":"stickerId_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$StoryContext",
-  "fields":[
-    {"name":"authorUuid_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"sentTimestamp_"}
-  ]
+  "fields":[{"name":"authorUuid_"}, {"name":"bitField0_"}, {"name":"sentTimestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$EditMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"dataMessage_"}, 
-    {"name":"targetSentTimestamp_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"dataMessage_"}, {"name":"targetSentTimestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Envelope",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"content_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"reportingToken_"}, 
-    {"name":"serverGuid_"}, 
-    {"name":"serverTimestamp_"}, 
-    {"name":"sourceDevice_"}, 
-    {"name":"sourceUuid_"}, 
-    {"name":"story_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"type_"}, 
-    {"name":"updatedPni_"}, 
-    {"name":"urgent_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"content_"}, {"name":"destinationUuid_"}, {"name":"reportingToken_"}, {"name":"serverGuid_"}, {"name":"serverTimestamp_"}, {"name":"sourceDevice_"}, {"name":"sourceUuid_"}, {"name":"story_"}, {"name":"timestamp_"}, {"name":"type_"}, {"name":"updatedPni_"}, {"name":"urgent_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContext",
-  "fields":[
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"id_"}, 
-    {"name":"membersE164_"}, 
-    {"name":"members_"}, 
-    {"name":"name_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"avatar_"}, {"name":"bitField0_"}, {"name":"id_"}, {"name":"membersE164_"}, {"name":"members_"}, {"name":"name_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContext$Member",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"e164_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"e164_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContextV2",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"groupChange_"}, 
-    {"name":"masterKey_"}, 
-    {"name":"revision_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"groupChange_"}, {"name":"masterKey_"}, {"name":"revision_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails",
-  "fields":[
-    {"name":"active_"}, 
-    {"name":"archived_"}, 
-    {"name":"avatar_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"blocked_"}, 
-    {"name":"color_"}, 
-    {"name":"expireTimer_"}, 
-    {"name":"id_"}, 
-    {"name":"inboxPosition_"}, 
-    {"name":"membersE164_"}, 
-    {"name":"members_"}, 
-    {"name":"name_"}
-  ]
+  "fields":[{"name":"active_"}, {"name":"archived_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"color_"}, {"name":"expireTimer_"}, {"name":"id_"}, {"name":"inboxPosition_"}, {"name":"membersE164_"}, {"name":"members_"}, {"name":"name_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails$Avatar",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"contentType_"}, 
-    {"name":"length_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"contentType_"}, {"name":"length_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails$Member",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"e164_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"e164_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$NullMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"padding_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"padding_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PaymentAddress",
-  "fields":[
-    {"name":"addressCase_"}, 
-    {"name":"address_"}
-  ]
+  "fields":[{"name":"addressCase_"}, {"name":"address_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PaymentAddress$MobileCoinAddress",
-  "fields":[
-    {"name":"address_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"signature_"}
-  ]
+  "fields":[{"name":"address_"}, {"name":"bitField0_"}, {"name":"signature_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PniSignatureMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"pni_"}, 
-    {"name":"signature_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"pni_"}, {"name":"signature_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Preview",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"date_"}, 
-    {"name":"description_"}, 
-    {"name":"image_"}, 
-    {"name":"title_"}, 
-    {"name":"url_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"date_"}, {"name":"description_"}, {"name":"image_"}, {"name":"title_"}, {"name":"url_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ReceiptMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"timestamp_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$StoryMessage",
-  "fields":[
-    {"name":"allowsReplies_"}, 
-    {"name":"attachmentCase_"}, 
-    {"name":"attachment_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"bodyRanges_"}, 
-    {"name":"group_"}, 
-    {"name":"profileKey_"}
-  ]
+  "fields":[{"name":"allowsReplies_"}, {"name":"attachmentCase_"}, {"name":"attachment_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"group_"}, {"name":"profileKey_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"blocked_"}, 
-    {"name":"callEvent_"}, 
-    {"name":"callLinkUpdate_"}, 
-    {"name":"configuration_"}, 
-    {"name":"contacts_"}, 
-    {"name":"fetchLatest_"}, 
-    {"name":"groups_"}, 
-    {"name":"keys_"}, 
-    {"name":"messageRequestResponse_"}, 
-    {"name":"outgoingPayment_"}, 
-    {"name":"padding_"}, 
-    {"name":"pniChangeNumber_"}, 
-    {"name":"read_"}, 
-    {"name":"request_"}, 
-    {"name":"sent_"}, 
-    {"name":"stickerPackOperation_"}, 
-    {"name":"verified_"}, 
-    {"name":"viewOnceOpen_"}, 
-    {"name":"viewed_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"blocked_"}, {"name":"callEvent_"}, {"name":"callLinkUpdate_"}, {"name":"configuration_"}, {"name":"contacts_"}, {"name":"fetchLatest_"}, {"name":"groups_"}, {"name":"keys_"}, {"name":"messageRequestResponse_"}, {"name":"outgoingPayment_"}, {"name":"padding_"}, {"name":"pniChangeNumber_"}, {"name":"read_"}, {"name":"request_"}, {"name":"sent_"}, {"name":"stickerPackOperation_"}, {"name":"verified_"}, {"name":"viewOnceOpen_"}, {"name":"viewed_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Blocked",
-  "fields":[
-    {"name":"groupIds_"}, 
-    {"name":"numbers_"}, 
-    {"name":"uuids_"}
-  ]
+  "fields":[{"name":"groupIds_"}, {"name":"numbers_"}, {"name":"uuids_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$CallEvent",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"conversationId_"}, 
-    {"name":"direction_"}, 
-    {"name":"event_"}, 
-    {"name":"id_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"conversationId_"}, {"name":"direction_"}, {"name":"event_"}, {"name":"id_"}, {"name":"timestamp_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Configuration",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"linkPreviews_"}, 
-    {"name":"provisioningVersion_"}, 
-    {"name":"readReceipts_"}, 
-    {"name":"typingIndicators_"}, 
-    {"name":"unidentifiedDeliveryIndicators_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"linkPreviews_"}, {"name":"provisioningVersion_"}, {"name":"readReceipts_"}, {"name":"typingIndicators_"}, {"name":"unidentifiedDeliveryIndicators_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Contacts",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"blob_"}, 
-    {"name":"complete_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"blob_"}, {"name":"complete_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$FetchLatest",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Groups",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"blob_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"blob_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Keys",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"storageService_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"storageService_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$MessageRequestResponse",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"groupId_"}, 
-    {"name":"threadUuid_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"groupId_"}, {"name":"threadUuid_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"note_"}, 
-    {"name":"paymentDetailCase_"}, 
-    {"name":"paymentDetail_"}, 
-    {"name":"recipientUuid_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"note_"}, {"name":"paymentDetailCase_"}, {"name":"paymentDetail_"}, {"name":"recipientUuid_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment$MobileCoin",
-  "fields":[
-    {"name":"amountPicoMob_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"feePicoMob_"}, 
-    {"name":"ledgerBlockIndex_"}, 
-    {"name":"ledgerBlockTimestamp_"}, 
-    {"name":"outputPublicKeys_"}, 
-    {"name":"receipt_"}, 
-    {"name":"recipientAddress_"}, 
-    {"name":"spentKeyImages_"}
-  ]
+  "fields":[{"name":"amountPicoMob_"}, {"name":"bitField0_"}, {"name":"feePicoMob_"}, {"name":"ledgerBlockIndex_"}, {"name":"ledgerBlockTimestamp_"}, {"name":"outputPublicKeys_"}, {"name":"receipt_"}, {"name":"recipientAddress_"}, {"name":"spentKeyImages_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Read",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"senderUuid_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"senderUuid_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Request",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"destinationE164_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"editMessage_"}, 
-    {"name":"expirationStartTimestamp_"}, 
-    {"name":"isRecipientUpdate_"}, 
-    {"name":"message_"}, 
-    {"name":"storyMessageRecipients_"}, 
-    {"name":"storyMessage_"}, 
-    {"name":"timestamp_"}, 
-    {"name":"unidentifiedStatus_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationE164_"}, {"name":"destinationUuid_"}, {"name":"editMessage_"}, {"name":"expirationStartTimestamp_"}, {"name":"isRecipientUpdate_"}, {"name":"message_"}, {"name":"storyMessageRecipients_"}, {"name":"storyMessage_"}, {"name":"timestamp_"}, {"name":"unidentifiedStatus_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$StoryMessageRecipient",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"distributionListIds_"}, 
-    {"name":"isAllowedToReply_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationUuid_"}, {"name":"distributionListIds_"}, {"name":"isAllowedToReply_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$UnidentifiedDeliveryStatus",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"unidentified_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationUuid_"}, {"name":"unidentified_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$StickerPackOperation",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"packId_"}, 
-    {"name":"packKey_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"packId_"}, {"name":"packKey_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$ViewOnceOpen",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"senderUuid_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"senderUuid_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Viewed",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"senderUuid_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"senderUuid_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TextAttachment",
-  "fields":[
-    {"name":"backgroundCase_"}, 
-    {"name":"background_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"preview_"}, 
-    {"name":"textBackgroundColor_"}, 
-    {"name":"textForegroundColor_"}, 
-    {"name":"textStyle_"}, 
-    {"name":"text_"}
-  ]
+  "fields":[{"name":"backgroundCase_"}, {"name":"background_"}, {"name":"bitField0_"}, {"name":"preview_"}, {"name":"textBackgroundColor_"}, {"name":"textForegroundColor_"}, {"name":"textStyle_"}, {"name":"text_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TextAttachment$Gradient",
-  "fields":[
-    {"name":"angle_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"colors_"}, 
-    {"name":"endColor_"}, 
-    {"name":"positions_"}, 
-    {"name":"startColor_"}
-  ]
+  "fields":[{"name":"angle_"}, {"name":"bitField0_"}, {"name":"colors_"}, {"name":"endColor_"}, {"name":"positions_"}, {"name":"startColor_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TypingMessage",
-  "fields":[
-    {"name":"action_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"groupId_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"action_"}, {"name":"bitField0_"}, {"name":"groupId_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Verified",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"identityKey_"}, 
-    {"name":"nullMessage_"}, 
-    {"name":"state_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationUuid_"}, {"name":"identityKey_"}, {"name":"nullMessage_"}, {"name":"state_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.StaleDevices",
@@ -3710,27 +2573,14 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"getCaptcha","parameterTypes":[] }, 
-    {"name":"getMcc","parameterTypes":[] }, 
-    {"name":"getMnc","parameterTypes":[] }, 
-    {"name":"getPushChallenge","parameterTypes":[] }, 
-    {"name":"getPushToken","parameterTypes":[] }, 
-    {"name":"getPushTokenType","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getCaptcha","parameterTypes":[] }, {"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getPushChallenge","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.VerificationSessionMetadataRequestBody",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[
-    {"name":"getMcc","parameterTypes":[] }, 
-    {"name":"getMnc","parameterTypes":[] }, 
-    {"name":"getNumber","parameterTypes":[] }, 
-    {"name":"getPushToken","parameterTypes":[] }, 
-    {"name":"getPushTokenType","parameterTypes":[] }
-  ]
+  "methods":[{"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getNumber","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.VerifyAccountResponse",
@@ -3747,55 +2597,23 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.serialize.protos.AddressProto",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"e164_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"e164_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.serialize.protos.MetadataProto",
-  "fields":[
-    {"name":"address_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"destinationUuid_"}, 
-    {"name":"groupId_"}, 
-    {"name":"needsReceipt_"}, 
-    {"name":"senderDevice_"}, 
-    {"name":"serverDeliveredTimestamp_"}, 
-    {"name":"serverGuid_"}, 
-    {"name":"serverReceivedTimestamp_"}, 
-    {"name":"timestamp_"}
-  ]
+  "fields":[{"name":"address_"}, {"name":"bitField0_"}, {"name":"destinationUuid_"}, {"name":"groupId_"}, {"name":"needsReceipt_"}, {"name":"senderDevice_"}, {"name":"serverDeliveredTimestamp_"}, {"name":"serverGuid_"}, {"name":"serverReceivedTimestamp_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"dataCase_"}, 
-    {"name":"data_"}, 
-    {"name":"localAddress_"}, 
-    {"name":"metadata_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"dataCase_"}, {"name":"data_"}, {"name":"localAddress_"}, {"name":"metadata_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.sticker.StickerProtos$Pack",
-  "fields":[
-    {"name":"author_"}, 
-    {"name":"bitField0_"}, 
-    {"name":"cover_"}, 
-    {"name":"stickers_"}, 
-    {"name":"title_"}
-  ]
+  "fields":[{"name":"author_"}, {"name":"bitField0_"}, {"name":"cover_"}, {"name":"stickers_"}, {"name":"title_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.sticker.StickerProtos$Pack$Sticker",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"contentType_"}, 
-    {"name":"emoji_"}, 
-    {"name":"id_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"contentType_"}, {"name":"emoji_"}, {"name":"id_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
@@ -3803,17 +2621,11 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PinnedConversation",
-  "fields":[
-    {"name":"identifierCase_"}, 
-    {"name":"identifier_"}
-  ]
+  "fields":[{"name":"identifierCase_"}, {"name":"identifier_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PinnedConversation$Contact",
-  "fields":[
-    {"name":"e164_"}, 
-    {"name":"uuid_"}
-  ]
+  "fields":[{"name":"e164_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
@@ -3829,18 +2641,11 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ManifestRecord",
-  "fields":[
-    {"name":"identifiers_"}, 
-    {"name":"sourceDevice_"}, 
-    {"name":"version_"}
-  ]
+  "fields":[{"name":"identifiers_"}, {"name":"sourceDevice_"}, {"name":"version_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ManifestRecord$Identifier",
-  "fields":[
-    {"name":"raw_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"raw_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.Payments",
@@ -3852,10 +2657,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StorageItem",
-  "fields":[
-    {"name":"key_"}, 
-    {"name":"value_"}
-  ]
+  "fields":[{"name":"key_"}, {"name":"value_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StorageItems",
@@ -3863,17 +2665,11 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StorageManifest",
-  "fields":[
-    {"name":"value_"}, 
-    {"name":"version_"}
-  ]
+  "fields":[{"name":"value_"}, {"name":"version_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StorageRecord",
-  "fields":[
-    {"name":"recordCase_"}, 
-    {"name":"record_"}
-  ]
+  "fields":[{"name":"recordCase_"}, {"name":"record_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.StoryDistributionListRecord",
@@ -3901,75 +2697,20 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.websocket.WebSocketProtos$WebSocketMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"request_"}, 
-    {"name":"response_"}, 
-    {"name":"type_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"request_"}, {"name":"response_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.websocket.WebSocketProtos$WebSocketRequestMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"body_"}, 
-    {"name":"headers_"}, 
-    {"name":"id_"}, 
-    {"name":"path_"}, 
-    {"name":"verb_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"body_"}, {"name":"headers_"}, {"name":"id_"}, {"name":"path_"}, {"name":"verb_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.websocket.WebSocketProtos$WebSocketResponseMessage",
-  "fields":[
-    {"name":"bitField0_"}, 
-    {"name":"body_"}, 
-    {"name":"headers_"}, 
-    {"name":"id_"}, 
-    {"name":"message_"}, 
-    {"name":"status_"}
-  ]
+  "fields":[{"name":"bitField0_"}, {"name":"body_"}, {"name":"headers_"}, {"name":"id_"}, {"name":"message_"}, {"name":"status_"}]
 },
 {
   "name":"sun.misc.Unsafe",
   "allDeclaredFields":true,
-  "methods":[
-    {"name":"allocateMemory","parameterTypes":["long"] }, 
-    {"name":"arrayBaseOffset","parameterTypes":["java.lang.Class"] }, 
-    {"name":"arrayIndexScale","parameterTypes":["java.lang.Class"] }, 
-    {"name":"copyMemory","parameterTypes":["long","long","long"] }, 
-    {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, 
-    {"name":"freeMemory","parameterTypes":["long"] }, 
-    {"name":"getAddress","parameterTypes":["long"] }, 
-    {"name":"getBoolean","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getByte","parameterTypes":["long"] }, 
-    {"name":"getByte","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getDouble","parameterTypes":["long"] }, 
-    {"name":"getDouble","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getFloat","parameterTypes":["long"] }, 
-    {"name":"getFloat","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getInt","parameterTypes":["long"] }, 
-    {"name":"getInt","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getLong","parameterTypes":["long"] }, 
-    {"name":"getLong","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getObject","parameterTypes":["java.lang.Object","long"] }, 
-    {"name":"getShort","parameterTypes":["long"] }, 
-    {"name":"objectFieldOffset","parameterTypes":["java.lang.reflect.Field"] }, 
-    {"name":"putAddress","parameterTypes":["long","long"] }, 
-    {"name":"putBoolean","parameterTypes":["java.lang.Object","long","boolean"] }, 
-    {"name":"putByte","parameterTypes":["long","byte"] }, 
-    {"name":"putByte","parameterTypes":["java.lang.Object","long","byte"] }, 
-    {"name":"putDouble","parameterTypes":["long","double"] }, 
-    {"name":"putDouble","parameterTypes":["java.lang.Object","long","double"] }, 
-    {"name":"putFloat","parameterTypes":["long","float"] }, 
-    {"name":"putFloat","parameterTypes":["java.lang.Object","long","float"] }, 
-    {"name":"putInt","parameterTypes":["long","int"] }, 
-    {"name":"putInt","parameterTypes":["java.lang.Object","long","int"] }, 
-    {"name":"putLong","parameterTypes":["long","long"] }, 
-    {"name":"putLong","parameterTypes":["java.lang.Object","long","long"] }, 
-    {"name":"putObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, 
-    {"name":"putShort","parameterTypes":["long","short"] }
-  ]
+  "methods":[{"name":"allocateMemory","parameterTypes":["long"] }, {"name":"arrayBaseOffset","parameterTypes":["java.lang.Class"] }, {"name":"arrayIndexScale","parameterTypes":["java.lang.Class"] }, {"name":"copyMemory","parameterTypes":["long","long","long"] }, {"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, {"name":"freeMemory","parameterTypes":["long"] }, {"name":"getAddress","parameterTypes":["long"] }, {"name":"getBoolean","parameterTypes":["java.lang.Object","long"] }, {"name":"getByte","parameterTypes":["long"] }, {"name":"getByte","parameterTypes":["java.lang.Object","long"] }, {"name":"getDouble","parameterTypes":["long"] }, {"name":"getDouble","parameterTypes":["java.lang.Object","long"] }, {"name":"getFloat","parameterTypes":["long"] }, {"name":"getFloat","parameterTypes":["java.lang.Object","long"] }, {"name":"getInt","parameterTypes":["long"] }, {"name":"getInt","parameterTypes":["java.lang.Object","long"] }, {"name":"getLong","parameterTypes":["long"] }, {"name":"getLong","parameterTypes":["java.lang.Object","long"] }, {"name":"getObject","parameterTypes":["java.lang.Object","long"] }, {"name":"getShort","parameterTypes":["long"] }, {"name":"objectFieldOffset","parameterTypes":["java.lang.reflect.Field"] }, {"name":"putAddress","parameterTypes":["long","long"] }, {"name":"putBoolean","parameterTypes":["java.lang.Object","long","boolean"] }, {"name":"putByte","parameterTypes":["long","byte"] }, {"name":"putByte","parameterTypes":["java.lang.Object","long","byte"] }, {"name":"putDouble","parameterTypes":["long","double"] }, {"name":"putDouble","parameterTypes":["java.lang.Object","long","double"] }, {"name":"putFloat","parameterTypes":["long","float"] }, {"name":"putFloat","parameterTypes":["java.lang.Object","long","float"] }, {"name":"putInt","parameterTypes":["long","int"] }, {"name":"putInt","parameterTypes":["java.lang.Object","long","int"] }, {"name":"putLong","parameterTypes":["long","long"] }, {"name":"putLong","parameterTypes":["java.lang.Object","long","long"] }, {"name":"putObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, {"name":"putShort","parameterTypes":["long","short"] }]
 },
 {
   "name":"sun.security.provider.DSA$SHA224withDSA",
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 2ebe8973..17fbddb7 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -1,250 +1,168 @@
 {
   "resources":{
-  "includes":[
-    {
-      "pattern":"\\QMETA-INF/maven/org.xerial/sqlite-jdbc/pom.properties\\E"
-    }, 
-    {
-      "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
-    }, 
-    {
-      "pattern":"\\QMETA-INF/services/java.sql.Driver\\E"
-    }, 
-    {
-      "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
-    }, 
-    {
-      "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE\\E"
-    }, 
-    {
-      "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK\\E"
-    }, 
-    {
-      "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
-    }, 
-    {
-      "pattern":"\\Qlibsignal_jni.dylib\\E"
-    }, 
-    {
-      "pattern":"\\Qlibsignal_jni.so\\E"
-    }, 
-    {
-      "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
-    }, 
-    {
-      "pattern":"\\Qorg/asamk/signal/manager/config/whisper.store\\E"
-    }, 
-    {
-      "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-    }, 
-    {
-      "pattern":"\\Qorg/sqlite/native/Linux/x86_64/libsqlitejdbc.so\\E"
-    }, 
-    {
-      "pattern":"\\Qsignal_jni.dll\\E"
-    }, 
-    {
-      "pattern":"\\Qsqlite-jdbc.properties\\E"
-    }, 
-    {
-      "pattern":"com/google/i18n/phonenumbers/data/.*"
-    }
-  ]},
+  "includes":[{
+    "pattern":"\\QMETA-INF/maven/org.xerial/sqlite-jdbc/pom.properties\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.sql.Driver\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/org.slf4j.spi.SLF4JServiceProvider\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AG\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AI\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AT\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AZ\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BM\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BO\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CH\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CN\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CO\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CZ\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DK\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EC\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FI\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LV\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MO\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NG\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NL\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NZ\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PA\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RU\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SA\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SK\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TR\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UG\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VE\\E"
+  }, {
+    "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK\\E"
+  }, {
+    "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni.dylib\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni.so\\E"
+  }, {
+    "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
+  }, {
+    "pattern":"\\Qorg/asamk/signal/manager/config/whisper.store\\E"
+  }, {
+    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
+  }, {
+    "pattern":"\\Qorg/sqlite/native/Linux/x86_64/libsqlitejdbc.so\\E"
+  }, {
+    "pattern":"\\Qsignal_jni.dll\\E"
+  }, {
+    "pattern":"\\Qsqlite-jdbc.properties\\E"
+  }, {
+    "pattern":"com/google/i18n/phonenumbers/data/.*"
+  }, {
+    "pattern":"java.base:\\Qsun/text/resources/LineBreakIteratorData\\E"
+  }]},
   "bundles":[{
-      "name":"net.sourceforge.argparse4j.internal.ArgumentParserImpl",
-      "locales":[
-        "", 
-        "en", 
-        "und"
-      ]
-    }]
+    "name":"net.sourceforge.argparse4j.internal.ArgumentParserImpl",
+    "locales":["", "en", "und"]
+  }]
 }

From a3f7de89f103fd1abdc8684672f9b2e6af4e6326 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 17 Jun 2023 12:21:15 +0200
Subject: [PATCH 140/672] Update graalvm buildtools

---
 build.gradle.kts                        |  2 +-
 graalvm-config-dir/reflect-config.json  | 53 ++++++++++++++++++++++---
 graalvm-config-dir/resource-config.json |  6 +++
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9c436568..e2e0b51d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.22"
+    id("org.graalvm.buildtools.native") version "0.9.23"
 }
 
 version = "0.11.11"
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index f053cead..0952cd1b 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -81,10 +81,22 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true
 },
+{
+  "name":"com.google.protobuf.DescriptorMessageInfoFactory"
+},
+{
+  "name":"com.google.protobuf.ExtensionRegistry"
+},
+{
+  "name":"com.google.protobuf.ExtensionSchemaFull"
+},
 {
   "name":"com.google.protobuf.GeneratedMessageLite",
   "fields":[{"name":"unknownFields"}]
 },
+{
+  "name":"com.google.protobuf.GeneratedMessageV3"
+},
 {
   "name":"com.google.protobuf.Internal$LongList",
   "allDeclaredMethods":true
@@ -99,10 +111,19 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"com.google.protobuf.MapFieldSchemaFull"
+},
+{
+  "name":"com.google.protobuf.NewInstanceSchemaFull"
+},
 {
   "name":"com.google.protobuf.PrimitiveNonBoxingCollection",
   "allDeclaredMethods":true
 },
+{
+  "name":"com.google.protobuf.UnknownFieldSetSchema"
+},
 {
   "name":"com.sun.crypto.provider.AESCipher$General",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -155,7 +176,15 @@
   "name":"com.zaxxer.hikari.HikariConfig",
   "allDeclaredFields":true,
   "queryAllPublicMethods":true,
-  "methods":[{"name":"getCatalog","parameterTypes":[] }, {"name":"getConnectionInitSql","parameterTypes":[] }, {"name":"getConnectionTestQuery","parameterTypes":[] }, {"name":"getConnectionTimeout","parameterTypes":[] }, {"name":"getDataSource","parameterTypes":[] }, {"name":"getDataSourceClassName","parameterTypes":[] }, {"name":"getDataSourceJNDI","parameterTypes":[] }, {"name":"getDataSourceProperties","parameterTypes":[] }, {"name":"getDriverClassName","parameterTypes":[] }, {"name":"getExceptionOverrideClassName","parameterTypes":[] }, {"name":"getHealthCheckProperties","parameterTypes":[] }, {"name":"getHealthCheckRegistry","parameterTypes":[] }, {"name":"getIdleTimeout","parameterTypes":[] }, {"name":"getInitializationFailTimeout","parameterTypes":[] }, {"name":"getJdbcUrl","parameterTypes":[] }, {"name":"getKeepaliveTime","parameterTypes":[] }, {"name":"getLeakDetectionThreshold","parameterTypes":[] }, {"name":"getMaxLifetime","parameterTypes":[] }, {"name":"getMaximumPoolSize","parameterTypes":[] }, {"name":"getMetricRegistry","parameterTypes":[] }, {"name":"getMetricsTrackerFactory","parameterTypes":[] }, {"name":"getMinimumIdle","parameterTypes":[] }, {"name":"getPassword","parameterTypes":[] }, {"name":"getPoolName","parameterTypes":[] }, {"name":"getScheduledExecutor","parameterTypes":[] }, {"name":"getSchema","parameterTypes":[] }, {"name":"getThreadFactory","parameterTypes":[] }, {"name":"getTransactionIsolation","parameterTypes":[] }, {"name":"getUsername","parameterTypes":[] }, {"name":"getValidationTimeout","parameterTypes":[] }, {"name":"isAllowPoolSuspension","parameterTypes":[] }, {"name":"isAutoCommit","parameterTypes":[] }, {"name":"isIsolateInternalQueries","parameterTypes":[] }, {"name":"isReadOnly","parameterTypes":[] }, {"name":"isRegisterMbeans","parameterTypes":[] }, {"name":"setAllowPoolSuspension","parameterTypes":["boolean"] }, {"name":"setAutoCommit","parameterTypes":["boolean"] }, {"name":"setCatalog","parameterTypes":["java.lang.String"] }, {"name":"setConnectionInitSql","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTestQuery","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTimeout","parameterTypes":["long"] }, {"name":"setDataSource","parameterTypes":["javax.sql.DataSource"] }, {"name":"setDataSourceClassName","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceJNDI","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceProperties","parameterTypes":["java.util.Properties"] }, {"name":"setDriverClassName","parameterTypes":["java.lang.String"] }, {"name":"setExceptionOverrideClassName","parameterTypes":["java.lang.String"] }, {"name":"setHealthCheckProperties","parameterTypes":["java.util.Properties"] }, {"name":"setHealthCheckRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setIdleTimeout","parameterTypes":["long"] }, {"name":"setInitializationFailTimeout","parameterTypes":["long"] }, {"name":"setIsolateInternalQueries","parameterTypes":["boolean"] }, {"name":"setJdbcUrl","parameterTypes":["java.lang.String"] }, {"name":"setKeepaliveTime","parameterTypes":["long"] }, {"name":"setLeakDetectionThreshold","parameterTypes":["long"] }, {"name":"setMaxLifetime","parameterTypes":["long"] }, {"name":"setMaximumPoolSize","parameterTypes":["int"] }, {"name":"setMetricRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setMetricsTrackerFactory","parameterTypes":["com.zaxxer.hikari.metrics.MetricsTrackerFactory"] }, {"name":"setMinimumIdle","parameterTypes":["int"] }, {"name":"setPassword","parameterTypes":["java.lang.String"] }, {"name":"setPoolName","parameterTypes":["java.lang.String"] }, {"name":"setReadOnly","parameterTypes":["boolean"] }, {"name":"setRegisterMbeans","parameterTypes":["boolean"] }, {"name":"setScheduledExecutor","parameterTypes":["java.util.concurrent.ScheduledExecutorService"] }, {"name":"setSchema","parameterTypes":["java.lang.String"] }, {"name":"setThreadFactory","parameterTypes":["java.util.concurrent.ThreadFactory"] }, {"name":"setTransactionIsolation","parameterTypes":["java.lang.String"] }, {"name":"setUsername","parameterTypes":["java.lang.String"] }, {"name":"setValidationTimeout","parameterTypes":["long"] }]
+  "methods":[{"name":"getAllowPoolSuspension","parameterTypes":[] }, {"name":"getAutoCommit","parameterTypes":[] }, {"name":"getCatalog","parameterTypes":[] }, {"name":"getConnectionInitSql","parameterTypes":[] }, {"name":"getConnectionTestQuery","parameterTypes":[] }, {"name":"getConnectionTimeout","parameterTypes":[] }, {"name":"getDataSource","parameterTypes":[] }, {"name":"getDataSourceClassName","parameterTypes":[] }, {"name":"getDataSourceJNDI","parameterTypes":[] }, {"name":"getDataSourceProperties","parameterTypes":[] }, {"name":"getDriverClassName","parameterTypes":[] }, {"name":"getExceptionOverrideClassName","parameterTypes":[] }, {"name":"getHealthCheckProperties","parameterTypes":[] }, {"name":"getHealthCheckRegistry","parameterTypes":[] }, {"name":"getIdleTimeout","parameterTypes":[] }, {"name":"getInitializationFailTimeout","parameterTypes":[] }, {"name":"getIsolateInternalQueries","parameterTypes":[] }, {"name":"getJdbcUrl","parameterTypes":[] }, {"name":"getKeepaliveTime","parameterTypes":[] }, {"name":"getLeakDetectionThreshold","parameterTypes":[] }, {"name":"getMaxLifetime","parameterTypes":[] }, {"name":"getMaximumPoolSize","parameterTypes":[] }, {"name":"getMetricRegistry","parameterTypes":[] }, {"name":"getMetricsTrackerFactory","parameterTypes":[] }, {"name":"getMinimumIdle","parameterTypes":[] }, {"name":"getPassword","parameterTypes":[] }, {"name":"getPoolName","parameterTypes":[] }, {"name":"getReadOnly","parameterTypes":[] }, {"name":"getRegisterMbeans","parameterTypes":[] }, {"name":"getScheduledExecutor","parameterTypes":[] }, {"name":"getSchema","parameterTypes":[] }, {"name":"getThreadFactory","parameterTypes":[] }, {"name":"getTransactionIsolation","parameterTypes":[] }, {"name":"getUsername","parameterTypes":[] }, {"name":"getValidationTimeout","parameterTypes":[] }, {"name":"isAllowPoolSuspension","parameterTypes":[] }, {"name":"isAutoCommit","parameterTypes":[] }, {"name":"isIsolateInternalQueries","parameterTypes":[] }, {"name":"isReadOnly","parameterTypes":[] }, {"name":"isRegisterMbeans","parameterTypes":[] }, {"name":"setAllowPoolSuspension","parameterTypes":["boolean"] }, {"name":"setAutoCommit","parameterTypes":["boolean"] }, {"name":"setCatalog","parameterTypes":["java.lang.String"] }, {"name":"setClass","parameterTypes":["java.lang.Class"] }, {"name":"setConnectionInitSql","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTestQuery","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTimeout","parameterTypes":["long"] }, {"name":"setDataSource","parameterTypes":["javax.sql.DataSource"] }, {"name":"setDataSourceClassName","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceJNDI","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceProperties","parameterTypes":["java.util.Properties"] }, {"name":"setDriverClassName","parameterTypes":["java.lang.String"] }, {"name":"setExceptionOverrideClassName","parameterTypes":["java.lang.String"] }, {"name":"setHealthCheckProperties","parameterTypes":["java.util.Properties"] }, {"name":"setHealthCheckRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setIdleTimeout","parameterTypes":["long"] }, {"name":"setInitializationFailTimeout","parameterTypes":["long"] }, {"name":"setIsolateInternalQueries","parameterTypes":["boolean"] }, {"name":"setJdbcUrl","parameterTypes":["java.lang.String"] }, {"name":"setKeepaliveTime","parameterTypes":["long"] }, {"name":"setLeakDetectionThreshold","parameterTypes":["long"] }, {"name":"setMaxLifetime","parameterTypes":["long"] }, {"name":"setMaximumPoolSize","parameterTypes":["int"] }, {"name":"setMetricRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setMetricsTrackerFactory","parameterTypes":["com.zaxxer.hikari.metrics.MetricsTrackerFactory"] }, {"name":"setMinimumIdle","parameterTypes":["int"] }, {"name":"setPassword","parameterTypes":["java.lang.String"] }, {"name":"setPoolName","parameterTypes":["java.lang.String"] }, {"name":"setReadOnly","parameterTypes":["boolean"] }, {"name":"setRegisterMbeans","parameterTypes":["boolean"] }, {"name":"setScheduledExecutor","parameterTypes":["java.util.concurrent.ScheduledExecutorService"] }, {"name":"setSchema","parameterTypes":["java.lang.String"] }, {"name":"setThreadFactory","parameterTypes":["java.util.concurrent.ThreadFactory"] }, {"name":"setTransactionIsolation","parameterTypes":["java.lang.String"] }, {"name":"setUsername","parameterTypes":["java.lang.String"] }, {"name":"setValidationTimeout","parameterTypes":["long"] }]
+},
+{
+  "name":"com.zaxxer.hikari.pool.PoolBase",
+  "fields":[{"name":"catalog"}]
+},
+{
+  "name":"com.zaxxer.hikari.pool.PoolEntry",
+  "fields":[{"name":"state"}]
 },
 {
   "name":"int",
@@ -169,7 +198,7 @@
 },
 {
   "name":"java.io.File",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }, {"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.io.FilePermission"
@@ -240,6 +269,10 @@
   "name":"java.lang.String",
   "allPublicMethods":true
 },
+{
+  "name":"java.lang.Thread",
+  "fields":[{"name":"threadLocalRandomProbe"}]
+},
 {
   "name":"java.lang.Throwable",
   "queryAllPublicMethods":true,
@@ -376,6 +409,10 @@
   "name":"java.util.concurrent.atomic.AtomicReference",
   "fields":[{"name":"value"}]
 },
+{
+  "name":"java.util.concurrent.atomic.Striped64",
+  "fields":[{"name":"base"}, {"name":"cellsBusy"}]
+},
 {
   "name":"javax.security.auth.x500.X500Principal",
   "methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
@@ -383,6 +420,9 @@
 {
   "name":"javax.smartcardio.CardPermission"
 },
+{
+  "name":"libcore.io.Memory"
+},
 {
   "name":"long",
   "allDeclaredMethods":true,
@@ -1146,7 +1186,7 @@
 },
 {
   "name":"org.asamk.signal.util.SecurityProvider$DefaultRandom",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
 },
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.COMPOSITE$Mappings",
@@ -1576,6 +1616,9 @@
   "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
   "allPublicConstructors":true
 },
+{
+  "name":"org.robolectric.Robolectric"
+},
 {
   "name":"org.signal.cdsi.proto.ClientRequest",
   "fields":[{"name":"aciUakPairs_"}, {"name":"discardE164S_"}, {"name":"newE164S_"}, {"name":"prevE164S_"}, {"name":"returnAcisWithoutUaks_"}, {"name":"tokenAck_"}, {"name":"token_"}]
@@ -2726,11 +2769,11 @@
 },
 {
   "name":"sun.security.provider.NativePRNG",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
 },
 {
   "name":"sun.security.provider.NativePRNG$NonBlocking",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
 },
 {
   "name":"sun.security.provider.SHA",
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 17fbddb7..0d8cde58 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -158,6 +158,12 @@
     "pattern":"\\Qsqlite-jdbc.properties\\E"
   }, {
     "pattern":"com/google/i18n/phonenumbers/data/.*"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/nfc.nrm\\E"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/uprops.icu\\E"
+  }, {
+    "pattern":"java.base:\\Qsun/net/idn/uidna.spp\\E"
   }, {
     "pattern":"java.base:\\Qsun/text/resources/LineBreakIteratorData\\E"
   }]},

From ac815f759820a9e91cd1857159972ea8a106dbff Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 17 Jun 2023 12:59:55 +0200
Subject: [PATCH 141/672] Fix json deserialization for request params

Fixes #1261
---
 graalvm-config-dir/reflect-config.json            | 15 +++++++++++----
 .../asamk/signal/commands/FinishLinkCommand.java  |  5 ++++-
 .../org/asamk/signal/commands/ReceiveCommand.java |  2 +-
 .../asamk/signal/commands/RegisterCommand.java    |  2 +-
 .../org/asamk/signal/commands/VerifyCommand.java  |  2 +-
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 0952cd1b..6a754766 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -405,6 +405,10 @@
   "name":"java.util.concurrent.atomic.AtomicBoolean",
   "fields":[{"name":"value"}]
 },
+{
+  "name":"java.util.concurrent.atomic.AtomicMarkableReference",
+  "fields":[{"name":"pair"}]
+},
 {
   "name":"java.util.concurrent.atomic.AtomicReference",
   "fields":[{"name":"value"}]
@@ -951,19 +955,22 @@
   "name":"org.asamk.signal.jsonrpc.JsonRpcRequest",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getError","parameterTypes":[] }, {"name":"getId","parameterTypes":[] }, {"name":"getJsonrpc","parameterTypes":[] }, {"name":"getResult","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcResponse$Error",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getCode","parameterTypes":[] }, {"name":"getData","parameterTypes":[] }, {"name":"getMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.api.PhoneNumberSharingMode",
@@ -2797,7 +2804,7 @@
 },
 {
   "name":"sun.security.provider.SecureRandom",
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
 },
 {
   "name":"sun.security.provider.certpath.PKIXCertPathValidator",
diff --git a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
index d08520df..2d1422aa 100644
--- a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
@@ -34,6 +34,9 @@ public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.
     public void handleCommand(
             final FinishLinkParams request, final MultiAccountManager m, final JsonWriter jsonWriter
     ) throws CommandException {
+        if (request.deviceLinkUri() == null) {
+            throw new UserErrorException("Missing deviceLinkUri.");
+        }
         final URI deviceLinkUri;
         try {
             deviceLinkUri = new URI(request.deviceLinkUri());
@@ -71,7 +74,7 @@ public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.
         jsonWriter.write(new JsonFinishLink(number));
     }
 
-    record FinishLinkParams(String deviceLinkUri, String deviceName) {}
+    public record FinishLinkParams(String deviceLinkUri, String deviceName) {}
 
     private record JsonFinishLink(String number) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index ab65f837..16421b62 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -112,5 +112,5 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
         }
     }
 
-    record ReceiveParams(Double timeout, Integer maxMessages) {}
+    public record ReceiveParams(Double timeout, Integer maxMessages) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 3ff6dc09..5018b7e0 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -97,5 +97,5 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
         }
     }
 
-    record RegistrationParams(Boolean voice, String captcha) {}
+    public record RegistrationParams(Boolean voice, String captcha) {}
 }
diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
index 542c0716..4ac26955 100644
--- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
@@ -77,5 +77,5 @@ public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCo
         }
     }
 
-    record VerifyParams(String verificationCode, String pin) {}
+    public record VerifyParams(String verificationCode, String pin) {}
 }

From 4e5c859aab2f727b85b4f964114ada6f3a9e9312 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 17 Jun 2023 17:22:26 +0200
Subject: [PATCH 142/672] Update logback

---
 graalvm-config-dir/jni-config.json | 4 ++++
 settings.gradle.kts                | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index f5051e5b..387549dd 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -91,6 +91,10 @@
   "name":"org.signal.libsignal.protocol.UntrustedIdentityException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"org.signal.libsignal.protocol.fingerprint.FingerprintParsingException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.signal.libsignal.protocol.groups.state.SenderKeyRecord",
   "fields":[{"name":"unsafeHandle"}],
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f21554e4..a6a66ae3 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ dependencyResolutionManagement {
             version("slf4j", "2.0.7")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.4.7")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_73")

From 306e38c9ee3ba1d1c1038f16bdf07422ab2c34bb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 17 Jun 2023 21:18:24 +0200
Subject: [PATCH 143/672] Implement support for kyber pre keys

---
 graalvm-config-dir/jni-config.json            |   6 +-
 graalvm-config-dir/reflect-config.json        |  14 +-
 .../signal/manager/config/ServiceConfig.java  |   4 +-
 .../signal/manager/helper/PreKeyHelper.java   |  64 +++++-
 .../manager/storage/AccountDatabase.java      |  22 +-
 .../signal/manager/storage/SignalAccount.java | 172 ++++++++++++--
 .../storage/prekeys/KyberPreKeyStore.java     | 211 ++++++++++++++++++
 .../manager/storage/prekeys/PreKeyStore.java  |   2 +-
 .../storage/protocol/SignalProtocolStore.java |  24 +-
 .../storage/sessions/SessionStore.java        |   4 +-
 .../asamk/signal/manager/util/KeyUtils.java   |  26 ++-
 11 files changed, 504 insertions(+), 45 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 387549dd..33dbd070 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -46,7 +46,7 @@
 },
 {
   "name":"org.asamk.signal.manager.storage.protocol.SignalProtocolStore",
-  "methods":[{"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"getIdentityKeyPair","parameterTypes":[] }, {"name":"getLocalRegistrationId","parameterTypes":[] }, {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, {"name":"loadPreKey","parameterTypes":["int"] }, {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"loadSignedPreKey","parameterTypes":["int"] }, {"name":"removePreKey","parameterTypes":["int"] }, {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }]
+  "methods":[{"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"getIdentityKeyPair","parameterTypes":[] }, {"name":"getLocalRegistrationId","parameterTypes":[] }, {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, {"name":"loadKyberPreKey","parameterTypes":["int"] }, {"name":"loadPreKey","parameterTypes":["int"] }, {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, {"name":"loadSignedPreKey","parameterTypes":["int"] }, {"name":"markKyberPreKeyUsed","parameterTypes":["int"] }, {"name":"removePreKey","parameterTypes":["int"] }, {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.senderKeys.SenderKeyStore",
@@ -133,6 +133,10 @@
   "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$Direction",
   "fields":[{"name":"RECEIVING"}, {"name":"SENDING"}]
 },
+{
+  "name":"org.signal.libsignal.protocol.state.KyberPreKeyRecord",
+  "fields":[{"name":"unsafeHandle"}]
+},
 {
   "name":"org.signal.libsignal.protocol.state.KyberPreKeyStore"
 },
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 6a754766..0f08810c 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2179,16 +2179,25 @@
   "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getKeyId","parameterTypes":[] }, {"name":"getPublicKey","parameterTypes":[] }, {"name":"getSignature","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$ByteArrayDeserializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$ByteArraySerializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$KEMPublicKeyDeserializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$KEMPublicKeySerializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.MismatchedDevices",
   "allDeclaredFields":true,
@@ -2250,7 +2259,8 @@
   "name":"org.whispersystems.signalservice.internal.push.PreKeyState",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getIdentityKey","parameterTypes":[] }, {"name":"getPreKeys","parameterTypes":[] }, {"name":"getSignedPreKey","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyStatus",
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index b2b45a9c..f97e8f68 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager.config;
 
 import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.signal.libsignal.protocol.util.Medium;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.push.TrustStore;
 
@@ -15,8 +16,9 @@ import okhttp3.Interceptor;
 
 public class ServiceConfig {
 
-    public final static int PREKEY_MINIMUM_COUNT = 20;
+    public final static int PREKEY_MINIMUM_COUNT = 10;
     public final static int PREKEY_BATCH_SIZE = 100;
+    public final static int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;
     public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
     public final static long MAX_ENVELOPE_SIZE = 0;
     public final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 06dc31b9..282b017a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -5,6 +5,7 @@ import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.slf4j.Logger;
@@ -39,7 +40,9 @@ public class PreKeyHelper {
         if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
             refreshPreKeys(serviceIdType);
         }
-        // TODO kyber pre keys
+        if (preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+            refreshKyberPreKeys(serviceIdType);
+        }
     }
 
     public void refreshPreKeys() throws IOException {
@@ -47,7 +50,7 @@ public class PreKeyHelper {
         refreshPreKeys(ServiceIdType.PNI);
     }
 
-    public void refreshPreKeys(ServiceIdType serviceIdType) throws IOException {
+    private void refreshPreKeys(ServiceIdType serviceIdType) throws IOException {
         final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
         if (identityKeyPair == null) {
             return;
@@ -97,4 +100,61 @@ public class PreKeyHelper {
 
         return record;
     }
+
+    private void refreshKyberPreKeys(ServiceIdType serviceIdType) throws IOException {
+        final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
+        if (identityKeyPair == null) {
+            return;
+        }
+        final var accountId = account.getAccountId(serviceIdType);
+        if (accountId == null) {
+            return;
+        }
+        try {
+            refreshKyberPreKeys(serviceIdType, identityKeyPair);
+        } catch (Exception e) {
+            logger.warn("Failed to store new pre keys, resetting preKey id offset", e);
+            account.resetKyberPreKeyOffsets(serviceIdType);
+            refreshKyberPreKeys(serviceIdType, identityKeyPair);
+        }
+    }
+
+    private void refreshKyberPreKeys(
+            final ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
+    ) throws IOException {
+        final var oneTimePreKeys = generateKyberPreKeys(serviceIdType, identityKeyPair);
+        final var lastResortPreKeyRecord = generateLastResortKyberPreKey(serviceIdType, identityKeyPair);
+
+        final var preKeyUpload = new PreKeyUpload(serviceIdType,
+                identityKeyPair.getPublicKey(),
+                null,
+                null,
+                lastResortPreKeyRecord,
+                oneTimePreKeys);
+        dependencies.getAccountManager().setPreKeys(preKeyUpload);
+    }
+
+    private List<KyberPreKeyRecord> generateKyberPreKeys(
+            ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
+    ) {
+        final var offset = account.getKyberPreKeyIdOffset(serviceIdType);
+
+        var records = KeyUtils.generateKyberPreKeyRecords(offset,
+                ServiceConfig.PREKEY_BATCH_SIZE,
+                identityKeyPair.getPrivateKey());
+        account.addKyberPreKeys(serviceIdType, records);
+
+        return records;
+    }
+
+    private KyberPreKeyRecord generateLastResortKyberPreKey(
+            ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair
+    ) {
+        final var signedPreKeyId = account.getKyberPreKeyIdOffset(serviceIdType);
+
+        var record = KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
+        account.addLastResortKyberPreKey(serviceIdType, record);
+
+        return record;
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index a15b4aab..7f6babe6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -4,6 +4,7 @@ import com.zaxxer.hikari.HikariDataSource;
 
 import org.asamk.signal.manager.storage.groups.GroupStore;
 import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
+import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.PreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.SignedPreKeyStore;
 import org.asamk.signal.manager.storage.recipients.RecipientStore;
@@ -23,7 +24,7 @@ import java.sql.SQLException;
 public class AccountDatabase extends Database {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 13;
+    private static final long DATABASE_VERSION = 14;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -40,6 +41,7 @@ public class AccountDatabase extends Database {
         StickerStore.createSql(connection);
         PreKeyStore.createSql(connection);
         SignedPreKeyStore.createSql(connection);
+        KyberPreKeyStore.createSql(connection);
         GroupStore.createSql(connection);
         SessionStore.createSql(connection);
         IdentityKeyStore.createSql(connection);
@@ -328,5 +330,23 @@ public class AccountDatabase extends Database {
                 }
             }
         }
+        if (oldVersion < 14) {
+            logger.debug("Updating database: Creating kyber_pre_key table");
+            {
+                try (final var statement = connection.createStatement()) {
+                    statement.executeUpdate("""
+                                            CREATE TABLE kyber_pre_key (
+                                                    _id INTEGER PRIMARY KEY,
+                                                    account_id_type INTEGER NOT NULL,
+                                                    key_id INTEGER NOT NULL,
+                                                    serialized BLOB NOT NULL,
+                                                    is_last_resort INTEGER NOT NULL,
+                                                    UNIQUE(account_id_type, key_id)
+                                            ) STRICT;
+                                            """);
+                }
+            }
+
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 850b264f..76867b72 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -21,6 +21,7 @@ import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
 import org.asamk.signal.manager.storage.identities.LegacyIdentityKeyStore;
 import org.asamk.signal.manager.storage.identities.SignalIdentityKeyStore;
 import org.asamk.signal.manager.storage.messageCache.MessageCache;
+import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.LegacyPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.LegacySignedPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.PreKeyStore;
@@ -51,11 +52,11 @@ import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SessionRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.protocol.util.KeyHelper;
-import org.signal.libsignal.protocol.util.Medium;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
@@ -98,6 +99,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Supplier;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
 import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
 
 public class SignalAccount implements Closeable {
@@ -105,7 +107,7 @@ public class SignalAccount implements Closeable {
     private final static Logger logger = LoggerFactory.getLogger(SignalAccount.class);
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
-    private static final int CURRENT_STORAGE_VERSION = 6;
+    private static final int CURRENT_STORAGE_VERSION = 7;
 
     private final Object LOCK = new Object();
 
@@ -138,6 +140,10 @@ public class SignalAccount implements Closeable {
     private int aciNextSignedPreKeyId = 1;
     private int pniPreKeyIdOffset = 1;
     private int pniNextSignedPreKeyId = 1;
+    private int aciKyberPreKeyIdOffset = 1;
+    private int aciActiveLastResortKyberPreKeyId = -1;
+    private int pniKyberPreKeyIdOffset = 1;
+    private int pniActiveLastResortKyberPreKeyId = -1;
     private IdentityKeyPair aciIdentityKeyPair;
     private IdentityKeyPair pniIdentityKeyPair;
     private int localRegistrationId;
@@ -151,8 +157,10 @@ public class SignalAccount implements Closeable {
     private SignalProtocolStore pniSignalProtocolStore;
     private PreKeyStore aciPreKeyStore;
     private SignedPreKeyStore aciSignedPreKeyStore;
+    private KyberPreKeyStore aciKyberPreKeyStore;
     private PreKeyStore pniPreKeyStore;
     private SignedPreKeyStore pniSignedPreKeyStore;
+    private KyberPreKeyStore pniKyberPreKeyStore;
     private SessionStore aciSessionStore;
     private SessionStore pniSessionStore;
     private IdentityKeyStore identityKeyStore;
@@ -302,10 +310,14 @@ public class SignalAccount implements Closeable {
     private void clearAllPreKeys() {
         resetPreKeyOffsets(ServiceIdType.ACI);
         resetPreKeyOffsets(ServiceIdType.PNI);
+        resetKyberPreKeyOffsets(ServiceIdType.ACI);
+        resetKyberPreKeyOffsets(ServiceIdType.PNI);
         this.getAciPreKeyStore().removeAllPreKeys();
         this.getAciSignedPreKeyStore().removeAllSignedPreKeys();
+        this.getAciKyberPreKeyStore().removeAllKyberPreKeys();
         this.getPniPreKeyStore().removeAllPreKeys();
         this.getPniSignedPreKeyStore().removeAllSignedPreKeys();
+        this.getPniKyberPreKeyStore().removeAllKyberPreKeys();
         save();
     }
 
@@ -614,22 +626,42 @@ public class SignalAccount implements Closeable {
         if (rootNode.hasNonNull("preKeyIdOffset")) {
             aciPreKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
         } else {
-            aciPreKeyIdOffset = 1;
+            aciPreKeyIdOffset = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("nextSignedPreKeyId")) {
             aciNextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(1);
         } else {
-            aciNextSignedPreKeyId = 1;
+            aciNextSignedPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("pniPreKeyIdOffset")) {
             pniPreKeyIdOffset = rootNode.get("pniPreKeyIdOffset").asInt(1);
         } else {
-            pniPreKeyIdOffset = 1;
+            pniPreKeyIdOffset = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("pniNextSignedPreKeyId")) {
             pniNextSignedPreKeyId = rootNode.get("pniNextSignedPreKeyId").asInt(1);
         } else {
-            pniNextSignedPreKeyId = 1;
+            pniNextSignedPreKeyId = getRandomPreKeyIdOffset();
+        }
+        if (rootNode.hasNonNull("kyberPreKeyIdOffset")) {
+            aciKyberPreKeyIdOffset = rootNode.get("kyberPreKeyIdOffset").asInt(1);
+        } else {
+            aciKyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+        }
+        if (rootNode.hasNonNull("activeLastResortKyberPreKeyId")) {
+            aciActiveLastResortKyberPreKeyId = rootNode.get("activeLastResortKyberPreKeyId").asInt(-1);
+        } else {
+            aciActiveLastResortKyberPreKeyId = -1;
+        }
+        if (rootNode.hasNonNull("pniKyberPreKeyIdOffset")) {
+            pniKyberPreKeyIdOffset = rootNode.get("pniKyberPreKeyIdOffset").asInt(1);
+        } else {
+            pniKyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+        }
+        if (rootNode.hasNonNull("pniActiveLastResortKyberPreKeyId")) {
+            pniActiveLastResortKyberPreKeyId = rootNode.get("pniActiveLastResortKyberPreKeyId").asInt(-1);
+        } else {
+            pniActiveLastResortKyberPreKeyId = -1;
         }
         if (rootNode.hasNonNull("profileKey")) {
             try {
@@ -974,6 +1006,10 @@ public class SignalAccount implements Closeable {
                     .put("nextSignedPreKeyId", aciNextSignedPreKeyId)
                     .put("pniPreKeyIdOffset", pniPreKeyIdOffset)
                     .put("pniNextSignedPreKeyId", pniNextSignedPreKeyId)
+                    .put("kyberPreKeyIdOffset", aciKyberPreKeyIdOffset)
+                    .put("activeLastResortKyberPreKeyId", aciActiveLastResortKyberPreKeyId)
+                    .put("pniKyberPreKeyIdOffset", pniKyberPreKeyIdOffset)
+                    .put("pniActiveLastResortKyberPreKeyId", pniActiveLastResortKyberPreKeyId)
                     .put("profileKey",
                             profileKey == null ? null : Base64.getEncoder().encodeToString(profileKey.serialize()))
                     .put("registered", registered)
@@ -1019,15 +1055,19 @@ public class SignalAccount implements Closeable {
 
     public void resetPreKeyOffsets(final ServiceIdType serviceIdType) {
         if (serviceIdType.equals(ServiceIdType.ACI)) {
-            this.aciPreKeyIdOffset = new SecureRandom().nextInt(Medium.MAX_VALUE);
-            this.aciNextSignedPreKeyId = new SecureRandom().nextInt(Medium.MAX_VALUE);
+            this.aciPreKeyIdOffset = getRandomPreKeyIdOffset();
+            this.aciNextSignedPreKeyId = getRandomPreKeyIdOffset();
         } else {
-            this.pniPreKeyIdOffset = new SecureRandom().nextInt(Medium.MAX_VALUE);
-            this.pniNextSignedPreKeyId = new SecureRandom().nextInt(Medium.MAX_VALUE);
+            this.pniPreKeyIdOffset = getRandomPreKeyIdOffset();
+            this.pniNextSignedPreKeyId = getRandomPreKeyIdOffset();
         }
         save();
     }
 
+    private static int getRandomPreKeyIdOffset() {
+        return new SecureRandom().nextInt(PREKEY_MAXIMUM_ID);
+    }
+
     public void addPreKeys(ServiceIdType serviceIdType, List<PreKeyRecord> records) {
         if (serviceIdType.equals(ServiceIdType.ACI)) {
             addAciPreKeys(records);
@@ -1036,26 +1076,26 @@ public class SignalAccount implements Closeable {
         }
     }
 
-    public void addAciPreKeys(List<PreKeyRecord> records) {
+    private void addAciPreKeys(List<PreKeyRecord> records) {
         for (var record : records) {
             if (aciPreKeyIdOffset != record.getId()) {
                 logger.error("Invalid pre key id {}, expected {}", record.getId(), aciPreKeyIdOffset);
                 throw new AssertionError("Invalid pre key id");
             }
             getAciPreKeyStore().storePreKey(record.getId(), record);
-            aciPreKeyIdOffset = (aciPreKeyIdOffset + 1) % Medium.MAX_VALUE;
+            aciPreKeyIdOffset = (aciPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
         }
         save();
     }
 
-    public void addPniPreKeys(List<PreKeyRecord> records) {
+    private void addPniPreKeys(List<PreKeyRecord> records) {
         for (var record : records) {
             if (pniPreKeyIdOffset != record.getId()) {
                 logger.error("Invalid pre key id {}, expected {}", record.getId(), pniPreKeyIdOffset);
                 throw new AssertionError("Invalid pre key id");
             }
             getPniPreKeyStore().storePreKey(record.getId(), record);
-            pniPreKeyIdOffset = (pniPreKeyIdOffset + 1) % Medium.MAX_VALUE;
+            pniPreKeyIdOffset = (pniPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
         }
         save();
     }
@@ -1074,7 +1114,7 @@ public class SignalAccount implements Closeable {
             throw new AssertionError("Invalid signed pre key id");
         }
         getAciSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
-        aciNextSignedPreKeyId = (aciNextSignedPreKeyId + 1) % Medium.MAX_VALUE;
+        aciNextSignedPreKeyId = (aciNextSignedPreKeyId + 1) % PREKEY_MAXIMUM_ID;
         save();
     }
 
@@ -1084,7 +1124,84 @@ public class SignalAccount implements Closeable {
             throw new AssertionError("Invalid signed pre key id");
         }
         getPniSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
-        pniNextSignedPreKeyId = (pniNextSignedPreKeyId + 1) % Medium.MAX_VALUE;
+        pniNextSignedPreKeyId = (pniNextSignedPreKeyId + 1) % PREKEY_MAXIMUM_ID;
+        save();
+    }
+
+    public void resetKyberPreKeyOffsets(final ServiceIdType serviceIdType) {
+        if (serviceIdType.equals(ServiceIdType.ACI)) {
+            this.aciKyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+            this.aciActiveLastResortKyberPreKeyId = -1;
+        } else {
+            this.pniKyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+            this.pniActiveLastResortKyberPreKeyId = -1;
+        }
+        save();
+    }
+
+    public void addKyberPreKeys(ServiceIdType serviceIdType, List<KyberPreKeyRecord> records) {
+        if (serviceIdType.equals(ServiceIdType.ACI)) {
+            addAciKyberPreKeys(records);
+        } else {
+            addPniKyberPreKeys(records);
+        }
+    }
+
+    private void addAciKyberPreKeys(List<KyberPreKeyRecord> records) {
+        for (var record : records) {
+            if (aciKyberPreKeyIdOffset != record.getId()) {
+                logger.error("Invalid kyber pre key id {}, expected {}", record.getId(), aciKyberPreKeyIdOffset);
+                throw new AssertionError("Invalid kyber pre key id");
+            }
+            getAciKyberPreKeyStore().storeKyberPreKey(record.getId(), record);
+            aciKyberPreKeyIdOffset = (aciKyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+        }
+        save();
+    }
+
+    private void addPniKyberPreKeys(List<KyberPreKeyRecord> records) {
+        for (var record : records) {
+            if (pniKyberPreKeyIdOffset != record.getId()) {
+                logger.error("Invalid kyber pre key id {}, expected {}", record.getId(), pniKyberPreKeyIdOffset);
+                throw new AssertionError("Invalid kyber pre key id");
+            }
+            getPniKyberPreKeyStore().storeKyberPreKey(record.getId(), record);
+            pniKyberPreKeyIdOffset = (pniKyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+        }
+        save();
+    }
+
+    public void addLastResortKyberPreKey(ServiceIdType serviceIdType, KyberPreKeyRecord record) {
+        if (serviceIdType.equals(ServiceIdType.ACI)) {
+            addAciLastResortKyberPreKey(record);
+        } else {
+            addPniLastResortKyberPreKey(record);
+        }
+    }
+
+    public void addAciLastResortKyberPreKey(KyberPreKeyRecord record) {
+        if (aciKyberPreKeyIdOffset != record.getId()) {
+            logger.error("Invalid last resort kyber pre key id {}, expected {}",
+                    record.getId(),
+                    aciKyberPreKeyIdOffset);
+            throw new AssertionError("Invalid last resort kyber pre key id");
+        }
+        getAciKyberPreKeyStore().storeLastResortKyberPreKey(record.getId(), record);
+        aciActiveLastResortKyberPreKeyId = record.getId();
+        aciKyberPreKeyIdOffset = (aciKyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+        save();
+    }
+
+    public void addPniLastResortKyberPreKey(KyberPreKeyRecord record) {
+        if (pniKyberPreKeyIdOffset != record.getId()) {
+            logger.error("Invalid last resort kyber pre key id {}, expected {}",
+                    record.getId(),
+                    pniKyberPreKeyIdOffset);
+            throw new AssertionError("Invalid last resort kyber pre key id");
+        }
+        getPniKyberPreKeyStore().storeLastResortKyberPreKey(record.getId(), record);
+        pniActiveLastResortKyberPreKeyId = record.getId();
+        pniKyberPreKeyIdOffset = (pniKyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
         save();
     }
 
@@ -1126,6 +1243,7 @@ public class SignalAccount implements Closeable {
         return getOrCreate(() -> aciSignalProtocolStore,
                 () -> aciSignalProtocolStore = new SignalProtocolStore(getAciPreKeyStore(),
                         getAciSignedPreKeyStore(),
+                        getAciKyberPreKeyStore(),
                         getAciSessionStore(),
                         getAciIdentityKeyStore(),
                         getSenderKeyStore(),
@@ -1136,6 +1254,7 @@ public class SignalAccount implements Closeable {
         return getOrCreate(() -> pniSignalProtocolStore,
                 () -> pniSignalProtocolStore = new SignalProtocolStore(getPniPreKeyStore(),
                         getPniSignedPreKeyStore(),
+                        getPniKyberPreKeyStore(),
                         getPniSessionStore(),
                         getPniIdentityKeyStore(),
                         getSenderKeyStore(),
@@ -1152,6 +1271,11 @@ public class SignalAccount implements Closeable {
                 () -> aciSignedPreKeyStore = new SignedPreKeyStore(getAccountDatabase(), ServiceIdType.ACI));
     }
 
+    private KyberPreKeyStore getAciKyberPreKeyStore() {
+        return getOrCreate(() -> aciKyberPreKeyStore,
+                () -> aciKyberPreKeyStore = new KyberPreKeyStore(getAccountDatabase(), ServiceIdType.ACI));
+    }
+
     private PreKeyStore getPniPreKeyStore() {
         return getOrCreate(() -> pniPreKeyStore,
                 () -> pniPreKeyStore = new PreKeyStore(getAccountDatabase(), ServiceIdType.PNI));
@@ -1162,6 +1286,11 @@ public class SignalAccount implements Closeable {
                 () -> pniSignedPreKeyStore = new SignedPreKeyStore(getAccountDatabase(), ServiceIdType.PNI));
     }
 
+    private KyberPreKeyStore getPniKyberPreKeyStore() {
+        return getOrCreate(() -> pniKyberPreKeyStore,
+                () -> pniKyberPreKeyStore = new KyberPreKeyStore(getAccountDatabase(), ServiceIdType.PNI));
+    }
+
     public SessionStore getAciSessionStore() {
         return getOrCreate(() -> aciSessionStore,
                 () -> aciSessionStore = new SessionStore(getAccountDatabase(), ServiceIdType.ACI));
@@ -1362,6 +1491,9 @@ public class SignalAccount implements Closeable {
             identityKeyStore.deleteIdentity(this.pni);
             getPniPreKeyStore().removeAllPreKeys();
             getPniSignedPreKeyStore().removeAllSignedPreKeys();
+            getPniKyberPreKeyStore().removeAllKyberPreKeys();
+            aciActiveLastResortKyberPreKeyId = -1;
+            pniActiveLastResortKyberPreKeyId = -1;
         }
 
         this.pni = updatedPni;
@@ -1406,10 +1538,6 @@ public class SignalAccount implements Closeable {
         save();
     }
 
-    public byte[] getEncryptedDeviceName() {
-        return encryptedDeviceName == null ? null : Base64.getDecoder().decode(encryptedDeviceName);
-    }
-
     public void setEncryptedDeviceName(final String encryptedDeviceName) {
         this.encryptedDeviceName = encryptedDeviceName;
         save();
@@ -1590,6 +1718,10 @@ public class SignalAccount implements Closeable {
         return serviceIdType.equals(ServiceIdType.ACI) ? aciNextSignedPreKeyId : pniNextSignedPreKeyId;
     }
 
+    public int getKyberPreKeyIdOffset(ServiceIdType serviceIdType) {
+        return serviceIdType.equals(ServiceIdType.ACI) ? aciKyberPreKeyIdOffset : pniKyberPreKeyIdOffset;
+    }
+
     public boolean isRegistered() {
         return registered;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
new file mode 100644
index 00000000..54fbba43
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
@@ -0,0 +1,211 @@
+package org.asamk.signal.manager.storage.prekeys;
+
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+import org.signal.libsignal.protocol.InvalidKeyIdException;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.SignalServiceKyberPreKeyStore;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
+
+public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
+
+    private static final String TABLE_KYBER_PRE_KEY = "kyber_pre_key";
+    private final static Logger logger = LoggerFactory.getLogger(KyberPreKeyStore.class);
+
+    private final Database database;
+    private final int accountIdType;
+
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE kyber_pre_key (
+                                      _id INTEGER PRIMARY KEY,
+                                      account_id_type INTEGER NOT NULL,
+                                      key_id INTEGER NOT NULL,
+                                      serialized BLOB NOT NULL,
+                                      is_last_resort INTEGER NOT NULL,
+                                      UNIQUE(account_id_type, key_id)
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public KyberPreKeyStore(final Database database, final ServiceIdType serviceIdType) {
+        this.database = database;
+        this.accountIdType = Utils.getAccountIdType(serviceIdType);
+    }
+
+    @Override
+    public KyberPreKeyRecord loadKyberPreKey(final int keyId) throws InvalidKeyIdException {
+        final var kyberPreKey = getPreKey(keyId);
+        if (kyberPreKey == null) {
+            throw new InvalidKeyIdException("No such kyber pre key record: " + keyId);
+        }
+        return kyberPreKey;
+    }
+
+    @Override
+    public List<KyberPreKeyRecord> loadKyberPreKeys() {
+        final var sql = (
+                """
+                SELECT p.serialized
+                FROM %s p
+                WHERE p.account_id_type = ?
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                return Utils.executeQueryForStream(statement, this::getKyberPreKeyRecordFromResultSet).toList();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public List<KyberPreKeyRecord> loadLastResortKyberPreKeys() {
+        final var sql = (
+                """
+                SELECT p.serialized
+                FROM %s p
+                WHERE p.account_id_type = ? AND p.is_last_resort = TRUE
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                return Utils.executeQueryForStream(statement, this::getKyberPreKeyRecordFromResultSet).toList();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public void storeLastResortKyberPreKey(final int keyId, final KyberPreKeyRecord record) {
+        storeKyberPreKey(keyId, record, true);
+    }
+
+    @Override
+    public void storeKyberPreKey(final int keyId, final KyberPreKeyRecord record) {
+        storeKyberPreKey(keyId, record, false);
+    }
+
+    public void storeKyberPreKey(final int keyId, final KyberPreKeyRecord record, final boolean isLastResort) {
+        final var sql = (
+                """
+                INSERT INTO %s (account_id_type, key_id, serialized, is_last_resort)
+                VALUES (?, ?, ?, ?)
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, keyId);
+                statement.setBytes(3, record.serialize());
+                statement.setBoolean(4, isLastResort);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public boolean containsKyberPreKey(final int keyId) {
+        return getPreKey(keyId) != null;
+    }
+
+    @Override
+    public void markKyberPreKeyUsed(final int keyId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ? AND p.key_id = ? AND p.is_last_resort = FALSE
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, keyId);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    @Override
+    public void removeKyberPreKey(final int keyId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ? AND p.key_id = ?
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, keyId);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    public void removeAllKyberPreKeys() {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ?
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
+    private KyberPreKeyRecord getPreKey(int keyId) {
+        final var sql = (
+                """
+                SELECT p.serialized
+                FROM %s p
+                WHERE p.account_id_type = ? AND p.key_id = ?
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, keyId);
+                return Utils.executeQueryForOptional(statement, this::getKyberPreKeyRecordFromResultSet).orElse(null);
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from kyber_pre_key store", e);
+        }
+    }
+
+    private KyberPreKeyRecord getKyberPreKeyRecordFromResultSet(ResultSet resultSet) throws SQLException {
+        try {
+            final var serialized = resultSet.getBytes("serialized");
+            return new KyberPreKeyRecord(serialized);
+        } catch (InvalidMessageException e) {
+            return null;
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
index cc51a20a..f6dc271e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
@@ -49,7 +49,7 @@ public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeySt
     public PreKeyRecord loadPreKey(int preKeyId) throws InvalidKeyIdException {
         final var preKey = getPreKey(preKeyId);
         if (preKey == null) {
-            throw new InvalidKeyIdException("No such signed pre key record: " + preKeyId);
+            throw new InvalidKeyIdException("No such pre key record: " + preKeyId);
         }
         return preKey;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index b4e27afc..e565e915 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -14,6 +14,7 @@ import org.signal.libsignal.protocol.state.SessionRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
+import org.whispersystems.signalservice.api.SignalServiceKyberPreKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceSenderKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceSessionStore;
 import org.whispersystems.signalservice.api.push.DistributionId;
@@ -28,6 +29,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
 
     private final PreKeyStore preKeyStore;
     private final SignedPreKeyStore signedPreKeyStore;
+    private final SignalServiceKyberPreKeyStore kyberPreKeyStore;
     private final SignalServiceSessionStore sessionStore;
     private final IdentityKeyStore identityKeyStore;
     private final SignalServiceSenderKeyStore senderKeyStore;
@@ -36,6 +38,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     public SignalProtocolStore(
             final PreKeyStore preKeyStore,
             final SignedPreKeyStore signedPreKeyStore,
+            final SignalServiceKyberPreKeyStore kyberPreKeyStore,
             final SignalServiceSessionStore sessionStore,
             final IdentityKeyStore identityKeyStore,
             final SignalServiceSenderKeyStore senderKeyStore,
@@ -43,6 +46,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     ) {
         this.preKeyStore = preKeyStore;
         this.signedPreKeyStore = signedPreKeyStore;
+        this.kyberPreKeyStore = kyberPreKeyStore;
         this.sessionStore = sessionStore;
         this.identityKeyStore = identityKeyStore;
         this.senderKeyStore = senderKeyStore;
@@ -201,45 +205,41 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
 
     @Override
     public KyberPreKeyRecord loadKyberPreKey(final int kyberPreKeyId) throws InvalidKeyIdException {
-        // TODO
-        throw new InvalidKeyIdException("Missing kyber prekey with ID: $kyberPreKeyId");
+        return kyberPreKeyStore.loadKyberPreKey(kyberPreKeyId);
     }
 
     @Override
     public List<KyberPreKeyRecord> loadKyberPreKeys() {
-        // TODO
-        return List.of();
+        return kyberPreKeyStore.loadKyberPreKeys();
     }
 
     @Override
     public void storeKyberPreKey(final int kyberPreKeyId, final KyberPreKeyRecord record) {
-        // TODO
+        kyberPreKeyStore.storeKyberPreKey(kyberPreKeyId, record);
     }
 
     @Override
     public boolean containsKyberPreKey(final int kyberPreKeyId) {
-        // TODO
-        return false;
+        return kyberPreKeyStore.containsKyberPreKey(kyberPreKeyId);
     }
 
     @Override
     public void markKyberPreKeyUsed(final int kyberPreKeyId) {
-        // TODO
+        kyberPreKeyStore.markKyberPreKeyUsed(kyberPreKeyId);
     }
 
     @Override
     public List<KyberPreKeyRecord> loadLastResortKyberPreKeys() {
-        // TODO
-        return List.of();
+        return kyberPreKeyStore.loadLastResortKyberPreKeys();
     }
 
     @Override
     public void removeKyberPreKey(final int i) {
-        // TODO
+        kyberPreKeyStore.removeKyberPreKey(i);
     }
 
     @Override
     public void storeLastResortKyberPreKey(final int i, final KyberPreKeyRecord kyberPreKeyRecord) {
-        // TODO
+        kyberPreKeyStore.storeLastResortKyberPreKey(i, kyberPreKeyRecord);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index 0f267583..3608e0c1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -406,9 +406,7 @@ public class SessionStore implements SignalServiceSessionStore {
     }
 
     private static boolean isActive(SessionRecord record) {
-        return record != null
-                && record.hasSenderChain()
-                && record.getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
+        return record != null && record.hasSenderChain();
     }
 
     record Key(ServiceId serviceId, int deviceId) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index d87868ee..3ee5657e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -5,9 +5,11 @@ import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPrivateKey;
+import org.signal.libsignal.protocol.kem.KEMKeyPair;
+import org.signal.libsignal.protocol.kem.KEMKeyType;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
-import org.signal.libsignal.protocol.util.Medium;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
@@ -17,6 +19,8 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
+
 public class KeyUtils {
 
     private static final SecureRandom secureRandom = new SecureRandom();
@@ -46,7 +50,7 @@ public class KeyUtils {
     public static List<PreKeyRecord> generatePreKeyRecords(final int offset, final int batchSize) {
         var records = new ArrayList<PreKeyRecord>(batchSize);
         for (var i = 0; i < batchSize; i++) {
-            var preKeyId = (offset + i) % Medium.MAX_VALUE;
+            var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID;
             var keyPair = Curve.generateKeyPair();
             var record = new PreKeyRecord(preKeyId, keyPair);
 
@@ -68,6 +72,24 @@ public class KeyUtils {
         return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature);
     }
 
+    public static List<KyberPreKeyRecord> generateKyberPreKeyRecords(
+            final int offset, final int batchSize, final ECPrivateKey privateKey
+    ) {
+        var records = new ArrayList<KyberPreKeyRecord>(batchSize);
+        for (var i = 0; i < batchSize; i++) {
+            var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID;
+            records.add(generateKyberPreKeyRecord(preKeyId, privateKey));
+        }
+        return records;
+    }
+
+    public static KyberPreKeyRecord generateKyberPreKeyRecord(final int preKeyId, final ECPrivateKey privateKey) {
+        KEMKeyPair keyPair = KEMKeyPair.generate(KEMKeyType.KYBER_1024);
+        byte[] signature = privateKey.calculateSignature(keyPair.getPublicKey().serialize());
+
+        return new KyberPreKeyRecord(preKeyId, System.currentTimeMillis(), keyPair, signature);
+    }
+
     public static ProfileKey createProfileKey() {
         try {
             return new ProfileKey(getSecretBytes(32));

From 0ebfd989d12f3479ec220eb98ccfc72bbb47a5c3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Jun 2023 14:44:57 +0200
Subject: [PATCH 144/672] Refactor ACI/PNI store handling

---
 .../manager/actions/RenewSessionAction.java   |   6 +-
 .../SendRetryMessageRequestAction.java        |   7 +-
 .../helper/IncomingMessageHandler.java        |  42 +-
 .../signal/manager/internal/ManagerImpl.java  |   7 +-
 .../signal/manager/storage/SignalAccount.java | 575 ++++++++----------
 .../asamk/signal/manager/util/KeyUtils.java   |   4 +
 6 files changed, 302 insertions(+), 339 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
index 2718bc26..40117246 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
@@ -8,15 +8,17 @@ public class RenewSessionAction implements HandleAction {
 
     private final RecipientId recipientId;
     private final ServiceId serviceId;
+    private final ServiceId accountId;
 
-    public RenewSessionAction(final RecipientId recipientId, final ServiceId serviceId) {
+    public RenewSessionAction(final RecipientId recipientId, final ServiceId serviceId, final ServiceId accountId) {
         this.recipientId = recipientId;
         this.serviceId = serviceId;
+        this.accountId = accountId;
     }
 
     @Override
     public void execute(Context context) throws Throwable {
-        context.getAccount().getAciSessionStore().archiveSessions(serviceId);
+        context.getAccount().getAccountData(accountId).getSessionStore().archiveSessions(serviceId);
         if (!recipientId.equals(context.getAccount().getSelfRecipientId())) {
             context.getSendHelper().sendNullMessage(recipientId);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
index 2300eae9..add09e72 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
@@ -18,22 +18,25 @@ public class SendRetryMessageRequestAction implements HandleAction {
     private final ServiceId serviceId;
     private final ProtocolException protocolException;
     private final SignalServiceEnvelope envelope;
+    private final ServiceId accountId;
 
     public SendRetryMessageRequestAction(
             final RecipientId recipientId,
             final ServiceId serviceId,
             final ProtocolException protocolException,
-            final SignalServiceEnvelope envelope
+            final SignalServiceEnvelope envelope,
+            final ServiceId accountId
     ) {
         this.recipientId = recipientId;
         this.serviceId = serviceId;
         this.protocolException = protocolException;
         this.envelope = envelope;
+        this.accountId = accountId;
     }
 
     @Override
     public void execute(Context context) throws Throwable {
-        context.getAccount().getAciSessionStore().archiveSessions(serviceId);
+        context.getAccount().getAccountData(accountId).getSessionStore().archiveSessions(serviceId);
 
         int senderDevice = protocolException.getSenderDevice();
         Optional<GroupId> groupId = protocolException.getGroupId().isPresent() ? Optional.of(GroupId.unknownVersion(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 3b616644..7cc3d09d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -181,12 +181,13 @@ public final class IncomingMessageHandler {
                                 .contains(Profile.Capability.senderKey);
                         final var isSelfSenderKeyCapable = selfProfile != null && selfProfile.getCapabilities()
                                 .contains(Profile.Capability.senderKey);
+                        final var destination = getDestination(envelope).serviceId();
                         if (!isSelf && isSenderSenderKeyCapable && isSelfSenderKeyCapable) {
                             logger.debug("Received invalid message, requesting message resend.");
-                            actions.add(new SendRetryMessageRequestAction(sender, serviceId, e, envelope));
+                            actions.add(new SendRetryMessageRequestAction(sender, serviceId, e, envelope, destination));
                         } else {
                             logger.debug("Received invalid message, queuing renew session action.");
-                            actions.add(new RenewSessionAction(sender, serviceId));
+                            actions.add(new RenewSessionAction(sender, serviceId, destination));
                         }
                     } else {
                         logger.debug("Received invalid message from invalid sender: {}", e.getSender());
@@ -346,7 +347,12 @@ public final class IncomingMessageHandler {
                     senderDeviceId,
                     message.getTimestamp());
             if (message.getDeviceId() == account.getDeviceId()) {
-                handleDecryptionErrorMessage(actions, sender, senderServiceId, senderDeviceId, message);
+                handleDecryptionErrorMessage(actions,
+                        sender,
+                        senderServiceId,
+                        senderDeviceId,
+                        message,
+                        destination.serviceId());
             } else {
                 logger.debug("Request is for another one of our devices");
             }
@@ -430,7 +436,8 @@ public final class IncomingMessageHandler {
             final RecipientId sender,
             final ServiceId senderServiceId,
             final int senderDeviceId,
-            final DecryptionErrorMessage message
+            final DecryptionErrorMessage message,
+            final ServiceId destination
     ) {
         final var logEntries = account.getMessageSendLogStore()
                 .findMessages(senderServiceId,
@@ -443,14 +450,14 @@ public final class IncomingMessageHandler {
         }
 
         if (message.getRatchetKey().isPresent()) {
-            if (account.getAciSessionStore()
-                    .isCurrentRatchetKey(senderServiceId, senderDeviceId, message.getRatchetKey().get())) {
+            final var sessionStore = account.getAccountData(destination).getSessionStore();
+            if (sessionStore.isCurrentRatchetKey(senderServiceId, senderDeviceId, message.getRatchetKey().get())) {
                 if (logEntries.isEmpty()) {
                     logger.debug("Renewing the session with sender");
-                    actions.add(new RenewSessionAction(sender, senderServiceId));
+                    actions.add(new RenewSessionAction(sender, senderServiceId, destination));
                 } else {
                     logger.trace("Archiving the session with sender, a resend message has already been queued");
-                    context.getAccount().getAciSessionStore().archiveSessions(senderServiceId);
+                    sessionStore.archiveSessions(senderServiceId);
                 }
             }
             return;
@@ -806,9 +813,12 @@ public final class IncomingMessageHandler {
             }
         }
 
+        final var selfAddress = isSync ? source : destination;
         final var conversationPartnerAddress = isSync ? destination : source;
         if (conversationPartnerAddress != null && message.isEndSession()) {
-            account.getAciSessionStore().deleteAllSessions(conversationPartnerAddress.serviceId());
+            account.getAccountData(selfAddress.serviceId())
+                    .getSessionStore()
+                    .deleteAllSessions(conversationPartnerAddress.serviceId());
         }
         if (message.isExpirationUpdate() || message.getBody().isPresent()) {
             if (message.getGroupContext().isPresent()) {
@@ -854,10 +864,12 @@ public final class IncomingMessageHandler {
             if (message.getQuote().isPresent()) {
                 final var quote = message.getQuote().get();
 
-                for (var quotedAttachment : quote.getAttachments()) {
-                    final var thumbnail = quotedAttachment.getThumbnail();
-                    if (thumbnail != null) {
-                        context.getAttachmentHelper().downloadAttachment(thumbnail);
+                if (quote.getAttachments() != null) {
+                    for (var quotedAttachment : quote.getAttachments()) {
+                        final var thumbnail = quotedAttachment.getThumbnail();
+                        if (thumbnail != null) {
+                            context.getAttachmentHelper().downloadAttachment(thumbnail);
+                        }
                     }
                 }
             }
@@ -972,7 +984,9 @@ public final class IncomingMessageHandler {
             return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
         }
         final var address = addressOptional.get();
-        return new DeviceAddress(context.getRecipientHelper().resolveRecipient(address), address.getServiceId(), 0);
+        return new DeviceAddress(context.getRecipientHelper().resolveRecipient(address),
+                address.getServiceId(),
+                account.getDeviceId());
     }
 
     private record DeviceAddress(RecipientId recipientId, ServiceId serviceId, int deviceId) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 90b2f6a4..faea76d7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -82,6 +82,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
@@ -183,8 +184,8 @@ public class ManagerImpl implements Manager {
         });
         disposable.add(account.getIdentityKeyStore().getIdentityChanges().subscribe(serviceId -> {
             logger.trace("Archiving old sessions for {}", serviceId);
-            account.getAciSessionStore().archiveSessions(serviceId);
-            account.getPniSessionStore().archiveSessions(serviceId);
+            account.getAccountData(ServiceIdType.ACI).getSessionStore().archiveSessions(serviceId);
+            account.getAccountData(ServiceIdType.PNI).getSessionStore().archiveSessions(serviceId);
             account.getSenderKeyStore().deleteSharedWith(serviceId);
             final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
             final var profile = account.getProfileStore().getProfile(recipientId);
@@ -775,7 +776,7 @@ public class ManagerImpl implements Manager {
                         .resolveRecipientAddress(recipientId)
                         .serviceId();
                 if (serviceId.isPresent()) {
-                    account.getAciSessionStore().deleteAllSessions(serviceId.get());
+                    account.getAccountData(ServiceIdType.ACI).getSessionStore().deleteAllSessions(serviceId.get());
                 }
             }
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 76867b72..931a45a2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -89,7 +89,6 @@ import java.nio.channels.ClosedChannelException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.nio.file.Files;
-import java.security.SecureRandom;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Base64;
@@ -136,36 +135,14 @@ public class SignalAccount implements Closeable {
     private StorageKey storageKey;
     private long storageManifestVersion = -1;
     private ProfileKey profileKey;
-    private int aciPreKeyIdOffset = 1;
-    private int aciNextSignedPreKeyId = 1;
-    private int pniPreKeyIdOffset = 1;
-    private int pniNextSignedPreKeyId = 1;
-    private int aciKyberPreKeyIdOffset = 1;
-    private int aciActiveLastResortKyberPreKeyId = -1;
-    private int pniKyberPreKeyIdOffset = 1;
-    private int pniActiveLastResortKyberPreKeyId = -1;
-    private IdentityKeyPair aciIdentityKeyPair;
-    private IdentityKeyPair pniIdentityKeyPair;
-    private int localRegistrationId;
-    private int localPniRegistrationId;
     private Settings settings;
     private long lastReceiveTimestamp = 0;
 
     private boolean registered = false;
 
-    private SignalProtocolStore aciSignalProtocolStore;
-    private SignalProtocolStore pniSignalProtocolStore;
-    private PreKeyStore aciPreKeyStore;
-    private SignedPreKeyStore aciSignedPreKeyStore;
-    private KyberPreKeyStore aciKyberPreKeyStore;
-    private PreKeyStore pniPreKeyStore;
-    private SignedPreKeyStore pniSignedPreKeyStore;
-    private KyberPreKeyStore pniKyberPreKeyStore;
-    private SessionStore aciSessionStore;
-    private SessionStore pniSessionStore;
+    private final AccountData aciAccountData = new AccountData(ServiceIdType.ACI);
+    private final AccountData pniAccountData = new AccountData(ServiceIdType.PNI);
     private IdentityKeyStore identityKeyStore;
-    private SignalIdentityKeyStore aciIdentityKeyStore;
-    private SignalIdentityKeyStore pniIdentityKeyStore;
     private SenderKeyStore senderKeyStore;
     private GroupStore groupStore;
     private RecipientStore recipientStore;
@@ -231,10 +208,10 @@ public class SignalAccount implements Closeable {
         signalAccount.profileKey = profileKey;
 
         signalAccount.dataPath = dataPath;
-        signalAccount.aciIdentityKeyPair = aciIdentityKey;
-        signalAccount.pniIdentityKeyPair = pniIdentityKey;
-        signalAccount.localRegistrationId = registrationId;
-        signalAccount.localPniRegistrationId = pniRegistrationId;
+        signalAccount.aciAccountData.setIdentityKeyPair(aciIdentityKey);
+        signalAccount.pniAccountData.setIdentityKeyPair(pniIdentityKey);
+        signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
+        signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
         signalAccount.settings = settings;
         signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
 
@@ -296,8 +273,8 @@ public class SignalAccount implements Closeable {
                 profileKey);
         signalAccount.getRecipientTrustedResolver()
                 .resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
-        signalAccount.getAciSessionStore().archiveAllSessions();
-        signalAccount.getPniSessionStore().archiveAllSessions();
+        signalAccount.aciAccountData.getSessionStore().archiveAllSessions();
+        signalAccount.pniAccountData.getSessionStore().archiveAllSessions();
         signalAccount.getSenderKeyStore().deleteAll();
         signalAccount.clearAllPreKeys();
         return signalAccount;
@@ -308,16 +285,17 @@ public class SignalAccount implements Closeable {
     }
 
     private void clearAllPreKeys() {
-        resetPreKeyOffsets(ServiceIdType.ACI);
-        resetPreKeyOffsets(ServiceIdType.PNI);
-        resetKyberPreKeyOffsets(ServiceIdType.ACI);
-        resetKyberPreKeyOffsets(ServiceIdType.PNI);
-        this.getAciPreKeyStore().removeAllPreKeys();
-        this.getAciSignedPreKeyStore().removeAllSignedPreKeys();
-        this.getAciKyberPreKeyStore().removeAllKyberPreKeys();
-        this.getPniPreKeyStore().removeAllPreKeys();
-        this.getPniSignedPreKeyStore().removeAllSignedPreKeys();
-        this.getPniKyberPreKeyStore().removeAllKyberPreKeys();
+        clearAllPreKeys(ServiceIdType.ACI);
+        clearAllPreKeys(ServiceIdType.PNI);
+    }
+
+    private void clearAllPreKeys(ServiceIdType serviceIdType) {
+        final var accountData = getAccountData(serviceIdType);
+        resetPreKeyOffsets(serviceIdType);
+        resetKyberPreKeyOffsets(serviceIdType);
+        accountData.getPreKeyStore().removeAllPreKeys();
+        accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
+        accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
         save();
     }
 
@@ -347,8 +325,8 @@ public class SignalAccount implements Closeable {
         signalAccount.dataPath = dataPath;
         signalAccount.accountPath = accountPath;
         signalAccount.serviceEnvironment = serviceEnvironment;
-        signalAccount.localRegistrationId = registrationId;
-        signalAccount.localPniRegistrationId = pniRegistrationId;
+        signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
+        signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
         signalAccount.settings = settings;
         signalAccount.setProvisioningData(number,
                 aci,
@@ -391,8 +369,8 @@ public class SignalAccount implements Closeable {
         getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
         this.encryptedDeviceName = encryptedDeviceName;
         this.deviceId = deviceId;
-        this.aciIdentityKeyPair = aciIdentity;
-        this.pniIdentityKeyPair = pniIdentity;
+        this.aciAccountData.setIdentityKeyPair(aciIdentity);
+        this.pniAccountData.setIdentityKeyPair(pniIdentity);
         this.registered = true;
         this.isMultiDevice = true;
         this.lastReceiveTimestamp = 0;
@@ -400,13 +378,9 @@ public class SignalAccount implements Closeable {
         this.storageManifestVersion = -1;
         this.setStorageManifest(null);
         this.storageKey = null;
-        final var aciPublicKey = getAciIdentityKeyPair().getPublicKey();
-        getIdentityKeyStore().saveIdentity(getAci(), aciPublicKey);
-        getIdentityKeyStore().setIdentityTrustLevel(getAci(), aciPublicKey, TrustLevel.TRUSTED_VERIFIED);
+        trustSelfIdentity(ServiceIdType.ACI);
         if (getPniIdentityKeyPair() != null) {
-            final var pniPublicKey = getPniIdentityKeyPair().getPublicKey();
-            getIdentityKeyStore().saveIdentity(getPni(), pniPublicKey);
-            getIdentityKeyStore().setIdentityTrustLevel(getPni(), pniPublicKey, TrustLevel.TRUSTED_VERIFIED);
+            trustSelfIdentity(ServiceIdType.PNI);
         }
     }
 
@@ -438,8 +412,8 @@ public class SignalAccount implements Closeable {
         getMessageCache().deleteMessages(recipientId);
         if (recipientAddress.serviceId().isPresent()) {
             final var serviceId = recipientAddress.serviceId().get();
-            getAciSessionStore().deleteAllSessions(serviceId);
-            getPniSessionStore().deleteAllSessions(serviceId);
+            aciAccountData.getSessionStore().deleteAllSessions(serviceId);
+            pniAccountData.getSessionStore().deleteAllSessions(serviceId);
             getIdentityKeyStore().deleteIdentity(serviceId);
             getSenderKeyStore().deleteAll(serviceId);
         }
@@ -595,9 +569,9 @@ public class SignalAccount implements Closeable {
             registrationId = rootNode.get("registrationId").asInt();
         }
         if (rootNode.hasNonNull("pniRegistrationId")) {
-            localPniRegistrationId = rootNode.get("pniRegistrationId").asInt();
+            pniAccountData.setLocalRegistrationId(rootNode.get("pniRegistrationId").asInt());
         } else {
-            localPniRegistrationId = KeyHelper.generateRegistrationId(false);
+            pniAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
         }
         IdentityKeyPair aciIdentityKeyPair = null;
         if (rootNode.hasNonNull("identityPrivateKey") && rootNode.hasNonNull("identityKey")) {
@@ -608,7 +582,7 @@ public class SignalAccount implements Closeable {
         if (rootNode.hasNonNull("pniIdentityPrivateKey") && rootNode.hasNonNull("pniIdentityKey")) {
             final var publicKeyBytes = Base64.getDecoder().decode(rootNode.get("pniIdentityKey").asText());
             final var privateKeyBytes = Base64.getDecoder().decode(rootNode.get("pniIdentityPrivateKey").asText());
-            pniIdentityKeyPair = KeyUtils.getIdentityKeyPair(publicKeyBytes, privateKeyBytes);
+            pniAccountData.setIdentityKeyPair(KeyUtils.getIdentityKeyPair(publicKeyBytes, privateKeyBytes));
         }
 
         if (rootNode.hasNonNull("registrationLockPin")) {
@@ -624,44 +598,46 @@ public class SignalAccount implements Closeable {
             storageManifestVersion = rootNode.get("storageManifestVersion").asLong();
         }
         if (rootNode.hasNonNull("preKeyIdOffset")) {
-            aciPreKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
+            aciAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
         } else {
-            aciPreKeyIdOffset = getRandomPreKeyIdOffset();
+            aciAccountData.preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("nextSignedPreKeyId")) {
-            aciNextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(1);
+            aciAccountData.preKeyMetadata.nextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(1);
         } else {
-            aciNextSignedPreKeyId = getRandomPreKeyIdOffset();
+            aciAccountData.preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("pniPreKeyIdOffset")) {
-            pniPreKeyIdOffset = rootNode.get("pniPreKeyIdOffset").asInt(1);
+            pniAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("pniPreKeyIdOffset").asInt(1);
         } else {
-            pniPreKeyIdOffset = getRandomPreKeyIdOffset();
+            pniAccountData.preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("pniNextSignedPreKeyId")) {
-            pniNextSignedPreKeyId = rootNode.get("pniNextSignedPreKeyId").asInt(1);
+            pniAccountData.preKeyMetadata.nextSignedPreKeyId = rootNode.get("pniNextSignedPreKeyId").asInt(1);
         } else {
-            pniNextSignedPreKeyId = getRandomPreKeyIdOffset();
+            pniAccountData.preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("kyberPreKeyIdOffset")) {
-            aciKyberPreKeyIdOffset = rootNode.get("kyberPreKeyIdOffset").asInt(1);
+            aciAccountData.preKeyMetadata.kyberPreKeyIdOffset = rootNode.get("kyberPreKeyIdOffset").asInt(1);
         } else {
-            aciKyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+            aciAccountData.preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("activeLastResortKyberPreKeyId")) {
-            aciActiveLastResortKyberPreKeyId = rootNode.get("activeLastResortKyberPreKeyId").asInt(-1);
+            aciAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = rootNode.get("activeLastResortKyberPreKeyId")
+                    .asInt(-1);
         } else {
-            aciActiveLastResortKyberPreKeyId = -1;
+            aciAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = -1;
         }
         if (rootNode.hasNonNull("pniKyberPreKeyIdOffset")) {
-            pniKyberPreKeyIdOffset = rootNode.get("pniKyberPreKeyIdOffset").asInt(1);
+            pniAccountData.preKeyMetadata.kyberPreKeyIdOffset = rootNode.get("pniKyberPreKeyIdOffset").asInt(1);
         } else {
-            pniKyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+            pniAccountData.preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("pniActiveLastResortKyberPreKeyId")) {
-            pniActiveLastResortKyberPreKeyId = rootNode.get("pniActiveLastResortKyberPreKeyId").asInt(-1);
+            pniAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = rootNode.get(
+                    "pniActiveLastResortKyberPreKeyId").asInt(-1);
         } else {
-            pniActiveLastResortKyberPreKeyId = -1;
+            pniAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = -1;
         }
         if (rootNode.hasNonNull("profileKey")) {
             try {
@@ -687,22 +663,22 @@ public class SignalAccount implements Closeable {
         }
         final var legacyAciPreKeysPath = getAciPreKeysPath(dataPath, accountPath);
         if (legacyAciPreKeysPath.exists()) {
-            LegacyPreKeyStore.migrate(legacyAciPreKeysPath, getAciPreKeyStore());
+            LegacyPreKeyStore.migrate(legacyAciPreKeysPath, aciAccountData.getPreKeyStore());
             migratedLegacyConfig = true;
         }
         final var legacyPniPreKeysPath = getPniPreKeysPath(dataPath, accountPath);
         if (legacyPniPreKeysPath.exists()) {
-            LegacyPreKeyStore.migrate(legacyPniPreKeysPath, getPniPreKeyStore());
+            LegacyPreKeyStore.migrate(legacyPniPreKeysPath, pniAccountData.getPreKeyStore());
             migratedLegacyConfig = true;
         }
         final var legacyAciSignedPreKeysPath = getAciSignedPreKeysPath(dataPath, accountPath);
         if (legacyAciSignedPreKeysPath.exists()) {
-            LegacySignedPreKeyStore.migrate(legacyAciSignedPreKeysPath, getAciSignedPreKeyStore());
+            LegacySignedPreKeyStore.migrate(legacyAciSignedPreKeysPath, aciAccountData.getSignedPreKeyStore());
             migratedLegacyConfig = true;
         }
         final var legacyPniSignedPreKeysPath = getPniSignedPreKeysPath(dataPath, accountPath);
         if (legacyPniSignedPreKeysPath.exists()) {
-            LegacySignedPreKeyStore.migrate(legacyPniSignedPreKeysPath, getPniSignedPreKeyStore());
+            LegacySignedPreKeyStore.migrate(legacyPniSignedPreKeysPath, pniAccountData.getSignedPreKeyStore());
             migratedLegacyConfig = true;
         }
         final var legacySessionsPath = getSessionsPath(dataPath, accountPath);
@@ -710,7 +686,7 @@ public class SignalAccount implements Closeable {
             LegacySessionStore.migrate(legacySessionsPath,
                     getRecipientResolver(),
                     getRecipientAddressResolver(),
-                    getAciSessionStore());
+                    aciAccountData.getSessionStore());
             migratedLegacyConfig = true;
         }
         final var legacyIdentitiesPath = getIdentitiesPath(dataPath, accountPath);
@@ -731,8 +707,8 @@ public class SignalAccount implements Closeable {
             migratedLegacyConfig = true;
         }
 
-        this.aciIdentityKeyPair = aciIdentityKeyPair;
-        this.localRegistrationId = registrationId;
+        this.aciAccountData.setIdentityKeyPair(aciIdentityKeyPair);
+        this.aciAccountData.setLocalRegistrationId(registrationId);
 
         migratedLegacyConfig = loadLegacyStores(rootNode, legacySignalProtocolStore) || migratedLegacyConfig;
 
@@ -805,7 +781,7 @@ public class SignalAccount implements Closeable {
             logger.debug("Migrating legacy pre key store.");
             for (var entry : legacySignalProtocolStore.getLegacyPreKeyStore().getPreKeys().entrySet()) {
                 try {
-                    getAciPreKeyStore().storePreKey(entry.getKey(), new PreKeyRecord(entry.getValue()));
+                    aciAccountData.getPreKeyStore().storePreKey(entry.getKey(), new PreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate pre key, ignoring", e);
                 }
@@ -817,8 +793,8 @@ public class SignalAccount implements Closeable {
             logger.debug("Migrating legacy signed pre key store.");
             for (var entry : legacySignalProtocolStore.getLegacySignedPreKeyStore().getSignedPreKeys().entrySet()) {
                 try {
-                    getAciSignedPreKeyStore().storeSignedPreKey(entry.getKey(),
-                            new SignedPreKeyRecord(entry.getValue()));
+                    aciAccountData.getSignedPreKeyStore()
+                            .storeSignedPreKey(entry.getKey(), new SignedPreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate signed pre key, ignoring", e);
                 }
@@ -830,8 +806,9 @@ public class SignalAccount implements Closeable {
             logger.debug("Migrating legacy session store.");
             for (var session : legacySignalProtocolStore.getLegacySessionStore().getSessions()) {
                 try {
-                    getAciSessionStore().storeSession(new SignalProtocolAddress(session.address.getIdentifier(),
-                            session.deviceId), new SessionRecord(session.sessionRecord));
+                    aciAccountData.getSessionStore()
+                            .storeSession(new SignalProtocolAddress(session.address.getIdentifier(), session.deviceId),
+                                    new SessionRecord(session.sessionRecord));
                 } catch (Exception e) {
                     logger.warn("Failed to migrate session, ignoring", e);
                 }
@@ -981,35 +958,44 @@ public class SignalAccount implements Closeable {
                     .put("isMultiDevice", isMultiDevice)
                     .put("lastReceiveTimestamp", lastReceiveTimestamp)
                     .put("password", password)
-                    .put("registrationId", localRegistrationId)
-                    .put("pniRegistrationId", localPniRegistrationId)
+                    .put("registrationId", aciAccountData.getLocalRegistrationId())
+                    .put("pniRegistrationId", pniAccountData.getLocalRegistrationId())
                     .put("identityPrivateKey",
-                            Base64.getEncoder().encodeToString(aciIdentityKeyPair.getPrivateKey().serialize()))
+                            Base64.getEncoder()
+                                    .encodeToString(aciAccountData.getIdentityKeyPair().getPrivateKey().serialize()))
                     .put("identityKey",
-                            Base64.getEncoder().encodeToString(aciIdentityKeyPair.getPublicKey().serialize()))
+                            Base64.getEncoder()
+                                    .encodeToString(aciAccountData.getIdentityKeyPair().getPublicKey().serialize()))
                     .put("pniIdentityPrivateKey",
-                            pniIdentityKeyPair == null
+                            pniAccountData.getIdentityKeyPair() == null
                                     ? null
                                     : Base64.getEncoder()
-                                            .encodeToString(pniIdentityKeyPair.getPrivateKey().serialize()))
+                                            .encodeToString(pniAccountData.getIdentityKeyPair()
+                                                    .getPrivateKey()
+                                                    .serialize()))
                     .put("pniIdentityKey",
-                            pniIdentityKeyPair == null
+                            pniAccountData.getIdentityKeyPair() == null
                                     ? null
-                                    : Base64.getEncoder().encodeToString(pniIdentityKeyPair.getPublicKey().serialize()))
+                                    : Base64.getEncoder()
+                                            .encodeToString(pniAccountData.getIdentityKeyPair()
+                                                    .getPublicKey()
+                                                    .serialize()))
                     .put("registrationLockPin", registrationLockPin)
                     .put("pinMasterKey",
                             pinMasterKey == null ? null : Base64.getEncoder().encodeToString(pinMasterKey.serialize()))
                     .put("storageKey",
                             storageKey == null ? null : Base64.getEncoder().encodeToString(storageKey.serialize()))
                     .put("storageManifestVersion", storageManifestVersion == -1 ? null : storageManifestVersion)
-                    .put("preKeyIdOffset", aciPreKeyIdOffset)
-                    .put("nextSignedPreKeyId", aciNextSignedPreKeyId)
-                    .put("pniPreKeyIdOffset", pniPreKeyIdOffset)
-                    .put("pniNextSignedPreKeyId", pniNextSignedPreKeyId)
-                    .put("kyberPreKeyIdOffset", aciKyberPreKeyIdOffset)
-                    .put("activeLastResortKyberPreKeyId", aciActiveLastResortKyberPreKeyId)
-                    .put("pniKyberPreKeyIdOffset", pniKyberPreKeyIdOffset)
-                    .put("pniActiveLastResortKyberPreKeyId", pniActiveLastResortKyberPreKeyId)
+                    .put("preKeyIdOffset", aciAccountData.getPreKeyMetadata().preKeyIdOffset)
+                    .put("nextSignedPreKeyId", aciAccountData.getPreKeyMetadata().nextSignedPreKeyId)
+                    .put("pniPreKeyIdOffset", pniAccountData.getPreKeyMetadata().preKeyIdOffset)
+                    .put("pniNextSignedPreKeyId", pniAccountData.getPreKeyMetadata().nextSignedPreKeyId)
+                    .put("kyberPreKeyIdOffset", aciAccountData.getPreKeyMetadata().kyberPreKeyIdOffset)
+                    .put("activeLastResortKyberPreKeyId",
+                            aciAccountData.getPreKeyMetadata().activeLastResortKyberPreKeyId)
+                    .put("pniKyberPreKeyIdOffset", pniAccountData.getPreKeyMetadata().kyberPreKeyIdOffset)
+                    .put("pniActiveLastResortKyberPreKeyId",
+                            pniAccountData.getPreKeyMetadata().activeLastResortKyberPreKeyId)
                     .put("profileKey",
                             profileKey == null ? null : Base64.getEncoder().encodeToString(profileKey.serialize()))
                     .put("registered", registered)
@@ -1054,154 +1040,79 @@ public class SignalAccount implements Closeable {
     }
 
     public void resetPreKeyOffsets(final ServiceIdType serviceIdType) {
-        if (serviceIdType.equals(ServiceIdType.ACI)) {
-            this.aciPreKeyIdOffset = getRandomPreKeyIdOffset();
-            this.aciNextSignedPreKeyId = getRandomPreKeyIdOffset();
-        } else {
-            this.pniPreKeyIdOffset = getRandomPreKeyIdOffset();
-            this.pniNextSignedPreKeyId = getRandomPreKeyIdOffset();
-        }
+        final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
+        preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
+        preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
         save();
     }
 
     private static int getRandomPreKeyIdOffset() {
-        return new SecureRandom().nextInt(PREKEY_MAXIMUM_ID);
+        return KeyUtils.getRandomInt(PREKEY_MAXIMUM_ID);
     }
 
     public void addPreKeys(ServiceIdType serviceIdType, List<PreKeyRecord> records) {
-        if (serviceIdType.equals(ServiceIdType.ACI)) {
-            addAciPreKeys(records);
-        } else {
-            addPniPreKeys(records);
-        }
-    }
-
-    private void addAciPreKeys(List<PreKeyRecord> records) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
         for (var record : records) {
-            if (aciPreKeyIdOffset != record.getId()) {
-                logger.error("Invalid pre key id {}, expected {}", record.getId(), aciPreKeyIdOffset);
+            if (preKeyMetadata.preKeyIdOffset != record.getId()) {
+                logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.preKeyIdOffset);
                 throw new AssertionError("Invalid pre key id");
             }
-            getAciPreKeyStore().storePreKey(record.getId(), record);
-            aciPreKeyIdOffset = (aciPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
-        }
-        save();
-    }
-
-    private void addPniPreKeys(List<PreKeyRecord> records) {
-        for (var record : records) {
-            if (pniPreKeyIdOffset != record.getId()) {
-                logger.error("Invalid pre key id {}, expected {}", record.getId(), pniPreKeyIdOffset);
-                throw new AssertionError("Invalid pre key id");
-            }
-            getPniPreKeyStore().storePreKey(record.getId(), record);
-            pniPreKeyIdOffset = (pniPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+            accountData.getPreKeyStore().storePreKey(record.getId(), record);
+            preKeyMetadata.preKeyIdOffset = (preKeyMetadata.preKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
         }
         save();
     }
 
     public void addSignedPreKey(ServiceIdType serviceIdType, SignedPreKeyRecord record) {
-        if (serviceIdType.equals(ServiceIdType.ACI)) {
-            addAciSignedPreKey(record);
-        } else {
-            addPniSignedPreKey(record);
-        }
-    }
-
-    public void addAciSignedPreKey(SignedPreKeyRecord record) {
-        if (aciNextSignedPreKeyId != record.getId()) {
-            logger.error("Invalid signed pre key id {}, expected {}", record.getId(), aciNextSignedPreKeyId);
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        if (preKeyMetadata.nextSignedPreKeyId != record.getId()) {
+            logger.error("Invalid signed pre key id {}, expected {}",
+                    record.getId(),
+                    preKeyMetadata.nextSignedPreKeyId);
             throw new AssertionError("Invalid signed pre key id");
         }
-        getAciSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
-        aciNextSignedPreKeyId = (aciNextSignedPreKeyId + 1) % PREKEY_MAXIMUM_ID;
-        save();
-    }
-
-    public void addPniSignedPreKey(SignedPreKeyRecord record) {
-        if (pniNextSignedPreKeyId != record.getId()) {
-            logger.error("Invalid signed pre key id {}, expected {}", record.getId(), pniNextSignedPreKeyId);
-            throw new AssertionError("Invalid signed pre key id");
-        }
-        getPniSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
-        pniNextSignedPreKeyId = (pniNextSignedPreKeyId + 1) % PREKEY_MAXIMUM_ID;
+        accountData.getSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
+        preKeyMetadata.nextSignedPreKeyId = (preKeyMetadata.nextSignedPreKeyId + 1) % PREKEY_MAXIMUM_ID;
         save();
     }
 
     public void resetKyberPreKeyOffsets(final ServiceIdType serviceIdType) {
-        if (serviceIdType.equals(ServiceIdType.ACI)) {
-            this.aciKyberPreKeyIdOffset = getRandomPreKeyIdOffset();
-            this.aciActiveLastResortKyberPreKeyId = -1;
-        } else {
-            this.pniKyberPreKeyIdOffset = getRandomPreKeyIdOffset();
-            this.pniActiveLastResortKyberPreKeyId = -1;
-        }
+        final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
+        preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+        preKeyMetadata.activeLastResortKyberPreKeyId = -1;
         save();
     }
 
     public void addKyberPreKeys(ServiceIdType serviceIdType, List<KyberPreKeyRecord> records) {
-        if (serviceIdType.equals(ServiceIdType.ACI)) {
-            addAciKyberPreKeys(records);
-        } else {
-            addPniKyberPreKeys(records);
-        }
-    }
-
-    private void addAciKyberPreKeys(List<KyberPreKeyRecord> records) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
         for (var record : records) {
-            if (aciKyberPreKeyIdOffset != record.getId()) {
-                logger.error("Invalid kyber pre key id {}, expected {}", record.getId(), aciKyberPreKeyIdOffset);
+            if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
+                logger.error("Invalid kyber pre key id {}, expected {}",
+                        record.getId(),
+                        preKeyMetadata.kyberPreKeyIdOffset);
                 throw new AssertionError("Invalid kyber pre key id");
             }
-            getAciKyberPreKeyStore().storeKyberPreKey(record.getId(), record);
-            aciKyberPreKeyIdOffset = (aciKyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
-        }
-        save();
-    }
-
-    private void addPniKyberPreKeys(List<KyberPreKeyRecord> records) {
-        for (var record : records) {
-            if (pniKyberPreKeyIdOffset != record.getId()) {
-                logger.error("Invalid kyber pre key id {}, expected {}", record.getId(), pniKyberPreKeyIdOffset);
-                throw new AssertionError("Invalid kyber pre key id");
-            }
-            getPniKyberPreKeyStore().storeKyberPreKey(record.getId(), record);
-            pniKyberPreKeyIdOffset = (pniKyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+            accountData.getKyberPreKeyStore().storeKyberPreKey(record.getId(), record);
+            preKeyMetadata.kyberPreKeyIdOffset = (preKeyMetadata.kyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
         }
         save();
     }
 
     public void addLastResortKyberPreKey(ServiceIdType serviceIdType, KyberPreKeyRecord record) {
-        if (serviceIdType.equals(ServiceIdType.ACI)) {
-            addAciLastResortKyberPreKey(record);
-        } else {
-            addPniLastResortKyberPreKey(record);
-        }
-    }
-
-    public void addAciLastResortKyberPreKey(KyberPreKeyRecord record) {
-        if (aciKyberPreKeyIdOffset != record.getId()) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
             logger.error("Invalid last resort kyber pre key id {}, expected {}",
                     record.getId(),
-                    aciKyberPreKeyIdOffset);
+                    preKeyMetadata.kyberPreKeyIdOffset);
             throw new AssertionError("Invalid last resort kyber pre key id");
         }
-        getAciKyberPreKeyStore().storeLastResortKyberPreKey(record.getId(), record);
-        aciActiveLastResortKyberPreKeyId = record.getId();
-        aciKyberPreKeyIdOffset = (aciKyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
-        save();
-    }
-
-    public void addPniLastResortKyberPreKey(KyberPreKeyRecord record) {
-        if (pniKyberPreKeyIdOffset != record.getId()) {
-            logger.error("Invalid last resort kyber pre key id {}, expected {}",
-                    record.getId(),
-                    pniKyberPreKeyIdOffset);
-            throw new AssertionError("Invalid last resort kyber pre key id");
-        }
-        getPniKyberPreKeyStore().storeLastResortKyberPreKey(record.getId(), record);
-        pniActiveLastResortKyberPreKeyId = record.getId();
-        pniKyberPreKeyIdOffset = (pniKyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+        accountData.getKyberPreKeyStore().storeLastResortKyberPreKey(record.getId(), record);
+        preKeyMetadata.activeLastResortKyberPreKeyId = record.getId();
+        preKeyMetadata.kyberPreKeyIdOffset = (preKeyMetadata.kyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
         save();
     }
 
@@ -1209,6 +1120,23 @@ public class SignalAccount implements Closeable {
         return previousStorageVersion;
     }
 
+    public AccountData getAccountData(ServiceIdType serviceIdType) {
+        return switch (serviceIdType) {
+            case ACI -> aciAccountData;
+            case PNI -> pniAccountData;
+        };
+    }
+
+    public AccountData getAccountData(ServiceId accountIdentifier) {
+        if (accountIdentifier.equals(aci)) {
+            return aciAccountData;
+        } else if (accountIdentifier.equals(pni)) {
+            return pniAccountData;
+        } else {
+            throw new IllegalArgumentException("No matching account data found for " + accountIdentifier);
+        }
+    }
+
     public SignalServiceDataStore getSignalServiceDataStore() {
         return new SignalServiceDataStore() {
             @Override
@@ -1224,12 +1152,12 @@ public class SignalAccount implements Closeable {
 
             @Override
             public SignalServiceAccountDataStore aci() {
-                return getAciSignalServiceAccountDataStore();
+                return aciAccountData.getSignalServiceAccountDataStore();
             }
 
             @Override
             public SignalServiceAccountDataStore pni() {
-                return getPniSignalServiceAccountDataStore();
+                return pniAccountData.getSignalServiceAccountDataStore();
             }
 
             @Override
@@ -1239,89 +1167,11 @@ public class SignalAccount implements Closeable {
         };
     }
 
-    private SignalServiceAccountDataStore getAciSignalServiceAccountDataStore() {
-        return getOrCreate(() -> aciSignalProtocolStore,
-                () -> aciSignalProtocolStore = new SignalProtocolStore(getAciPreKeyStore(),
-                        getAciSignedPreKeyStore(),
-                        getAciKyberPreKeyStore(),
-                        getAciSessionStore(),
-                        getAciIdentityKeyStore(),
-                        getSenderKeyStore(),
-                        this::isMultiDevice));
-    }
-
-    private SignalServiceAccountDataStore getPniSignalServiceAccountDataStore() {
-        return getOrCreate(() -> pniSignalProtocolStore,
-                () -> pniSignalProtocolStore = new SignalProtocolStore(getPniPreKeyStore(),
-                        getPniSignedPreKeyStore(),
-                        getPniKyberPreKeyStore(),
-                        getPniSessionStore(),
-                        getPniIdentityKeyStore(),
-                        getSenderKeyStore(),
-                        this::isMultiDevice));
-    }
-
-    private PreKeyStore getAciPreKeyStore() {
-        return getOrCreate(() -> aciPreKeyStore,
-                () -> aciPreKeyStore = new PreKeyStore(getAccountDatabase(), ServiceIdType.ACI));
-    }
-
-    private SignedPreKeyStore getAciSignedPreKeyStore() {
-        return getOrCreate(() -> aciSignedPreKeyStore,
-                () -> aciSignedPreKeyStore = new SignedPreKeyStore(getAccountDatabase(), ServiceIdType.ACI));
-    }
-
-    private KyberPreKeyStore getAciKyberPreKeyStore() {
-        return getOrCreate(() -> aciKyberPreKeyStore,
-                () -> aciKyberPreKeyStore = new KyberPreKeyStore(getAccountDatabase(), ServiceIdType.ACI));
-    }
-
-    private PreKeyStore getPniPreKeyStore() {
-        return getOrCreate(() -> pniPreKeyStore,
-                () -> pniPreKeyStore = new PreKeyStore(getAccountDatabase(), ServiceIdType.PNI));
-    }
-
-    private SignedPreKeyStore getPniSignedPreKeyStore() {
-        return getOrCreate(() -> pniSignedPreKeyStore,
-                () -> pniSignedPreKeyStore = new SignedPreKeyStore(getAccountDatabase(), ServiceIdType.PNI));
-    }
-
-    private KyberPreKeyStore getPniKyberPreKeyStore() {
-        return getOrCreate(() -> pniKyberPreKeyStore,
-                () -> pniKyberPreKeyStore = new KyberPreKeyStore(getAccountDatabase(), ServiceIdType.PNI));
-    }
-
-    public SessionStore getAciSessionStore() {
-        return getOrCreate(() -> aciSessionStore,
-                () -> aciSessionStore = new SessionStore(getAccountDatabase(), ServiceIdType.ACI));
-    }
-
-    public SessionStore getPniSessionStore() {
-        return getOrCreate(() -> pniSessionStore,
-                () -> pniSessionStore = new SessionStore(getAccountDatabase(), ServiceIdType.PNI));
-    }
-
     public IdentityKeyStore getIdentityKeyStore() {
         return getOrCreate(() -> identityKeyStore,
                 () -> identityKeyStore = new IdentityKeyStore(getAccountDatabase(), settings.trustNewIdentity()));
     }
 
-    public SignalIdentityKeyStore getAciIdentityKeyStore() {
-        return getOrCreate(() -> aciIdentityKeyStore,
-                () -> aciIdentityKeyStore = new SignalIdentityKeyStore(getRecipientResolver(),
-                        () -> aciIdentityKeyPair,
-                        localRegistrationId,
-                        getIdentityKeyStore()));
-    }
-
-    public SignalIdentityKeyStore getPniIdentityKeyStore() {
-        return getOrCreate(() -> pniIdentityKeyStore,
-                () -> pniIdentityKeyStore = new SignalIdentityKeyStore(getRecipientResolver(),
-                        () -> pniIdentityKeyPair,
-                        localRegistrationId,
-                        getIdentityKeyStore()));
-    }
-
     public GroupStore getGroupStore() {
         return getOrCreate(() -> groupStore,
                 () -> groupStore = new GroupStore(getAccountDatabase(),
@@ -1489,11 +1339,7 @@ public class SignalAccount implements Closeable {
         if (this.pni != null && !this.pni.equals(updatedPni)) {
             // Clear data for old PNI
             identityKeyStore.deleteIdentity(this.pni);
-            getPniPreKeyStore().removeAllPreKeys();
-            getPniSignedPreKeyStore().removeAllSignedPreKeys();
-            getPniKyberPreKeyStore().removeAllKyberPreKeys();
-            aciActiveLastResortKyberPreKeyId = -1;
-            pniActiveLastResortKyberPreKeyId = -1;
+            clearAllPreKeys(ServiceIdType.PNI);
         }
 
         this.pni = updatedPni;
@@ -1509,7 +1355,7 @@ public class SignalAccount implements Closeable {
         setPni(updatedPni);
 
         setPniIdentityKeyPair(pniIdentityKeyPair);
-        addPniSignedPreKey(pniSignedPreKey);
+        addSignedPreKey(ServiceIdType.PNI, pniSignedPreKey);
         setLocalPniRegistrationId(localPniRegistrationId);
     }
 
@@ -1552,35 +1398,33 @@ public class SignalAccount implements Closeable {
     }
 
     public IdentityKeyPair getIdentityKeyPair(ServiceIdType serviceIdType) {
-        return serviceIdType.equals(ServiceIdType.ACI) ? aciIdentityKeyPair : pniIdentityKeyPair;
+        return getAccountData(serviceIdType).getIdentityKeyPair();
     }
 
     public IdentityKeyPair getAciIdentityKeyPair() {
-        return aciIdentityKeyPair;
+        return aciAccountData.getIdentityKeyPair();
     }
 
     public IdentityKeyPair getPniIdentityKeyPair() {
-        return pniIdentityKeyPair;
+        return pniAccountData.getIdentityKeyPair();
     }
 
     public void setPniIdentityKeyPair(final IdentityKeyPair identityKeyPair) {
-        pniIdentityKeyPair = identityKeyPair;
-        final var pniPublicKey = identityKeyPair.getPublicKey();
-        getIdentityKeyStore().saveIdentity(getPni(), pniPublicKey);
-        getIdentityKeyStore().setIdentityTrustLevel(getPni(), pniPublicKey, TrustLevel.TRUSTED_VERIFIED);
+        pniAccountData.setIdentityKeyPair(identityKeyPair);
+        trustSelfIdentity(ServiceIdType.PNI);
         save();
     }
 
     public int getLocalRegistrationId() {
-        return localRegistrationId;
+        return aciAccountData.getLocalRegistrationId();
     }
 
     public int getLocalPniRegistrationId() {
-        return localPniRegistrationId;
+        return pniAccountData.getLocalRegistrationId();
     }
 
     public void setLocalPniRegistrationId(final int localPniRegistrationId) {
-        this.localPniRegistrationId = localPniRegistrationId;
+        pniAccountData.setLocalRegistrationId(localPniRegistrationId);
         save();
     }
 
@@ -1711,15 +1555,15 @@ public class SignalAccount implements Closeable {
     }
 
     public int getPreKeyIdOffset(ServiceIdType serviceIdType) {
-        return serviceIdType.equals(ServiceIdType.ACI) ? aciPreKeyIdOffset : pniPreKeyIdOffset;
+        return getAccountData(serviceIdType).getPreKeyMetadata().preKeyIdOffset;
     }
 
     public int getNextSignedPreKeyId(ServiceIdType serviceIdType) {
-        return serviceIdType.equals(ServiceIdType.ACI) ? aciNextSignedPreKeyId : pniNextSignedPreKeyId;
+        return getAccountData(serviceIdType).getPreKeyMetadata().nextSignedPreKeyId;
     }
 
     public int getKyberPreKeyIdOffset(ServiceIdType serviceIdType) {
-        return serviceIdType.equals(ServiceIdType.ACI) ? aciKyberPreKeyIdOffset : pniKyberPreKeyIdOffset;
+        return getAccountData(serviceIdType).getPreKeyMetadata().kyberPreKeyIdOffset;
     }
 
     public boolean isRegistered() {
@@ -1778,22 +1622,26 @@ public class SignalAccount implements Closeable {
         save();
 
         clearAllPreKeys();
-        getAciSessionStore().archiveAllSessions();
-        getPniSessionStore().archiveAllSessions();
+        aciAccountData.getSessionStore().archiveAllSessions();
+        pniAccountData.getSessionStore().archiveAllSessions();
         getSenderKeyStore().deleteAll();
         getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
-        final var aciPublicKey = getAciIdentityKeyPair().getPublicKey();
-        getIdentityKeyStore().saveIdentity(getAci(), aciPublicKey);
-        getIdentityKeyStore().setIdentityTrustLevel(getAci(), aciPublicKey, TrustLevel.TRUSTED_VERIFIED);
+        trustSelfIdentity(ServiceIdType.ACI);
         if (getPniIdentityKeyPair() == null) {
             setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         } else {
-            final var pniPublicKey = getPniIdentityKeyPair().getPublicKey();
-            getIdentityKeyStore().saveIdentity(getPni(), pniPublicKey);
-            getIdentityKeyStore().setIdentityTrustLevel(getPni(), pniPublicKey, TrustLevel.TRUSTED_VERIFIED);
+            trustSelfIdentity(ServiceIdType.PNI);
         }
     }
 
+    private void trustSelfIdentity(ServiceIdType serviceIdType) {
+        final var accountData = getAccountData(serviceIdType);
+        final var serviceId = accountData.getServiceId();
+        final var publicKey = accountData.getIdentityKeyPair().getPublicKey();
+        getIdentityKeyStore().saveIdentity(serviceId, publicKey);
+        getIdentityKeyStore().setIdentityTrustLevel(serviceId, publicKey, TrustLevel.TRUSTED_VERIFIED);
+    }
+
     public void deleteAccountData() throws IOException {
         close();
         try (final var files = Files.walk(getUserPath(dataPath, accountPath).toPath())
@@ -1850,4 +1698,95 @@ public class SignalAccount implements Closeable {
 
         void call();
     }
+
+    private static class PreKeyMetadata {
+
+        private int preKeyIdOffset = 1;
+        private int nextSignedPreKeyId = 1;
+        private int kyberPreKeyIdOffset = 1;
+        private int activeLastResortKyberPreKeyId = -1;
+    }
+
+    public class AccountData {
+
+        private final ServiceIdType serviceIdType;
+        private IdentityKeyPair identityKeyPair;
+        private int localRegistrationId;
+        private final PreKeyMetadata preKeyMetadata = new PreKeyMetadata();
+
+        private SignalProtocolStore signalProtocolStore;
+        private PreKeyStore preKeyStore;
+        private SignedPreKeyStore signedPreKeyStore;
+        private KyberPreKeyStore kyberPreKeyStore;
+        private SessionStore sessionStore;
+        private SignalIdentityKeyStore identityKeyStore;
+
+        public AccountData(final ServiceIdType serviceIdType) {
+            this.serviceIdType = serviceIdType;
+        }
+
+        public ServiceId getServiceId() {
+            return getAccountId(serviceIdType);
+        }
+
+        public IdentityKeyPair getIdentityKeyPair() {
+            return identityKeyPair;
+        }
+
+        private void setIdentityKeyPair(final IdentityKeyPair identityKeyPair) {
+            this.identityKeyPair = identityKeyPair;
+        }
+
+        public int getLocalRegistrationId() {
+            return localRegistrationId;
+        }
+
+        private void setLocalRegistrationId(final int localRegistrationId) {
+            this.localRegistrationId = localRegistrationId;
+            this.identityKeyStore = null;
+        }
+
+        public PreKeyMetadata getPreKeyMetadata() {
+            return preKeyMetadata;
+        }
+
+        private SignalServiceAccountDataStore getSignalServiceAccountDataStore() {
+            return getOrCreate(() -> signalProtocolStore,
+                    () -> signalProtocolStore = new SignalProtocolStore(getPreKeyStore(),
+                            getSignedPreKeyStore(),
+                            getKyberPreKeyStore(),
+                            getSessionStore(),
+                            getIdentityKeyStore(),
+                            getSenderKeyStore(),
+                            SignalAccount.this::isMultiDevice));
+        }
+
+        private PreKeyStore getPreKeyStore() {
+            return getOrCreate(() -> preKeyStore,
+                    () -> preKeyStore = new PreKeyStore(getAccountDatabase(), serviceIdType));
+        }
+
+        private SignedPreKeyStore getSignedPreKeyStore() {
+            return getOrCreate(() -> signedPreKeyStore,
+                    () -> signedPreKeyStore = new SignedPreKeyStore(getAccountDatabase(), serviceIdType));
+        }
+
+        private KyberPreKeyStore getKyberPreKeyStore() {
+            return getOrCreate(() -> kyberPreKeyStore,
+                    () -> kyberPreKeyStore = new KyberPreKeyStore(getAccountDatabase(), serviceIdType));
+        }
+
+        public SessionStore getSessionStore() {
+            return getOrCreate(() -> sessionStore,
+                    () -> sessionStore = new SessionStore(getAccountDatabase(), serviceIdType));
+        }
+
+        public SignalIdentityKeyStore getIdentityKeyStore() {
+            return getOrCreate(() -> identityKeyStore,
+                    () -> identityKeyStore = new SignalIdentityKeyStore(getRecipientResolver(),
+                            () -> identityKeyPair,
+                            localRegistrationId,
+                            SignalAccount.this.getIdentityKeyStore()));
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 3ee5657e..8db8d0a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -120,4 +120,8 @@ public class KeyUtils {
         secureRandom.nextBytes(secret);
         return secret;
     }
+
+    public static int getRandomInt(int bound) {
+        return secureRandom.nextInt(bound);
+    }
 }

From c8e35991b9a9c4f920395adbd33516618e5d0991 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 23 Jun 2023 21:48:02 +0200
Subject: [PATCH 145/672] Update dependencies

---
 client/Cargo.lock | 412 ++++++++++++++++++++++++----------------------
 1 file changed, 216 insertions(+), 196 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 4ffb7140..9a03783e 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -12,10 +12,68 @@ dependencies = [
 ]
 
 [[package]]
-name = "anyhow"
-version = "1.0.69"
+name = "aho-corasick"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
 
 [[package]]
 name = "autocfg"
@@ -31,9 +89,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bstr"
-version = "1.2.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832"
+checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
 dependencies = [
  "memchr",
  "serde",
@@ -59,41 +117,53 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.1.6"
+version = "4.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
+checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed"
 dependencies = [
- "bitflags",
+ "clap_builder",
  "clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags",
  "clap_lex",
- "is-terminal",
  "once_cell",
  "strsim",
- "termcolor",
  "terminal_size",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.1.0"
+version = "4.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
+checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.3.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "convert_case"
@@ -111,18 +181,18 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "errno"
-version = "0.2.8"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -149,9 +219,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
 
 [[package]]
 name = "futures"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e2792b0ff0340399d58445b88fd9770e3489eff258a4cbc1523418f12abf84"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -164,9 +234,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -174,15 +244,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -192,38 +262,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
 
 [[package]]
 name = "futures-task"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
 
 [[package]]
 name = "futures-util"
-version = "0.3.26"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
 dependencies = [
  "futures 0.1.31",
  "futures-channel",
@@ -255,7 +325,7 @@ version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
 dependencies = [
- "aho-corasick",
+ "aho-corasick 0.7.20",
  "bstr",
  "fnv",
  "log",
@@ -294,31 +364,32 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
+ "hermit-abi 0.3.1",
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.3"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
 dependencies = [
  "hermit-abi 0.3.1",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
 
 [[package]]
 name = "jsonrpc-client-transports"
@@ -326,7 +397,7 @@ version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
  "derive_more",
- "futures 0.3.26",
+ "futures 0.3.28",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "jsonrpc-pubsub",
  "jsonrpc-server-utils 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
@@ -343,7 +414,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
 dependencies = [
- "futures 0.3.26",
+ "futures 0.3.28",
  "futures-executor",
  "futures-util",
  "log",
@@ -357,7 +428,7 @@ name = "jsonrpc-core"
 version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
- "futures 0.3.26",
+ "futures 0.3.28",
  "futures-executor",
  "futures-util",
  "log",
@@ -372,7 +443,7 @@ version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
 dependencies = [
- "futures 0.3.26",
+ "futures 0.3.28",
  "jsonrpc-client-transports",
 ]
 
@@ -384,7 +455,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -392,7 +463,7 @@ name = "jsonrpc-pubsub"
 version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
- "futures 0.3.26",
+ "futures 0.3.28",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "lazy_static",
  "log",
@@ -408,7 +479,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
 dependencies = [
  "bytes",
- "futures 0.3.26",
+ "futures 0.3.28",
  "globset",
  "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static",
@@ -425,7 +496,7 @@ version = "18.0.0"
 source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
 dependencies = [
  "bytes",
- "futures 0.3.26",
+ "futures 0.3.28",
  "globset",
  "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
  "lazy_static",
@@ -444,21 +515,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.146"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -466,12 +537,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.17"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
+checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
 
 [[package]]
 name = "memchr"
@@ -481,14 +549,13 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "mio"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -503,15 +570,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
-
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "parity-tokio-ipc"
@@ -519,7 +580,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
 dependencies = [
- "futures 0.3.26",
+ "futures 0.3.28",
  "libc",
  "log",
  "rand",
@@ -579,44 +640,20 @@ dependencies = [
  "toml",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
@@ -673,20 +710,20 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.1"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
 dependencies = [
- "aho-corasick",
+ "aho-corasick 1.0.2",
  "memchr",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "rustc_version"
@@ -699,23 +736,23 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.8"
+version = "0.37.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
 
 [[package]]
 name = "scopeguard"
@@ -725,35 +762,35 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "semver"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.93"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
+checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
 dependencies = [
  "itoa",
  "ryu",
@@ -779,9 +816,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
 dependencies = [
  "autocfg",
 ]
@@ -794,9 +831,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
 [[package]]
 name = "socket2"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
 dependencies = [
  "libc",
  "winapi",
@@ -810,9 +847,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -820,58 +857,59 @@ dependencies = [
 ]
 
 [[package]]
-name = "termcolor"
-version = "1.2.0"
+name = "syn"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
- "winapi-util",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a"
+checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
 dependencies = [
  "rustix",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.25.0"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
  "autocfg",
  "bytes",
  "libc",
- "memchr",
  "mio",
  "num_cpus",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "1.8.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.18",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.11"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -912,9 +950,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "version_check"
@@ -950,15 +994,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -967,33 +1002,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.42.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -1006,42 +1026,42 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"

From e57e5b090ee340dbbb7ac21b5d48a264ac44a347 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 24 Jun 2023 00:21:03 +0200
Subject: [PATCH 146/672] Update libsignal-service-java

---
 graalvm-config-dir/reflect-config.json        | 38 ++++++----
 .../signal/manager/helper/AccountHelper.java  |  2 +-
 .../signal/manager/helper/PreKeyHelper.java   | 21 +++---
 .../signal/manager/internal/ManagerImpl.java  |  2 +-
 .../internal/RegistrationManagerImpl.java     | 60 ++++++++++++++--
 .../signal/manager/storage/SignalAccount.java | 71 ++++++++++++++++---
 .../asamk/signal/manager/util/KeyUtils.java   | 15 ++--
 settings.gradle.kts                           |  2 +-
 8 files changed, 165 insertions(+), 46 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 0f08810c..42c4b4aa 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -956,7 +956,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getId","parameterTypes":[] }, {"name":"getJsonrpc","parameterTypes":[] }, {"name":"getMethod","parameterTypes":[] }, {"name":"getParams","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcResponse",
@@ -1987,7 +1987,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getSignature","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity$ByteArrayDeserializer",
@@ -2015,7 +2015,8 @@
   "name":"org.whispersystems.signalservice.internal.contacts.crypto.SignatureBodyEntity",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.DiscoveryRequest",
@@ -2033,13 +2034,15 @@
   "name":"org.whispersystems.signalservice.internal.contacts.entities.KeyBackupRequest",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getData","parameterTypes":[] }, {"name":"getIv","parameterTypes":[] }, {"name":"getMac","parameterTypes":[] }, {"name":"getRequestId","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.KeyBackupResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.MultiRemoteAttestationResponse",
@@ -2057,19 +2060,22 @@
   "name":"org.whispersystems.signalservice.internal.contacts.entities.RemoteAttestationRequest",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"getClientPublic","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.RemoteAttestationResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.contacts.entities.TokenResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.devices.DeviceNameProtos$DeviceName",
@@ -2113,7 +2119,8 @@
   "name":"org.whispersystems.signalservice.internal.push.AuthCredentials",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.CdsiAuthResponse",
@@ -2154,6 +2161,12 @@
   "allDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.GcmRegistrationId",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.GetAciByUsernameResponse",
   "allDeclaredFields":true,
@@ -2231,7 +2244,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getKeyId","parameterTypes":[] }, {"name":"getPublicKey","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PreKeyEntity$ECPublicKeyDeserializer",
@@ -2317,7 +2330,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"getAccountAttributes","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getSessionId","parameterTypes":[] }, {"name":"getSkipDeviceTransfer","parameterTypes":[] }]
+  "methods":[{"name":"getAccountAttributes","parameterTypes":[] }, {"name":"getAciIdentityKey","parameterTypes":[] }, {"name":"getAciPqLastResortPreKey","parameterTypes":[] }, {"name":"getAciSignedPreKey","parameterTypes":[] }, {"name":"getGcmToken","parameterTypes":[] }, {"name":"getPniIdentityKey","parameterTypes":[] }, {"name":"getPniPqLastResortPreKey","parameterTypes":[] }, {"name":"getPniSignedPreKey","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getSessionId","parameterTypes":[] }, {"name":"getSkipDeviceTransfer","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ReserveUsernameRequest",
@@ -2646,7 +2659,8 @@
   "name":"org.whispersystems.signalservice.internal.push.VerifyAccountResponse",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.WhoAmIResponse",
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 16ab92bd..801e7987 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -113,7 +113,7 @@ public class AccountHelper {
         account.setNumber(number);
         account.setAci(aci);
         account.setPni(pni);
-        if (account.isPrimaryDevice() && account.getPniIdentityKeyPair() == null && account.getPni() != null) {
+        if (account.isPrimaryDevice() && account.getPniIdentityKeyPair() == null) {
             account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         }
         account.getRecipientTrustedResolver().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 282b017a..2bbef3c8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -38,18 +38,21 @@ public class PreKeyHelper {
     public void refreshPreKeysIfNecessary(ServiceIdType serviceIdType) throws IOException {
         final var preKeyCounts = dependencies.getAccountManager().getPreKeyCounts(serviceIdType);
         if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+            logger.debug("Refreshing {} ec pre keys, because only {} of {} pre keys remain",
+                    serviceIdType,
+                    preKeyCounts.getEcCount(),
+                    ServiceConfig.PREKEY_MINIMUM_COUNT);
             refreshPreKeys(serviceIdType);
         }
         if (preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+            logger.debug("Refreshing {} kyber pre keys, because only {} of {} pre keys remain",
+                    serviceIdType,
+                    preKeyCounts.getEcCount(),
+                    ServiceConfig.PREKEY_MINIMUM_COUNT);
             refreshKyberPreKeys(serviceIdType);
         }
     }
 
-    public void refreshPreKeys() throws IOException {
-        refreshPreKeys(ServiceIdType.ACI);
-        refreshPreKeys(ServiceIdType.PNI);
-    }
-
     private void refreshPreKeys(ServiceIdType serviceIdType) throws IOException {
         final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
         if (identityKeyPair == null) {
@@ -86,7 +89,7 @@ public class PreKeyHelper {
     private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) {
         final var offset = account.getPreKeyIdOffset(serviceIdType);
 
-        var records = KeyUtils.generatePreKeyRecords(offset, ServiceConfig.PREKEY_BATCH_SIZE);
+        var records = KeyUtils.generatePreKeyRecords(offset);
         account.addPreKeys(serviceIdType, records);
 
         return records;
@@ -95,7 +98,7 @@ public class PreKeyHelper {
     private SignedPreKeyRecord generateSignedPreKey(ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair) {
         final var signedPreKeyId = account.getNextSignedPreKeyId(serviceIdType);
 
-        var record = KeyUtils.generateSignedPreKeyRecord(identityKeyPair, signedPreKeyId);
+        var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair);
         account.addSignedPreKey(serviceIdType, record);
 
         return record;
@@ -139,9 +142,7 @@ public class PreKeyHelper {
     ) {
         final var offset = account.getKyberPreKeyIdOffset(serviceIdType);
 
-        var records = KeyUtils.generateKyberPreKeyRecords(offset,
-                ServiceConfig.PREKEY_BATCH_SIZE,
-                identityKeyPair.getPrivateKey());
+        var records = KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey());
         account.addKyberPreKeys(serviceIdType, records);
 
         return records;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index faea76d7..4e2fd82c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -378,7 +378,7 @@ public class ManagerImpl implements Manager {
     }
 
     void refreshPreKeys() throws IOException {
-        context.getPreKeyHelper().refreshPreKeys();
+        context.getPreKeyHelper().refreshPreKeysIfNecessary();
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index eb51b715..dca5f7ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -29,16 +29,19 @@ import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.PinHelper;
 import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.PNI;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
@@ -48,6 +51,8 @@ import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider
 import java.io.IOException;
 import java.util.function.Consumer;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
+
 public class RegistrationManagerImpl implements RegistrationManager {
 
     private final static Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
@@ -138,12 +143,21 @@ public class RegistrationManagerImpl implements RegistrationManager {
     public void verifyAccount(
             String verificationCode, String pin
     ) throws IOException, PinLockedException, IncorrectPinException {
-        var sessionId = account.getSessionId(account.getNumber());
-        final var result = NumberVerificationUtils.verifyNumber(sessionId,
+        if (account.getPniIdentityKeyPair() == null) {
+            account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
+        }
+
+        final var aciPreKeys = generatePreKeysForType(ServiceIdType.ACI);
+        final var pniPreKeys = generatePreKeysForType(ServiceIdType.PNI);
+        final var result = NumberVerificationUtils.verifyNumber(account.getSessionId(account.getNumber()),
                 verificationCode,
                 pin,
                 pinHelper,
-                this::verifyAccountWithCode);
+                (sessionId1, verificationCode1, registrationLock) -> verifyAccountWithCode(sessionId1,
+                        verificationCode1,
+                        registrationLock,
+                        aciPreKeys,
+                        pniPreKeys));
         final var response = result.first();
         final var masterKey = result.second();
         if (masterKey == null) {
@@ -153,7 +167,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         final var aci = ACI.parseOrNull(response.getUuid());
         final var pni = PNI.parseOrNull(response.getPni());
-        account.finishRegistration(aci, pni, masterKey, pin);
+        account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
         accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
 
         ManagerImpl m = null;
@@ -228,7 +242,11 @@ public class RegistrationManagerImpl implements RegistrationManager {
     }
 
     private VerifyAccountResponse verifyAccountWithCode(
-            final String sessionId, final String verificationCode, final String registrationLock
+            final String sessionId,
+            final String verificationCode,
+            final String registrationLock,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
     ) throws IOException {
         try {
             Utils.handleResponseException(accountManager.verifyAccount(verificationCode, sessionId));
@@ -238,9 +256,41 @@ public class RegistrationManagerImpl implements RegistrationManager {
         return Utils.handleResponseException(accountManager.registerAccount(sessionId,
                 null,
                 account.getAccountAttributes(registrationLock),
+                aciPreKeys,
+                pniPreKeys,
+                null,
                 true));
     }
 
+    private PreKeyCollection generatePreKeysForType(ServiceIdType serviceIdType) {
+        final var accountData = account.getAccountData(serviceIdType);
+        final var keyPair = accountData.getIdentityKeyPair();
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+
+        final var preKeyIdOffset = preKeyMetadata.getPreKeyIdOffset();
+        final var oneTimeEcPreKeys = KeyUtils.generatePreKeyRecords(preKeyIdOffset);
+        final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId();
+        final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair);
+
+        final var privateKey = keyPair.getPrivateKey();
+        final var kyberPreKeyIdOffset = preKeyMetadata.getKyberPreKeyIdOffset();
+        final var oneTimeKyberPreKeys = KeyUtils.generateKyberPreKeyRecords(kyberPreKeyIdOffset, privateKey);
+        final var lastResortKyberPreKeyId = (kyberPreKeyIdOffset + oneTimeKyberPreKeys.size()) % PREKEY_MAXIMUM_ID;
+        final var lastResortKyberPreKey = KeyUtils.generateKyberPreKeyRecord(lastResortKyberPreKeyId, privateKey);
+
+        return new PreKeyCollection(keyPair,
+                nextSignedPreKeyId,
+                preKeyIdOffset,
+                lastResortKyberPreKeyId,
+                kyberPreKeyIdOffset,
+                serviceIdType,
+                keyPair.getPublicKey(),
+                signedPreKey,
+                oneTimeEcPreKeys,
+                lastResortKyberPreKey,
+                oneTimeKyberPreKeys);
+    }
+
     @Override
     public void close() {
         if (account != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 931a45a2..8cb5d7ed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -64,6 +64,7 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
+import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.ACI;
@@ -299,6 +300,26 @@ public class SignalAccount implements Closeable {
         save();
     }
 
+    private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyCollection) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getNextSignedPreKeyId();
+        preKeyMetadata.preKeyIdOffset = preKeyCollection.getEcOneTimePreKeyIdOffset();
+        preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getOneTimeKyberPreKeyIdOffset();
+        preKeyMetadata.activeLastResortKyberPreKeyId = preKeyCollection.getLastResortKyberPreKeyId();
+
+        accountData.getPreKeyStore().removeAllPreKeys();
+        accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
+        accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
+
+        addPreKeys(serviceIdType, preKeyCollection.getOneTimeEcPreKeys());
+        addSignedPreKey(serviceIdType, preKeyCollection.getSignedPreKey());
+        addKyberPreKeys(serviceIdType, preKeyCollection.getOneTimeKyberPreKeys());
+        addLastResortKyberPreKey(serviceIdType, preKeyCollection.getLastResortKyberPreKey());
+
+        save();
+    }
+
     private static SignalAccount createLinkedAccount(
             File dataPath,
             String accountPath,
@@ -394,7 +415,7 @@ public class SignalAccount implements Closeable {
             setProfileKey(KeyUtils.createProfileKey());
         }
         getProfileStore().storeProfileKey(getSelfRecipientId(), getProfileKey());
-        if (isPrimaryDevice() && getPniIdentityKeyPair() == null && getPni() != null) {
+        if (isPrimaryDevice() && getPniIdentityKeyPair() == null) {
             setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         }
     }
@@ -1053,6 +1074,10 @@ public class SignalAccount implements Closeable {
     public void addPreKeys(ServiceIdType serviceIdType, List<PreKeyRecord> records) {
         final var accountData = getAccountData(serviceIdType);
         final var preKeyMetadata = accountData.getPreKeyMetadata();
+        logger.debug("Adding {} {} pre keys with offset {}",
+                records.size(),
+                serviceIdType,
+                preKeyMetadata.preKeyIdOffset);
         for (var record : records) {
             if (preKeyMetadata.preKeyIdOffset != record.getId()) {
                 logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.preKeyIdOffset);
@@ -1067,6 +1092,7 @@ public class SignalAccount implements Closeable {
     public void addSignedPreKey(ServiceIdType serviceIdType, SignedPreKeyRecord record) {
         final var accountData = getAccountData(serviceIdType);
         final var preKeyMetadata = accountData.getPreKeyMetadata();
+        logger.debug("Adding {} signed pre key with offset {}", serviceIdType, preKeyMetadata.nextSignedPreKeyId);
         if (preKeyMetadata.nextSignedPreKeyId != record.getId()) {
             logger.error("Invalid signed pre key id {}, expected {}",
                     record.getId(),
@@ -1088,6 +1114,10 @@ public class SignalAccount implements Closeable {
     public void addKyberPreKeys(ServiceIdType serviceIdType, List<KyberPreKeyRecord> records) {
         final var accountData = getAccountData(serviceIdType);
         final var preKeyMetadata = accountData.getPreKeyMetadata();
+        logger.debug("Adding {} {} kyber pre keys with offset {}",
+                records.size(),
+                serviceIdType,
+                preKeyMetadata.kyberPreKeyIdOffset);
         for (var record : records) {
             if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
                 logger.error("Invalid kyber pre key id {}, expected {}",
@@ -1104,6 +1134,9 @@ public class SignalAccount implements Closeable {
     public void addLastResortKyberPreKey(ServiceIdType serviceIdType, KyberPreKeyRecord record) {
         final var accountData = getAccountData(serviceIdType);
         final var preKeyMetadata = accountData.getPreKeyMetadata();
+        logger.debug("Adding {} last resort kyber pre key with offset {}",
+                serviceIdType,
+                preKeyMetadata.kyberPreKeyIdOffset);
         if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
             logger.error("Invalid last resort kyber pre key id {}, expected {}",
                     record.getId(),
@@ -1606,7 +1639,14 @@ public class SignalAccount implements Closeable {
         return phoneNumberUnlisted == null || !phoneNumberUnlisted;
     }
 
-    public void finishRegistration(final ACI aci, final PNI pni, final MasterKey masterKey, final String pin) {
+    public void finishRegistration(
+            final ACI aci,
+            final PNI pni,
+            final MasterKey masterKey,
+            final String pin,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
+    ) {
         this.pinMasterKey = masterKey;
         this.storageManifestVersion = -1;
         this.setStorageManifest(null);
@@ -1621,17 +1661,14 @@ public class SignalAccount implements Closeable {
         this.lastReceiveTimestamp = 0;
         save();
 
-        clearAllPreKeys();
+        setPreKeys(ServiceIdType.ACI, aciPreKeys);
+        setPreKeys(ServiceIdType.PNI, pniPreKeys);
         aciAccountData.getSessionStore().archiveAllSessions();
         pniAccountData.getSessionStore().archiveAllSessions();
         getSenderKeyStore().deleteAll();
         getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
         trustSelfIdentity(ServiceIdType.ACI);
-        if (getPniIdentityKeyPair() == null) {
-            setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
-        } else {
-            trustSelfIdentity(ServiceIdType.PNI);
-        }
+        trustSelfIdentity(ServiceIdType.PNI);
     }
 
     private void trustSelfIdentity(ServiceIdType serviceIdType) {
@@ -1699,12 +1736,28 @@ public class SignalAccount implements Closeable {
         void call();
     }
 
-    private static class PreKeyMetadata {
+    public static class PreKeyMetadata {
 
         private int preKeyIdOffset = 1;
         private int nextSignedPreKeyId = 1;
         private int kyberPreKeyIdOffset = 1;
         private int activeLastResortKyberPreKeyId = -1;
+
+        public int getPreKeyIdOffset() {
+            return preKeyIdOffset;
+        }
+
+        public int getNextSignedPreKeyId() {
+            return nextSignedPreKeyId;
+        }
+
+        public int getKyberPreKeyIdOffset() {
+            return kyberPreKeyIdOffset;
+        }
+
+        public int getActiveLastResortKyberPreKeyId() {
+            return activeLastResortKyberPreKeyId;
+        }
     }
 
     public class AccountData {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 8db8d0a4..3fd6e308 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_BATCH_SIZE;
 import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
 
 public class KeyUtils {
@@ -47,9 +48,9 @@ public class KeyUtils {
         return new IdentityKeyPair(djbIdentityKey, djbPrivateKey);
     }
 
-    public static List<PreKeyRecord> generatePreKeyRecords(final int offset, final int batchSize) {
-        var records = new ArrayList<PreKeyRecord>(batchSize);
-        for (var i = 0; i < batchSize; i++) {
+    public static List<PreKeyRecord> generatePreKeyRecords(final int offset) {
+        var records = new ArrayList<PreKeyRecord>(PREKEY_BATCH_SIZE);
+        for (var i = 0; i < PREKEY_BATCH_SIZE; i++) {
             var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID;
             var keyPair = Curve.generateKeyPair();
             var record = new PreKeyRecord(preKeyId, keyPair);
@@ -60,7 +61,7 @@ public class KeyUtils {
     }
 
     public static SignedPreKeyRecord generateSignedPreKeyRecord(
-            final IdentityKeyPair identityKeyPair, final int signedPreKeyId
+            final int signedPreKeyId, final IdentityKeyPair identityKeyPair
     ) {
         var keyPair = Curve.generateKeyPair();
         byte[] signature;
@@ -73,10 +74,10 @@ public class KeyUtils {
     }
 
     public static List<KyberPreKeyRecord> generateKyberPreKeyRecords(
-            final int offset, final int batchSize, final ECPrivateKey privateKey
+            final int offset, final ECPrivateKey privateKey
     ) {
-        var records = new ArrayList<KyberPreKeyRecord>(batchSize);
-        for (var i = 0; i < batchSize; i++) {
+        var records = new ArrayList<KyberPreKeyRecord>(PREKEY_BATCH_SIZE);
+        for (var i = 0; i < PREKEY_BATCH_SIZE; i++) {
             var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID;
             records.add(generateKyberPreKeyRecord(preKeyId, privateKey));
         }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a6a66ae3..9b5ae2d7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_73")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_74")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From ffeae1a95adf542d8b263101091952841da7ae24 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 1 Jul 2023 14:06:35 +0200
Subject: [PATCH 147/672] Store last resort kyber pre key from PniChangeNumber
 message

---
 .../signal/manager/helper/AccountHelper.java      | 12 +++++++-----
 .../manager/helper/IncomingMessageHandler.java    |  8 +++++++-
 .../signal/manager/storage/SignalAccount.java     | 15 ++++++++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 801e7987..4841bdbd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -14,6 +14,7 @@ import org.asamk.signal.manager.util.NumberVerificationUtils;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
@@ -120,20 +121,21 @@ public class AccountHelper {
         // TODO check and update remote storage
         context.getUnidentifiedAccessHelper().rotateSenderCertificates();
         dependencies.resetAfterAddressChange();
+        context.getGroupV2Helper().clearAuthCredentialCache();
         context.getAccountFileUpdater().updateAccountIdentifiers(account.getNumber(), account.getAci());
     }
 
     public void setPni(
             final PNI updatedPni,
             final IdentityKeyPair pniIdentityKeyPair,
+            final String number,
+            final int localPniRegistrationId,
             final SignedPreKeyRecord pniSignedPreKey,
-            final int localPniRegistrationId
+            final KyberPreKeyRecord lastResortKyberPreKey
     ) throws IOException {
-        account.setPni(updatedPni, pniIdentityKeyPair, pniSignedPreKey, localPniRegistrationId);
+        updateSelfIdentifiers(number != null ? number : account.getNumber(), account.getAci(), updatedPni);
+        account.setNewPniIdentity(pniIdentityKeyPair, pniSignedPreKey, lastResortKyberPreKey, localPniRegistrationId);
         context.getPreKeyHelper().refreshPreKeysIfNecessary(ServiceIdType.PNI);
-        if (account.getPni() == null || !account.getPni().equals(updatedPni)) {
-            context.getGroupV2Helper().clearAuthCredentialCache();
-        }
     }
 
     public void startChangeNumber(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 7cc3d09d..0692a06e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -44,6 +44,7 @@ import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
+import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
@@ -646,8 +647,13 @@ public final class IncomingMessageHandler {
                     context.getAccountHelper()
                             .setPni(updatedPni,
                                     new IdentityKeyPair(pniChangeNumber.getIdentityKeyPair().toByteArray()),
+                                    pniChangeNumber.hasNewE164() ? pniChangeNumber.getNewE164() : null,
+                                    pniChangeNumber.getRegistrationId(),
                                     new SignedPreKeyRecord(pniChangeNumber.getSignedPreKey().toByteArray()),
-                                    pniChangeNumber.getRegistrationId());
+                                    pniChangeNumber.hasLastResortKyberPreKey()
+                                            ? new KyberPreKeyRecord(pniChangeNumber.getLastResortKyberPreKey()
+                                            .toByteArray())
+                                            : null);
                 } catch (Exception e) {
                     logger.warn("Failed to handle change number message", e);
                 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 8cb5d7ed..c45e772f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1379,17 +1379,22 @@ public class SignalAccount implements Closeable {
         save();
     }
 
-    public void setPni(
-            final PNI updatedPni,
+    public void setNewPniIdentity(
             final IdentityKeyPair pniIdentityKeyPair,
             final SignedPreKeyRecord pniSignedPreKey,
+            final KyberPreKeyRecord lastResortKyberPreKey,
             final int localPniRegistrationId
     ) {
-        setPni(updatedPni);
-
         setPniIdentityKeyPair(pniIdentityKeyPair);
-        addSignedPreKey(ServiceIdType.PNI, pniSignedPreKey);
         setLocalPniRegistrationId(localPniRegistrationId);
+
+        final var preKeyMetadata = getAccountData(ServiceIdType.PNI).getPreKeyMetadata();
+        preKeyMetadata.nextSignedPreKeyId = pniSignedPreKey.getId();
+        addSignedPreKey(ServiceIdType.PNI, pniSignedPreKey);
+        if (lastResortKyberPreKey != null) {
+            preKeyMetadata.kyberPreKeyIdOffset = lastResortKyberPreKey.getId();
+            addLastResortKyberPreKey(ServiceIdType.PNI, lastResortKyberPreKey);
+        }
     }
 
     public SignalServiceAddress getSelfAddress() {

From 2487fff44a03f9a7461d166073ad58eab1b4820c Mon Sep 17 00:00:00 2001
From: Benjamin Loison <12752145+Benjamin-Loison@users.noreply.github.com>
Date: Wed, 5 Jul 2023 08:13:21 +0000
Subject: [PATCH 148/672] Remove unnecessary spaces in `README.md` and add `sh`
 syntax highlighting (#1270)

---
 README.md | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 093b0eef..6d857fb6 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ of all country codes.)
 
 * Register a number (with SMS verification)
 
-        signal-cli -a ACCOUNT register
+      signal-cli -a ACCOUNT register
 
   You can register Signal using a landline number. In this case you can skip SMS verification process and jump directly
   to the voice call verification by adding the `--voice` switch at the end of above register command.
@@ -64,19 +64,21 @@ of all country codes.)
 * Verify the number using the code received via SMS or voice, optionally add `--pin PIN_CODE` if you've added a pin code
   to your account
 
-        signal-cli -a ACCOUNT verify CODE
+      signal-cli -a ACCOUNT verify CODE
 
 * Send a message
 
-        signal-cli -a ACCOUNT send -m "This is a message" RECIPIENT
+     ```sh
+     signal-cli -a ACCOUNT send -m "This is a message" RECIPIENT
+     ```
 
 * Pipe the message content from another process.
 
-        uname -a | signal-cli -a ACCOUNT send --message-from-stdin RECIPIENT
+      uname -a | signal-cli -a ACCOUNT send --message-from-stdin RECIPIENT
 
 * Receive messages
 
-        signal-cli -a ACCOUNT receive
+      signal-cli -a ACCOUNT receive
 
 **Hint**: The Signal protocol expects that incoming messages are regularly received (using `daemon` or `receive`
 command). This is required for the encryption to work efficiently and for getting updates to groups, expiration timer
@@ -86,8 +88,8 @@ and other features.
 
 The password and cryptographic keys are created when registering and stored in the current users home directory:
 
-        $XDG_DATA_HOME/signal-cli/data/
-        $HOME/.local/share/signal-cli/data/
+    $XDG_DATA_HOME/signal-cli/data/
+    $HOME/.local/share/signal-cli/data/
 
 ## Building
 
@@ -96,27 +98,29 @@ version installed, you can replace `./gradlew` with `gradle` in the following st
 
 1. Checkout the source somewhere on your filesystem with
 
-        git clone https://github.com/AsamK/signal-cli.git
+       git clone https://github.com/AsamK/signal-cli.git
 
 2. Execute Gradle:
 
-        ./gradlew build
+       ./gradlew build
 
    2a. Create shell wrapper in *build/install/signal-cli/bin*:
 
-        ./gradlew installDist
+       ./gradlew installDist
 
    2b. Create tar file in *build/distributions*:
 
-        ./gradlew distTar
+       ./gradlew distTar
 
    2c. Create a fat tar file in *build/libs/signal-cli-fat*:
 
-        ./gradlew fatJar
+       ./gradlew fatJar
 
    2d. Compile and run signal-cli:
 
-        ./gradlew run --args="--help"
+      ```sh
+      ./gradlew run --args="--help"
+      ```
 
 ### Building a native binary with GraalVM (EXPERIMENTAL)
 
@@ -127,13 +131,13 @@ work in all situations.
 2. [Install prerequisites](https://www.graalvm.org/reference-manual/native-image/#prerequisites)
 3. Execute Gradle:
 
-        ./gradlew nativeCompile
+       ./gradlew nativeCompile
 
    The binary is available at *build/native/nativeCompile/signal-cli*
 
 ## FAQ and Troubleshooting
 
-For frequently asked questions and issues have a look at the [wiki](https://github.com/AsamK/signal-cli/wiki/FAQ)
+For frequently asked questions and issues have a look at the [wiki](https://github.com/AsamK/signal-cli/wiki/FAQ).
 
 ## License
 

From 02d4cb4a14bf13ea4df2fc190fd739e81eabd6e0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 14 Jul 2023 19:25:32 +0200
Subject: [PATCH 149/672] Update libsignal-service-java

---
 graalvm-config-dir/reflect-config.json        | 77 ++++++++++++++++++-
 graalvm-config-dir/resource-config.json       | 18 +++++
 .../signal/manager/helper/PinHelper.java      | 22 +++---
 .../manager/helper/RecipientHelper.java       |  1 +
 .../internal/RegistrationManagerImpl.java     | 20 +----
 .../signal/manager/storage/SignalAccount.java | 13 ++--
 .../manager/util/NumberVerificationUtils.java |  4 +-
 settings.gradle.kts                           |  2 +-
 8 files changed, 116 insertions(+), 41 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 42c4b4aa..34d6aea1 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -15,6 +15,18 @@
 {
   "name":"[J"
 },
+{
+  "name":"[Lcom.fasterxml.jackson.databind.deser.Deserializers;"
+},
+{
+  "name":"[Lcom.fasterxml.jackson.databind.deser.KeyDeserializers;"
+},
+{
+  "name":"[Lcom.fasterxml.jackson.databind.deser.ValueInstantiators;"
+},
+{
+  "name":"[Lcom.fasterxml.jackson.databind.ser.Serializers;"
+},
 {
   "name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
 },
@@ -68,6 +80,12 @@
 {
   "name":"char[]"
 },
+{
+  "name":"com.fasterxml.jackson.annotation.JsonIgnore"
+},
+{
+  "name":"com.fasterxml.jackson.annotation.JsonProperty"
+},
 {
   "name":"com.fasterxml.jackson.databind.ext.Java7HandlersImpl",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -257,6 +275,9 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true
 },
+{
+  "name":"java.lang.Object"
+},
 {
   "name":"java.lang.Record",
   "allDeclaredFields":true,
@@ -286,10 +307,18 @@
   "name":"java.lang.constant.ConstantDesc",
   "queryAllDeclaredMethods":true
 },
+{
+  "name":"java.lang.reflect.Executable",
+  "methods":[{"name":"getParameters","parameterTypes":[] }]
+},
 {
   "name":"java.lang.reflect.Method",
   "methods":[{"name":"isDefault","parameterTypes":[] }]
 },
+{
+  "name":"java.lang.reflect.Parameter",
+  "methods":[{"name":"getName","parameterTypes":[] }]
+},
 {
   "name":"java.lang.reflect.RecordComponent",
   "methods":[{"name":"getName","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
@@ -424,6 +453,50 @@
 {
   "name":"javax.smartcardio.CardPermission"
 },
+{
+  "name":"kotlin.Any"
+},
+{
+  "name":"kotlin.Boolean"
+},
+{
+  "name":"kotlin.ByteArray"
+},
+{
+  "name":"kotlin.Int"
+},
+{
+  "name":"kotlin.Long"
+},
+{
+  "name":"kotlin.Metadata",
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"bv","parameterTypes":[] }, {"name":"d1","parameterTypes":[] }, {"name":"d2","parameterTypes":[] }, {"name":"k","parameterTypes":[] }, {"name":"mv","parameterTypes":[] }, {"name":"pn","parameterTypes":[] }, {"name":"xi","parameterTypes":[] }, {"name":"xs","parameterTypes":[] }]
+},
+{
+  "name":"kotlin.SafePublicationLazyImpl",
+  "fields":[{"name":"_value"}]
+},
+{
+  "name":"kotlin.String"
+},
+{
+  "name":"kotlin.collections.List"
+},
+{
+  "name":"kotlin.collections.MutableList"
+},
+{
+  "name":"kotlin.jvm.internal.DefaultConstructorMarker"
+},
+{
+  "name":"kotlin.reflect.jvm.internal.ReflectionFactoryImpl",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"kotlin.reflect.jvm.internal.impl.resolve.scopes.DescriptorKindFilter",
+  "allPublicFields":true
+},
 {
   "name":"libcore.io.Memory"
 },
@@ -2230,6 +2303,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
   "methods":[{"name":"getDestinationDeviceId","parameterTypes":[] }]
 },
 {
@@ -2237,6 +2311,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
   "methods":[{"name":"getDestination","parameterTypes":[] }, {"name":"getMessages","parameterTypes":[] }, {"name":"getTimestamp","parameterTypes":[] }, {"name":"isOnline","parameterTypes":[] }, {"name":"isUrgent","parameterTypes":[] }]
 },
 {
@@ -2372,7 +2447,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$AttachmentPointer",
-  "fields":[{"name":"attachmentIdentifierCase_"}, {"name":"attachmentIdentifier_"}, {"name":"bitField0_"}, {"name":"blurHash_"}, {"name":"caption_"}, {"name":"cdnNumber_"}, {"name":"contentType_"}, {"name":"digest_"}, {"name":"fileName_"}, {"name":"flags_"}, {"name":"height_"}, {"name":"key_"}, {"name":"size_"}, {"name":"thumbnail_"}, {"name":"uploadTimestamp_"}, {"name":"width_"}]
+  "fields":[{"name":"attachmentIdentifierCase_"}, {"name":"attachmentIdentifier_"}, {"name":"bitField0_"}, {"name":"blurHash_"}, {"name":"caption_"}, {"name":"cdnNumber_"}, {"name":"contentType_"}, {"name":"digest_"}, {"name":"fileName_"}, {"name":"flags_"}, {"name":"height_"}, {"name":"incrementalDigest_"}, {"name":"key_"}, {"name":"size_"}, {"name":"thumbnail_"}, {"name":"uploadTimestamp_"}, {"name":"width_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$BodyRange",
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 0d8cde58..5e87a14d 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -6,6 +6,10 @@
     "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.sql.Driver\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoader\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition\\E"
   }, {
     "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
   }, {
@@ -140,6 +144,20 @@
     "pattern":"\\Qcom/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_XK\\E"
   }, {
     "pattern":"\\Qjni/x86_64-Linux/libjffi-1.2.so\\E"
+  }, {
+    "pattern":"\\Qkotlin/annotation/annotation.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/collections/collections.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/coroutines/coroutines.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/internal/internal.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/kotlin.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/ranges/ranges.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/reflect/reflect.kotlin_builtins\\E"
   }, {
     "pattern":"\\Qlibsignal_jni.dylib\\E"
   }, {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 6bc3978f..c734323f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -5,14 +5,15 @@ import org.asamk.signal.manager.api.Pair;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.KbsPinData;
 import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.KeyBackupServicePinException;
-import org.whispersystems.signalservice.api.KeyBackupSystemNoDataException;
+import org.whispersystems.signalservice.api.SvrNoDataException;
+import org.whispersystems.signalservice.api.SvrPinData;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.kbs.PinHashUtil;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
+import org.whispersystems.signalservice.internal.push.AuthCredentials;
 import org.whispersystems.signalservice.internal.push.LockedException;
 
 import java.io.IOException;
@@ -70,26 +71,27 @@ public class PinHelper {
         }
     }
 
-    public KbsPinData getRegistrationLockData(
+    public SvrPinData getRegistrationLockData(
             String pin, LockedException e
     ) throws IOException, IncorrectPinException {
-        var basicStorageCredentials = e.getBasicStorageCredentials();
+        var basicStorageCredentials = e.getSvr1Credentials();
         if (basicStorageCredentials == null) {
             return null;
         }
 
         try {
             return getRegistrationLockData(pin, basicStorageCredentials);
-        } catch (KeyBackupSystemNoDataException ex) {
+        } catch (SvrNoDataException ex) {
             throw new IOException(e);
         } catch (KeyBackupServicePinException ex) {
             throw new IncorrectPinException(ex.getTriesRemaining());
         }
     }
 
-    private KbsPinData getRegistrationLockData(
-            String pin, String basicStorageCredentials
-    ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
+    private SvrPinData getRegistrationLockData(
+            String pin, AuthCredentials authCredentials
+    ) throws IOException, SvrNoDataException, KeyBackupServicePinException {
+        final var basicStorageCredentials = authCredentials.asBasic();
         var tokenResponsePair = getTokenResponse(basicStorageCredentials);
         final var tokenResponse = tokenResponsePair.first();
         final var keyBackupService = tokenResponsePair.second();
@@ -113,12 +115,12 @@ public class PinHelper {
         throw new IOException("KBS Account locked, maximum pin attempts reached.");
     }
 
-    private KbsPinData restoreMasterKey(
+    private SvrPinData restoreMasterKey(
             String pin,
             String basicStorageCredentials,
             TokenResponse tokenResponse,
             final KeyBackupService keyBackupService
-    ) throws IOException, KeyBackupSystemNoDataException, KeyBackupServicePinException {
+    ) throws IOException, SvrNoDataException, KeyBackupServicePinException {
         if (pin == null) return null;
 
         if (basicStorageCredentials == null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 8f100612..a0f03b79 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -163,6 +163,7 @@ public class RecipientHelper {
                             useCompat,
                             Optional.empty(),
                             serviceEnvironmentConfig.getCdsiMrenclave(),
+                            null,
                             token -> {
                                 // Not storing for partial refresh
                             });
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index dca5f7ab..ff8076e0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -51,8 +51,6 @@ import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider
 import java.io.IOException;
 import java.util.function.Consumer;
 
-import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
-
 public class RegistrationManagerImpl implements RegistrationManager {
 
     private final static Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
@@ -267,28 +265,14 @@ public class RegistrationManagerImpl implements RegistrationManager {
         final var keyPair = accountData.getIdentityKeyPair();
         final var preKeyMetadata = accountData.getPreKeyMetadata();
 
-        final var preKeyIdOffset = preKeyMetadata.getPreKeyIdOffset();
-        final var oneTimeEcPreKeys = KeyUtils.generatePreKeyRecords(preKeyIdOffset);
         final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId();
         final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair);
 
         final var privateKey = keyPair.getPrivateKey();
         final var kyberPreKeyIdOffset = preKeyMetadata.getKyberPreKeyIdOffset();
-        final var oneTimeKyberPreKeys = KeyUtils.generateKyberPreKeyRecords(kyberPreKeyIdOffset, privateKey);
-        final var lastResortKyberPreKeyId = (kyberPreKeyIdOffset + oneTimeKyberPreKeys.size()) % PREKEY_MAXIMUM_ID;
-        final var lastResortKyberPreKey = KeyUtils.generateKyberPreKeyRecord(lastResortKyberPreKeyId, privateKey);
+        final var lastResortKyberPreKey = KeyUtils.generateKyberPreKeyRecord(kyberPreKeyIdOffset, privateKey);
 
-        return new PreKeyCollection(keyPair,
-                nextSignedPreKeyId,
-                preKeyIdOffset,
-                lastResortKyberPreKeyId,
-                kyberPreKeyIdOffset,
-                serviceIdType,
-                keyPair.getPublicKey(),
-                signedPreKey,
-                oneTimeEcPreKeys,
-                lastResortKyberPreKey,
-                oneTimeKyberPreKeys);
+        return new PreKeyCollection(keyPair.getPublicKey(), signedPreKey, lastResortKyberPreKey);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index c45e772f..c9974e86 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -303,18 +303,14 @@ public class SignalAccount implements Closeable {
     private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyCollection) {
         final var accountData = getAccountData(serviceIdType);
         final var preKeyMetadata = accountData.getPreKeyMetadata();
-        preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getNextSignedPreKeyId();
-        preKeyMetadata.preKeyIdOffset = preKeyCollection.getEcOneTimePreKeyIdOffset();
-        preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getOneTimeKyberPreKeyIdOffset();
-        preKeyMetadata.activeLastResortKyberPreKeyId = preKeyCollection.getLastResortKyberPreKeyId();
+        preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getSignedPreKey().getId();
+        preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getLastResortKyberPreKey().getId();
 
         accountData.getPreKeyStore().removeAllPreKeys();
         accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
         accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
 
-        addPreKeys(serviceIdType, preKeyCollection.getOneTimeEcPreKeys());
         addSignedPreKey(serviceIdType, preKeyCollection.getSignedPreKey());
-        addKyberPreKeys(serviceIdType, preKeyCollection.getOneTimeKyberPreKeys());
         addLastResortKyberPreKey(serviceIdType, preKeyCollection.getLastResortKyberPreKey());
 
         save();
@@ -1335,13 +1331,14 @@ public class SignalAccount implements Closeable {
     public AccountAttributes getAccountAttributes(String registrationLock) {
         return new AccountAttributes(null,
                 getLocalRegistrationId(),
+                false,
+                false,
                 true,
-                null,
                 registrationLock != null ? registrationLock : getRegistrationLock(),
                 getSelfUnidentifiedAccessKey(),
                 isUnrestrictedUnidentifiedAccess(),
-                getAccountCapabilities(),
                 isDiscoverableByPhoneNumber(),
+                getAccountCapabilities(),
                 encryptedDeviceName,
                 getLocalPniRegistrationId(),
                 null); // TODO recoveryPassword?
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 3d733c16..f8a14c05 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -7,7 +7,6 @@ import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.helper.PinHelper;
-import org.whispersystems.signalservice.api.KbsPinData;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException;
@@ -116,8 +115,7 @@ public class NumberVerificationUtils {
                 throw new PinLockedException(e.getTimeRemaining());
             }
 
-            KbsPinData registrationLockData;
-            registrationLockData = pinHelper.getRegistrationLockData(pin, e);
+            final var registrationLockData = pinHelper.getRegistrationLockData(pin, e);
             if (registrationLockData == null) {
                 throw e;
             }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9b5ae2d7..f0f4e936 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_74")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_75")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From 86f50e03550683fb5213f690a6591341df38a312 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 14 Jul 2023 20:26:24 +0200
Subject: [PATCH 150/672] Add support for SVR2

---
 graalvm-config-dir/reflect-config.json        |  38 +++++
 .../signal/manager/config/LiveConfig.java     |   7 +-
 .../signal/manager/config/ServiceConfig.java  |   6 +-
 .../config/ServiceEnvironmentConfig.java      |   9 +-
 .../signal/manager/config/StagingConfig.java  |   5 +
 .../asamk/signal/manager/helper/Context.java  |   3 +-
 .../signal/manager/helper/PinHelper.java      | 130 +++++++++---------
 .../internal/RegistrationManagerImpl.java     |   3 +-
 .../manager/internal/SignalDependencies.java  |   7 +
 9 files changed, 135 insertions(+), 73 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 34d6aea1..2c1fe0f0 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -459,15 +459,45 @@
 {
   "name":"kotlin.Boolean"
 },
+{
+  "name":"kotlin.BooleanArray"
+},
+{
+  "name":"kotlin.Byte"
+},
 {
   "name":"kotlin.ByteArray"
 },
+{
+  "name":"kotlin.Char"
+},
+{
+  "name":"kotlin.CharArray"
+},
+{
+  "name":"kotlin.Double"
+},
+{
+  "name":"kotlin.DoubleArray"
+},
+{
+  "name":"kotlin.Float"
+},
+{
+  "name":"kotlin.FloatArray"
+},
 {
   "name":"kotlin.Int"
 },
+{
+  "name":"kotlin.IntArray"
+},
 {
   "name":"kotlin.Long"
 },
+{
+  "name":"kotlin.LongArray"
+},
 {
   "name":"kotlin.Metadata",
   "queryAllDeclaredMethods":true,
@@ -477,6 +507,12 @@
   "name":"kotlin.SafePublicationLazyImpl",
   "fields":[{"name":"_value"}]
 },
+{
+  "name":"kotlin.Short"
+},
+{
+  "name":"kotlin.ShortArray"
+},
 {
   "name":"kotlin.String"
 },
@@ -2108,6 +2144,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
   "methods":[{"name":"getData","parameterTypes":[] }, {"name":"getIv","parameterTypes":[] }, {"name":"getMac","parameterTypes":[] }, {"name":"getRequestId","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
 },
 {
@@ -2134,6 +2171,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
   "methods":[{"name":"getClientPublic","parameterTypes":[] }]
 },
 {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 80322b8b..285b7c93 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -28,6 +28,7 @@ class LiveConfig {
     private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
     private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
+    private final static String SVR2_MRENCLAVE = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";
 
     private final static String KEY_BACKUP_ENCLAVE_NAME = "e18376436159cda3ad7a45d9320e382e4a497f26b0dca34d8eab0bd0139483b5";
     private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
@@ -44,7 +45,7 @@ class LiveConfig {
     private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
     private final static String STORAGE_URL = "https://storage.signal.org";
     private final static String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
-    private final static String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
+    private final static String SIGNAL_SVR2_URL = "https://svr2.signal.org";
     private final static TrustStore TRUST_STORE = new WhisperTrustStore();
 
     private final static Optional<Dns> dns = Optional.empty();
@@ -96,6 +97,10 @@ class LiveConfig {
         return CDSI_MRENCLAVE;
     }
 
+    static String getSvr2Mrenclave() {
+        return SVR2_MRENCLAVE;
+    }
+
     private LiveConfig() {
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index f97e8f68..5b6bce47 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -66,13 +66,15 @@ public class ServiceConfig {
                     LiveConfig.getUnidentifiedSenderTrustRoot(),
                     LiveConfig.createKeyBackupConfig(),
                     LiveConfig.createFallbackKeyBackupConfigs(),
-                    LiveConfig.getCdsiMrenclave());
+                    LiveConfig.getCdsiMrenclave(),
+                    LiveConfig.getSvr2Mrenclave());
             case STAGING -> new ServiceEnvironmentConfig(serviceEnvironment,
                     StagingConfig.createDefaultServiceConfiguration(interceptors),
                     StagingConfig.getUnidentifiedSenderTrustRoot(),
                     StagingConfig.createKeyBackupConfig(),
                     StagingConfig.createFallbackKeyBackupConfigs(),
-                    StagingConfig.getCdsiMrenclave());
+                    StagingConfig.getCdsiMrenclave(),
+                    StagingConfig.getSvr2Mrenclave());
         };
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index 2a95f34f..64f17589 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -17,6 +17,7 @@ public class ServiceEnvironmentConfig {
     private final Collection<KeyBackupConfig> fallbackKeyBackupConfigs;
 
     private final String cdsiMrenclave;
+    private final String svr2Mrenclave;
 
     public ServiceEnvironmentConfig(
             final ServiceEnvironment type,
@@ -24,7 +25,8 @@ public class ServiceEnvironmentConfig {
             final ECPublicKey unidentifiedSenderTrustRoot,
             final KeyBackupConfig keyBackupConfig,
             final Collection<KeyBackupConfig> fallbackKeyBackupConfigs,
-            final String cdsiMrenclave
+            final String cdsiMrenclave,
+            final String svr2Mrenclave
     ) {
         this.type = type;
         this.signalServiceConfiguration = signalServiceConfiguration;
@@ -32,6 +34,7 @@ public class ServiceEnvironmentConfig {
         this.keyBackupConfig = keyBackupConfig;
         this.fallbackKeyBackupConfigs = fallbackKeyBackupConfigs;
         this.cdsiMrenclave = cdsiMrenclave;
+        this.svr2Mrenclave = svr2Mrenclave;
     }
 
     public ServiceEnvironment getType() {
@@ -57,4 +60,8 @@ public class ServiceEnvironmentConfig {
     public String getCdsiMrenclave() {
         return cdsiMrenclave;
     }
+
+    public String getSvr2Mrenclave() {
+        return svr2Mrenclave;
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 95a3dd96..f573e505 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -28,6 +28,7 @@ class StagingConfig {
     private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
     private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
+    private final static String SVR2_MRENCLAVE = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";
 
     private final static String KEY_BACKUP_ENCLAVE_NAME = "39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b";
     private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
@@ -96,6 +97,10 @@ class StagingConfig {
         return CDSI_MRENCLAVE;
     }
 
+    static String getSvr2Mrenclave() {
+        return SVR2_MRENCLAVE;
+    }
+
     private StagingConfig() {
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index 2caeb0fb..a11ea470 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -116,7 +116,8 @@ public class Context {
     PinHelper getPinHelper() {
         return getOrCreate(() -> pinHelper,
                 () -> pinHelper = new PinHelper(dependencies.getKeyBackupService(),
-                        dependencies.getFallbackKeyBackupServices()));
+                        dependencies.getFallbackKeyBackupServices(),
+                        dependencies.getSecureValueRecoveryV2()));
     }
 
     public PreKeyHelper getPreKeyHelper() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index c734323f..2c56092e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -1,37 +1,39 @@
 package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.IncorrectPinException;
-import org.asamk.signal.manager.api.Pair;
-import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.KeyBackupService;
-import org.whispersystems.signalservice.api.KeyBackupServicePinException;
-import org.whispersystems.signalservice.api.SvrNoDataException;
-import org.whispersystems.signalservice.api.SvrPinData;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.kbs.PinHashUtil;
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
+import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV1;
+import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
-import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;
 import org.whispersystems.signalservice.internal.push.AuthCredentials;
 import org.whispersystems.signalservice.internal.push.LockedException;
 
 import java.io.IOException;
 import java.util.Collection;
-import java.util.stream.Stream;
 
 public class PinHelper {
 
     private final static Logger logger = LoggerFactory.getLogger(PinHelper.class);
 
     private final KeyBackupService keyBackupService;
+    private final SecureValueRecoveryV1 secureValueRecoveryV1;
+    private final SecureValueRecoveryV2 secureValueRecoveryV2;
     private final Collection<KeyBackupService> fallbackKeyBackupServices;
 
     public PinHelper(
-            final KeyBackupService keyBackupService, final Collection<KeyBackupService> fallbackKeyBackupServices
+            final KeyBackupService keyBackupService,
+            final Collection<KeyBackupService> fallbackKeyBackupServices,
+            SecureValueRecoveryV2 secureValueRecoveryV2
     ) {
         this.keyBackupService = keyBackupService;
         this.fallbackKeyBackupServices = fallbackKeyBackupServices;
+        this.secureValueRecoveryV1 = new SecureValueRecoveryV1(keyBackupService);
+        this.secureValueRecoveryV2 = secureValueRecoveryV2;
     }
 
     public void setRegistrationLockPin(
@@ -46,6 +48,22 @@ public class PinHelper {
             throw new IOException(e);
         }
         pinChangeSession.enableRegistrationLock(masterKey);
+
+        final var backupResponse = secureValueRecoveryV2.setPin(pin, masterKey).execute();
+        if (backupResponse instanceof SecureValueRecovery.BackupResponse.Success) {
+        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.ServerRejected) {
+            logger.warn("Backup svr2 failed: ServerRejected");
+        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.EnclaveNotFound) {
+            logger.warn("Backup svr2 failed: EnclaveNotFound");
+        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.ExposeFailure) {
+            logger.warn("Backup svr2 failed: ExposeFailure");
+        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.ApplicationError error) {
+            throw new IOException(error.getException());
+        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.NetworkError error) {
+            throw error.getException();
+        } else {
+            throw new AssertionError("Unexpected response");
+        }
     }
 
     public void migrateRegistrationLockPin(String pin, MasterKey masterKey) throws IOException {
@@ -69,75 +87,53 @@ public class PinHelper {
         } catch (UnauthenticatedResponseException e) {
             throw new IOException(e);
         }
+
+        final var deleteResponse = secureValueRecoveryV2.deleteData();
+        if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.Success) {
+        } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.ServerRejected) {
+            logger.warn("Delete svr2 failed: ServerRejected");
+        } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.EnclaveNotFound) {
+            logger.warn("Delete svr2 failed: EnclaveNotFound");
+        } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.ApplicationError error) {
+            throw new IOException(error.getException());
+        } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.NetworkError error) {
+            throw error.getException();
+        } else {
+            throw new AssertionError("Unexpected response");
+        }
     }
 
-    public SvrPinData getRegistrationLockData(
+    public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
             String pin, LockedException e
     ) throws IOException, IncorrectPinException {
-        var basicStorageCredentials = e.getSvr1Credentials();
-        if (basicStorageCredentials == null) {
-            return null;
+        var svr1Credentials = e.getSvr1Credentials();
+        if (svr1Credentials != null) {
+            return getRegistrationLockData(secureValueRecoveryV1, svr1Credentials, pin);
         }
 
-        try {
-            return getRegistrationLockData(pin, basicStorageCredentials);
-        } catch (SvrNoDataException ex) {
-            throw new IOException(e);
-        } catch (KeyBackupServicePinException ex) {
-            throw new IncorrectPinException(ex.getTriesRemaining());
+        var svr2Credentials = e.getSvr2Credentials();
+        if (svr2Credentials != null) {
+            return getRegistrationLockData(secureValueRecoveryV2, svr2Credentials, pin);
         }
+
+        return null;
     }
 
-    private SvrPinData getRegistrationLockData(
-            String pin, AuthCredentials authCredentials
-    ) throws IOException, SvrNoDataException, KeyBackupServicePinException {
-        final var basicStorageCredentials = authCredentials.asBasic();
-        var tokenResponsePair = getTokenResponse(basicStorageCredentials);
-        final var tokenResponse = tokenResponsePair.first();
-        final var keyBackupService = tokenResponsePair.second();
+    public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
+            SecureValueRecovery secureValueRecovery, AuthCredentials authCredentials, String pin
+    ) throws IOException, IncorrectPinException {
+        final var restoreResponse = secureValueRecovery.restoreDataPreRegistration(authCredentials, pin);
 
-        var registrationLockData = restoreMasterKey(pin, basicStorageCredentials, tokenResponse, keyBackupService);
-        if (registrationLockData == null) {
-            throw new AssertionError("Failed to restore master key");
-        }
-        return registrationLockData;
-    }
-
-    private Pair<TokenResponse, KeyBackupService> getTokenResponse(String basicStorageCredentials) throws IOException {
-        final var keyBackupServices = Stream.concat(Stream.of(keyBackupService), fallbackKeyBackupServices.stream())
-                .toList();
-        for (final var keyBackupService : keyBackupServices) {
-            var tokenResponse = keyBackupService.getToken(basicStorageCredentials);
-            if (tokenResponse != null && tokenResponse.getTries() > 0) {
-                return new Pair<>(tokenResponse, keyBackupService);
-            }
-        }
-        throw new IOException("KBS Account locked, maximum pin attempts reached.");
-    }
-
-    private SvrPinData restoreMasterKey(
-            String pin,
-            String basicStorageCredentials,
-            TokenResponse tokenResponse,
-            final KeyBackupService keyBackupService
-    ) throws IOException, SvrNoDataException, KeyBackupServicePinException {
-        if (pin == null) return null;
-
-        if (basicStorageCredentials == null) {
-            throw new AssertionError("Cannot restore KBS key, no storage credentials supplied");
-        }
-
-        var session = keyBackupService.newRegistrationSession(basicStorageCredentials, tokenResponse);
-
-        try {
-            var hashedPin = PinHashUtil.hashPin(pin, session.hashSalt());
-            var kbsData = session.restorePin(hashedPin);
-            if (kbsData == null) {
-                throw new AssertionError("Null not expected");
-            }
-            return kbsData;
-        } catch (UnauthenticatedResponseException | InvalidKeyException e) {
-            throw new IOException(e);
+        if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.Success s) {
+            return s;
+        } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.PinMismatch pinMismatch) {
+            throw new IncorrectPinException(pinMismatch.getTriesRemaining());
+        } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.ApplicationError error) {
+            throw new IOException(error.getException());
+        } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.NetworkError error) {
+            throw error.getException();
+        } else {
+            throw new AssertionError("Unexpected response");
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index ff8076e0..bf53a9b8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -107,7 +107,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
                         config.getMrenclave(),
                         10))
                 .toList();
-        this.pinHelper = new PinHelper(keyBackupService, fallbackKeyBackupServices);
+        final var secureValueRecoveryV2 = accountManager.getSecureValueRecoveryV2(serviceEnvironmentConfig.getSvr2Mrenclave());
+        this.pinHelper = new PinHelper(keyBackupService, fallbackKeyBackupServices, secureValueRecoveryV2);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index bf2f76df..7b3a5a54 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -17,6 +17,7 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.ProfileService;
+import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
@@ -50,6 +51,7 @@ public class SignalDependencies {
     private SignalServiceMessageSender messageSender;
 
     private KeyBackupService keyBackupService;
+    private SecureValueRecoveryV2 secureValueRecoveryV2;
     private ProfileService profileService;
     private SignalServiceCipher cipher;
 
@@ -194,6 +196,11 @@ public class SignalDependencies {
                         10));
     }
 
+    public SecureValueRecoveryV2 getSecureValueRecoveryV2() {
+        return getOrCreate(() -> secureValueRecoveryV2,
+                () -> secureValueRecoveryV2 = getAccountManager().getSecureValueRecoveryV2(serviceEnvironmentConfig.getSvr2Mrenclave()));
+    }
+
     public Collection<KeyBackupService> getFallbackKeyBackupServices() {
         return serviceEnvironmentConfig.getFallbackKeyBackupConfigs()
                 .stream()

From 409a707baabd4a61293b8796a7f60f68501edafb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 20 Jul 2023 20:58:49 +0200
Subject: [PATCH 151/672] Update libsignal-service

---
 graalvm-config-dir/reflect-config.json             | 14 +++++++-------
 .../asamk/signal/manager/api/MessageEnvelope.java  | 10 +++++++---
 .../manager/helper/IncomingMessageHandler.java     |  8 ++++----
 .../asamk/signal/manager/helper/ReceiveHelper.java |  6 +++---
 .../internal/SignalWebSocketHealthMonitor.java     |  2 +-
 settings.gradle.kts                                |  2 +-
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 2c1fe0f0..676be954 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2577,7 +2577,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote",
-  "fields":[{"name":"attachments_"}, {"name":"authorUuid_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"id_"}, {"name":"text_"}, {"name":"type_"}]
+  "fields":[{"name":"attachments_"}, {"name":"authorAci_"}, {"name":"authorUuid_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"id_"}, {"name":"text_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote$QuotedAttachment",
@@ -2585,7 +2585,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Reaction",
-  "fields":[{"name":"bitField0_"}, {"name":"emoji_"}, {"name":"remove_"}, {"name":"targetAuthorUuid_"}, {"name":"targetSentTimestamp_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"emoji_"}, {"name":"remove_"}, {"name":"targetAuthorAci_"}, {"name":"targetAuthorUuid_"}, {"name":"targetSentTimestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Sticker",
@@ -2601,7 +2601,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Envelope",
-  "fields":[{"name":"bitField0_"}, {"name":"content_"}, {"name":"destinationUuid_"}, {"name":"reportingToken_"}, {"name":"serverGuid_"}, {"name":"serverTimestamp_"}, {"name":"sourceDevice_"}, {"name":"sourceUuid_"}, {"name":"story_"}, {"name":"timestamp_"}, {"name":"type_"}, {"name":"updatedPni_"}, {"name":"urgent_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"content_"}, {"name":"destinationServiceId_"}, {"name":"destinationUuid_"}, {"name":"reportingToken_"}, {"name":"serverGuid_"}, {"name":"serverTimestamp_"}, {"name":"sourceDevice_"}, {"name":"sourceServiceId_"}, {"name":"sourceUuid_"}, {"name":"story_"}, {"name":"timestamp_"}, {"name":"type_"}, {"name":"updatedPni_"}, {"name":"urgent_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContext",
@@ -2657,7 +2657,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage",
-  "fields":[{"name":"bitField0_"}, {"name":"blocked_"}, {"name":"callEvent_"}, {"name":"callLinkUpdate_"}, {"name":"configuration_"}, {"name":"contacts_"}, {"name":"fetchLatest_"}, {"name":"groups_"}, {"name":"keys_"}, {"name":"messageRequestResponse_"}, {"name":"outgoingPayment_"}, {"name":"padding_"}, {"name":"pniChangeNumber_"}, {"name":"read_"}, {"name":"request_"}, {"name":"sent_"}, {"name":"stickerPackOperation_"}, {"name":"verified_"}, {"name":"viewOnceOpen_"}, {"name":"viewed_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"blocked_"}, {"name":"callEvent_"}, {"name":"callLinkUpdate_"}, {"name":"callLogEvent_"}, {"name":"configuration_"}, {"name":"contacts_"}, {"name":"fetchLatest_"}, {"name":"groups_"}, {"name":"keys_"}, {"name":"messageRequestResponse_"}, {"name":"outgoingPayment_"}, {"name":"padding_"}, {"name":"pniChangeNumber_"}, {"name":"read_"}, {"name":"request_"}, {"name":"sent_"}, {"name":"stickerPackOperation_"}, {"name":"verified_"}, {"name":"viewOnceOpen_"}, {"name":"viewed_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Blocked",
@@ -2701,7 +2701,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Read",
-  "fields":[{"name":"bitField0_"}, {"name":"senderUuid_"}, {"name":"timestamp_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"senderAci_"}, {"name":"senderUuid_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Request",
@@ -2709,7 +2709,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationE164_"}, {"name":"destinationUuid_"}, {"name":"editMessage_"}, {"name":"expirationStartTimestamp_"}, {"name":"isRecipientUpdate_"}, {"name":"message_"}, {"name":"storyMessageRecipients_"}, {"name":"storyMessage_"}, {"name":"timestamp_"}, {"name":"unidentifiedStatus_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationE164_"}, {"name":"destinationServiceId_"}, {"name":"destinationUuid_"}, {"name":"editMessage_"}, {"name":"expirationStartTimestamp_"}, {"name":"isRecipientUpdate_"}, {"name":"message_"}, {"name":"storyMessageRecipients_"}, {"name":"storyMessage_"}, {"name":"timestamp_"}, {"name":"unidentifiedStatus_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$StoryMessageRecipient",
@@ -2717,7 +2717,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$UnidentifiedDeliveryStatus",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationUuid_"}, {"name":"unidentified_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationServiceId_"}, {"name":"destinationUuid_"}, {"name":"unidentified_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$StickerPackOperation",
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 9cc34aba..1ba25af6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -708,7 +708,9 @@ public record MessageEnvelope(
             Optional<Hangup> hangup,
             Optional<Busy> busy,
             List<IceUpdate> iceUpdate,
-            Optional<Opaque> opaque
+            Optional<Opaque> opaque,
+            boolean isMultiRing,
+            boolean isUrgent
     ) {
 
         public static Call from(final SignalServiceCallMessage callMessage) {
@@ -722,7 +724,9 @@ public record MessageEnvelope(
                     callMessage.getIceUpdateMessages()
                             .map(m -> m.stream().map(IceUpdate::from).toList())
                             .orElse(List.of()),
-                    callMessage.getOpaqueMessage().map(Opaque::from));
+                    callMessage.getOpaqueMessage().map(Opaque::from),
+                    callMessage.isMultiRing(),
+                    callMessage.isUrgent());
         }
 
         public record Offer(long id, String sdp, Type type, byte[] opaque) {
@@ -895,7 +899,7 @@ public record MessageEnvelope(
             final AttachmentFileProvider fileProvider,
             Exception exception
     ) {
-        final var source = !envelope.isUnidentifiedSender() && envelope.hasSourceUuid()
+        final var source = !envelope.isUnidentifiedSender() && envelope.hasSourceServiceId()
                 ? recipientResolver.resolveRecipient(envelope.getSourceAddress())
                 : envelope.isUnidentifiedSender() && content != null
                         ? recipientResolver.resolveRecipient(content.getSender())
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 0692a06e..b45f21d3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -137,7 +137,7 @@ public final class IncomingMessageHandler {
             final Manager.ReceiveMessageHandler handler
     ) {
         final var actions = new ArrayList<HandleAction>();
-        if (envelope.hasSourceUuid()) {
+        if (envelope.hasSourceServiceId()) {
             // Store uuid if we don't have it already
             // address/uuid in envelope is sent by server
             account.getRecipientTrustedResolver().resolveRecipientTrusted(envelope.getSourceAddress());
@@ -960,7 +960,7 @@ public final class IncomingMessageHandler {
     }
 
     private SignalServiceAddress getSenderAddress(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
+        if (!envelope.isUnidentifiedSender() && envelope.hasSourceServiceId()) {
             return envelope.getSourceAddress();
         } else if (content != null) {
             return content.getSender();
@@ -970,7 +970,7 @@ public final class IncomingMessageHandler {
     }
 
     private DeviceAddress getSender(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
+        if (!envelope.isUnidentifiedSender() && envelope.hasSourceServiceId()) {
             return new DeviceAddress(context.getRecipientHelper().resolveRecipient(envelope.getSourceAddress()),
                     envelope.getSourceAddress().getServiceId(),
                     envelope.getSourceDevice());
@@ -985,7 +985,7 @@ public final class IncomingMessageHandler {
         if (!envelope.hasDestinationUuid()) {
             return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
         }
-        final var addressOptional = SignalServiceAddress.fromRaw(envelope.getDestinationUuid(), null);
+        final var addressOptional = SignalServiceAddress.fromRaw(envelope.getDestinationServiceId(), null);
         if (addressOptional.isEmpty()) {
             return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 3d4ca38d..55c93e57 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -147,7 +147,7 @@ public class ReceiveHelper {
                     for (final var it : batch) {
                         SignalServiceEnvelope envelope1 = new SignalServiceEnvelope(it.getEnvelope(),
                                 it.getServerDeliveredTimestamp());
-                        final var recipientId = envelope1.hasSourceUuid() ? account.getRecipientResolver()
+                        final var recipientId = envelope1.hasSourceServiceId() ? account.getRecipientResolver()
                                 .resolveRecipient(envelope1.getSourceAddress()) : null;
                         logger.trace("Storing new message from {}", recipientId);
                         // store message on disk, before acknowledging receipt to the server
@@ -226,7 +226,7 @@ public class ReceiveHelper {
                 if (exception instanceof UntrustedIdentityException) {
                     logger.debug("Keeping message with untrusted identity in message cache");
                     final var address = ((UntrustedIdentityException) exception).getSender();
-                    if (!envelope.hasSourceUuid() && address.uuid().isPresent()) {
+                    if (!envelope.hasSourceServiceId() && address.uuid().isPresent()) {
                         final var recipientId = account.getRecipientResolver()
                                 .resolveRecipient(ServiceId.from(address.uuid().get()));
                         try {
@@ -273,7 +273,7 @@ public class ReceiveHelper {
                 cachedMessage.delete();
                 return null;
             }
-            if (!envelope.hasSourceUuid()) {
+            if (!envelope.hasSourceServiceId()) {
                 final var identifier = ((UntrustedIdentityException) exception).getSender();
                 final var recipientId = account.getRecipientResolver()
                         .resolveRecipient(new RecipientAddress(identifier));
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index f4ac35e2..0986d62e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -25,7 +25,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
 
     private final static Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
 
-    private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_TIMEOUT_SECONDS);
+    private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
     private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3;
 
     private SignalWebSocket signalWebSocket;
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f0f4e936..941d9ce0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_75")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_76")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From 86e1079195a6001f77d6ef5e20e0bd0b8dd11959 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 6 Aug 2023 16:24:30 +0200
Subject: [PATCH 152/672] Update libsignal-service

---
 CHANGELOG.md                                  |  1 +
 graalvm-config-dir/reflect-config.json        | 12 +--
 .../signal/manager/api/RecipientAddress.java  |  6 +-
 .../manager/helper/AccountFileUpdater.java    |  2 +-
 .../signal/manager/helper/AccountHelper.java  |  4 +-
 .../signal/manager/helper/GroupHelper.java    |  2 +-
 .../signal/manager/helper/GroupV2Helper.java  | 57 ++++++------
 .../helper/IncomingMessageHandler.java        | 12 +--
 .../signal/manager/helper/ReceiveHelper.java  |  4 +-
 .../manager/helper/RecipientHelper.java       |  6 +-
 .../signal/manager/helper/SendHelper.java     | 59 +++++++-----
 .../signal/manager/helper/StorageHelper.java  | 17 ++--
 .../internal/AccountFileUpdaterImpl.java      |  2 +-
 .../signal/manager/internal/ManagerImpl.java  |  6 +-
 .../internal/RegistrationManagerImpl.java     |  4 +-
 .../manager/storage/AccountDatabase.java      |  6 +-
 .../signal/manager/storage/SignalAccount.java |  8 +-
 .../storage/accounts/AccountsStore.java       |  2 +-
 .../storage/contacts/LegacyContactInfo.java   |  4 +-
 .../manager/storage/groups/GroupInfoV2.java   | 10 +--
 .../protocol/LegacyJsonIdentityKeyStore.java  |  4 +-
 .../protocol/LegacyJsonSessionStore.java      |  4 +-
 .../storage/recipients/RecipientAddress.java  |  9 +-
 .../storage/recipients/RecipientStore.java    | 23 ++---
 .../recipients/RecipientTrustedResolver.java  |  4 +-
 .../recipients/MergeRecipientHelperTest.java  | 90 +------------------
 settings.gradle.kts                           |  2 +-
 27 files changed, 152 insertions(+), 208 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8cbe4fc..08d45108 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## [Unreleased]
+**Attention**: Now requires native libsignal-client version 0.30.0
 
 ## [0.11.11] - 2023-05-24
 **Attention**: Now requires native libsignal-client version 0.25.0
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 676be954..5bb16c87 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1934,7 +1934,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedBannedMember",
-  "fields":[{"name":"timestamp_"}, {"name":"uuid_"}]
+  "fields":[{"name":"serviceIdBinary_"}, {"name":"timestamp_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroup",
@@ -1958,7 +1958,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMember",
-  "fields":[{"name":"addedByUuid_"}, {"name":"role_"}, {"name":"timestamp_"}, {"name":"uuidCipherText_"}, {"name":"uuid_"}]
+  "fields":[{"name":"addedByUuid_"}, {"name":"role_"}, {"name":"serviceIdBinary_"}, {"name":"timestamp_"}, {"name":"uuidCipherText_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval",
@@ -2517,7 +2517,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails",
-  "fields":[{"name":"archived_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"color_"}, {"name":"expireTimer_"}, {"name":"inboxPosition_"}, {"name":"name_"}, {"name":"number_"}, {"name":"profileKey_"}, {"name":"uuid_"}, {"name":"verified_"}]
+  "fields":[{"name":"aci_"}, {"name":"archived_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"color_"}, {"name":"expireTimer_"}, {"name":"inboxPosition_"}, {"name":"name_"}, {"name":"number_"}, {"name":"profileKey_"}, {"name":"uuid_"}, {"name":"verified_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails$Avatar",
@@ -2661,7 +2661,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Blocked",
-  "fields":[{"name":"groupIds_"}, {"name":"numbers_"}, {"name":"uuids_"}]
+  "fields":[{"name":"acis_"}, {"name":"groupIds_"}, {"name":"numbers_"}, {"name":"uuids_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$CallEvent",
@@ -2745,7 +2745,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Verified",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationUuid_"}, {"name":"identityKey_"}, {"name":"nullMessage_"}, {"name":"state_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationAci_"}, {"name":"destinationUuid_"}, {"name":"identityKey_"}, {"name":"nullMessage_"}, {"name":"state_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.StaleDevices",
@@ -2812,7 +2812,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PinnedConversation$Contact",
-  "fields":[{"name":"e164_"}, {"name":"uuid_"}]
+  "fields":[{"name":"e164_"}, {"name":"serviceId_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
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 f500e3a9..f042f8fb 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
@@ -1,14 +1,14 @@
 package org.asamk.signal.manager.api;
 
-import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.util.Optional;
 import java.util.UUID;
 
 public record RecipientAddress(Optional<UUID> uuid, Optional<String> number, Optional<String> username) {
 
-    public static final UUID UNKNOWN_UUID = ServiceId.UNKNOWN.uuid();
+    public static final UUID UNKNOWN_UUID = UuidUtil.UNKNOWN_UUID;
 
     /**
      * Construct a RecipientAddress.
@@ -32,7 +32,7 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number, Opt
     }
 
     public RecipientAddress(SignalServiceAddress address) {
-        this(Optional.of(address.getServiceId().uuid()), address.getNumber(), Optional.empty());
+        this(Optional.of(address.getServiceId().getRawUuid()), address.getNumber(), Optional.empty());
     }
 
     public RecipientAddress(UUID uuid) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountFileUpdater.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountFileUpdater.java
index a983e4b5..8edd5a4e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountFileUpdater.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountFileUpdater.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.helper;
 
-import org.whispersystems.signalservice.api.push.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
 public interface AccountFileUpdater {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 4841bdbd..485990ed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -21,8 +21,8 @@ import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index d987d3d1..eb54780e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -447,7 +447,7 @@ public class GroupHelper {
 
     private void storeProfileKeysFromMembers(final DecryptedGroup group) {
         for (var member : group.getMembersList()) {
-            final var serviceId = ServiceId.fromByteString(member.getUuid());
+            final var serviceId = ServiceId.parseOrThrow(member.getUuid());
             final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
             final var profileStore = account.getProfileStore();
             if (profileStore.getProfileKey(recipientId) != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 7cc28d6a..c817f01f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -39,9 +39,9 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2AuthorizationString
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.groupsv2.InvalidGroupStateException;
 import org.whispersystems.signalservice.api.groupsv2.NotAbleToApplyGroupV2ChangeException;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.util.UuidUtil;
@@ -124,7 +124,7 @@ class GroupV2Helper {
     }
 
     int findRevisionWeWereAdded(DecryptedGroup partialDecryptedGroup) {
-        ByteString bytes = UuidUtil.toByteString(getSelfAci().uuid());
+        ByteString bytes = getSelfAci().toByteString();
         for (DecryptedMember decryptedMember : partialDecryptedGroup.getMembersList()) {
             if (decryptedMember.getUuid().equals(bytes)) {
                 return decryptedMember.getJoinedAtRevision();
@@ -175,11 +175,11 @@ class GroupV2Helper {
             return null;
         }
 
-        final var self = new GroupCandidate(getSelfAci().uuid(), Optional.of(profileKeyCredential));
+        final var self = new GroupCandidate(getSelfAci(), Optional.of(profileKeyCredential));
         final var memberList = new ArrayList<>(members);
         final var credentials = context.getProfileHelper().getExpiringProfileKeyCredential(memberList).stream();
         final var uuids = memberList.stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid());
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId());
         var candidates = Utils.zip(uuids,
                         credentials,
                         (uuid, credential) -> new GroupCandidate(uuid, Optional.ofNullable(credential)))
@@ -227,18 +227,18 @@ class GroupV2Helper {
         final var memberList = new ArrayList<>(newMembers);
         final var credentials = context.getProfileHelper().getExpiringProfileKeyCredential(memberList).stream();
         final var uuids = memberList.stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid());
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId());
         var candidates = Utils.zip(uuids,
                         credentials,
                         (uuid, credential) -> new GroupCandidate(uuid, Optional.ofNullable(credential)))
                 .collect(Collectors.toSet());
         final var bannedUuids = groupInfoV2.getBannedMembers()
                 .stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId())
                 .collect(Collectors.toSet());
 
         final var aci = getSelfAci();
-        final var change = groupOperations.createModifyGroupMembershipChange(candidates, bannedUuids, aci.uuid());
+        final var change = groupOperations.createModifyGroupMembershipChange(candidates, bannedUuids, aci);
 
         change.setSourceUuid(getSelfAci().toByteString());
 
@@ -250,7 +250,7 @@ class GroupV2Helper {
     ) throws IOException {
         var pendingMembersList = groupInfoV2.getGroup().getPendingMembersList();
         final var selfAci = getSelfAci();
-        var selfPendingMember = DecryptedGroupUtil.findPendingByUuid(pendingMembersList, selfAci.uuid());
+        var selfPendingMember = DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, selfAci);
 
         if (selfPendingMember.isPresent()) {
             return revokeInvites(groupInfoV2, Set.of(selfPendingMember.get()));
@@ -259,11 +259,11 @@ class GroupV2Helper {
         final var adminUuids = membersToMakeAdmin.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::uuid)
+                .map(ServiceId::getRawUuid)
                 .toList();
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2,
-                groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci.uuid(), adminUuids));
+                groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci.getRawUuid(), adminUuids));
     }
 
     Pair<DecryptedGroup, GroupChange> removeMembers(
@@ -272,7 +272,7 @@ class GroupV2Helper {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::uuid)
+                .map(ServiceId::getRawUuid)
                 .collect(Collectors.toSet());
         return ejectMembers(groupInfoV2, memberUuids);
     }
@@ -283,7 +283,7 @@ class GroupV2Helper {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::uuid)
+                .map(ServiceId::getRawUuid)
                 .collect(Collectors.toSet());
         return approveJoinRequest(groupInfoV2, memberUuids);
     }
@@ -294,7 +294,7 @@ class GroupV2Helper {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::uuid)
+                .map(ServiceId::getRawUuid)
                 .collect(Collectors.toSet());
         return refuseJoinRequest(groupInfoV2, memberUuids);
     }
@@ -306,8 +306,7 @@ class GroupV2Helper {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::uuid)
-                .map(uuid -> DecryptedGroupUtil.findPendingByUuid(pendingMembersList, uuid))
+                .map(uuid -> DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, uuid))
                 .filter(Optional::isPresent)
                 .map(Optional::get)
                 .collect(Collectors.toSet());
@@ -320,7 +319,10 @@ class GroupV2Helper {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
         final var uuids = block.stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+                .map(member -> context.getRecipientHelper()
+                        .resolveSignalServiceAddress(member)
+                        .getServiceId()
+                        .getRawUuid())
                 .collect(Collectors.toSet());
 
         final var change = groupOperations.createBanUuidsChange(uuids,
@@ -337,11 +339,11 @@ class GroupV2Helper {
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
-        final var uuids = block.stream()
-                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+        final var serviceIds = block.stream()
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId())
                 .collect(Collectors.toSet());
 
-        final var change = groupOperations.createUnbanUuidsChange(uuids);
+        final var change = groupOperations.createUnbanServiceIdsChange(serviceIds);
 
         change.setSourceUuid(getSelfAci().toByteString());
 
@@ -394,7 +396,8 @@ class GroupV2Helper {
     Pair<DecryptedGroup, GroupChange> updateSelfProfileKey(GroupInfoV2 groupInfoV2) throws IOException {
         Optional<DecryptedMember> selfInGroup = groupInfoV2.getGroup() == null
                 ? Optional.empty()
-                : DecryptedGroupUtil.findMemberByUuid(groupInfoV2.getGroup().getMembersList(), getSelfAci().uuid());
+                : DecryptedGroupUtil.findMemberByUuid(groupInfoV2.getGroup().getMembersList(),
+                        getSelfAci().getRawUuid());
         if (selfInGroup.isEmpty()) {
             logger.trace("Not updating group, self not in group " + groupInfoV2.getGroupId().toBase64());
             return null;
@@ -471,8 +474,12 @@ class GroupV2Helper {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
         final var newRole = admin ? Member.Role.ADMINISTRATOR : Member.Role.DEFAULT;
-        final var change = groupOperations.createChangeMemberRole(address.getServiceId().uuid(), newRole);
-        return commitChange(groupInfoV2, change);
+        if (address.getServiceId() instanceof ACI aci) {
+            final var change = groupOperations.createChangeMemberRole(aci, newRole);
+            return commitChange(groupInfoV2, change);
+        } else {
+            throw new IllegalArgumentException("Can't make a PNI a group admin.");
+        }
     }
 
     Pair<DecryptedGroup, GroupChange> setMessageExpirationTimer(
@@ -558,7 +565,7 @@ class GroupV2Helper {
         final DecryptedGroup decryptedGroupState;
 
         try {
-            decryptedChange = groupOperations.decryptChange(changeActions, getSelfAci().uuid());
+            decryptedChange = groupOperations.decryptChange(changeActions, getSelfAci());
             decryptedGroupState = DecryptedGroupUtil.apply(previousGroupState, decryptedChange);
         } catch (VerificationFailedException | InvalidGroupStateException | NotAbleToApplyGroupV2ChangeException e) {
             throw new IOException(e);
@@ -610,7 +617,7 @@ class GroupV2Helper {
             return null;
         }
 
-        return new Pair<>(ServiceId.from(editor), profileKey);
+        return new Pair<>(ACI.from(editor), profileKey);
     }
 
     DecryptedGroup getUpdatedDecryptedGroup(DecryptedGroup group, DecryptedGroupChange decryptedGroupChange) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index b45f21d3..6ffa08fb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -66,9 +66,9 @@ import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage
 import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
@@ -139,7 +139,7 @@ public final class IncomingMessageHandler {
         final var actions = new ArrayList<HandleAction>();
         if (envelope.hasSourceServiceId()) {
             // Store uuid if we don't have it already
-            // address/uuid in envelope is sent by server
+            // uuid in envelope is sent by server
             account.getRecipientTrustedResolver().resolveRecipientTrusted(envelope.getSourceAddress());
         }
         SignalServiceContent content = null;
@@ -409,7 +409,7 @@ public final class IncomingMessageHandler {
     private boolean handlePniSignatureMessage(
             final SignalServicePniSignatureMessage message, final SignalServiceAddress senderAddress
     ) {
-        final var aci = ACI.from(senderAddress.getServiceId());
+        final var aci = senderAddress.getServiceId();
         final var aciIdentity = account.getIdentityKeyStore().getIdentityInfo(aci);
         final var pni = message.getPni();
         final var pniIdentity = account.getIdentityKeyStore().getIdentityInfo(pni);
@@ -428,7 +428,9 @@ public final class IncomingMessageHandler {
 
         logger.debug("Verified association of ACI {} with PNI {}", aci, pni);
         account.getRecipientTrustedResolver()
-                .resolveRecipientTrusted(Optional.of(aci), Optional.of(pni), senderAddress.getNumber());
+                .resolveRecipientTrusted(Optional.of(ACI.from(aci.getRawUuid())),
+                        Optional.of(pni),
+                        senderAddress.getNumber());
         return true;
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 55c93e57..b733507d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -12,7 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalWebSocket;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
 import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
 
@@ -228,7 +228,7 @@ public class ReceiveHelper {
                     final var address = ((UntrustedIdentityException) exception).getSender();
                     if (!envelope.hasSourceServiceId() && address.uuid().isPresent()) {
                         final var recipientId = account.getRecipientResolver()
-                                .resolveRecipient(ServiceId.from(address.uuid().get()));
+                                .resolveRecipient(ACI.from(address.uuid().get()));
                         try {
                             cachedMessage[0] = account.getMessageCache().replaceSender(cachedMessage[0], recipientId);
                         } catch (IOException ioException) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index a0f03b79..aff45ed2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -10,9 +10,9 @@ import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.CdsiV2Service;
 import org.whispersystems.util.Base64UrlSafe;
@@ -80,7 +80,7 @@ public class RecipientHelper {
 
     public RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) throws UnregisteredRecipientException {
         if (recipient instanceof RecipientIdentifier.Uuid uuidRecipient) {
-            return account.getRecipientResolver().resolveRecipient(ServiceId.from(uuidRecipient.uuid()));
+            return account.getRecipientResolver().resolveRecipient(ACI.from(uuidRecipient.uuid()));
         } else if (recipient instanceof RecipientIdentifier.Number numberRecipient) {
             final var number = numberRecipient.number();
             return account.getRecipientStore().resolveRecipientByNumber(number, () -> {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 666867fe..c1ba113a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -41,6 +41,7 @@ import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredExcepti
 import org.whispersystems.signalservice.api.push.exceptions.RateLimitException;
 import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.signalservice.internal.push.exceptions.InvalidUnidentifiedAccessHeaderException;
+import org.whispersystems.signalservice.internal.push.http.PartialSendCompleteListener;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -330,29 +331,41 @@ public class SendHelper {
         final AtomicLong entryId = new AtomicLong(-1);
 
         final var urgent = true;
-        final LegacySenderHandler legacySender = (recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendDataMessage(
-                recipients,
-                unidentifiedAccess,
-                isRecipientUpdate,
-                contentHint,
-                message,
-                SignalServiceMessageSender.LegacyGroupEvents.EMPTY,
-                sendResult -> {
-                    logger.trace("Partial message send result: {}", sendResult.isSuccess());
-                    synchronized (entryId) {
-                        if (entryId.get() == -1) {
-                            final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
-                                    sendResult,
-                                    contentHint,
-                                    urgent);
-                            entryId.set(newId);
-                        } else {
-                            messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
-                        }
-                    }
-                },
-                () -> false,
-                urgent);
+        final PartialSendCompleteListener partialSendCompleteListener = sendResult -> {
+            logger.trace("Partial message send result: {}", sendResult.isSuccess());
+            synchronized (entryId) {
+                if (entryId.get() == -1) {
+                    final var newId = messageSendLogStore.insertIfPossible(message.getTimestamp(),
+                            sendResult,
+                            contentHint,
+                            urgent);
+                    entryId.set(newId);
+                } else {
+                    messageSendLogStore.addRecipientToExistingEntryIfPossible(entryId.get(), sendResult);
+                }
+            }
+        };
+        final LegacySenderHandler legacySender = (recipients, unidentifiedAccess, isRecipientUpdate) ->
+                editTargetTimestamp.isEmpty()
+                        ? messageSender.sendDataMessage(recipients,
+                        unidentifiedAccess,
+                        isRecipientUpdate,
+                        contentHint,
+                        message,
+                        SignalServiceMessageSender.LegacyGroupEvents.EMPTY,
+                        partialSendCompleteListener,
+                        () -> false,
+                        urgent)
+                        : messageSender.sendEditMessage(recipients,
+                                unidentifiedAccess,
+                                isRecipientUpdate,
+                                contentHint,
+                                message,
+                                SignalServiceMessageSender.LegacyGroupEvents.EMPTY,
+                                partialSendCompleteListener,
+                                () -> false,
+                                urgent,
+                                editTargetTimestamp.get());
         final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendGroupDataMessage(
                 distId,
                 recipients,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index fc084f28..863bdf99 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -101,15 +101,16 @@ public class StorageHelper {
         }
 
         final var contactRecord = record.getContact().get();
-        final var serviceId = contactRecord.getServiceId();
-        if (contactRecord.getNumber().isEmpty() && serviceId.isUnknown()) {
+        final var aci = contactRecord.getAci();
+        final var pni = contactRecord.getPni().orElse(null);
+        if (contactRecord.getNumber().isEmpty() && aci.isUnknown()) {
             return;
         }
-        final var address = new RecipientAddress(serviceId, contactRecord.getNumber().orElse(null));
+        final var address = new RecipientAddress(aci, pni, contactRecord.getNumber().orElse(null));
         var recipientId = account.getRecipientResolver().resolveRecipient(address);
-        if (serviceId.isValid() && contactRecord.getUsername().isPresent()) {
+        if (aci.isValid() && contactRecord.getUsername().isPresent()) {
             recipientId = account.getRecipientTrustedResolver()
-                    .resolveRecipientTrusted(serviceId, contactRecord.getUsername().get());
+                    .resolveRecipientTrusted(aci, contactRecord.getUsername().get());
         }
 
         final var contact = account.getContactStore().getContact(recipientId);
@@ -170,15 +171,15 @@ public class StorageHelper {
                 logger.warn("Received invalid contact profile key from storage");
             }
         }
-        if (contactRecord.getIdentityKey().isPresent() && serviceId.isValid()) {
+        if (contactRecord.getIdentityKey().isPresent() && aci.isValid()) {
             try {
                 logger.trace("Storing identity key {}", recipientId);
                 final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get());
-                account.getIdentityKeyStore().saveIdentity(serviceId, identityKey);
+                account.getIdentityKeyStore().saveIdentity(aci, identityKey);
 
                 final var trustLevel = TrustLevel.fromIdentityState(contactRecord.getIdentityState());
                 if (trustLevel != null) {
-                    account.getIdentityKeyStore().setIdentityTrustLevel(serviceId, identityKey, trustLevel);
+                    account.getIdentityKeyStore().setIdentityTrustLevel(aci, identityKey, trustLevel);
                 }
             } catch (InvalidKeyException e) {
                 logger.warn("Received invalid contact identity key from storage");
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
index 5c99d0c1..35564362 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/AccountFileUpdaterImpl.java
@@ -2,7 +2,7 @@ package org.asamk.signal.manager.internal;
 
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
-import org.whispersystems.signalservice.api.push.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
 public class AccountFileUpdaterImpl implements AccountFileUpdater {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 4e2fd82c..36051333 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -80,8 +80,8 @@ import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServicePreview;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
-import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
@@ -239,7 +239,7 @@ public class ManagerImpl implements Manager {
                     : context.getProfileHelper()
                             .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId));
             return new UserStatus(number.isEmpty() ? null : number,
-                    serviceId == null ? null : serviceId.uuid(),
+                    serviceId == null ? null : serviceId.getRawUuid(),
                     profile != null
                             && profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNRESTRICTED);
         }));
@@ -700,7 +700,7 @@ public class ManagerImpl implements Manager {
         for (final var recipient : recipients) {
             if (recipient instanceof RecipientIdentifier.Uuid u) {
                 account.getMessageSendLogStore()
-                        .deleteEntryForRecipientNonGroup(targetSentTimestamp, ServiceId.from(u.uuid()));
+                        .deleteEntryForRecipientNonGroup(targetSentTimestamp, ACI.from(u.uuid()));
             } else if (recipient instanceof RecipientIdentifier.Single r) {
                 try {
                     final var recipientId = context.getRecipientHelper().resolveRecipient(r);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index bf53a9b8..720b2de1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -39,8 +39,8 @@ import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 7f6babe6..f40e23ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -15,7 +15,7 @@ import org.asamk.signal.manager.storage.sessions.SessionStore;
 import org.asamk.signal.manager.storage.stickers.StickerStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
 import java.io.File;
 import java.sql.Connection;
@@ -315,7 +315,7 @@ public class AccountDatabase extends Database {
                                 WHERE i.uuid = ?
                                 """;
                 try (final var statement = connection.prepareStatement(sql)) {
-                    statement.setBytes(1, ServiceId.UNKNOWN.toByteArray());
+                    statement.setBytes(1, ACI.UNKNOWN.toByteArray());
                     statement.executeUpdate();
                 }
             }
@@ -325,7 +325,7 @@ public class AccountDatabase extends Database {
                                 WHERE i.uuid = ?
                                 """;
                 try (final var statement = connection.prepareStatement(sql)) {
-                    statement.setBytes(1, ServiceId.UNKNOWN.toByteArray());
+                    statement.setBytes(1, ACI.UNKNOWN.toByteArray());
                     statement.executeUpdate();
                 }
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index c9974e86..647e9ee0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -67,9 +67,9 @@ import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
@@ -558,7 +558,7 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.hasNonNull("pni")) {
             try {
-                pni = PNI.parseOrThrow(rootNode.get("pni").asText());
+                pni = PNI.from(UuidUtil.parseOrThrow(rootNode.get("pni").asText()));
             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid pni, needs to be a valid UUID", e);
             }
@@ -967,7 +967,7 @@ public class SignalAccount implements Closeable {
                     .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
                     .put("usernameIdentifier", username)
                     .put("uuid", aci == null ? null : aci.toString())
-                    .put("pni", pni == null ? null : pni.toString())
+                    .put("pni", pni == null ? null : pni.getRawUuid().toString())
                     .put("sessionId", sessionId)
                     .put("sessionNumber", sessionNumber)
                     .put("deviceName", encryptedDeviceName)
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
index e7297c6b..0e9fc5fc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
@@ -9,7 +9,7 @@ import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/contacts/LegacyContactInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/LegacyContactInfo.java
index 0d297e7f..50dcd91e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/contacts/LegacyContactInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/contacts/LegacyContactInfo.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 
 import java.util.UUID;
 
@@ -44,6 +44,6 @@ public class LegacyContactInfo {
 
     @JsonIgnore
     public RecipientAddress getAddress() {
-        return new RecipientAddress(uuid == null ? null : ServiceId.from(uuid), number);
+        return new RecipientAddress(uuid == null ? null : ACI.from(uuid), number);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index 3e5eac7a..199a9da0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -114,7 +114,7 @@ public final class GroupInfoV2 extends GroupInfo {
         }
         return group.getMembersList()
                 .stream()
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+                .map(m -> ServiceId.parseOrThrow(m.getUuid()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -126,7 +126,7 @@ public final class GroupInfoV2 extends GroupInfo {
         }
         return group.getBannedMembersList()
                 .stream()
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+                .map(m -> ServiceId.parseOrThrow(m.getServiceIdBinary()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -138,7 +138,7 @@ public final class GroupInfoV2 extends GroupInfo {
         }
         return group.getPendingMembersList()
                 .stream()
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+                .map(m -> ServiceId.parseOrThrow(m.getServiceIdBinary()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -150,7 +150,7 @@ public final class GroupInfoV2 extends GroupInfo {
         }
         return group.getRequestingMembersList()
                 .stream()
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+                .map(m -> ServiceId.parseOrThrow(m.getUuid()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -163,7 +163,7 @@ public final class GroupInfoV2 extends GroupInfo {
         return group.getMembersList()
                 .stream()
                 .filter(m -> m.getRole() == Member.Role.ADMINISTRATOR)
-                .map(m -> ServiceId.fromByteString(m.getUuid()))
+                .map(m -> ServiceId.parseOrThrow(m.getUuid()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
index 4d94b455..56986333 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
@@ -13,7 +13,7 @@ import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;
@@ -101,7 +101,7 @@ public class LegacyJsonIdentityKeyStore {
                             : null;
                     final var address = uuid == null
                             ? Utils.getRecipientAddressFromIdentifier(trustedKeyName)
-                            : new RecipientAddress(ServiceId.from(uuid), trustedKeyName);
+                            : new RecipientAddress(ACI.from(uuid), trustedKeyName);
                     try {
                         var id = new IdentityKey(Base64.getDecoder().decode(trustedKey.get("identityKey").asText()), 0);
                         var trustLevel = trustedKey.hasNonNull("trustLevel") ? TrustLevel.fromInt(trustedKey.get(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
index df8f5cda..73a85f76 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;
@@ -48,7 +48,7 @@ public class LegacyJsonSessionStore {
                     var uuid = session.hasNonNull("uuid") ? UuidUtil.parseOrNull(session.get("uuid").asText()) : null;
                     final var address = uuid == null
                             ? Utils.getRecipientAddressFromIdentifier(sessionName)
-                            : new RecipientAddress(ServiceId.from(uuid), sessionName);
+                            : new RecipientAddress(ACI.from(uuid), sessionName);
                     final var deviceId = session.get("deviceId").asInt();
                     final var record = Base64.getDecoder().decode(session.get("record").asText());
                     var sessionInfo = new LegacySessionInfo(address, deviceId, record);
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 f323a5cb..86ada86a 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
@@ -1,7 +1,8 @@
 package org.asamk.signal.manager.storage.recipients;
 
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Optional;
@@ -63,7 +64,7 @@ public record RecipientAddress(
     }
 
     public RecipientAddress(org.asamk.signal.manager.api.RecipientAddress address) {
-        this(address.uuid().map(ServiceId::from), Optional.empty(), address.number(), address.username());
+        this(address.uuid().map(ACI::from), Optional.empty(), address.number(), address.username());
     }
 
     public RecipientAddress(ServiceId serviceId) {
@@ -169,11 +170,11 @@ public record RecipientAddress(
     }
 
     public SignalServiceAddress toSignalServiceAddress() {
-        return new SignalServiceAddress(serviceId.orElse(ServiceId.UNKNOWN), number);
+        return new SignalServiceAddress(serviceId.orElse(ACI.UNKNOWN), number);
     }
 
     public org.asamk.signal.manager.api.RecipientAddress toApiRecipientAddress() {
-        return new org.asamk.signal.manager.api.RecipientAddress(serviceId().map(ServiceId::uuid),
+        return new org.asamk.signal.manager.api.RecipientAddress(serviceId().map(ServiceId::getRawUuid),
                 number(),
                 username());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 9c13459b..5a112c79 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -13,9 +13,9 @@ import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
@@ -509,7 +509,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                     statement.setBytes(3,
                             recipient.getAddress()
                                     .serviceId()
-                                    .map(ServiceId::uuid)
+                                    .map(ServiceId::getRawUuid)
                                     .map(UuidUtil::toByteArray)
                                     .orElse(null));
                     statement.executeUpdate();
@@ -754,8 +754,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, address.number().orElse(null));
-            statement.setBytes(2, address.serviceId().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setBytes(3, address.pni().map(PNI::uuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(2,
+                    address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.executeUpdate();
             final var generatedKeys = statement.getGeneratedKeys();
             if (generatedKeys.next()) {
@@ -794,8 +795,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, address.number().orElse(null));
-            statement.setBytes(2, address.serviceId().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setBytes(3, address.pni().map(PNI::uuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(2,
+                    address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setString(4, address.username().orElse(null));
             statement.setLong(5, recipientId.id());
             statement.executeUpdate();
@@ -886,7 +888,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                         LIMIT 1
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, UuidUtil.toByteArray(serviceId.uuid()));
+            statement.setBytes(1, UuidUtil.toByteArray(serviceId.getRawUuid()));
             return Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
         }
     }
@@ -903,8 +905,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                               r.username = ?4
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, address.serviceId().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setBytes(2, address.pni().map(ServiceId::uuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(1,
+                    address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(2, address.pni().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setString(3, address.number().orElse(null));
             statement.setString(4, address.username().orElse(null));
             return Utils.executeQueryForStream(statement, this::getRecipientWithAddressFromResultSet)
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
index 9fc46d67..54e5d5d1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.storage.recipients;
 
-import org.whispersystems.signalservice.api.push.ACI;
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Optional;
diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
index 42a57d35..a617ce93 100644
--- a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
@@ -3,8 +3,8 @@ package org.asamk.signal.manager.storage.recipients;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -17,170 +17,90 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class MergeRecipientHelperTest {
 
-    static final ServiceId SERVICE_ID_A = ServiceId.from(UUID.randomUUID());
-    static final ServiceId SERVICE_ID_B = ServiceId.from(UUID.randomUUID());
-    static final ServiceId SERVICE_ID_C = ServiceId.from(UUID.randomUUID());
+    static final ServiceId SERVICE_ID_A = ServiceId.ACI.from(UUID.randomUUID());
+    static final ServiceId SERVICE_ID_B = ServiceId.ACI.from(UUID.randomUUID());
     static final PNI PNI_A = PNI.from(UUID.randomUUID());
     static final PNI PNI_B = PNI.from(UUID.randomUUID());
-    static final PNI PNI_C = PNI.from(UUID.randomUUID());
     static final String NUMBER_A = "+AAA";
     static final String NUMBER_B = "+BBB";
-    static final String NUMBER_C = "+CCC";
 
     static final PartialAddresses ADDR_A = new PartialAddresses(SERVICE_ID_A, PNI_A, NUMBER_A);
     static final PartialAddresses ADDR_B = new PartialAddresses(SERVICE_ID_B, PNI_B, NUMBER_B);
 
     static T[] testInstancesNone = new T[]{
-            // 1
             new T(Set.of(), ADDR_A.FULL, Set.of(rec(1000000, ADDR_A.FULL))),
             new T(Set.of(), ADDR_A.ACI_NUM, Set.of(rec(1000000, ADDR_A.ACI_NUM))),
             new T(Set.of(), ADDR_A.ACI_PNI, Set.of(rec(1000000, ADDR_A.ACI_PNI))),
-            new T(Set.of(), ADDR_A.PNI_S_NUM, Set.of(rec(1000000, ADDR_A.PNI_S_NUM))),
             new T(Set.of(), ADDR_A.PNI_NUM, Set.of(rec(1000000, ADDR_A.PNI_NUM))),
     };
 
     static T[] testInstancesSingle = new T[]{
-            // 1
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
 
-            // 10
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
             new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.PNI), rec(1000000, ADDR_A.ACI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S)),
-                    ADDR_A.ACI_NUM,
-                    Set.of(rec(1, ADDR_A.PNI_S), rec(1000000, ADDR_A.ACI_NUM))),
             new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
             new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
             new T(Set.of(rec(1, ADDR_A.PNI_NUM)),
                     ADDR_A.ACI_NUM,
                     Set.of(rec(1, ADDR_A.PNI), rec(1000000, ADDR_A.ACI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)),
-                    ADDR_A.ACI_NUM,
-                    Set.of(rec(1, ADDR_A.PNI_S), rec(1000000, ADDR_A.ACI_NUM))),
             new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
 
-            // 19
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_NUM))),
             new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
             new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
             new T(Set.of(rec(1, ADDR_A.ACI_NUM)),
                     ADDR_A.PNI_NUM,
                     Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_NUM))),
             new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
             new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.FULL))),
 
-            // 28
-            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.ACI)),
-                    ADDR_A.PNI_S_NUM,
-                    Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_S_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_S_NUM))),
-            new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_S_NUM))),
-            new T(Set.of(rec(1, ADDR_A.ACI_NUM)),
-                    ADDR_A.PNI_S_NUM,
-                    Set.of(rec(1, ADDR_A.ACI), rec(1000000, ADDR_A.PNI_S_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_S_NUM))),
-            new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.FULL))),
-
-            // 37
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
             new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
             new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.NUM), rec(1000000, ADDR_A.ACI_PNI))),
             new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
 
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_B.FULL, Set.of(rec(1, ADDR_A.FULL), rec(1000000, ADDR_B.FULL))),
     };
 
     static T[] testInstancesTwo = new T[]{
-            // 1
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.ACI_NUM)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.PNI_S)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.FULL, Set.of(rec(2, ADDR_A.FULL))),
 
-            // 12
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)),
-                    ADDR_A.ACI_NUM,
-                    Set.of(rec(1, ADDR_A.ACI_NUM), rec(2, ADDR_A.PNI_S))),
             new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.ACI_NUM, Set.of(rec(2, ADDR_A.FULL))),
 
-            // 16
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)),
                     ADDR_A.PNI_NUM,
                     Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)),
-                    ADDR_A.PNI_NUM,
-                    Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM))),
             new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
             new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)),
                     ADDR_A.PNI_NUM,
                     Set.of(rec(1, ADDR_A.PNI_NUM), rec(2, ADDR_A.ACI))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.NUM)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.ACI_NUM)),
-                    ADDR_A.PNI_NUM,
-                    Set.of(rec(1, ADDR_A.PNI_NUM), rec(2, ADDR_A.ACI))),
-            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.PNI_S)), ADDR_A.PNI_NUM, Set.of(rec(2, ADDR_A.PNI_NUM))),
             new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.PNI_NUM, Set.of(rec(2, ADDR_A.FULL))),
 
-            // 24
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)),
-                    ADDR_A.PNI_S_NUM,
-                    Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)),
-                    ADDR_A.PNI_S_NUM,
-                    Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)),
-                    ADDR_A.PNI_S_NUM,
-                    Set.of(rec(1, ADDR_A.PNI_NUM), rec(2, ADDR_A.ACI))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.NUM)), ADDR_A.PNI_S_NUM, Set.of(rec(1, ADDR_A.PNI_S_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.ACI_NUM)),
-                    ADDR_A.PNI_S_NUM,
-                    Set.of(rec(1, ADDR_A.PNI_S_NUM), rec(2, ADDR_A.ACI))),
-            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.PNI_S)), ADDR_A.PNI_S_NUM, Set.of(rec(2, ADDR_A.PNI_S_NUM))),
-            new T(Set.of(rec(1, ADDR_A.NUM), rec(2, ADDR_A.ACI_PNI)), ADDR_A.PNI_S_NUM, Set.of(rec(2, ADDR_A.FULL))),
-
-            // 32
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_S_NUM)),
-                    ADDR_A.ACI_PNI,
-                    Set.of(rec(1, ADDR_A.ACI_PNI), rec(2, ADDR_A.NUM))),
             new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(2, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.PNI_S), rec(2, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(2, ADDR_A.FULL))),
     };
 
     static T[] testInstancesThree = new T[]{
-            // 1
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
                     ADDR_A.FULL,
                     Set.of(rec(1, ADDR_A.FULL))),
@@ -307,11 +227,9 @@ class MergeRecipientHelperTest {
             RecipientAddress FULL,
             RecipientAddress ACI,
             RecipientAddress PNI,
-            RecipientAddress PNI_S,
             RecipientAddress NUM,
             RecipientAddress ACI_NUM,
             RecipientAddress PNI_NUM,
-            RecipientAddress PNI_S_NUM,
             RecipientAddress ACI_PNI
     ) {
 
@@ -319,11 +237,9 @@ class MergeRecipientHelperTest {
             this(new RecipientAddress(serviceId, pni, number),
                     new RecipientAddress(serviceId, null, null),
                     new RecipientAddress(null, pni, null),
-                    new RecipientAddress(ServiceId.from(pni.uuid()), null, null),
                     new RecipientAddress(null, null, number),
                     new RecipientAddress(serviceId, null, number),
                     new RecipientAddress(null, pni, number),
-                    new RecipientAddress(ServiceId.from(pni.uuid()), null, number),
                     new RecipientAddress(serviceId, pni, null));
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 941d9ce0..14a476ce 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_76")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_77")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From 6bde5960aa1e019612544c3e9e061dd737a67a37 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 7 Aug 2023 21:03:39 +0200
Subject: [PATCH 153/672] Fix issues with pni parsing

---
 graalvm-config-dir/reflect-config.json        | 109 ++++++++++--------
 graalvm-config-dir/resource-config.json       |   2 +
 .../signal/manager/helper/AccountHelper.java  |   5 +-
 .../internal/RegistrationManagerImpl.java     |   5 +-
 .../storage/recipients/RecipientStore.java    |   6 +-
 run_tests.sh                                  |  13 ++-
 .../java/org/asamk/signal/BaseConfig.java     |   2 +-
 7 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 5bb16c87..ab5eff95 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -86,6 +86,12 @@
 {
   "name":"com.fasterxml.jackson.annotation.JsonProperty"
 },
+{
+  "name":"com.fasterxml.jackson.databind.annotation.JsonDeserialize"
+},
+{
+  "name":"com.fasterxml.jackson.databind.annotation.JsonSerialize"
+},
 {
   "name":"com.fasterxml.jackson.databind.ext.Java7HandlersImpl",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -229,7 +235,8 @@
   "name":"java.lang.Boolean",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.lang.Class",
@@ -257,7 +264,8 @@
   "name":"java.lang.Integer",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"valueOf","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"java.lang.Iterable",
@@ -675,7 +683,8 @@
   "name":"org.asamk.signal.commands.ListContactsCommand$JsonContact",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"color","parameterTypes":[] }, {"name":"isBlocked","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"profile","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListContactsCommand$JsonContact$JsonProfile",
@@ -688,19 +697,22 @@
   "name":"org.asamk.signal.commands.ListDevicesCommand$JsonDevice",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"createdTimestamp","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"lastSeenTimestamp","parameterTypes":[] }, {"name":"name","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListGroupsCommand$JsonGroup",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"admins","parameterTypes":[] }, {"name":"banned","parameterTypes":[] }, {"name":"description","parameterTypes":[] }, {"name":"groupInviteLink","parameterTypes":[] }, {"name":"id","parameterTypes":[] }, {"name":"isBlocked","parameterTypes":[] }, {"name":"isMember","parameterTypes":[] }, {"name":"members","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"pendingMembers","parameterTypes":[] }, {"name":"permissionAddMember","parameterTypes":[] }, {"name":"permissionEditDetails","parameterTypes":[] }, {"name":"permissionSendMessage","parameterTypes":[] }, {"name":"requestingMembers","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListGroupsCommand$JsonGroupMember",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"number","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListIdentitiesCommand$JsonIdentity",
@@ -1743,6 +1755,15 @@
   "name":"org.signal.cdsi.proto.ClientResponse",
   "fields":[{"name":"debugPermitsUsed_"}, {"name":"e164PniAciTriples_"}, {"name":"retryAfterSecs_"}, {"name":"token_"}]
 },
+{
+  "name":"org.signal.libsignal.protocol.IdentityKey"
+},
+{
+  "name":"org.signal.libsignal.protocol.ecc.ECPublicKey"
+},
+{
+  "name":"org.signal.libsignal.protocol.kem.KEMPublicKey"
+},
 {
   "name":"org.signal.libsignal.protocol.state.IdentityKeyStore",
   "allDeclaredMethods":true
@@ -1934,7 +1955,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedBannedMember",
-  "fields":[{"name":"serviceIdBinary_"}, {"name":"timestamp_"}, {"name":"uuid_"}]
+  "fields":[{"name":"serviceIdBinary_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroup",
@@ -1958,11 +1979,11 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMember",
-  "fields":[{"name":"addedByUuid_"}, {"name":"role_"}, {"name":"serviceIdBinary_"}, {"name":"timestamp_"}, {"name":"uuidCipherText_"}, {"name":"uuid_"}]
+  "fields":[{"name":"addedByUuid_"}, {"name":"role_"}, {"name":"serviceIdBinary_"}, {"name":"timestamp_"}, {"name":"uuidCipherText_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval",
-  "fields":[{"name":"uuidCipherText_"}, {"name":"uuid_"}]
+  "fields":[{"name":"uuidCipherText_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedRequestingMember",
@@ -1984,7 +2005,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"getCapabilities","parameterTypes":[] }, {"name":"getDiscoverableByPhoneNumber","parameterTypes":[] }, {"name":"getFetchesMessages","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getPin","parameterTypes":[] }, {"name":"getPniRegistrationId","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getRegistrationId","parameterTypes":[] }, {"name":"getRegistrationLock","parameterTypes":[] }, {"name":"getSignalingKey","parameterTypes":[] }, {"name":"getUnidentifiedAccessKey","parameterTypes":[] }, {"name":"getUnrestrictedUnidentifiedAccess","parameterTypes":[] }, {"name":"getVideo","parameterTypes":[] }, {"name":"getVoice","parameterTypes":[] }]
+  "methods":[{"name":"getCapabilities","parameterTypes":[] }, {"name":"getDiscoverableByPhoneNumber","parameterTypes":[] }, {"name":"getFetchesMessages","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getPniRegistrationId","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getRegistrationId","parameterTypes":[] }, {"name":"getRegistrationLock","parameterTypes":[] }, {"name":"getSignalingKey","parameterTypes":[] }, {"name":"getUnidentifiedAccessKey","parameterTypes":[] }, {"name":"getUnrestrictedUnidentifiedAccess","parameterTypes":[] }, {"name":"getVideo","parameterTypes":[] }, {"name":"getVoice","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.AccountAttributes$Capabilities",
@@ -2079,12 +2100,6 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
-{
-  "name":"org.whispersystems.signalservice.api.push.ACI",
-  "allDeclaredFields":true,
-  "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
-},
 {
   "name":"org.whispersystems.signalservice.api.push.ServiceId",
   "allDeclaredFields":true,
@@ -2096,6 +2111,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getSignature","parameterTypes":[] }]
 },
 {
@@ -2224,7 +2240,8 @@
   "name":"org.whispersystems.signalservice.internal.push.AttachmentV2UploadAttributes",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.AuthCredentials",
@@ -2263,7 +2280,8 @@
   "name":"org.whispersystems.signalservice.internal.push.DeviceId",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.DeviceInfoList",
@@ -2276,7 +2294,8 @@
   "name":"org.whispersystems.signalservice.internal.push.GcmRegistrationId",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","boolean"] }, {"name":"getGcmRegistrationId","parameterTypes":[] }, {"name":"getWebSocketChannel","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.GetAciByUsernameResponse",
@@ -2302,6 +2321,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity",
   "allDeclaredFields":true,
+  "allDeclaredClasses":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getKeyId","parameterTypes":[] }, {"name":"getPublicKey","parameterTypes":[] }, {"name":"getSignature","parameterTypes":[] }]
@@ -2357,6 +2377,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getKeyId","parameterTypes":[] }, {"name":"getPublicKey","parameterTypes":[] }]
 },
 {
@@ -2386,20 +2407,15 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
+  "allDeclaredClasses":true,
   "methods":[{"name":"getIdentityKey","parameterTypes":[] }, {"name":"getPreKeys","parameterTypes":[] }, {"name":"getSignedPreKey","parameterTypes":[] }]
 },
-{
-  "name":"org.whispersystems.signalservice.internal.push.PreKeyStatus",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-},
 {
   "name":"org.whispersystems.signalservice.internal.push.ProfileAvatarUploadAttributes",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningMessage",
@@ -2423,7 +2439,8 @@
   "name":"org.whispersystems.signalservice.internal.push.PushServiceSocket$RegistrationLockFailure",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.PushServiceSocket$RegistrationLockV2",
@@ -2436,14 +2453,14 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.Integer","java.lang.Integer","java.lang.Integer","boolean","java.util.List","boolean"] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.Integer","java.lang.Integer","java.lang.Integer","boolean","java.util.List","boolean"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.Integer","java.lang.Integer","java.lang.Integer","boolean","java.util.List","boolean","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.RegistrationSessionRequestBody",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"getAccountAttributes","parameterTypes":[] }, {"name":"getAciIdentityKey","parameterTypes":[] }, {"name":"getAciPqLastResortPreKey","parameterTypes":[] }, {"name":"getAciSignedPreKey","parameterTypes":[] }, {"name":"getGcmToken","parameterTypes":[] }, {"name":"getPniIdentityKey","parameterTypes":[] }, {"name":"getPniPqLastResortPreKey","parameterTypes":[] }, {"name":"getPniSignedPreKey","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getSessionId","parameterTypes":[] }, {"name":"getSkipDeviceTransfer","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","org.whispersystems.signalservice.api.account.AccountAttributes","java.lang.String","java.lang.String","org.whispersystems.signalservice.api.push.SignedPreKeyEntity","org.whispersystems.signalservice.api.push.SignedPreKeyEntity","org.whispersystems.signalservice.internal.push.KyberPreKeyEntity","org.whispersystems.signalservice.internal.push.KyberPreKeyEntity","org.whispersystems.signalservice.internal.push.GcmRegistrationId","boolean","boolean"] }, {"name":"getAccountAttributes","parameterTypes":[] }, {"name":"getAciIdentityKey","parameterTypes":[] }, {"name":"getAciPqLastResortPreKey","parameterTypes":[] }, {"name":"getAciSignedPreKey","parameterTypes":[] }, {"name":"getGcmToken","parameterTypes":[] }, {"name":"getPniIdentityKey","parameterTypes":[] }, {"name":"getPniPqLastResortPreKey","parameterTypes":[] }, {"name":"getPniSignedPreKey","parameterTypes":[] }, {"name":"getRecoveryPassword","parameterTypes":[] }, {"name":"getRequireAtomic","parameterTypes":[] }, {"name":"getSessionId","parameterTypes":[] }, {"name":"getSkipDeviceTransfer","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.ReserveUsernameRequest",
@@ -2517,7 +2534,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails",
-  "fields":[{"name":"aci_"}, {"name":"archived_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"color_"}, {"name":"expireTimer_"}, {"name":"inboxPosition_"}, {"name":"name_"}, {"name":"number_"}, {"name":"profileKey_"}, {"name":"uuid_"}, {"name":"verified_"}]
+  "fields":[{"name":"aci_"}, {"name":"archived_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"color_"}, {"name":"expireTimer_"}, {"name":"inboxPosition_"}, {"name":"name_"}, {"name":"number_"}, {"name":"profileKey_"}, {"name":"verified_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails$Avatar",
@@ -2577,7 +2594,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote",
-  "fields":[{"name":"attachments_"}, {"name":"authorAci_"}, {"name":"authorUuid_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"id_"}, {"name":"text_"}, {"name":"type_"}]
+  "fields":[{"name":"attachments_"}, {"name":"authorAci_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"id_"}, {"name":"text_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote$QuotedAttachment",
@@ -2585,7 +2602,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Reaction",
-  "fields":[{"name":"bitField0_"}, {"name":"emoji_"}, {"name":"remove_"}, {"name":"targetAuthorAci_"}, {"name":"targetAuthorUuid_"}, {"name":"targetSentTimestamp_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"emoji_"}, {"name":"remove_"}, {"name":"targetAuthorAci_"}, {"name":"targetSentTimestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Sticker",
@@ -2593,7 +2610,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$StoryContext",
-  "fields":[{"name":"authorUuid_"}, {"name":"bitField0_"}, {"name":"sentTimestamp_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"sentTimestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$EditMessage",
@@ -2601,7 +2618,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Envelope",
-  "fields":[{"name":"bitField0_"}, {"name":"content_"}, {"name":"destinationServiceId_"}, {"name":"destinationUuid_"}, {"name":"reportingToken_"}, {"name":"serverGuid_"}, {"name":"serverTimestamp_"}, {"name":"sourceDevice_"}, {"name":"sourceServiceId_"}, {"name":"sourceUuid_"}, {"name":"story_"}, {"name":"timestamp_"}, {"name":"type_"}, {"name":"updatedPni_"}, {"name":"urgent_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"content_"}, {"name":"destinationServiceId_"}, {"name":"reportingToken_"}, {"name":"serverGuid_"}, {"name":"serverTimestamp_"}, {"name":"sourceDevice_"}, {"name":"sourceServiceId_"}, {"name":"story_"}, {"name":"timestamp_"}, {"name":"type_"}, {"name":"updatedPni_"}, {"name":"urgent_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContext",
@@ -2689,11 +2706,11 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$MessageRequestResponse",
-  "fields":[{"name":"bitField0_"}, {"name":"groupId_"}, {"name":"threadUuid_"}, {"name":"type_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"groupId_"}, {"name":"type_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment",
-  "fields":[{"name":"bitField0_"}, {"name":"note_"}, {"name":"paymentDetailCase_"}, {"name":"paymentDetail_"}, {"name":"recipientUuid_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"note_"}, {"name":"paymentDetailCase_"}, {"name":"paymentDetail_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment$MobileCoin",
@@ -2701,7 +2718,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Read",
-  "fields":[{"name":"bitField0_"}, {"name":"senderAci_"}, {"name":"senderUuid_"}, {"name":"timestamp_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"senderAci_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Request",
@@ -2709,15 +2726,15 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationE164_"}, {"name":"destinationServiceId_"}, {"name":"destinationUuid_"}, {"name":"editMessage_"}, {"name":"expirationStartTimestamp_"}, {"name":"isRecipientUpdate_"}, {"name":"message_"}, {"name":"storyMessageRecipients_"}, {"name":"storyMessage_"}, {"name":"timestamp_"}, {"name":"unidentifiedStatus_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationE164_"}, {"name":"destinationServiceId_"}, {"name":"editMessage_"}, {"name":"expirationStartTimestamp_"}, {"name":"isRecipientUpdate_"}, {"name":"message_"}, {"name":"storyMessageRecipients_"}, {"name":"storyMessage_"}, {"name":"timestamp_"}, {"name":"unidentifiedStatus_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$StoryMessageRecipient",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationUuid_"}, {"name":"distributionListIds_"}, {"name":"isAllowedToReply_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationServiceId_"}, {"name":"distributionListIds_"}, {"name":"isAllowedToReply_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$UnidentifiedDeliveryStatus",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationServiceId_"}, {"name":"destinationUuid_"}, {"name":"unidentified_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationServiceId_"}, {"name":"unidentified_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$StickerPackOperation",
@@ -2725,11 +2742,11 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$ViewOnceOpen",
-  "fields":[{"name":"bitField0_"}, {"name":"senderUuid_"}, {"name":"timestamp_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Viewed",
-  "fields":[{"name":"bitField0_"}, {"name":"senderUuid_"}, {"name":"timestamp_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"senderAci_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TextAttachment",
@@ -2745,7 +2762,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Verified",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationAci_"}, {"name":"destinationUuid_"}, {"name":"identityKey_"}, {"name":"nullMessage_"}, {"name":"state_"}]
+  "fields":[{"name":"bitField0_"}, {"name":"destinationAci_"}, {"name":"identityKey_"}, {"name":"nullMessage_"}, {"name":"state_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.StaleDevices",
@@ -2759,14 +2776,14 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"getCaptcha","parameterTypes":[] }, {"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getPushChallenge","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"getCaptcha","parameterTypes":[] }, {"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getPushChallenge","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.VerificationSessionMetadataRequestBody",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getNumber","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getNumber","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.VerifyAccountResponse",
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 5e87a14d..8d629bae 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -182,6 +182,8 @@
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/uprops.icu\\E"
   }, {
     "pattern":"java.base:\\Qsun/net/idn/uidna.spp\\E"
+  }, {
+    "pattern":"java.base:\\Qsun/net/www/content-types.properties\\E"
   }, {
     "pattern":"java.base:\\Qsun/text/resources/LineBreakIteratorData\\E"
   }]},
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 485990ed..de7c6667 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -29,6 +29,7 @@ import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedExcep
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.api.util.UuidUtil;
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
 import org.whispersystems.util.Base64UrlSafe;
@@ -101,8 +102,8 @@ public class AccountHelper {
     public void checkWhoAmiI() throws IOException {
         final var whoAmI = dependencies.getAccountManager().getWhoAmI();
         final var number = whoAmI.getNumber();
-        final var aci = ACI.parseOrNull(whoAmI.getAci());
-        final var pni = PNI.parseOrNull(whoAmI.getPni());
+        final var aci = ACI.parseOrThrow(whoAmI.getAci());
+        final var pni = PNI.from(UuidUtil.parseOrThrow(whoAmI.getPni()));
         if (number.equals(account.getNumber()) && aci.equals(account.getAci()) && pni.equals(account.getPni())) {
             return;
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 720b2de1..3ba708ea 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -45,6 +45,7 @@ import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
+import org.whispersystems.signalservice.api.util.UuidUtil;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
@@ -164,8 +165,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
         }
 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
-        final var aci = ACI.parseOrNull(response.getUuid());
-        final var pni = PNI.parseOrNull(response.getPni());
+        final var aci = ACI.parseOrThrow(response.getUuid());
+        final var pni = PNI.from(UuidUtil.parseOrThrow(response.getPni()));
         account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
         accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 5a112c79..81e622a8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -975,8 +975,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private RecipientAddress getRecipientAddressFromResultSet(ResultSet resultSet) throws SQLException {
-        final var serviceId = Optional.ofNullable(resultSet.getBytes("uuid")).map(ServiceId::parseOrNull);
-        final var pni = Optional.ofNullable(resultSet.getBytes("pni")).map(PNI::parseOrNull);
+        final var pni = Optional.ofNullable(resultSet.getBytes("pni")).map(UuidUtil::parseOrNull).map(PNI::from);
+        final var serviceIdUuid = Optional.ofNullable(resultSet.getBytes("uuid")).map(UuidUtil::parseOrNull);
+        final var serviceId = serviceIdUuid.isPresent() && pni.isPresent() && serviceIdUuid.get()
+                .equals(pni.get().getRawUuid()) ? pni.<ServiceId>map(p -> p) : serviceIdUuid.<ServiceId>map(ACI::from);
         final var number = Optional.ofNullable(resultSet.getString("number"));
         final var username = Optional.ofNullable(resultSet.getString("username"));
         return new RecipientAddress(serviceId, pni, number, username);
diff --git a/run_tests.sh b/run_tests.sh
index 90f98747..538676ed 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -11,6 +11,7 @@ NUMBER_2="$2"
 TEST_PIN_1=456test_pin_foo123
 NATIVE=0
 JSON_RPC=0
+TEST_REGISTER=0
 
 PATH_TEST_CONFIG="$PWD/test-config"
 PATH_MAIN="$PATH_TEST_CONFIG/main"
@@ -100,8 +101,10 @@ run_main --version
 run_main --help
 
 ## Register
-register "$NUMBER_1" "$TEST_PIN_1"
-register "$NUMBER_2"
+if [ "$TEST_REGISTER" -eq 1 ]; then
+	register "$NUMBER_1" "$TEST_PIN_1"
+	register "$NUMBER_2"
+fi
 
 sleep 5
 
@@ -230,8 +233,10 @@ done
 run_main -a "$NUMBER_1" removeDevice -d 2
 
 ## Unregister
-run_main -a "$NUMBER_1" unregister
-run_main -a "$NUMBER_2" unregister --delete-account
+if [ "$TEST_REGISTER" -eq 1 ]; then
+	run_main -a "$NUMBER_1" unregister
+	run_main -a "$NUMBER_2" unregister --delete-account
+fi
 
 if [ ! -z "$GRAALVM_HOME" ]; then
   "$GRAALVM_HOME"/lib/svm/bin/native-image-configure generate --input-dir=graalvm-config-dir/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=graalvm-config-dir//
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 547e80a8..339d7c7e 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -5,7 +5,7 @@ public class BaseConfig {
     public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
     public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.22.0";
+    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.28.1";
     final static String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 68dbf27b2ff3b6fef98e33690a38cf613e2ac466 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 19:37:15 +0200
Subject: [PATCH 154/672] Update staging key backup service id

---
 .../java/org/asamk/signal/manager/config/StagingConfig.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index f573e505..4e40a14b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -32,7 +32,7 @@ class StagingConfig {
 
     private final static String KEY_BACKUP_ENCLAVE_NAME = "39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b";
     private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
-            "9dbc6855c198e04f21b5cc35df839fdcd51b53658454dfa3f817afefaffc95ef");
+            "ee1d0d972b7ea903615670de43ab1b6e7a825e811c70a29bb5fe0f819e0975fa");
     private final static String KEY_BACKUP_MRENCLAVE = "45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c";
     private final static String FALLBACK_KEY_BACKUP_ENCLAVE_NAME = "dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99";
     private final static byte[] FALLBACK_KEY_BACKUP_SERVICE_ID = Hex.decode(

From 376a1704df25bfb4e1a60fa6f2a966f778e0a525 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 19:38:29 +0200
Subject: [PATCH 155/672] Add missing handling for
 SecureValueRecovery.RestoreResponse.Missing response

---
 .../org/asamk/signal/manager/helper/PinHelper.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 2c56092e..dcd89f20 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -108,7 +108,10 @@ public class PinHelper {
     ) throws IOException, IncorrectPinException {
         var svr1Credentials = e.getSvr1Credentials();
         if (svr1Credentials != null) {
-            return getRegistrationLockData(secureValueRecoveryV1, svr1Credentials, pin);
+            final var registrationLockData = getRegistrationLockData(secureValueRecoveryV1, svr1Credentials, pin);
+            if (registrationLockData != null) {
+                return registrationLockData;
+            }
         }
 
         var svr2Credentials = e.getSvr2Credentials();
@@ -132,8 +135,11 @@ public class PinHelper {
             throw new IOException(error.getException());
         } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.NetworkError error) {
             throw error.getException();
+        } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.Missing) {
+            logger.debug("No SVR data stored for the given credentials.");
+            return null;
         } else {
-            throw new AssertionError("Unexpected response");
+            throw new AssertionError("Unexpected response: " + restoreResponse.getClass().getSimpleName());
         }
     }
 }

From 1559d28ed890891b03e4bb20953ebcab06f6d76c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 20:47:58 +0200
Subject: [PATCH 156/672] Fix linking when preKeyCount is not available

---
 .../org/asamk/signal/manager/helper/PreKeyHelper.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 2bbef3c8..3cc927e9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -12,6 +12,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.PreKeyUpload;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
+import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts;
 
 import java.io.IOException;
 import java.util.List;
@@ -36,7 +38,13 @@ public class PreKeyHelper {
     }
 
     public void refreshPreKeysIfNecessary(ServiceIdType serviceIdType) throws IOException {
-        final var preKeyCounts = dependencies.getAccountManager().getPreKeyCounts(serviceIdType);
+        OneTimePreKeyCounts preKeyCounts;
+        try {
+            preKeyCounts = dependencies.getAccountManager().getPreKeyCounts(serviceIdType);
+        } catch (AuthorizationFailedException e) {
+            logger.debug("Failed to get pre key count, ignoring: " + e.getClass().getSimpleName());
+            preKeyCounts = new OneTimePreKeyCounts(0, 0);
+        }
         if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
             logger.debug("Refreshing {} ec pre keys, because only {} of {} pre keys remain",
                     serviceIdType,

From ca088bcc336ce83cd7c409e4a2eec95472c70bbd Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 20:48:24 +0200
Subject: [PATCH 157/672] Extend tests

---
 run_tests.sh | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index 538676ed..605ba892 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -98,6 +98,7 @@ link() {
 }
 
 run_main --version
+run_main version
 run_main --help
 
 ## Register
@@ -110,6 +111,7 @@ sleep 5
 
 run_main listAccounts
 run_main --output=json listAccounts
+run_main --scrub-log listAccounts
 
 if [ "$JSON_RPC" -eq 0 ]; then
 ## DBus
@@ -189,14 +191,6 @@ run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
 run_main -a "$NUMBER_1" block -g "$GROUP_ID"
 run_main -a "$NUMBER_1" unblock -g "$GROUP_ID"
 
-## Configuration
-run_main -a "$NUMBER_1" updateConfiguration --read-receipts=true
-
-## Identities
-run_main -a "$NUMBER_1" listIdentities
-run_main -a "$NUMBER_2" listIdentities
-run_main -a "$NUMBER_2" trust "$NUMBER_1" -a
-
 ## Basic send/receive
 for OUTPUT in "plain-text" "json"; do
   run_main -a "$NUMBER_1" --output="$OUTPUT" getUserStatus "$NUMBER_1" "$NUMBER_2" "+111111111"
@@ -213,7 +207,7 @@ for OUTPUT in "plain-text" "json"; do
 done
 
 ## Profile
-run_main -a "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE
+run_main -a "$NUMBER_1" updateProfile --given-name=GIVEN --family-name=FAMILY --about=ABOUT --about-emoji=EMOJI --avatar=LICENSE --mobile-coin-address="YWJjCg=="
 
 ## Provisioning
 link "$NUMBER_1"
@@ -222,9 +216,19 @@ run_main -a "$NUMBER_1" listDevices
 run_linked -a "$NUMBER_1" sendSyncRequest
 run_main -a "$NUMBER_1" sendContacts
 
+## Configuration
+run_main -a "$NUMBER_1" updateConfiguration --read-receipts=true
+
+## Identities
+run_main -a "$NUMBER_1" listIdentities
+run_main -a "$NUMBER_2" listIdentities
+run_main -a "$NUMBER_2" trust "$NUMBER_1" -a
+
 for OUTPUT in "plain-text" "json"; do
   run_main -a "$NUMBER_1" --output="$OUTPUT" send "$NUMBER_2" -m hi
-  run_main -a "$NUMBER_2" --output="$OUTPUT" send "$NUMBER_1" -m hi
+  run_main -a "$NUMBER_1" --output="$OUTPUT" send "$NUMBER_2" -m hi --edit-timestamp 123456677
+  run_main -a "$NUMBER_2" --output="$OUTPUT" send "$NUMBER_1" -m hi --text-style "1:1:BOLD" --quote-timestamp 12345 --quote-author "$NUMBER_1" --quote-message hitest --quote-text-style "1:1:BOLD" --preview-url "https://example.com" --preview-title preview --preview-description foo --preview-image LICENSE --story-timestamp 1234567 --story-author "$NUMBER_1"
+  run_main -a "$NUMBER_1" --output="$OUTPUT" sendPaymentNotification --receipt "YWJjCg==" --note notefoo "$NUMBER_2"
   run_main -a "$NUMBER_2" --output="$OUTPUT" receive
   run_main -a "$NUMBER_1" --output="$OUTPUT" receive
   run_linked -a "$NUMBER_1" --output="$OUTPUT" receive
@@ -237,6 +241,7 @@ if [ "$TEST_REGISTER" -eq 1 ]; then
 	run_main -a "$NUMBER_1" unregister
 	run_main -a "$NUMBER_2" unregister --delete-account
 fi
+run_main -a "$NUMBER_2" deleteLocalAccountData || true
 
 if [ ! -z "$GRAALVM_HOME" ]; then
   "$GRAALVM_HOME"/lib/svm/bin/native-image-configure generate --input-dir=graalvm-config-dir/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=graalvm-config-dir//

From 934697af2855ddf34dd378ab05293466d150948e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 20:47:26 +0200
Subject: [PATCH 158/672] Update libsignal-service-java

---
 graalvm-config-dir/reflect-config.json                        | 2 +-
 .../java/org/asamk/signal/manager/helper/AccountHelper.java   | 3 +--
 .../signal/manager/internal/RegistrationManagerImpl.java      | 3 +--
 .../java/org/asamk/signal/manager/storage/SignalAccount.java  | 4 ++--
 .../java/org/asamk/signal/manager/util/AttachmentUtils.java   | 3 ++-
 settings.gradle.kts                                           | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index ab5eff95..7172a28d 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2610,7 +2610,7 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$StoryContext",
-  "fields":[{"name":"bitField0_"}, {"name":"sentTimestamp_"}]
+  "fields":[{"name":"authorAci_"}, {"name":"bitField0_"}, {"name":"sentTimestamp_"}]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$EditMessage",
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index de7c6667..1b1de941 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -29,7 +29,6 @@ import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedExcep
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
-import org.whispersystems.signalservice.api.util.UuidUtil;
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
 import org.whispersystems.util.Base64UrlSafe;
@@ -103,7 +102,7 @@ public class AccountHelper {
         final var whoAmI = dependencies.getAccountManager().getWhoAmI();
         final var number = whoAmI.getNumber();
         final var aci = ACI.parseOrThrow(whoAmI.getAci());
-        final var pni = PNI.from(UuidUtil.parseOrThrow(whoAmI.getPni()));
+        final var pni = PNI.parseUnPrefixedOrThrow(whoAmI.getPni());
         if (number.equals(account.getNumber()) && aci.equals(account.getAci()) && pni.equals(account.getPni())) {
             return;
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 3ba708ea..a216237c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -45,7 +45,6 @@ import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
-import org.whispersystems.signalservice.api.util.UuidUtil;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
@@ -166,7 +165,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         final var aci = ACI.parseOrThrow(response.getUuid());
-        final var pni = PNI.from(UuidUtil.parseOrThrow(response.getPni()));
+        final var pni = PNI.parseUnPrefixedOrThrow(response.getPni());
         account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
         accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 647e9ee0..6f1a00ee 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -558,7 +558,7 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.hasNonNull("pni")) {
             try {
-                pni = PNI.from(UuidUtil.parseOrThrow(rootNode.get("pni").asText()));
+                pni = PNI.parseUnPrefixedOrThrow(rootNode.get("pni").asText());
             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid pni, needs to be a valid UUID", e);
             }
@@ -967,7 +967,7 @@ public class SignalAccount implements Closeable {
                     .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
                     .put("usernameIdentifier", username)
                     .put("uuid", aci == null ? null : aci.toString())
-                    .put("pni", pni == null ? null : pni.getRawUuid().toString())
+                    .put("pni", pni == null ? null : pni.toStringWithoutPrefix())
                     .put("sessionId", sessionId)
                     .put("sessionNumber", sessionNumber)
                     .put("deviceName", encryptedDeviceName)
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index a535d82b..3abcefbb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -57,6 +57,7 @@ public class AttachmentUtils {
                 blurHash,
                 null,
                 null,
-                resumableUploadSpec);
+                resumableUploadSpec,
+                false);
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 14a476ce..a0290589 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_77")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_78")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From e19ad4002377fbd02664f3b3904a851e72691de3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 21:01:46 +0200
Subject: [PATCH 159/672] Update graalvm build tools

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e2e0b51d..2dbfcbd6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.23"
+    id("org.graalvm.buildtools.native") version "0.9.24"
 }
 
 version = "0.11.11"

From 5e692df08c93b48caf388d6f3e9d9d233187d906 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 21:13:58 +0200
Subject: [PATCH 160/672] Ignore groovy deprecations

---
 buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt b/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
index 270ae835..3661a462 100644
--- a/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
+++ b/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
@@ -1,3 +1,5 @@
+@file:Suppress("DEPRECATION")
+
 import groovy.util.XmlSlurper
 import groovy.util.slurpersupport.GPathResult
 import org.codehaus.groovy.runtime.ResourceGroovyMethods

From b55d75ef992b8a58a1b87e2880dd0cf3451e1aaa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 21:14:17 +0200
Subject: [PATCH 161/672] Update dependencies

---
 settings.gradle.kts                                         | 6 +++---
 src/main/java/org/asamk/signal/logging/LogConfigurator.java | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index a0290589..c698a36e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,14 +13,14 @@ dependencyResolutionManagement {
             version("slf4j", "2.0.7")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.4.8")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.4.10")
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_78")
-            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.23.0")
+            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
-            library("junit", "org.junit.jupiter", "junit-jupiter").version("5.9.3")
+            library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 114ad5ff..8571aff9 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -9,6 +9,7 @@ import ch.qos.logback.classic.PatternLayout;
 import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
+import ch.qos.logback.core.Context;
 import ch.qos.logback.core.FileAppender;
 import ch.qos.logback.core.Layout;
 import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
@@ -34,7 +35,9 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         LogConfigurator.scrubSensitiveInformation = scrubSensitiveInformation;
     }
 
-    public ExecutionStatus configure(LoggerContext lc) {
+    @Override
+    public ExecutionStatus configure(final Context context) {
+        LoggerContext lc = (LoggerContext) context;
         final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
         final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN;

From 6cbd583746faee3cde94be1d77d7ddc4e2501bb5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Aug 2023 21:23:10 +0200
Subject: [PATCH 162/672] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08d45108..89a34114 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@
 ## [Unreleased]
 **Attention**: Now requires native libsignal-client version 0.30.0
 
+### Added
+- Manage identities via DBus (Thanks @bublath)
+- Added support for SVR2 PINs
+
+### Fixed
+- Fixed finishLink/receive/register/verify commands for JSON-RPC
+- Update to the latest libsignal to fix various issues
+
 ## [0.11.11] - 2023-05-24
 **Attention**: Now requires native libsignal-client version 0.25.0
 

From b51c7916293cb3303193c48e281f2a9d55224f85 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 11 Aug 2023 00:35:48 +0200
Subject: [PATCH 163/672] Adapt receive subscription notification to have
 payload in result field

---
 CHANGELOG.md                                               | 7 ++++++-
 .../signal/jsonrpc/SignalJsonRpcDispatcherHandler.java     | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89a34114..11271473 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 ## [Unreleased]
 **Attention**: Now requires native libsignal-client version 0.30.0
 
+### Breaking changes
+- Adapt receive subscription notification in JSON-RPC to have payload in result field
+  - Before: `{"jsonrpc":"2.0","method":"receive","params":{"envelope":{ ... },"account":"+XXX","subscription":0}}`
+  - After: `{"jsonrpc":"2.0","method":"receive","params":{"subscription":0,"result":{"envelope":{ ... },"account":"+XXX"}}}`
+
 ### Added
 - Manage identities via DBus (Thanks @bublath)
 - Added support for SVR2 PINs
@@ -597,7 +602,7 @@ Bug fixes and small improvements
 * new listGroups command
 * Support for attachments with file names
 * Support for complete contacts sync
-* Support for contact verification sync 
+* Support for contact verification sync
 * DBus interface:
  * Get/Set group info
  * Get/Set contact info
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 3548f655..aea332fd 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ContainerNode;
 import com.fasterxml.jackson.databind.node.IntNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -86,8 +85,9 @@ public class SignalJsonRpcDispatcherHandler {
         final var subscriptionId = nextSubscriptionId.getAndIncrement();
         final var handlers = managers.stream().map(m -> {
             final var receiveMessageHandler = new JsonReceiveMessageHandler(m, s -> {
-                final ContainerNode<?> params = objectMapper.valueToTree(s);
-                ((ObjectNode) params).set("subscription", IntNode.valueOf(subscriptionId));
+                final var params = new ObjectNode(objectMapper.getNodeFactory());
+                params.set("subscription", IntNode.valueOf(subscriptionId));
+                params.set("result", objectMapper.valueToTree(s));
                 final var jsonRpcRequest = JsonRpcRequest.forNotification("receive", params, null);
                 try {
                     jsonRpcSender.sendRequest(jsonRpcRequest);

From edbf803a987a4959d72a644e2fb3afc370a79cff Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 10 Aug 2023 18:50:52 +0200
Subject: [PATCH 164/672] Update dependencies

---
 client/Cargo.lock | 286 +++++++++++++++++++++++++++++-----------------
 1 file changed, 183 insertions(+), 103 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 9a03783e..aed17e7f 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -3,19 +3,25 @@
 version = 3
 
 [[package]]
-name = "aho-corasick"
-version = "0.7.20"
+name = "addr2line"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
 dependencies = [
- "memchr",
+ "gimli",
 ]
 
 [[package]]
-name = "aho-corasick"
+name = "adler"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c"
 dependencies = [
  "memchr",
 ]
@@ -37,15 +43,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
 dependencies = [
  "utf8parse",
 ]
@@ -61,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -71,9 +77,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 
 [[package]]
 name = "autocfg"
@@ -81,6 +87,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -88,10 +109,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "bstr"
-version = "1.5.0"
+name = "bitflags"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
+[[package]]
+name = "bstr"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
 dependencies = [
  "memchr",
  "serde",
@@ -105,9 +132,12 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cfg-if"
@@ -117,9 +147,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.3.4"
+version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed"
+checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -128,13 +158,12 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.3.4"
+version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636"
+checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags",
  "clap_lex",
  "once_cell",
  "strsim",
@@ -143,14 +172,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.3.2"
+version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -186,9 +215,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -274,7 +303,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -320,12 +349,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "globset"
-version = "0.4.10"
+name = "gimli"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
+[[package]]
+name = "globset"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "bstr",
  "fnv",
  "log",
@@ -340,18 +375,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "instant"
@@ -368,28 +394,27 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi",
  "libc",
  "windows-sys",
 ]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
+ "hermit-abi",
+ "rustix 0.38.7",
  "windows-sys",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jsonrpc-client-transports"
@@ -515,9 +540,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "linux-raw-sys"
@@ -525,6 +550,12 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+
 [[package]]
 name = "lock_api"
 version = "0.4.10"
@@ -547,6 +578,15 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.8"
@@ -560,14 +600,23 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "libc",
 ]
 
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.18.0"
@@ -615,9 +664,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
 
 [[package]]
 name = "pin-utils"
@@ -642,18 +691,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.60"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
  "proc-macro2",
 ]
@@ -705,25 +754,43 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+dependencies = [
+ "aho-corasick",
  "memchr",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustc_version"
@@ -736,61 +803,74 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.20"
+version = "0.37.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.3.8",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.5",
  "windows-sys",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "semver"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 
 [[package]]
 name = "serde"
-version = "1.0.164"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.164"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.28",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.97"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
 dependencies = [
  "itoa",
  "ryu",
@@ -825,18 +905,18 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
 dependencies = [
  "libc",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -858,9 +938,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -873,17 +953,17 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
 dependencies = [
- "rustix",
+ "rustix 0.37.23",
  "windows-sys",
 ]
 
 [[package]]
 name = "tokio"
-version = "1.28.2"
+version = "1.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
+checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd"
 dependencies = [
- "autocfg",
+ "backtrace",
  "bytes",
  "libc",
  "mio",
@@ -902,7 +982,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.18",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -950,9 +1030,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "utf8parse"
@@ -1011,9 +1091,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",

From 8037fb2d66e52fa65333e4b176c430118f59e89c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 11 Aug 2023 00:21:38 +0200
Subject: [PATCH 165/672] Switch to jsonrpsee

Fixes #1275
---
 client/Cargo.lock                     | 923 ++++++++++++++++----------
 client/Cargo.toml                     |  22 +-
 client/src/cli.rs                     |   8 +-
 client/src/jsonrpc.rs                 | 219 +++---
 client/src/main.rs                    |  79 ++-
 client/src/tcp.rs                     |  29 -
 client/src/transports/ipc.rs          |  23 +
 client/src/transports/mod.rs          |  64 ++
 client/src/transports/stream_codec.rs |  61 ++
 client/src/transports/tcp.rs          |  21 +
 10 files changed, 928 insertions(+), 521 deletions(-)
 delete mode 100644 client/src/tcp.rs
 create mode 100644 client/src/transports/ipc.rs
 create mode 100644 client/src/transports/mod.rs
 create mode 100644 client/src/transports/stream_codec.rs
 create mode 100644 client/src/transports/tcp.rs

diff --git a/client/Cargo.lock b/client/Cargo.lock
index aed17e7f..45764a22 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -17,15 +17,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "aho-corasick"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "anstream"
 version = "0.3.2"
@@ -81,6 +72,26 @@ version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 
+[[package]]
+name = "async-lock"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+dependencies = [
+ "event-listener",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -102,6 +113,21 @@ dependencies = [
  "rustc-demangle",
 ]
 
+[[package]]
+name = "base64"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+
+[[package]]
+name = "beef"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -115,14 +141,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
 
 [[package]]
-name = "bstr"
-version = "1.6.0"
+name = "bumpalo"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
-dependencies = [
- "memchr",
- "serde",
-]
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "bytes"
@@ -195,23 +217,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
-name = "convert_case"
-version = "0.4.0"
+name = "core-foundation"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
 
 [[package]]
-name = "derive_more"
-version = "0.99.17"
+name = "core-foundation-sys"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 1.0.109",
-]
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
@@ -234,33 +259,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
-[[package]]
-name = "futures"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
 [[package]]
 name = "futures-channel"
 version = "0.3.28"
@@ -268,7 +278,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
@@ -277,24 +286,6 @@ version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
 
-[[package]]
-name = "futures-executor"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
- "num_cpus",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-
 [[package]]
 name = "futures-macro"
 version = "0.3.28"
@@ -318,36 +309,27 @@ version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
 
+[[package]]
+name = "futures-timer"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+
 [[package]]
 name = "futures-util"
 version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
 dependencies = [
- "futures 0.1.31",
- "futures-channel",
  "futures-core",
- "futures-io",
  "futures-macro",
  "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "pin-utils",
  "slab",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "gimli"
 version = "0.27.3"
@@ -355,18 +337,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
 [[package]]
-name = "globset"
-version = "0.4.13"
+name = "h2"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
 dependencies = [
- "aho-corasick",
- "bstr",
+ "bytes",
  "fnv",
- "log",
- "regex",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 1.9.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -380,12 +380,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
-name = "instant"
-version = "0.1.12"
+name = "http"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
- "cfg-if",
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2 0.4.9",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "log",
+ "rustls",
+ "rustls-native-certs",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
 ]
 
 [[package]]
@@ -406,7 +491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
- "rustix 0.38.7",
+ "rustix 0.38.8",
  "windows-sys",
 ]
 
@@ -417,66 +502,76 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
-name = "jsonrpc-client-transports"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
- "derive_more",
- "futures 0.3.28",
- "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
- "jsonrpc-pubsub",
- "jsonrpc-server-utils 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
- "log",
- "parity-tokio-ipc",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsonrpsee"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5f3783308bddc49d0218307f66a09330c106fbd792c58bac5c8dc294fdd0f98"
+dependencies = [
+ "jsonrpsee-core",
+ "jsonrpsee-http-client",
+ "jsonrpsee-proc-macros",
+ "jsonrpsee-types",
+ "tracing",
+]
+
+[[package]]
+name = "jsonrpsee-core"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aaa4c4d5fb801dcc316d81f76422db259809037a86b3194ae538dd026b05ed7"
+dependencies = [
+ "anyhow",
+ "async-lock",
+ "async-trait",
+ "beef",
+ "futures-timer",
+ "futures-util",
+ "hyper",
+ "jsonrpsee-types",
+ "rustc-hash",
  "serde",
  "serde_json",
+ "thiserror",
  "tokio",
+ "tokio-stream",
+ "tracing",
 ]
 
 [[package]]
-name = "jsonrpc-core"
-version = "18.0.0"
+name = "jsonrpsee-http-client"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb"
+checksum = "aa7165efcbfbc951d180162ff28fe91b657ed81925e37a35e4a396ce12109f96"
 dependencies = [
- "futures 0.3.28",
- "futures-executor",
- "futures-util",
- "log",
+ "async-trait",
+ "hyper",
+ "hyper-rustls",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
  "serde",
- "serde_derive",
  "serde_json",
+ "thiserror",
+ "tokio",
+ "tower",
+ "tracing",
 ]
 
 [[package]]
-name = "jsonrpc-core"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
-dependencies = [
- "futures 0.3.28",
- "futures-executor",
- "futures-util",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
-]
-
-[[package]]
-name = "jsonrpc-core-client"
-version = "18.0.0"
+name = "jsonrpsee-proc-macros"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0"
-dependencies = [
- "futures 0.3.28",
- "jsonrpc-client-transports",
-]
-
-[[package]]
-name = "jsonrpc-derive"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
+checksum = "21dc12b1d4f16a86e8c522823c4fab219c88c03eb7c924ec0501a64bf12e058b"
 dependencies = [
+ "heck",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
@@ -484,60 +579,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "jsonrpc-pubsub"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
+name = "jsonrpsee-types"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00aa7cc87bc42e04e26c8ac3e7186142f7fd2949c763d9b6a7e64a69672d8fb2"
 dependencies = [
- "futures 0.3.28",
- "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
- "lazy_static",
- "log",
- "parking_lot",
- "rand",
+ "anyhow",
+ "beef",
  "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
 ]
 
-[[package]]
-name = "jsonrpc-server-utils"
-version = "18.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4"
-dependencies = [
- "bytes",
- "futures 0.3.28",
- "globset",
- "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static",
- "log",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "unicase",
-]
-
-[[package]]
-name = "jsonrpc-server-utils"
-version = "18.0.0"
-source = "git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params#8a68f95e202943fd338fd0c14da08c2dc8f6e6a6"
-dependencies = [
- "bytes",
- "futures 0.3.28",
- "globset",
- "jsonrpc-core 18.0.0 (git+https://github.com/AsamK/jsonrpc?branch=client_subscribe_named_params)",
- "lazy_static",
- "log",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "unicase",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
 [[package]]
 name = "libc"
 version = "0.2.147"
@@ -556,16 +610,6 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
 
-[[package]]
-name = "lock_api"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
 [[package]]
 name = "log"
 version = "0.4.19"
@@ -594,7 +638,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys",
 ]
 
@@ -624,42 +668,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
-name = "parity-tokio-ipc"
-version = "0.9.0"
+name = "openssl-probe"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "pin-project"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
- "futures 0.3.28",
- "libc",
- "log",
- "rand",
- "tokio",
- "winapi",
+ "pin-project-internal",
 ]
 
 [[package]]
-name = "parking_lot"
-version = "0.11.2"
+name = "pin-project-internal"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
 ]
 
 [[package]]
@@ -674,19 +705,14 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
 [[package]]
 name = "proc-macro-crate"
-version = "0.1.5"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
- "toml",
+ "once_cell",
+ "toml_edit",
 ]
 
 [[package]]
@@ -708,84 +734,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand"
-version = "0.7.3"
+name = "ring"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
- "getrandom",
+ "cc",
  "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
+ "once_cell",
+ "spin",
+ "untrusted",
+ "web-sys",
+ "winapi",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "regex"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@@ -793,13 +755,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
-name = "rustc_version"
-version = "0.4.0"
+name = "rustc-hash"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
@@ -817,9 +776,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.7"
+version = "0.38.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399"
+checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
 dependencies = [
  "bitflags 2.3.3",
  "errno",
@@ -828,6 +787,49 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.21.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki",
+ "sct",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+dependencies = [
+ "base64",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -835,16 +837,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
-name = "scopeguard"
-version = "1.2.0"
+name = "schannel"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+dependencies = [
+ "windows-sys",
+]
 
 [[package]]
-name = "semver"
-version = "1.0.18"
+name = "sct"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
 
 [[package]]
 name = "serde"
@@ -882,16 +914,16 @@ name = "signal-cli-client"
 version = "0.0.1"
 dependencies = [
  "anyhow",
+ "bytes",
  "clap",
- "jsonrpc-client-transports",
- "jsonrpc-core 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "jsonrpc-core-client",
- "jsonrpc-derive",
- "jsonrpc-server-utils 18.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "futures-util",
+ "jsonrpsee",
  "log",
  "serde",
  "serde_json",
+ "thiserror",
  "tokio",
+ "tokio-util",
 ]
 
 [[package]]
@@ -904,10 +936,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "smallvec"
-version = "1.11.0"
+name = "socket2"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+dependencies = [
+ "libc",
+ "winapi",
+]
 
 [[package]]
 name = "socket2"
@@ -919,6 +955,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -957,6 +999,26 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
+]
+
 [[package]]
 name = "tokio"
 version = "1.30.0"
@@ -969,7 +1031,7 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2",
+ "socket2 0.5.3",
  "tokio-macros",
  "windows-sys",
 ]
@@ -985,6 +1047,16 @@ dependencies = [
  "syn 2.0.28",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.14"
@@ -998,42 +1070,113 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.10"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
- "log",
  "pin-project-lite",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
-name = "toml"
-version = "0.5.11"
+name = "toml_datetime"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
 dependencies = [
- "serde",
+ "indexmap 2.0.0",
+ "toml_datetime",
+ "winnow",
 ]
 
 [[package]]
-name = "unicase"
-version = "2.6.0"
+name = "tower"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
- "version_check",
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+ "tracing",
 ]
 
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -1041,16 +1184,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "want"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
 
 [[package]]
 name = "wasi"
@@ -1058,6 +1198,70 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "web-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1145,3 +1349,12 @@ name = "windows_x86_64_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winnow"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f495880723d0999eb3500a9064d8dbcf836460b24c17df80ea7b5794053aac"
+dependencies = [
+ "memchr",
+]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 9e3cd4df..fb77b86c 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -8,18 +8,16 @@ edition = "2021"
 [dependencies]
 anyhow = "1"
 clap = { version = "4", features = ["cargo", "derive", "wrap_help"] }
-jsonrpc-core = "18"
-jsonrpc-core-client = "18"
-jsonrpc-client-transports = { version = "18", default-features = false, features = [
-    "ipc",
-] }
-jsonrpc-derive = "18"
-jsonrpc-server-utils = "18"
 log = "0.4"
 serde = "1"
 serde_json = "1"
-tokio = { version = "1", features = ["rt", "macros", "net"] }
-
-[patch.crates-io]
-jsonrpc-client-transports = { git = "https://github.com/AsamK/jsonrpc", branch = "client_subscribe_named_params" }
-jsonrpc-derive = { git = "https://github.com/AsamK/jsonrpc", branch = "client_subscribe_named_params" }
+tokio = { version = "1", features = ["rt", "macros", "net", "rt-multi-thread"] }
+jsonrpsee = { version = "0.19.0", features = [
+    "macros",
+    "async-client",
+    "http-client",
+] }
+bytes = "1"
+tokio-util = "0.7"
+futures-util = "0.3"
+thiserror = "1"
diff --git a/client/src/cli.rs b/client/src/cli.rs
index ca809290..6a8dd361 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -10,13 +10,17 @@ pub struct Cli {
     pub account: Option<String>,
 
     /// TCP host and port of signal-cli daemon
-    #[arg(long)]
+    #[arg(long, conflicts_with = "json_rpc_http")]
     pub json_rpc_tcp: Option<Option<SocketAddr>>,
 
     /// UNIX socket address and port of signal-cli daemon
-    #[arg(long)]
+    #[arg(long, conflicts_with = "json_rpc_tcp")]
     pub json_rpc_socket: Option<Option<OsString>>,
 
+    /// HTTP URL of signal-cli daemon
+    #[arg(long, conflicts_with = "json_rpc_socket")]
+    pub json_rpc_http: Option<Option<String>>,
+
     #[arg(value_enum, long, default_value_t = OutputTypes::Json)]
     pub output: OutputTypes,
 
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 51e41c19..cd257305 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -1,49 +1,59 @@
 use std::path::Path;
 
-use jsonrpc_client_transports::{transports::ipc, RpcError};
-use jsonrpc_core::serde::Deserialize;
-use jsonrpc_derive::rpc;
+use jsonrpsee::async_client::ClientBuilder;
+use jsonrpsee::core::client::SubscriptionClientT;
+use jsonrpsee::core::Error;
+use jsonrpsee::http_client::HttpClientBuilder;
+use jsonrpsee::proc_macros::rpc;
+use serde::Deserialize;
+use serde_json::Value;
 use tokio::net::ToSocketAddrs;
 
-pub type SignalCliClient = gen_client::Client;
-
-#[rpc(client, params = "named")]
+#[rpc(client)]
 pub trait Rpc {
-    #[rpc(name = "addDevice", params = "named")]
-    fn add_device(&self, account: Option<String>, uri: String) -> Result<Value>;
+    #[method(name = "addDevice", param_kind = map)]
+    async fn add_device(
+        &self,
+        account: Option<String>,
+        uri: String,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "block", params = "named")]
+    #[method(name = "block", param_kind = map)]
     fn block(
         &self,
         account: Option<String>,
         recipients: Vec<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "deleteLocalAccountData", params = "named")]
+    #[method(name = "deleteLocalAccountData", param_kind = map)]
     fn delete_local_account_data(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] ignoreRegistered: Option<bool>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "getUserStatus", params = "named")]
-    fn get_user_status(&self, account: Option<String>, recipients: Vec<String>) -> Result<Value>;
+    #[method(name = "getUserStatus", param_kind = map)]
+    fn get_user_status(
+        &self,
+        account: Option<String>,
+        recipients: Vec<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "joinGroup", params = "named")]
-    fn join_group(&self, account: Option<String>, uri: String) -> Result<Value>;
+    #[method(name = "joinGroup", param_kind = map)]
+    fn join_group(&self, account: Option<String>, uri: String) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "finishLink", params = "named")]
+    #[method(name = "finishLink", param_kind = map)]
     fn finish_link(
         &self,
         #[allow(non_snake_case)] deviceLinkUri: String,
         #[allow(non_snake_case)] deviceName: String,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listAccounts", params = "named")]
-    fn list_accounts(&self) -> Result<Value>;
+    #[method(name = "listAccounts", param_kind = map)]
+    fn list_accounts(&self) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listContacts", params = "named")]
+    #[method(name = "listContacts", param_kind = map)]
     fn list_contacts(
         &self,
         account: Option<String>,
@@ -51,60 +61,64 @@ pub trait Rpc {
         #[allow(non_snake_case)] allRecipients: bool,
         blocked: Option<bool>,
         name: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listDevices", params = "named")]
-    fn list_devices(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "listDevices", param_kind = map)]
+    fn list_devices(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listGroups", params = "named")]
+    #[method(name = "listGroups", param_kind = map)]
     fn list_groups(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listIdentities", params = "named")]
-    fn list_identities(&self, account: Option<String>, number: Option<String>) -> Result<Value>;
+    #[method(name = "listIdentities", param_kind = map)]
+    fn list_identities(
+        &self,
+        account: Option<String>,
+        number: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "listStickerPacks", params = "named")]
-    fn list_sticker_packs(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "listStickerPacks", param_kind = map)]
+    fn list_sticker_packs(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "quitGroup", params = "named")]
+    #[method(name = "quitGroup", param_kind = map)]
     fn quit_group(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] groupId: String,
         delete: bool,
         admins: Vec<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "register", params = "named")]
+    #[method(name = "register", param_kind = map)]
     fn register(
         &self,
         account: Option<String>,
         voice: bool,
         captcha: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "removeContact", params = "named")]
+    #[method(name = "removeContact", param_kind = map)]
     fn remove_contact(
         &self,
         account: Option<String>,
         recipient: String,
         forget: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "removeDevice", params = "named")]
+    #[method(name = "removeDevice", param_kind = map)]
     fn remove_device(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] deviceId: u32,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "removePin", params = "named")]
-    fn remove_pin(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "removePin", param_kind = map)]
+    fn remove_pin(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "remoteDelete", params = "named")]
+    #[method(name = "remoteDelete", param_kind = map)]
     fn remote_delete(
         &self,
         account: Option<String>,
@@ -112,9 +126,9 @@ pub trait Rpc {
         recipients: Vec<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
         #[allow(non_snake_case)] noteToSelf: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "send", params = "named")]
+    #[method(name = "send", param_kind = map)]
     fn send(
         &self,
         account: Option<String>,
@@ -132,21 +146,21 @@ pub trait Rpc {
         sticker: Option<String>,
         #[allow(non_snake_case)] storyTimestamp: Option<u64>,
         #[allow(non_snake_case)] storyAuthor: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendContacts", params = "named")]
-    fn send_contacts(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "sendContacts", param_kind = map)]
+    fn send_contacts(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendPaymentNotification", params = "named")]
+    #[method(name = "sendPaymentNotification", param_kind = map)]
     fn send_payment_notification(
         &self,
         account: Option<String>,
         recipient: String,
         receipt: String,
         note: String,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendReaction", params = "named")]
+    #[method(name = "sendReaction", param_kind = map)]
     fn send_reaction(
         &self,
         account: Option<String>,
@@ -158,75 +172,75 @@ pub trait Rpc {
         #[allow(non_snake_case)] targetTimestamp: u64,
         remove: bool,
         story: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendReceipt", params = "named")]
+    #[method(name = "sendReceipt", param_kind = map)]
     fn send_receipt(
         &self,
         account: Option<String>,
         recipient: String,
         #[allow(non_snake_case)] targetTimestamps: Vec<u64>,
         r#type: String,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendSyncRequest", params = "named")]
-    fn send_sync_request(&self, account: Option<String>) -> Result<Value>;
+    #[method(name = "sendSyncRequest", param_kind = map)]
+    fn send_sync_request(&self, account: Option<String>) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "sendTyping", params = "named")]
+    #[method(name = "sendTyping", param_kind = map)]
     fn send_typing(
         &self,
         account: Option<String>,
         recipients: Vec<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
         stop: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "setPin", params = "named")]
-    fn set_pin(&self, account: Option<String>, pin: String) -> Result<Value>;
+    #[method(name = "setPin", param_kind = map)]
+    fn set_pin(&self, account: Option<String>, pin: String) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "submitRateLimitChallenge", params = "named")]
+    #[method(name = "submitRateLimitChallenge", param_kind = map)]
     fn submit_rate_limit_challenge(
         &self,
         account: Option<String>,
         challenge: String,
         captcha: String,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "startLink", params = "named")]
-    fn start_link(&self, account: Option<String>) -> Result<JsonLink>;
+    #[method(name = "startLink", param_kind = map)]
+    fn start_link(&self, account: Option<String>) -> Result<JsonLink, ErrorObjectOwned>;
 
-    #[rpc(name = "trust", params = "named")]
+    #[method(name = "trust", param_kind = map)]
     fn trust(
         &self,
         account: Option<String>,
         recipient: String,
         #[allow(non_snake_case)] trustAllKnownKeys: bool,
         #[allow(non_snake_case)] verifiedSafetyNumber: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "unblock", params = "named")]
+    #[method(name = "unblock", param_kind = map)]
     fn unblock(
         &self,
         account: Option<String>,
         recipients: Vec<String>,
         #[allow(non_snake_case)] groupIds: Vec<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "unregister", params = "named")]
+    #[method(name = "unregister", param_kind = map)]
     fn unregister(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] deleteAccount: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateAccount", params = "named")]
+    #[method(name = "updateAccount", param_kind = map)]
     fn update_account(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] deviceName: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateConfiguration", params = "named")]
+    #[method(name = "updateConfiguration", param_kind = map)]
     fn update_configuration(
         &self,
         account: Option<String>,
@@ -234,18 +248,18 @@ pub trait Rpc {
         #[allow(non_snake_case)] unidentifiedDeliveryIndicators: Option<bool>,
         #[allow(non_snake_case)] typingIndicators: Option<bool>,
         #[allow(non_snake_case)] linkPreviews: Option<bool>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateContact", params = "named")]
+    #[method(name = "updateContact", param_kind = map)]
     fn update_contact(
         &self,
         account: Option<String>,
         recipient: String,
         name: Option<String>,
         expiration: Option<u32>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateGroup", params = "named")]
+    #[method(name = "updateGroup", param_kind = map)]
     fn update_group(
         &self,
         account: Option<String>,
@@ -265,9 +279,9 @@ pub trait Rpc {
         #[allow(non_snake_case)] setPermissionEditDetails: Option<String>,
         #[allow(non_snake_case)] setPermissionSendMessages: Option<String>,
         expiration: Option<u32>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "updateProfile", params = "named")]
+    #[method(name = "updateProfile", param_kind = map)]
     fn update_profile(
         &self,
         account: Option<String>,
@@ -278,32 +292,33 @@ pub trait Rpc {
         #[allow(non_snake_case)] mobileCoinAddress: Option<String>,
         avatar: Option<String>,
         #[allow(non_snake_case)] removeAvatar: bool,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "uploadStickerPack", params = "named")]
-    fn upload_sticker_pack(&self, account: Option<String>, path: String) -> Result<Value>;
+    #[method(name = "uploadStickerPack", param_kind = map)]
+    fn upload_sticker_pack(
+        &self,
+        account: Option<String>,
+        path: String,
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[rpc(name = "verify", params = "named")]
+    #[method(name = "verify", param_kind = map)]
     fn verify(
         &self,
         account: Option<String>,
         #[allow(non_snake_case)] verificationCode: String,
         pin: Option<String>,
-    ) -> Result<Value>;
+    ) -> Result<Value, ErrorObjectOwned>;
 
-    #[pubsub(
-        subscription = "receive",
-        subscribe,
-        name = "subscribeReceive",
-        params = "named"
+    #[subscription(
+        name = "subscribeReceive" => "receive",
+        unsubscribe = "unsubscribeReceive",
+        item = Value,
+        param_kind = map
     )]
-    fn subscribe_receive(&self, _: Self::Metadata, _: Subscriber<Value>, account: Option<String>);
+    async fn subscribe_receive(&self, account: Option<String>) -> SubscriptionResult;
 
-    #[pubsub(subscription = "receive", unsubscribe, name = "unsubscribeReceive")]
-    fn unsubscribe_receive(&self, _: Option<Self::Metadata>, _: SubscriptionId) -> Result<bool>;
-
-    #[rpc(name = "version")]
-    fn version(&self) -> Result<Value>;
+    #[method(name = "version")]
+    fn version(&self) -> Result<Value, ErrorObjectOwned>;
 }
 
 #[derive(Deserialize)]
@@ -312,10 +327,20 @@ pub struct JsonLink {
     pub device_link_uri: String,
 }
 
-pub async fn connect_tcp(tcp: impl ToSocketAddrs) -> Result<SignalCliClient, RpcError> {
-    super::tcp::connect::<_, SignalCliClient>(tcp).await
+pub async fn connect_tcp(tcp: impl ToSocketAddrs) -> Result<impl SubscriptionClientT, Error> {
+    let (sender, receiver) = super::transports::tcp::connect(tcp).await?;
+
+    Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
 }
 
-pub async fn connect_unix(socket_path: impl AsRef<Path>) -> Result<SignalCliClient, RpcError> {
-    ipc::connect::<_, SignalCliClient>(socket_path).await
+pub async fn connect_unix(
+    socket_path: impl AsRef<Path>,
+) -> Result<impl SubscriptionClientT, Error> {
+    let (sender, receiver) = super::transports::ipc::connect(socket_path).await?;
+
+    Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
+}
+
+pub async fn connect_http(uri: &str) -> Result<impl SubscriptionClientT, Error> {
+    HttpClientBuilder::default().build(uri)
 }
diff --git a/client/src/main.rs b/client/src/main.rs
index ea9cb9c8..f4ab67f9 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -1,40 +1,53 @@
-use clap::Parser;
-use jsonrpc_client_transports::{RpcError, TypedSubscriptionStream};
-use jsonrpc_core::{futures_util::StreamExt, Value};
 use std::{path::PathBuf, time::Duration};
+
+use clap::Parser;
+use cli::Cli;
+use jsonrpsee::core::client::{Subscription, SubscriptionClientT};
+use jsonrpsee::core::Error as RpcError;
+use serde_json::Value;
 use tokio::{select, time::sleep};
 
 use crate::cli::{GroupPermission, LinkState};
+use crate::jsonrpc::RpcClient;
 
 mod cli;
-#[allow(clippy::too_many_arguments)]
+#[allow(non_snake_case, clippy::too_many_arguments)]
 mod jsonrpc;
-mod tcp;
+mod transports;
 
 const DEFAULT_TCP: &str = "127.0.0.1:7583";
 const DEFAULT_SOCKET_SUFFIX: &str = "signal-cli/socket";
+const DEFAULT_HTTP: &str = "http://localhost:8080/api/v1/rpc";
 
 #[tokio::main]
 async fn main() -> Result<(), anyhow::Error> {
     let cli = cli::Cli::parse();
 
-    let client = connect(&cli)
-        .await
-        .map_err(|e| anyhow::anyhow!("Failed to connect to socket: {e}"))?;
+    let result = connect(cli).await;
 
-    let result = match cli.command {
+    match result {
+        Ok(Value::Null) => {}
+        Ok(v) => println!("{v}"),
+        Err(e) => return Err(anyhow::anyhow!("JSON-RPC command failed: {e:?}")),
+    }
+    Ok(())
+}
+
+async fn handle_command(
+    cli: Cli,
+    client: impl SubscriptionClientT + Sync,
+) -> Result<Value, RpcError> {
+    match cli.command {
         cli::CliCommands::Receive { timeout } => {
-            let mut stream = client
-                .subscribe_receive(cli.account)
-                .map_err(|e| anyhow::anyhow!("JSON-RPC command failed: {:?}", e))?;
+            let mut stream = client.subscribe_receive(cli.account).await?;
 
             {
                 while let Some(v) = stream_next(timeout, &mut stream).await {
-                    let v = v.map_err(|e| anyhow::anyhow!("JSON-RPC command failed: {:?}", e))?;
+                    let v = v?;
                     println!("{v}");
                 }
             }
-            return Ok(());
+            Ok(Value::Null)
         }
         cli::CliCommands::AddDevice { uri } => client.add_device(cli.account, uri).await,
         cli::CliCommands::Block {
@@ -54,7 +67,7 @@ async fn main() -> Result<(), anyhow::Error> {
             let url = client
                 .start_link(cli.account)
                 .await
-                .map_err(|e| anyhow::anyhow!("JSON-RPC command startLink failed: {e:?}",))?
+                .map_err(|e| RpcError::Custom(format!("JSON-RPC command startLink failed: {e:?}")))?
                 .device_link_uri;
             println!("{}", url);
             client.finish_link(url, name).await
@@ -349,18 +362,28 @@ async fn main() -> Result<(), anyhow::Error> {
             pin,
         } => client.verify(cli.account, verification_code, pin).await,
         cli::CliCommands::Version => client.version().await,
-    };
-
-    result
-        .map(|v| println!("{v}"))
-        .map_err(|e| anyhow::anyhow!("JSON-RPC command failed: {e:?}",))?;
-    Ok(())
+    }
 }
 
-async fn connect(cli: &cli::Cli) -> Result<jsonrpc::SignalCliClient, RpcError> {
-    if let Some(tcp) = cli.json_rpc_tcp {
+async fn connect(cli: Cli) -> Result<Value, RpcError> {
+    if let Some(http) = &cli.json_rpc_http {
+        let uri = if let Some(uri) = http {
+            uri
+        } else {
+            DEFAULT_HTTP
+        };
+        let client = jsonrpc::connect_http(uri)
+            .await
+            .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
+
+        handle_command(cli, client).await
+    } else if let Some(tcp) = cli.json_rpc_tcp {
         let socket_addr = tcp.unwrap_or_else(|| DEFAULT_TCP.parse().unwrap());
-        jsonrpc::connect_tcp(socket_addr).await
+        let client = jsonrpc::connect_tcp(socket_addr)
+            .await
+            .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
+
+        handle_command(cli, client).await
     } else {
         let socket_path = cli
             .json_rpc_socket
@@ -374,13 +397,17 @@ async fn connect(cli: &cli::Cli) -> Result<jsonrpc::SignalCliClient, RpcError> {
                 })
             })
             .unwrap_or_else(|| ("/run".to_owned() + DEFAULT_SOCKET_SUFFIX).into());
-        jsonrpc::connect_unix(socket_path).await
+        let client = jsonrpc::connect_unix(socket_path)
+            .await
+            .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
+
+        handle_command(cli, client).await
     }
 }
 
 async fn stream_next(
     timeout: f64,
-    stream: &mut TypedSubscriptionStream<Value>,
+    stream: &mut Subscription<Value>,
 ) -> Option<Result<Value, RpcError>> {
     if timeout < 0.0 {
         stream.next().await
diff --git a/client/src/tcp.rs b/client/src/tcp.rs
deleted file mode 100644
index 53650381..00000000
--- a/client/src/tcp.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use jsonrpc_client_transports::{transports::duplex, RpcChannel, RpcError};
-use jsonrpc_core::futures_util::{SinkExt, StreamExt, TryStreamExt};
-use jsonrpc_server_utils::{codecs::StreamCodec, tokio_util::codec::Decoder};
-use tokio::net::{TcpStream, ToSocketAddrs};
-
-/// Connect to a JSON-RPC TCP server.
-pub async fn connect<S: ToSocketAddrs, Client: From<RpcChannel>>(
-    socket: S,
-) -> Result<Client, RpcError> {
-    let connection = TcpStream::connect(socket)
-        .await
-        .map_err(|e| RpcError::Other(Box::new(e)))?;
-    let (sink, stream) = StreamCodec::stream_incoming().framed(connection).split();
-    let sink = sink.sink_map_err(|e| RpcError::Other(Box::new(e)));
-    let stream = stream.map_err(|e| log::error!("TCP stream error: {}", e));
-
-    let (client, sender) = duplex(
-        Box::pin(sink),
-        Box::pin(
-            stream
-                .take_while(|x| std::future::ready(x.is_ok()))
-                .map(|x| x.expect("Stream is closed upon first error.")),
-        ),
-    );
-
-    tokio::spawn(client);
-
-    Ok(sender.into())
-}
diff --git a/client/src/transports/ipc.rs b/client/src/transports/ipc.rs
new file mode 100644
index 00000000..497955e3
--- /dev/null
+++ b/client/src/transports/ipc.rs
@@ -0,0 +1,23 @@
+use std::path::Path;
+
+use futures_util::stream::StreamExt;
+use jsonrpsee::core::client::{TransportReceiverT, TransportSenderT};
+use jsonrpsee::core::Error;
+use tokio::net::UnixStream;
+use tokio_util::codec::Decoder;
+
+use super::stream_codec::StreamCodec;
+use super::{Receiver, Sender};
+
+/// Connect to a JSON-RPC Unix Socket server.
+pub async fn connect(
+    socket: impl AsRef<Path>,
+) -> Result<(impl TransportSenderT + Send, impl TransportReceiverT + Send), Error> {
+    let connection = UnixStream::connect(socket).await?;
+    let (sink, stream) = StreamCodec::stream_incoming().framed(connection).split();
+
+    let sender = Sender { inner: sink };
+    let receiver = Receiver { inner: stream };
+
+    Ok((sender, receiver))
+}
diff --git a/client/src/transports/mod.rs b/client/src/transports/mod.rs
new file mode 100644
index 00000000..04f4390f
--- /dev/null
+++ b/client/src/transports/mod.rs
@@ -0,0 +1,64 @@
+use futures_util::{stream::StreamExt, Sink, SinkExt, Stream};
+use jsonrpsee::core::{
+    async_trait,
+    client::{ReceivedMessage, TransportReceiverT, TransportSenderT},
+};
+use thiserror::Error;
+
+pub mod ipc;
+mod stream_codec;
+pub mod tcp;
+
+#[derive(Debug, Error)]
+enum Errors {
+    #[error("Other: {0}")]
+    Other(String),
+    #[error("Closed")]
+    Closed,
+}
+
+struct Sender<T: Send + Sink<String>> {
+    inner: T,
+}
+
+#[async_trait]
+impl<T: Send + Sink<String, Error = impl std::error::Error> + Unpin + 'static> TransportSenderT
+    for Sender<T>
+{
+    type Error = Errors;
+
+    async fn send(&mut self, body: String) -> Result<(), Self::Error> {
+        self.inner
+            .send(body)
+            .await
+            .map_err(|e| Errors::Other(format!("{:?}", e)))?;
+        Ok(())
+    }
+
+    async fn close(&mut self) -> Result<(), Self::Error> {
+        self.inner
+            .close()
+            .await
+            .map_err(|e| Errors::Other(format!("{:?}", e)))?;
+        Ok(())
+    }
+}
+
+struct Receiver<T: Send + Stream> {
+    inner: T,
+}
+
+#[async_trait]
+impl<T: Send + Stream<Item = Result<String, std::io::Error>> + Unpin + 'static> TransportReceiverT
+    for Receiver<T>
+{
+    type Error = Errors;
+
+    async fn receive(&mut self) -> Result<ReceivedMessage, Self::Error> {
+        match self.inner.next().await {
+            None => Err(Errors::Closed),
+            Some(Ok(msg)) => Ok(ReceivedMessage::Text(msg)),
+            Some(Err(e)) => Err(Errors::Other(format!("{:?}", e))),
+        }
+    }
+}
diff --git a/client/src/transports/stream_codec.rs b/client/src/transports/stream_codec.rs
new file mode 100644
index 00000000..6f77306f
--- /dev/null
+++ b/client/src/transports/stream_codec.rs
@@ -0,0 +1,61 @@
+use bytes::BytesMut;
+use std::{io, str};
+use tokio_util::codec::{Decoder, Encoder};
+
+type Separator = u8;
+
+/// Stream codec for streaming protocols (ipc, tcp)
+#[derive(Debug, Default)]
+pub struct StreamCodec {
+    incoming_separator: Separator,
+    outgoing_separator: Separator,
+}
+
+impl StreamCodec {
+    /// Default codec with streaming input data. Input can be both enveloped and not.
+    pub fn stream_incoming() -> Self {
+        StreamCodec::new(b'\n', b'\n')
+    }
+
+    /// New custom stream codec
+    pub fn new(incoming_separator: Separator, outgoing_separator: Separator) -> Self {
+        StreamCodec {
+            incoming_separator,
+            outgoing_separator,
+        }
+    }
+}
+
+impl Decoder for StreamCodec {
+    type Item = String;
+    type Error = io::Error;
+
+    fn decode(&mut self, buf: &mut BytesMut) -> io::Result<Option<Self::Item>> {
+        if let Some(i) = buf
+            .as_ref()
+            .iter()
+            .position(|&b| b == self.incoming_separator)
+        {
+            let line = buf.split_to(i);
+            let _ = buf.split_to(1);
+
+            match str::from_utf8(line.as_ref()) {
+                Ok(s) => Ok(Some(s.to_string())),
+                Err(_) => Err(io::Error::new(io::ErrorKind::Other, "invalid UTF-8")),
+            }
+        } else {
+            Ok(None)
+        }
+    }
+}
+
+impl Encoder<String> for StreamCodec {
+    type Error = io::Error;
+
+    fn encode(&mut self, msg: String, buf: &mut BytesMut) -> io::Result<()> {
+        let mut payload = msg.into_bytes();
+        payload.push(self.outgoing_separator);
+        buf.extend_from_slice(&payload);
+        Ok(())
+    }
+}
diff --git a/client/src/transports/tcp.rs b/client/src/transports/tcp.rs
new file mode 100644
index 00000000..8d7a27dc
--- /dev/null
+++ b/client/src/transports/tcp.rs
@@ -0,0 +1,21 @@
+use futures_util::stream::StreamExt;
+use jsonrpsee::core::client::{TransportReceiverT, TransportSenderT};
+use jsonrpsee::core::Error;
+use tokio::net::{TcpStream, ToSocketAddrs};
+use tokio_util::codec::Decoder;
+
+use super::stream_codec::StreamCodec;
+use super::{Receiver, Sender};
+
+/// Connect to a JSON-RPC TCP server.
+pub async fn connect(
+    socket: impl ToSocketAddrs,
+) -> Result<(impl TransportSenderT + Send, impl TransportReceiverT + Send), Error> {
+    let connection = TcpStream::connect(socket).await?;
+    let (sink, stream) = StreamCodec::stream_incoming().framed(connection).split();
+
+    let sender = Sender { inner: sink };
+    let receiver = Receiver { inner: stream };
+
+    Ok((sender, receiver))
+}

From 2d73ba6735df60f1ac910bbbaff128f18351fb26 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 11 Aug 2023 00:21:54 +0200
Subject: [PATCH 166/672] Update graalvm reflect config

---
 graalvm-config-dir/reflect-config.json | 29 +++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 7172a28d..9d6d43ad 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -105,6 +105,9 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true
 },
+{
+  "name":"com.google.protobuf.ByteString"
+},
 {
   "name":"com.google.protobuf.DescriptorMessageInfoFactory"
 },
@@ -530,6 +533,10 @@
 {
   "name":"kotlin.collections.MutableList"
 },
+{
+  "name":"kotlin.jvm.JvmStatic",
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"kotlin.jvm.internal.DefaultConstructorMarker"
 },
@@ -1758,6 +1765,12 @@
 {
   "name":"org.signal.libsignal.protocol.IdentityKey"
 },
+{
+  "name":"org.signal.libsignal.protocol.ServiceId"
+},
+{
+  "name":"org.signal.libsignal.protocol.SignalProtocolAddress"
+},
 {
   "name":"org.signal.libsignal.protocol.ecc.ECPublicKey"
 },
@@ -2104,7 +2117,21 @@
   "name":"org.whispersystems.signalservice.api.push.ServiceId",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.api.push.ServiceId$ACI"
+},
+{
+  "name":"org.whispersystems.signalservice.api.push.ServiceId$Companion",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"fromLibSignal","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }, {"name":"parseOrNull","parameterTypes":["com.google.protobuf.ByteString"] }, {"name":"parseOrNull","parameterTypes":["java.lang.String"] }, {"name":"parseOrNull","parameterTypes":["byte[]"] }, {"name":"parseOrThrow","parameterTypes":["com.google.protobuf.ByteString"] }, {"name":"parseOrThrow","parameterTypes":["java.lang.String"] }, {"name":"parseOrThrow","parameterTypes":["byte[]"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.api.push.ServiceId$PNI"
 },
 {
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity",

From 9a63f97a19abef53e0bd3cb8f7144eafb3041b11 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 11 Aug 2023 00:43:07 +0200
Subject: [PATCH 167/672] Update dependencies

---
 settings.gradle.kts                                         | 2 +-
 src/main/java/org/asamk/signal/logging/LogConfigurator.java | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index c698a36e..fc585c00 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ dependencyResolutionManagement {
             version("slf4j", "2.0.7")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.4.10")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_78")
diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 8571aff9..dc4d3648 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -9,7 +9,6 @@ import ch.qos.logback.classic.PatternLayout;
 import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
-import ch.qos.logback.core.Context;
 import ch.qos.logback.core.FileAppender;
 import ch.qos.logback.core.Layout;
 import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
@@ -36,8 +35,7 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
     }
 
     @Override
-    public ExecutionStatus configure(final Context context) {
-        LoggerContext lc = (LoggerContext) context;
+    public ExecutionStatus configure(LoggerContext lc) {
         final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
         final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN;

From 29923cf930dda65e32375c0bc1b195a3ae24f748 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 11 Aug 2023 00:41:46 +0200
Subject: [PATCH 168/672] Bump version to 0.12.0

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11271473..55300aab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+
+## [0.12.0] - 2023-08-11
 **Attention**: Now requires native libsignal-client version 0.30.0
 
 ### Breaking changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 2dbfcbd6..d35ed373 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.24"
 }
 
-version = "0.11.11"
+version = "0.12.0"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From b3f550ee68d0e9119bc3f7a22659d1cdbaa1ded8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 17 Aug 2023 21:06:55 +0200
Subject: [PATCH 169/672] Unsubscribe in client after timeout

---
 client/src/main.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/main.rs b/client/src/main.rs
index f4ab67f9..c840fd5e 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -47,6 +47,7 @@ async fn handle_command(
                     println!("{v}");
                 }
             }
+            stream.unsubscribe().await?;
             Ok(Value::Null)
         }
         cli::CliCommands::AddDevice { uri } => client.add_device(cli.account, uri).await,

From e0a326f15b5b0a2ddd44de8cb0f01e779080d772 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 20 Aug 2023 19:40:42 +0200
Subject: [PATCH 170/672] Fix prekey log output

---
 .../java/org/asamk/signal/manager/helper/PreKeyHelper.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 3cc927e9..54eab17b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -46,16 +46,16 @@ public class PreKeyHelper {
             preKeyCounts = new OneTimePreKeyCounts(0, 0);
         }
         if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
-            logger.debug("Refreshing {} ec pre keys, because only {} of {} pre keys remain",
+            logger.debug("Refreshing {} ec pre keys, because only {} of min {} pre keys remain",
                     serviceIdType,
                     preKeyCounts.getEcCount(),
                     ServiceConfig.PREKEY_MINIMUM_COUNT);
             refreshPreKeys(serviceIdType);
         }
         if (preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
-            logger.debug("Refreshing {} kyber pre keys, because only {} of {} pre keys remain",
+            logger.debug("Refreshing {} kyber pre keys, because only {} of min {} pre keys remain",
                     serviceIdType,
-                    preKeyCounts.getEcCount(),
+                    preKeyCounts.getKyberCount(),
                     ServiceConfig.PREKEY_MINIMUM_COUNT);
             refreshKyberPreKeys(serviceIdType);
         }

From 133e2cc2223ceee8ebce2ece8a98905b155b8da4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 20 Aug 2023 19:41:00 +0200
Subject: [PATCH 171/672] Document listStickerPacks command

---
 man/signal-cli.1.adoc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 64e73380..5a8d287d 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -648,6 +648,10 @@ The required manifest.json has the following format:
 PATH::
 The path of the manifest.json or a zip file containing the sticker pack you wish to upload.
 
+=== listStickerPacks
+
+Show a list of known sticker packs.
+
 === getAttachment
 
 Gets the raw data for a specified attachment.

From e867c57af8f7582ed7307ea118b76f92a483f465 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 20 Aug 2023 22:27:50 +0200
Subject: [PATCH 172/672] Add addStickerPack command

---
 CHANGELOG.md                                  |  4 ++
 .../org/asamk/signal/manager/Manager.java     |  2 +
 .../signal/manager/api/StickerPackUrl.java    |  2 +-
 .../helper/IncomingMessageHandler.java        | 18 ++----
 .../signal/manager/helper/SendHelper.java     |  4 ++
 .../signal/manager/helper/StickerHelper.java  | 35 +++++++++--
 .../signal/manager/helper/SyncHelper.java     | 20 ++++++
 .../signal/manager/internal/ManagerImpl.java  | 16 +++++
 .../manager/jobs/RetrieveStickerPackJob.java  |  4 --
 .../storage/stickers/StickerStore.java        |  3 +-
 man/signal-cli.1.adoc                         |  8 +++
 .../commands/AddStickerPackCommand.java       | 62 +++++++++++++++++++
 .../org/asamk/signal/commands/Commands.java   |  1 +
 .../asamk/signal/dbus/DbusManagerImpl.java    |  5 ++
 14 files changed, 159 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55300aab..e86df17f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- New `addStickerPack` command
+
 ## [0.12.0] - 2023-08-11
 **Attention**: Now requires native libsignal-client version 0.30.0
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 38d9e12c..e527c1a0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -211,6 +211,8 @@ public interface Manager extends Closeable {
      */
     StickerPackUrl uploadStickerPack(File path) throws IOException, StickerPackInvalidException;
 
+    void installStickerPack(StickerPackUrl url) throws IOException;
+
     List<StickerPack> getStickerPacks();
 
     void requestAllSyncData() throws IOException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
index d018ac39..c571a424 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
@@ -22,7 +22,7 @@ public final class StickerPackUrl {
     public static StickerPackUrl fromUri(URI uri) throws InvalidStickerPackLinkException {
         final var rawQuery = uri.getRawFragment();
         if (isEmpty(rawQuery)) {
-            throw new RuntimeException("Invalid sticker pack uri");
+            throw new InvalidStickerPackLinkException("Invalid sticker pack uri");
         }
 
         var query = Utils.getQueryMap(rawQuery);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 6ffa08fb..9ffee5c8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -585,23 +585,15 @@ public final class IncomingMessageHandler {
                     continue;
                 }
                 final var stickerPackId = StickerPackId.deserialize(m.getPackId().get());
+                final var stickerPackKey = m.getPackKey().orElse(null);
                 final var installed = m.getType().isEmpty()
                         || m.getType().get() == StickerPackOperationMessage.Type.INSTALL;
 
-                var sticker = account.getStickerStore().getStickerPack(stickerPackId);
-                if (m.getPackKey().isPresent()) {
-                    if (sticker == null) {
-                        sticker = new StickerPack(-1, stickerPackId, m.getPackKey().get(), installed);
-                        account.getStickerStore().addStickerPack(sticker);
-                    }
-                    if (installed) {
-                        context.getJobExecutor()
-                                .enqueueJob(new RetrieveStickerPackJob(stickerPackId, m.getPackKey().get()));
-                    }
-                }
+                final var sticker = context.getStickerHelper()
+                        .addOrUpdateStickerPack(stickerPackId, stickerPackKey, installed);
 
-                if (sticker != null && sticker.isInstalled() != installed) {
-                    account.getStickerStore().updateStickerPackInstalled(sticker.packId(), installed);
+                if (sticker != null && installed) {
+                    context.getJobExecutor().enqueueJob(new RetrieveStickerPackJob(stickerPackId, sticker.packKey()));
                 }
             }
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index c1ba113a..8cd37aa9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -186,6 +186,10 @@ public class SendHelper {
 
     public SendMessageResult sendSyncMessage(SignalServiceSyncMessage message) {
         var messageSender = dependencies.getMessageSender();
+        if (!account.isMultiDevice()) {
+            logger.trace("Not sending sync message because there are no linked devices.");
+            return SendMessageResult.success(account.getSelfAddress(), List.of(), false, false, 0, Optional.empty());
+        }
         try {
             return messageSender.sendSyncMessage(message, context.getUnidentifiedAccessHelper().getAccessForSync());
         } catch (UnregisteredUserException e) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
index 915f3d71..daa5aeb6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
@@ -5,6 +5,7 @@ import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack;
+import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.IOUtils;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.slf4j.Logger;
@@ -28,15 +29,33 @@ public class StickerHelper {
         this.context = context;
     }
 
+    public StickerPack addOrUpdateStickerPack(
+            final StickerPackId stickerPackId, final byte[] stickerPackKey, final boolean installed
+    ) {
+        final var sticker = account.getStickerStore().getStickerPack(stickerPackId);
+        if (sticker != null) {
+            if (sticker.isInstalled() != installed) {
+                account.getStickerStore().updateStickerPackInstalled(sticker.packId(), installed);
+            }
+            return sticker;
+        }
+
+        if (stickerPackKey == null) {
+            return null;
+        }
+
+        final var newSticker = new StickerPack(-1, stickerPackId, stickerPackKey, installed);
+        account.getStickerStore().addStickerPack(newSticker);
+        return newSticker;
+    }
+
     public JsonStickerPack getOrRetrieveStickerPack(
             StickerPackId packId, byte[] packKey
     ) throws InvalidStickerException {
-        if (!context.getStickerPackStore().existsStickerPack(packId)) {
-            try {
-                retrieveStickerPack(packId, packKey);
-            } catch (InvalidMessageException | IOException e) {
-                throw new InvalidStickerException("Failed to retrieve sticker pack");
-            }
+        try {
+            retrieveStickerPack(packId, packKey);
+        } catch (InvalidMessageException | IOException e) {
+            throw new InvalidStickerException("Failed to retrieve sticker pack");
         }
         final JsonStickerPack manifest;
         try {
@@ -48,6 +67,10 @@ public class StickerHelper {
     }
 
     public void retrieveStickerPack(StickerPackId packId, byte[] packKey) throws InvalidMessageException, IOException {
+        if (context.getStickerPackStore().existsStickerPack(packId)) {
+            logger.debug("Sticker pack {} already downloaded.", Hex.toStringCondensed(packId.serialize()));
+            return;
+        }
         logger.debug("Retrieving sticker pack {}.", Hex.toStringCondensed(packId.serialize()));
         final var messageReceiver = dependencies.getMessageReceiver();
         final var manifest = messageReceiver.retrieveStickerManifest(packId.serialize(), packKey);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index f015cb1f..47923051 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -6,9 +6,11 @@ import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.MimeUtils;
+import org.jetbrains.annotations.NotNull;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +28,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOut
 import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
@@ -40,6 +43,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class SyncHelper {
 
@@ -222,6 +226,22 @@ public class SyncHelper {
         context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
     }
 
+    public void sendStickerOperationsMessage(List<StickerPack> installStickers, List<StickerPack> removeStickers) {
+        var installStickerMessages = installStickers.stream().map(s -> getStickerPackOperationMessage(s, true));
+        var removeStickerMessages = removeStickers.stream().map(s -> getStickerPackOperationMessage(s, false));
+        var stickerMessages = Stream.concat(installStickerMessages, removeStickerMessages).toList();
+        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(stickerMessages));
+    }
+
+    @NotNull
+    private static StickerPackOperationMessage getStickerPackOperationMessage(
+            final StickerPack s, final boolean installed
+    ) {
+        return new StickerPackOperationMessage(s.packId().serialize(),
+                s.packKey(),
+                installed ? StickerPackOperationMessage.Type.INSTALL : StickerPackOperationMessage.Type.REMOVE);
+    }
+
     public void sendConfigurationMessage() {
         final var config = account.getConfigurationStore();
         var configurationMessage = new ConfigurationMessage(Optional.ofNullable(config.getReadReceipts()),
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 36051333..3c7649e9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -72,6 +72,7 @@ import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.MimeUtils;
 import org.asamk.signal.manager.util.StickerUtils;
+import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -891,10 +892,25 @@ public class ManagerImpl implements Manager {
 
         var sticker = new StickerPack(packId, packKey);
         account.getStickerStore().addStickerPack(sticker);
+        context.getSyncHelper().sendStickerOperationsMessage(List.of(sticker), List.of());
 
         return new StickerPackUrl(packId, packKey);
     }
 
+    @Override
+    public void installStickerPack(StickerPackUrl url) throws IOException {
+        final var packId = url.getPackId();
+        final var packKey = url.getPackKey();
+        try {
+            context.getStickerHelper().retrieveStickerPack(packId, packKey);
+        } catch (InvalidMessageException e) {
+            throw new IOException(e);
+        }
+
+        final var sticker = context.getStickerHelper().addOrUpdateStickerPack(packId, packKey, true);
+        context.getSyncHelper().sendStickerOperationsMessage(List.of(sticker), List.of());
+    }
+
     @Override
     public List<org.asamk.signal.manager.api.StickerPack> getStickerPacks() {
         final var stickerPackStore = context.getStickerPackStore();
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
index 54c0390b..9d90a546 100644
--- a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
@@ -23,10 +23,6 @@ public class RetrieveStickerPackJob implements Job {
 
     @Override
     public void run(Context context) {
-        if (context.getStickerPackStore().existsStickerPack(packId)) {
-            logger.debug("Sticker pack {} already downloaded.", Hex.toStringCondensed(packId.serialize()));
-            return;
-        }
         try {
             context.getStickerHelper().retrieveStickerPack(packId, packKey);
         } catch (IOException e) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
index 6667d978..aacd18bd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
@@ -10,6 +10,7 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
+import java.util.List;
 
 public class StickerStore {
 
@@ -36,7 +37,7 @@ public class StickerStore {
         this.database = database;
     }
 
-    public Collection<StickerPack> getStickerPacks() {
+    public List<StickerPack> getStickerPacks() {
         final var sql = (
                 """
                 SELECT s._id, s.pack_id, s.pack_key, s.installed
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 5a8d287d..56449d19 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -652,6 +652,14 @@ The path of the manifest.json or a zip file containing the sticker pack you wish
 
 Show a list of known sticker packs.
 
+=== addStickerPack
+
+Install a sticker pack for this account.
+
+*--uri* [URI]::
+Specify the uri of the sticker pack.
+e.g. https://signal.art/addstickers/#pack_id=XXX&pack_key=XXX)"
+
 === getAttachment
 
 Gets the raw data for a specified attachment.
diff --git a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
new file mode 100644
index 00000000..33de6e30
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
@@ -0,0 +1,62 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.StickerPackUrl;
+import org.asamk.signal.output.OutputWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class AddStickerPackCommand implements JsonRpcLocalCommand {
+
+    private final static Logger logger = LoggerFactory.getLogger(AddStickerPackCommand.class);
+
+    @Override
+    public String getName() {
+        return "addStickerPack";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Install a sticker pack for this account.");
+        subparser.addArgument("--uri")
+                .required(true)
+                .nargs("+")
+                .help("Specify the uri of the sticker pack. (e.g. https://signal.art/addstickers/#pack_id=XXX&pack_key=XXX)");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var uris = ns.<String>getList("uri");
+        for (final var uri : uris) {
+            final URI stickerUri;
+            try {
+                stickerUri = new URI(uri);
+            } catch (URISyntaxException e) {
+                throw new UserErrorException("Sticker pack uri has invalid format: " + e.getMessage());
+            }
+
+            try {
+                var stickerPackUrl = StickerPackUrl.fromUri(stickerUri);
+                m.installStickerPack(stickerPackUrl);
+            } catch (IOException e) {
+                logger.error("Install sticker pack failed", e);
+                throw new IOErrorException("Install sticker pack failed", e);
+            } catch (StickerPackUrl.InvalidStickerPackLinkException e) {
+                logger.error("Invalid sticker pack link", e);
+                throw new UserErrorException("Invalid sticker pack link", e);
+            }
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 51820c9a..2783ca37 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -17,6 +17,7 @@ public class Commands {
         addCommand(new FinishLinkCommand());
         addCommand(new GetAttachmentCommand());
         addCommand(new GetUserStatusCommand());
+        addCommand(new AddStickerPackCommand());
         addCommand(new JoinGroupCommand());
         addCommand(new JsonRpcDispatcherCommand());
         addCommand(new LinkCommand());
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index f87eded6..9b7908b7 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -481,6 +481,11 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
+    @Override
+    public void installStickerPack(final StickerPackUrl url) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public List<StickerPack> getStickerPacks() {
         throw new UnsupportedOperationException();

From 98a8c991e2237ddb2365cc06dc25095294b759a1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 20 Aug 2023 22:36:29 +0200
Subject: [PATCH 173/672] Update gradle wrapper

---
 graalvm-config-dir/reflect-config.json   |  15 +++++++++++++++
 gradle/wrapper/gradle-wrapper.jar        | Bin 62076 -> 63721 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 ++-
 gradlew                                  |   8 ++++++--
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 9d6d43ad..8e2e8100 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -366,6 +366,9 @@
 {
   "name":"java.security.SecurityPermission"
 },
+{
+  "name":"java.security.cert.CertStoreParameters"
+},
 {
   "name":"java.security.cert.PKIXRevocationChecker"
 },
@@ -381,6 +384,10 @@
 {
   "name":"java.security.interfaces.RSAPublicKey"
 },
+{
+  "name":"java.sql.SQLException",
+  "fields":[{"name":"next"}]
+},
 {
   "name":"java.util.AbstractCollection",
   "allDeclaredFields":true,
@@ -2987,10 +2994,18 @@
   "name":"sun.security.provider.SecureRandom",
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
 },
+{
+  "name":"sun.security.provider.certpath.CollectionCertStore",
+  "methods":[{"name":"<init>","parameterTypes":["java.security.cert.CertStoreParameters"] }]
+},
 {
   "name":"sun.security.provider.certpath.PKIXCertPathValidator",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"sun.security.provider.certpath.SunCertPathBuilder",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"sun.security.rsa.PSSParameters",
   "methods":[{"name":"<init>","parameterTypes":[] }]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79e29d3e0ab67b14947c167a862655af9b..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644
GIT binary patch
delta 37652
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

delta 36122
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
Q>rd#E<Y8bi{`_z2zvXbYu>b%7

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3..ac72c34e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb..0adc8e1a 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

From 795c5f6a0480a0441a64598bbf825dc0276548aa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 20 Aug 2023 22:37:25 +0200
Subject: [PATCH 174/672] Fix npr when upgrading old accounts

---
 .../asamk/signal/manager/storage/SignalAccount.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 6f1a00ee..8d719ea3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -396,9 +396,7 @@ public class SignalAccount implements Closeable {
         this.setStorageManifest(null);
         this.storageKey = null;
         trustSelfIdentity(ServiceIdType.ACI);
-        if (getPniIdentityKeyPair() != null) {
-            trustSelfIdentity(ServiceIdType.PNI);
-        }
+        trustSelfIdentity(ServiceIdType.PNI);
     }
 
     private void migrateLegacyConfigs() {
@@ -1373,6 +1371,7 @@ public class SignalAccount implements Closeable {
         }
 
         this.pni = updatedPni;
+        trustSelfIdentity(ServiceIdType.PNI);
         save();
     }
 
@@ -1676,7 +1675,11 @@ public class SignalAccount implements Closeable {
     private void trustSelfIdentity(ServiceIdType serviceIdType) {
         final var accountData = getAccountData(serviceIdType);
         final var serviceId = accountData.getServiceId();
-        final var publicKey = accountData.getIdentityKeyPair().getPublicKey();
+        final var identityKeyPair = accountData.getIdentityKeyPair();
+        if (serviceId == null || identityKeyPair == null) {
+            return;
+        }
+        final var publicKey = identityKeyPair.getPublicKey();
         getIdentityKeyStore().saveIdentity(serviceId, publicKey);
         getIdentityKeyStore().setIdentityTrustLevel(serviceId, publicKey, TrustLevel.TRUSTED_VERIFIED);
     }

From fb8624f6309fc0d692a8e4791ca7a883343e5b94 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 21 Aug 2023 17:00:15 +0200
Subject: [PATCH 175/672] Fix incorrect sql query

---
 .../asamk/signal/manager/storage/recipients/RecipientStore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 81e622a8..d615f4ec 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -884,7 +884,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = """
                         SELECT r._id, r.number, r.uuid, r.pni, r.username
                         FROM %s r
-                        WHERE r.uuid = ? OR r.pni = ?
+                        WHERE r.uuid = ?1 OR r.pni = ?1
                         LIMIT 1
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {

From 3d13c69e41a0add0c99b3e2de94b916984cf852a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 21 Aug 2023 17:02:12 +0200
Subject: [PATCH 176/672] Extend logging

---
 .../org/asamk/signal/manager/helper/ReceiveHelper.java     | 7 +++++--
 .../signal/manager/storage/messageCache/MessageCache.java  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index b733507d..2f783467 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -233,7 +233,8 @@ public class ReceiveHelper {
                             cachedMessage[0] = account.getMessageCache().replaceSender(cachedMessage[0], recipientId);
                         } catch (IOException ioException) {
                             logger.warn("Failed to move cached message to recipient folder: {}",
-                                    ioException.getMessage());
+                                    ioException.getMessage(),
+                                    ioException);
                         }
                     }
                 } else {
@@ -280,7 +281,9 @@ public class ReceiveHelper {
                 try {
                     account.getMessageCache().replaceSender(cachedMessage, recipientId);
                 } catch (IOException ioException) {
-                    logger.warn("Failed to move cached message to recipient folder: {}", ioException.getMessage());
+                    logger.warn("Failed to move cached message to recipient folder: {}",
+                            ioException.getMessage(),
+                            ioException);
                 }
             }
             return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index 083dba06..6027d6c9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -125,7 +125,7 @@ public class MessageCache {
                 final var cacheFile = getMessageCacheFile(recipientId, file.getName());
                 Files.move(file.toPath(), cacheFile.toPath());
             } catch (IOException e) {
-                logger.warn("Failed to move cache file “{}”, ignoring: {}", file, e.getMessage());
+                logger.warn("Failed to move cache file “{}”, ignoring: {}", file, e.getMessage(), e);
             }
         }
     }

From 6d23eb3bf661a4e5c832cb2e9107f9606af56f61 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 21 Aug 2023 17:14:04 +0200
Subject: [PATCH 177/672] Show better error message when using addDevice on a
 linked device

---
 lib/src/main/java/org/asamk/signal/manager/Manager.java  | 2 +-
 .../org/asamk/signal/manager/internal/ManagerImpl.java   | 5 ++++-
 .../java/org/asamk/signal/commands/AddDeviceCommand.java | 9 ++++++---
 .../org/asamk/signal/commands/AddStickerPackCommand.java | 4 ++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index e527c1a0..264922a8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -117,7 +117,7 @@ public interface Manager extends Closeable {
 
     void removeLinkedDevices(int deviceId) throws IOException;
 
-    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException;
+    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException;
 
     void setRegistrationLockPin(Optional<String> pin) throws IOException, NotPrimaryDeviceException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 3c7649e9..e8ab75a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -362,7 +362,10 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void addDeviceLink(DeviceLinkUrl linkUrl) throws IOException, InvalidDeviceLinkException {
+    public void addDeviceLink(DeviceLinkUrl linkUrl) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
         context.getAccountHelper().addDevice(linkUrl);
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index 0895601a..47cf8748 100644
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -9,6 +9,7 @@ import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,11 +50,13 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
             var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(linkUri);
             m.addDeviceLink(deviceLinkUrl);
         } catch (IOException e) {
-            logger.error("Add device link failed", e);
+            logger.error("Add device link failed: {}", e.getMessage());
             throw new IOErrorException("Add device link failed", e);
         } catch (InvalidDeviceLinkException e) {
-            logger.error("Add device link failed", e);
-            throw new UserErrorException("Add device link failed.", e);
+            logger.error("Invalid device link");
+            throw new UserErrorException("Invalid device link", e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
index 33de6e30..a5af48d8 100644
--- a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
@@ -51,10 +51,10 @@ public class AddStickerPackCommand implements JsonRpcLocalCommand {
                 var stickerPackUrl = StickerPackUrl.fromUri(stickerUri);
                 m.installStickerPack(stickerPackUrl);
             } catch (IOException e) {
-                logger.error("Install sticker pack failed", e);
+                logger.error("Install sticker pack failed: {}", e.getMessage());
                 throw new IOErrorException("Install sticker pack failed", e);
             } catch (StickerPackUrl.InvalidStickerPackLinkException e) {
-                logger.error("Invalid sticker pack link", e);
+                logger.error("Invalid sticker pack link");
                 throw new UserErrorException("Invalid sticker pack link", e);
             }
         }

From a9f1944636534d293f3bde3e1a2cce00eef69d32 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 21 Aug 2023 17:14:04 +0200
Subject: [PATCH 178/672] Show better error message when using addDevice on a
 linked device

---
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index a2fd25e0..a4b1a48b 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -185,6 +185,8 @@ public class DbusSignalImpl implements Signal {
             m.addDeviceLink(deviceLinkUrl);
         } catch (IOException | InvalidDeviceLinkException e) {
             throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
+        } catch (NotPrimaryDeviceException e) {
+            throw new Error.Failure("This command doesn't work on linked devices.");
         } catch (URISyntaxException e) {
             throw new Error.InvalidUri(e.getClass().getSimpleName()
                     + " Device link uri has invalid format: "

From 4a37227b9586c368f0df4684d3240c5247bff7b9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 22 Aug 2023 11:52:22 +0200
Subject: [PATCH 179/672] Improve logging

---
 .../asamk/signal/manager/storage/messageCache/MessageCache.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index 6027d6c9..e78928a8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -66,6 +66,7 @@ public class MessageCache {
         if (cacheFile.equals(cachedMessage.getFile())) {
             return cachedMessage;
         }
+        logger.debug("Moving cached message {} to {}", cachedMessage.getFile().toPath(), cacheFile.toPath());
         Files.move(cachedMessage.getFile().toPath(), cacheFile.toPath());
         return new CachedMessage(cacheFile);
     }

From 884fa2748ecf7de5871732f0f6830be9e3547ce6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 22 Aug 2023 11:56:27 +0200
Subject: [PATCH 180/672] Ensure uniqueness of dbus identity names

---
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index a4b1a48b..0da98aa6 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1100,7 +1100,8 @@ public class DbusSignalImpl implements Signal {
 
         @Override
         public String getObjectPath() {
-            return getIdentityObjectPath(objectPath, identity.recipient().getLegacyIdentifier());
+            return getIdentityObjectPath(objectPath,
+                    identity.recipient().getLegacyIdentifier() + "_" + identity.recipient().getIdentifier());
         }
 
         @Override

From bc3bdbbf215c21084c5109209a9a4d6a6c345771 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 26 Aug 2023 16:33:39 +0200
Subject: [PATCH 181/672] Improve identites listing

---
 .../asamk/signal/manager/internal/ManagerImpl.java    | 11 ++++++++++-
 .../java/org/asamk/signal/dbus/DbusSignalImpl.java    |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index e8ab75a4..7db22fb2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1147,7 +1147,12 @@ public class ManagerImpl implements Manager {
 
     @Override
     public List<Identity> getIdentities() {
-        return account.getIdentityKeyStore().getIdentities().stream().map(this::toIdentity).toList();
+        return account.getIdentityKeyStore()
+                .getIdentities()
+                .stream()
+                .map(this::toIdentity)
+                .filter(Objects::nonNull)
+                .toList();
     }
 
     private Identity toIdentity(final IdentityInfo identityInfo) {
@@ -1157,6 +1162,10 @@ public class ManagerImpl implements Manager {
 
         final var address = account.getRecipientAddressResolver()
                 .resolveRecipientAddress(account.getRecipientResolver().resolveRecipient(identityInfo.getServiceId()));
+        if (address.serviceId().isPresent() && !Objects.equals(address.serviceId().get(),
+                identityInfo.getServiceId())) {
+            return null;
+        }
         final var scannableFingerprint = context.getIdentityHelper()
                 .computeSafetyNumberForScanning(identityInfo.getServiceId(), identityInfo.getIdentityKey());
         return new Identity(address.toApiRecipientAddress(),
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 0da98aa6..608ed581 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1032,7 +1032,7 @@ public class DbusSignalImpl implements Signal {
             connection.exportObject(object);
             logger.debug("Exported dbus object: " + object.getObjectPath());
         } catch (DBusException e) {
-            e.printStackTrace();
+            logger.warn("Failed to export dbus object (" + object.getObjectPath() + "): " + e.getMessage());
         }
     }
 

From 87e79bceaa9e9ce57ff3bca1f7ea40cd9336eabb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 26 Aug 2023 17:17:25 +0200
Subject: [PATCH 182/672] Fix output format of jsonrpc receive notification

Fixes #1313
---
 .../SignalJsonRpcDispatcherHandler.java       | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index aea332fd..53b876b8 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ContainerNode;
 import com.fasterxml.jackson.databind.node.IntNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -54,8 +55,8 @@ public class SignalJsonRpcDispatcherHandler {
         this.commandHandler = new SignalJsonRpcCommandHandler(c, this::getCommand);
 
         if (!noReceiveOnStart) {
-            this.subscribeReceive(c.getManagers());
-            c.addOnManagerAddedHandler(this::subscribeReceive);
+            this.subscribeReceive(c.getManagers(), true);
+            c.addOnManagerAddedHandler(m -> subscribeReceive(m, true));
             c.addOnManagerRemovedHandler(this::unsubscribeReceive);
         }
 
@@ -66,7 +67,7 @@ public class SignalJsonRpcDispatcherHandler {
         this.commandHandler = new SignalJsonRpcCommandHandler(m, this::getCommand);
 
         if (!noReceiveOnStart) {
-            subscribeReceive(m);
+            subscribeReceive(m, true);
         }
 
         final var currentThread = Thread.currentThread();
@@ -77,17 +78,23 @@ public class SignalJsonRpcDispatcherHandler {
 
     private static final AtomicInteger nextSubscriptionId = new AtomicInteger(0);
 
-    private int subscribeReceive(final Manager manager) {
-        return subscribeReceive(List.of(manager));
+    private int subscribeReceive(final Manager manager, boolean internalSubscription) {
+        return subscribeReceive(List.of(manager), internalSubscription);
     }
 
-    private int subscribeReceive(final List<Manager> managers) {
+    private int subscribeReceive(final List<Manager> managers, boolean internalSubscription) {
         final var subscriptionId = nextSubscriptionId.getAndIncrement();
         final var handlers = managers.stream().map(m -> {
             final var receiveMessageHandler = new JsonReceiveMessageHandler(m, s -> {
-                final var params = new ObjectNode(objectMapper.getNodeFactory());
-                params.set("subscription", IntNode.valueOf(subscriptionId));
-                params.set("result", objectMapper.valueToTree(s));
+                ContainerNode<?> params;
+                if (internalSubscription) {
+                    params = objectMapper.valueToTree(s);
+                } else {
+                    final var paramsNode = new ObjectNode(objectMapper.getNodeFactory());
+                    paramsNode.set("subscription", IntNode.valueOf(subscriptionId));
+                    paramsNode.set("result", objectMapper.valueToTree(s));
+                    params = paramsNode;
+                }
                 final var jsonRpcRequest = JsonRpcRequest.forNotification("receive", params, null);
                 try {
                     jsonRpcSender.sendRequest(jsonRpcRequest);
@@ -162,7 +169,7 @@ public class SignalJsonRpcDispatcherHandler {
         public void handleCommand(
                 final Void request, final Manager m, final JsonWriter jsonWriter
         ) throws CommandException {
-            final var subscriptionId = subscribeReceive(m);
+            final var subscriptionId = subscribeReceive(m, false);
             jsonWriter.write(subscriptionId);
         }
 
@@ -170,7 +177,7 @@ public class SignalJsonRpcDispatcherHandler {
         public void handleCommand(
                 final Void request, final MultiAccountManager c, final JsonWriter jsonWriter
         ) throws CommandException {
-            final var subscriptionId = subscribeReceive(c.getManagers());
+            final var subscriptionId = subscribeReceive(c.getManagers(), false);
             jsonWriter.write(subscriptionId);
         }
     }

From 26fea2d6a017db812e1ac85cd4853194e2359bd8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 26 Aug 2023 18:05:26 +0200
Subject: [PATCH 183/672] Update dependencies

---
 build.gradle.kts    | 2 +-
 settings.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d35ed373..25e18c82 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.24"
+    id("org.graalvm.buildtools.native") version "0.9.25"
 }
 
 version = "0.12.0"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fc585c00..b21930ba 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_78")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")
         }

From 6ecda0757781e59f0c7ce332e2d86e848d071fb1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 26 Aug 2023 18:05:51 +0200
Subject: [PATCH 184/672] Bump version to 0.12.1

---
 CHANGELOG.md     | 8 ++++++++
 build.gradle.kts | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e86df17f..ec128f3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,18 @@
 
 ## [Unreleased]
 
+## [0.12.1] - 2023-08-26
+
 ### Added
 
 - New `addStickerPack` command
 
+### Fixed
+- Fixed some issues with upgrading from older accounts
+
+### Changed
+- Reverted receive notification in JSON-RPC to old format, only explicit subscriptions should use the new format
+
 ## [0.12.0] - 2023-08-11
 **Attention**: Now requires native libsignal-client version 0.30.0
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 25e18c82..0d89c075 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.25"
 }
 
-version = "0.12.0"
+version = "0.12.1"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From ee195c966e3114988780ee148fc2b5c67d3fb4bf Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 1 Sep 2023 11:31:41 +0200
Subject: [PATCH 185/672] Update libsignal-service

---
 graalvm-config-dir/reflect-config.json        |  8 +--
 .../signal/manager/helper/AccountHelper.java  |  2 +-
 .../signal/manager/helper/GroupHelper.java    |  2 +-
 .../signal/manager/helper/GroupV2Helper.java  | 54 +++++++++----------
 .../signal/manager/helper/StorageHelper.java  |  8 +--
 .../internal/RegistrationManagerImpl.java     |  2 +-
 .../signal/manager/storage/SignalAccount.java |  2 +-
 .../manager/storage/groups/GroupInfoV2.java   | 13 +++--
 .../storage/prekeys/KyberPreKeyStore.java     | 10 ++++
 .../storage/protocol/SignalProtocolStore.java | 20 +++++++
 .../signal/manager/util/AttachmentUtils.java  |  3 +-
 settings.gradle.kts                           |  2 +-
 12 files changed, 77 insertions(+), 49 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 8e2e8100..989e6b90 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1975,7 +1975,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedBannedMember",
-  "fields":[{"name":"serviceIdBinary_"}, {"name":"timestamp_"}]
+  "fields":[{"name":"serviceIdBinary_"}, {"name":"serviceIdBytes_"}, {"name":"timestamp_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroup",
@@ -1991,7 +1991,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedMember",
-  "fields":[{"name":"joinedAtRevision_"}, {"name":"pni_"}, {"name":"profileKey_"}, {"name":"role_"}, {"name":"uuid_"}]
+  "fields":[{"name":"aciBytes_"}, {"name":"joinedAtRevision_"}, {"name":"pniBytes_"}, {"name":"pni_"}, {"name":"profileKey_"}, {"name":"role_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedModifyMemberRole",
@@ -1999,7 +1999,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMember",
-  "fields":[{"name":"addedByUuid_"}, {"name":"role_"}, {"name":"serviceIdBinary_"}, {"name":"timestamp_"}, {"name":"uuidCipherText_"}]
+  "fields":[{"name":"addedByAci_"}, {"name":"addedByUuid_"}, {"name":"role_"}, {"name":"serviceIdBinary_"}, {"name":"serviceIdBytes_"}, {"name":"serviceIdCipherText_"}, {"name":"timestamp_"}, {"name":"uuidCipherText_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedPendingMemberRemoval",
@@ -2007,7 +2007,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedRequestingMember",
-  "fields":[{"name":"profileKey_"}, {"name":"timestamp_"}, {"name":"uuid_"}]
+  "fields":[{"name":"aciBytes_"}, {"name":"profileKey_"}, {"name":"timestamp_"}, {"name":"uuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedString",
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 1b1de941..5ff11b34 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -102,7 +102,7 @@ public class AccountHelper {
         final var whoAmI = dependencies.getAccountManager().getWhoAmI();
         final var number = whoAmI.getNumber();
         final var aci = ACI.parseOrThrow(whoAmI.getAci());
-        final var pni = PNI.parseUnPrefixedOrThrow(whoAmI.getPni());
+        final var pni = PNI.parseOrThrow(whoAmI.getPni());
         if (number.equals(account.getNumber()) && aci.equals(account.getAci()) && pni.equals(account.getPni())) {
             return;
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index eb54780e..d30c79e4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -447,7 +447,7 @@ public class GroupHelper {
 
     private void storeProfileKeysFromMembers(final DecryptedGroup group) {
         for (var member : group.getMembersList()) {
-            final var serviceId = ServiceId.parseOrThrow(member.getUuid());
+            final var serviceId = ServiceId.parseOrThrow(member.getAciBytes());
             final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
             final var profileStore = account.getProfileStore();
             if (profileStore.getProfileKey(recipientId) != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index c817f01f..30de7b19 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -124,9 +124,10 @@ class GroupV2Helper {
     }
 
     int findRevisionWeWereAdded(DecryptedGroup partialDecryptedGroup) {
-        ByteString bytes = getSelfAci().toByteString();
+        ByteString aciBytes = getSelfAci().toByteString();
+        ByteString pniBytes = getSelfPni().toByteString();
         for (DecryptedMember decryptedMember : partialDecryptedGroup.getMembersList()) {
-            if (decryptedMember.getUuid().equals(bytes)) {
+            if (decryptedMember.getAciBytes().equals(aciBytes) || decryptedMember.getPniBytes().equals(pniBytes)) {
                 return decryptedMember.getJoinedAtRevision();
             }
         }
@@ -214,7 +215,7 @@ class GroupV2Helper {
             change.setModifyAvatar(GroupChange.Actions.ModifyAvatarAction.newBuilder().setAvatar(avatarCdnKey));
         }
 
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.setSourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -240,7 +241,7 @@ class GroupV2Helper {
         final var aci = getSelfAci();
         final var change = groupOperations.createModifyGroupMembershipChange(candidates, bannedUuids, aci);
 
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.setSourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -262,8 +263,7 @@ class GroupV2Helper {
                 .map(ServiceId::getRawUuid)
                 .toList();
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        return commitChange(groupInfoV2,
-                groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci.getRawUuid(), adminUuids));
+        return commitChange(groupInfoV2, groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci, adminUuids));
     }
 
     Pair<DecryptedGroup, GroupChange> removeMembers(
@@ -272,7 +272,8 @@ class GroupV2Helper {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::getRawUuid)
+                .filter(m -> m instanceof ACI)
+                .map(m -> (ACI) m)
                 .collect(Collectors.toSet());
         return ejectMembers(groupInfoV2, memberUuids);
     }
@@ -294,7 +295,6 @@ class GroupV2Helper {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
-                .map(ServiceId::getRawUuid)
                 .collect(Collectors.toSet());
         return refuseJoinRequest(groupInfoV2, memberUuids);
     }
@@ -318,18 +318,15 @@ class GroupV2Helper {
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
-        final var uuids = block.stream()
-                .map(member -> context.getRecipientHelper()
-                        .resolveSignalServiceAddress(member)
-                        .getServiceId()
-                        .getRawUuid())
+        final var serviceIds = block.stream()
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId())
                 .collect(Collectors.toSet());
 
-        final var change = groupOperations.createBanUuidsChange(uuids,
+        final var change = groupOperations.createBanServiceIdsChange(serviceIds,
                 false,
                 groupInfoV2.getGroup().getBannedMembersList());
 
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.setSourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -345,7 +342,7 @@ class GroupV2Helper {
 
         final var change = groupOperations.createUnbanServiceIdsChange(serviceIds);
 
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.setSourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -396,8 +393,7 @@ class GroupV2Helper {
     Pair<DecryptedGroup, GroupChange> updateSelfProfileKey(GroupInfoV2 groupInfoV2) throws IOException {
         Optional<DecryptedMember> selfInGroup = groupInfoV2.getGroup() == null
                 ? Optional.empty()
-                : DecryptedGroupUtil.findMemberByUuid(groupInfoV2.getGroup().getMembersList(),
-                        getSelfAci().getRawUuid());
+                : DecryptedGroupUtil.findMemberByAci(groupInfoV2.getGroup().getMembersList(), getSelfAci());
         if (selfInGroup.isEmpty()) {
             logger.trace("Not updating group, self not in group " + groupInfoV2.getGroupId().toBase64());
             return null;
@@ -420,7 +416,7 @@ class GroupV2Helper {
 
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var change = groupOperations.createUpdateProfileKeyCredentialChange(profileKeyCredential);
-        change.setSourceUuid(getSelfAci().toByteString());
+        change.setSourceServiceId(getSelfAci().toByteString());
         return commitChange(groupInfoV2, change);
     }
 
@@ -443,7 +439,7 @@ class GroupV2Helper {
                 ? groupOperations.createGroupJoinRequest(profileKeyCredential)
                 : groupOperations.createGroupJoinDirect(profileKeyCredential);
 
-        change.setSourceUuid(context.getRecipientHelper()
+        change.setSourceServiceId(context.getRecipientHelper()
                 .resolveSignalServiceAddress(selfRecipientId)
                 .getServiceId()
                 .toByteString());
@@ -463,7 +459,7 @@ class GroupV2Helper {
         final var change = groupOperations.createAcceptInviteChange(profileKeyCredential);
 
         final var aci = context.getRecipientHelper().resolveSignalServiceAddress(selfRecipientId).getServiceId();
-        change.setSourceUuid(aci.toByteString());
+        change.setSourceServiceId(aci.toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -524,7 +520,7 @@ class GroupV2Helper {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var uuidCipherTexts = pendingMembers.stream().map(member -> {
             try {
-                return new UuidCiphertext(member.getUuidCipherText().toByteArray());
+                return new UuidCiphertext(member.getServiceIdCipherText().toByteArray());
             } catch (InvalidInputException e) {
                 throw new AssertionError(e);
             }
@@ -540,17 +536,17 @@ class GroupV2Helper {
     }
 
     private Pair<DecryptedGroup, GroupChange> refuseJoinRequest(
-            GroupInfoV2 groupInfoV2, Set<UUID> uuids
+            GroupInfoV2 groupInfoV2, Set<ServiceId> serviceIds
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        return commitChange(groupInfoV2, groupOperations.createRefuseGroupJoinRequest(uuids, false, List.of()));
+        return commitChange(groupInfoV2, groupOperations.createRefuseGroupJoinRequest(serviceIds, false, List.of()));
     }
 
     private Pair<DecryptedGroup, GroupChange> ejectMembers(
-            GroupInfoV2 groupInfoV2, Set<UUID> uuids
+            GroupInfoV2 groupInfoV2, Set<ACI> members
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(uuids, false, List.of()));
+        return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(members, false, List.of()));
     }
 
     private Pair<DecryptedGroup, GroupChange> commitChange(
@@ -593,16 +589,16 @@ class GroupV2Helper {
     }
 
     Pair<ServiceId, ProfileKey> getAuthoritativeProfileKeyFromChange(final DecryptedGroupChange change) {
-        UUID editor = UuidUtil.fromByteStringOrNull(change.getEditor());
+        UUID editor = UuidUtil.fromByteStringOrNull(change.getEditorServiceIdBytes());
         final var editorProfileKeyBytes = Stream.concat(Stream.of(change.getNewMembersList().stream(),
                                 change.getPromotePendingMembersList().stream(),
                                 change.getModifiedProfileKeysList().stream())
                         .flatMap(Function.identity())
-                        .filter(m -> UuidUtil.fromByteString(m.getUuid()).equals(editor))
+                        .filter(m -> UuidUtil.fromByteString(m.getAciBytes()).equals(editor))
                         .map(DecryptedMember::getProfileKey),
                 change.getNewRequestingMembersList()
                         .stream()
-                        .filter(m -> UuidUtil.fromByteString(m.getUuid()).equals(editor))
+                        .filter(m -> UuidUtil.fromByteString(m.getAciBytes()).equals(editor))
                         .map(DecryptedRequestingMember::getProfileKey)).findFirst();
 
         if (editorProfileKeyBytes.isEmpty()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 863bdf99..a8eb7f50 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -101,14 +101,14 @@ public class StorageHelper {
         }
 
         final var contactRecord = record.getContact().get();
-        final var aci = contactRecord.getAci();
+        final var aci = contactRecord.getAci().orElse(null);
         final var pni = contactRecord.getPni().orElse(null);
-        if (contactRecord.getNumber().isEmpty() && aci.isUnknown()) {
+        if (contactRecord.getNumber().isEmpty() && aci == null && pni == null) {
             return;
         }
         final var address = new RecipientAddress(aci, pni, contactRecord.getNumber().orElse(null));
         var recipientId = account.getRecipientResolver().resolveRecipient(address);
-        if (aci.isValid() && contactRecord.getUsername().isPresent()) {
+        if (aci != null && contactRecord.getUsername().isPresent()) {
             recipientId = account.getRecipientTrustedResolver()
                     .resolveRecipientTrusted(aci, contactRecord.getUsername().get());
         }
@@ -171,7 +171,7 @@ public class StorageHelper {
                 logger.warn("Received invalid contact profile key from storage");
             }
         }
-        if (contactRecord.getIdentityKey().isPresent() && aci.isValid()) {
+        if (contactRecord.getIdentityKey().isPresent() && aci != null) {
             try {
                 logger.trace("Storing identity key {}", recipientId);
                 final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get());
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index a216237c..3e953631 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -165,7 +165,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
         //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
         final var aci = ACI.parseOrThrow(response.getUuid());
-        final var pni = PNI.parseUnPrefixedOrThrow(response.getPni());
+        final var pni = PNI.parseOrThrow(response.getPni());
         account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
         accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 8d719ea3..6ae2aaa4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -556,7 +556,7 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.hasNonNull("pni")) {
             try {
-                pni = PNI.parseUnPrefixedOrThrow(rootNode.get("pni").asText());
+                pni = PNI.parseOrThrow(rootNode.get("pni").asText());
             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid pni, needs to be a valid UUID", e);
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index 199a9da0..6a8de592 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -3,6 +3,7 @@ package org.asamk.signal.manager.storage.groups;
 import org.asamk.signal.manager.api.GroupIdV2;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
 import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
@@ -114,7 +115,7 @@ public final class GroupInfoV2 extends GroupInfo {
         }
         return group.getMembersList()
                 .stream()
-                .map(m -> ServiceId.parseOrThrow(m.getUuid()))
+                .map(m -> ServiceId.parseOrThrow(m.getAciBytes()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -126,7 +127,7 @@ public final class GroupInfoV2 extends GroupInfo {
         }
         return group.getBannedMembersList()
                 .stream()
-                .map(m -> ServiceId.parseOrThrow(m.getServiceIdBinary()))
+                .map(m -> ServiceId.parseOrThrow(m.getServiceIdBytes()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -138,7 +139,7 @@ public final class GroupInfoV2 extends GroupInfo {
         }
         return group.getPendingMembersList()
                 .stream()
-                .map(m -> ServiceId.parseOrThrow(m.getServiceIdBinary()))
+                .map(m -> ServiceId.parseOrThrow(m.getServiceIdBytes()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -150,7 +151,7 @@ public final class GroupInfoV2 extends GroupInfo {
         }
         return group.getRequestingMembersList()
                 .stream()
-                .map(m -> ServiceId.parseOrThrow(m.getUuid()))
+                .map(m -> ServiceId.parseOrThrow(m.getAciBytes()))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -163,7 +164,9 @@ public final class GroupInfoV2 extends GroupInfo {
         return group.getMembersList()
                 .stream()
                 .filter(m -> m.getRole() == Member.Role.ADMINISTRATOR)
-                .map(m -> ServiceId.parseOrThrow(m.getUuid()))
+                .map(m -> new RecipientAddress(ServiceId.ACI.parseOrNull(m.getAciBytes()),
+                        ServiceId.PNI.parseOrNull(m.getPniBytes()),
+                        null))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
index 54fbba43..9ce660b2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
@@ -208,4 +208,14 @@ public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
             return null;
         }
     }
+
+    @Override
+    public void deleteAllStaleOneTimeKyberPreKeys(final long threshold, final int minCount) {
+        //TODO
+    }
+
+    @Override
+    public void markAllOneTimeKyberPreKeysStaleIfNecessary(final long staleTime) {
+        //TODO
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index e565e915..f042f0e2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -242,4 +242,24 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     public void storeLastResortKyberPreKey(final int i, final KyberPreKeyRecord kyberPreKeyRecord) {
         kyberPreKeyStore.storeLastResortKyberPreKey(i, kyberPreKeyRecord);
     }
+
+    @Override
+    public void deleteAllStaleOneTimeKyberPreKeys(final long threshold, final int minCount) {
+        kyberPreKeyStore.deleteAllStaleOneTimeKyberPreKeys(threshold, minCount);
+    }
+
+    @Override
+    public void markAllOneTimeKyberPreKeysStaleIfNecessary(final long staleTime) {
+        kyberPreKeyStore.markAllOneTimeKyberPreKeysStaleIfNecessary(staleTime);
+    }
+
+    @Override
+    public void deleteAllStaleOneTimeEcPreKeys(final long l, final int i) {
+        // TODO
+    }
+
+    @Override
+    public void markAllOneTimeEcPreKeysStaleIfNecessary(final long l) {
+        // TODO
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index 3abcefbb..a535d82b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -57,7 +57,6 @@ public class AttachmentUtils {
                 blurHash,
                 null,
                 null,
-                resumableUploadSpec,
-                false);
+                resumableUploadSpec);
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b21930ba..d47e3272 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_78")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_79")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From c8daef51139cf112db6520d22713451a7d4a4c39 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 1 Sep 2023 12:08:56 +0200
Subject: [PATCH 186/672] Add --receive-mode parameter to jsonRpc command

---
 CHANGELOG.md                                  |  4 +++
 graalvm-config-dir/reflect-config.json        |  2 +-
 man/signal-cli.1.adoc                         | 18 ++++++++++++
 .../commands/JsonRpcDispatcherCommand.java    | 29 ++++++++++++++-----
 4 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec128f3e..d520e273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Added `--receive-mode` parameter for `jsonRpc` command
+
 ## [0.12.1] - 2023-08-26
 
 ### Added
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 989e6b90..a449c4ff 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1098,7 +1098,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"getError","parameterTypes":[] }, {"name":"getId","parameterTypes":[] }, {"name":"getJsonrpc","parameterTypes":[] }, {"name":"getResult","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"getError","parameterTypes":[] }, {"name":"getId","parameterTypes":[] }, {"name":"getJsonrpc","parameterTypes":[] }, {"name":"getResult","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.jsonrpc.JsonRpcResponse$Error",
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 56449d19..0fbbe855 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -717,6 +717,24 @@ Don’t print received messages to stdout.
 *--receive-mode*::
 Specify when to start receiving messages (on-start, on-connection, manual)
 
+=== jsonRpc
+
+Run in signal-cli in JSON-RPC mode.
+Reads JSON-RPC requests on stdin and responds on stdout.
+See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
+
+*--ignore-attachments*::
+Don’t download attachments of received messages.
+
+*--ignore-stories*::
+Don’t receive story messages from the server.
+
+*--send-read-receipts*::
+Send read receipts for all incoming data messages (in addition to the default delivery receipts)
+
+*--receive-mode*::
+Specify when to start receiving messages (on-start, manual)
+
 === submitRateLimitChallenge
 
 When running into rate limits, sometimes the limit can be lifted, by solving a CAPTCHA.
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 34961bd3..21176af3 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -40,6 +40,10 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
         subparser.addArgument("--send-read-receipts")
                 .help("Send read receipts for all incoming data messages (in addition to the default delivery receipts)")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--receive-mode")
+                .help("Specify when to start receiving messages.")
+                .type(Arguments.enumStringType(ReceiveMode.class))
+                .setDefault(ReceiveMode.ON_START);
     }
 
     @Override
@@ -51,16 +55,27 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
+        final var receiveMode = ns.<ReceiveMode>get("receive-mode");
+        final var receiveConfig = getReceiveConfig(ns);
+        m.setReceiveConfig(receiveConfig);
+
+        final var jsonOutputWriter = (JsonWriter) outputWriter;
+        final var lineSupplier = getLineSupplier();
+
+        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
+                lineSupplier,
+                receiveMode == ReceiveMode.MANUAL);
+        handler.handleConnection(m);
+    }
+
+    private static ReceiveConfig getReceiveConfig(final Namespace ns) {
         final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
         final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
         final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts));
+        return new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
+    }
 
-        final var jsonOutputWriter = (JsonWriter) outputWriter;
-        final Supplier<String> lineSupplier = IOUtils.getLineSupplier(new InputStreamReader(System.in,
-                IOUtils.getConsoleCharset()));
-
-        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, false);
-        handler.handleConnection(m);
+    private static Supplier<String> getLineSupplier() {
+        return IOUtils.getLineSupplier(new InputStreamReader(System.in, IOUtils.getConsoleCharset()));
     }
 }

From a7a5947a1bc468cbf202c603ed14fe40b14c73b0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 1 Sep 2023 12:11:38 +0200
Subject: [PATCH 187/672] Implement multi-account mode for jsonRpc command

Fixes #1319
---
 man/signal-cli-jsonrpc.5.adoc                 | 73 +++++++++++++++----
 .../commands/JsonRpcDispatcherCommand.java    | 21 +++++-
 2 files changed, 79 insertions(+), 15 deletions(-)

diff --git a/man/signal-cli-jsonrpc.5.adoc b/man/signal-cli-jsonrpc.5.adoc
index ff709f31..ad9cb538 100644
--- a/man/signal-cli-jsonrpc.5.adoc
+++ b/man/signal-cli-jsonrpc.5.adoc
@@ -13,7 +13,7 @@ signal-cli-jsonrpc - A commandline and dbus interface for the Signal messenger
 
 == Synopsis
 
-*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] daemon [--socket] [--tcp]
+*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] daemon [--socket] [--tcp] [--http]
 
 *signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] jsonRpc
 
@@ -26,16 +26,16 @@ signal-cli provides a JSON-RPC based API with the `jsonRpc` and `daemon` command
 - `jsonRpc` command accepts input on STDIN and responds on STDOUT.
 This is intended to make it easier to embed signal-cli in other applications.
 
-  `signal-cli -a _ACCOUNT_ jsonRpc`
+  `signal-cli -a _ACCOUNT_ jsonRpc` or for multi-account mode `signal-cli jsonRpc`
 
-- `daemon` command provides a UNIX or TCP socket and can handle requests from multiple clients.
+- `daemon` command provides a UNIX, TCP socket or HTTP endpoint and can handle requests from multiple clients.
 
   `signal-cli -a _ACCOUNT_ daemon --socket` or for multi-account mode `signal-cli daemon --socket`
 
 == Basic usage
 
 In JSON-RPC mode, signal-cli will read requests from stdin.
-Every requests must be a JSON object in a single line.
+Every request must be a JSON object in a single line.
 Requests must have a unique "id" value to be able to match the response to the corresponding request.
 
 Example:
@@ -48,15 +48,26 @@ From the command line:
 
 `echo '{"jsonrpc":"2.0","method":"listGroups","id":"my special mark"}' | signal-cli -u +33123456789 jsonRpc`
 
-Like in dbus daemon mode, messages are automatically received in jsonRpc mode.
+Like in dbus daemon mode, messages are automatically received in jsonRpc mode (`--receive-mode=on-start`).
 Incoming messages are sent as JSON-RPC notifications.
 
 Example:
 
 `{"jsonrpc":"2.0","method":"receive","params":{"envelope":{"source":"+33123456789","sourceNumber":"+33123456789","sourceUuid":"uuid","sourceName":"name","sourceDevice":1,"timestamp":1631458508784,"dataMessage":{"timestamp":1631458508784,"message":"foobar","expiresInSeconds":0,"viewOnce":false,"mentions":[],"attachments":[],"contacts":[]}}}}`
 
-=== Multi-account daemon mode
-When the daemon command is started without an account parameter (-a), signal-cli will provide all local accounts and additional commands to register and link new accounts.
+In order to not miss messages, automatic receiving of messages can be disabled with the `--receive-mode=manual` parameter.
+
+REQUEST: `{"jsonrpc":"2.0","id":"id","method":"subscribeReceive"}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":0,"id":"id"}`
+
+Messages are then sent similar to the automatic mode, but wrapped in a subscription response object:
+
+`{"jsonrpc":"2.0","method":"receive","params":{"subscription":0,"result":{"envelope":{"source":"+33123456789","sourceNumber":"+33123456789","sourceUuid":"uuid","sourceName":"name","sourceDevice":2,"timestamp":1693064367769,"syncMessage":{"sentMessage":{"destination":"+33123456789","destinationNumber":"+33123456789","destinationUuid":"uuid","timestamp":1693064367769,"message":"j","expiresInSeconds":0,"viewOnce":false}}},"account":"+33123456789"}}}`
+
+=== Multi-account mode
+
+When the daemon/jsonRpc command is started without an account parameter (-a), signal-cli will provide all local accounts and additional commands to register (`register`) and link (`startLink`, `finishLink`) new accounts.
 
 In multi-account mode, requests for a single account require an additional `account` param.
 
@@ -79,10 +90,10 @@ The `method` field is the command name and the parameters can be sent as the `pa
 
 === Additional JSON-RPC commands
 
-For receiving message additional commands are provided in JSON-RPC mode with `--receive-mode=manual`.
-
 ==== subscribeReceive
 
+For receiving message with `--receive-mode=manual` parameter.
+
 Tells the daemon to start receiving messages, returns the subscription id as a single integer value in the result.
 
 ==== unsubscribeReceive
@@ -93,17 +104,51 @@ Params:
 
 - `subscription`: the subscription id returned by `subscribeReceive`
 
+==== startLink
+
+Starts the provisioning for a new linked account.
+Responds with a URI that can be used with the `addDevice` signal-cli command or encoded as a QR-code and scanned with a mobile phone.
+The URI is only valid for a short amount of time.
+
+REQUEST: `{"jsonrpc":"2.0","method":"startLink","id":"5"}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":{"deviceLinkUri":"sgnl://linkdevice?uuid=X&pub_key=X"},"id":"5"}`
+
+==== finishLink
+
+Finish provisioning of a new linked account.
+Can be called immediately after `startLink`, it will wait for a response from the primary device.
+
+Params:
+
+- `deviceLinkUri`: the URI returned by `startLink`
+- `deviceName`: (optional) the name for the new linked device
+
+REQUEST: `{"jsonrpc":"2.0","method":"finishLink","id":"6","params":{"deviceLinkUri":"sgnl://linkdevice?uuid=X&pub_key=X","deviceName":"new-name"}}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":{"deviceLinkUri":"sgnl://linkdevice?uuid=X&pub_key=X"},"id":"6"}`
+
 == Examples
 
-REQUEST: `{"jsonrpc":"2.0","method":"listGroups","id":"5"}` RESPONSE: `{"jsonrpc":"2.0","result":[...],"id":"5"}`
+REQUEST: `{"jsonrpc":"2.0","method":"listGroups","id":"5"}`
 
-REQUEST: `{"jsonrpc":"2.0","method":"send","params":{"recipient":["+YYY"],"message":"MESSAGE"},"id":4}` RESPONSE: `{"jsonrpc":"2.0","result":{"timestamp":999},"id":4}`
+RESPONSE: `{"jsonrpc":"2.0","result":[...],"id":"5"}`
 
-REQUEST: `{"jsonrpc":"2.0","method":"updateGroup","params":{"groupId":"GROUP_ID=","name":"new group name","members":["+ZZZ"],"link":"enabledWithApproval","setPermissionEditDetails":"only-admins"},"id":"someId"}` RESPONSE: `{"jsonrpc":"2.0","result":{"timestamp":9999},"id":"someId"}`
+REQUEST: `{"jsonrpc":"2.0","method":"send","params":{"recipient":["+YYY"],"message":"MESSAGE"},"id":4}`
 
-REQUEST: `{"jsonrpc":"2.0","method":"sendSyncRequest","id":9}` RESPONSE: `{"jsonrpc":"2.0","result":{},"id":9}`
+RESPONSE: `{"jsonrpc":"2.0","result":{"timestamp":999},"id":4}`
 
-REQUEST: `{"jsonrpc":"2.0"}` RESPONSE: `{"jsonrpc":"2.0","error":{"code":-32600,"message":"method field must be set","data":null},"id":null}`
+REQUEST: `{"jsonrpc":"2.0","method":"updateGroup","params":{"groupId":"GROUP_ID=","name":"new group name","members":["+ZZZ"],"link":"enabledWithApproval","setPermissionEditDetails":"only-admins"},"id":"someId"}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":{"timestamp":9999},"id":"someId"}`
+
+REQUEST: `{"jsonrpc":"2.0","method":"sendSyncRequest","id":9}`
+
+RESPONSE: `{"jsonrpc":"2.0","result":{},"id":9}`
+
+REQUEST: `{"jsonrpc":"2.0"}`
+
+RESPONSE: `{"jsonrpc":"2.0","error":{"code":-32600,"message":"method field must be set","data":null},"id":null}`
 
 == Authors
 
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 21176af3..166dfcef 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -8,6 +8,7 @@ import org.asamk.signal.OutputType;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
@@ -19,7 +20,7 @@ import java.io.InputStreamReader;
 import java.util.List;
 import java.util.function.Supplier;
 
-public class JsonRpcDispatcherCommand implements LocalCommand {
+public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
 
@@ -68,6 +69,24 @@ public class JsonRpcDispatcherCommand implements LocalCommand {
         handler.handleConnection(m);
     }
 
+    @Override
+    public void handleCommand(
+            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var receiveMode = ns.<ReceiveMode>get("receive-mode");
+        final var receiveConfig = getReceiveConfig(ns);
+        c.getManagers().forEach(m -> m.setReceiveConfig(receiveConfig));
+        c.addOnManagerAddedHandler(m -> m.setReceiveConfig(receiveConfig));
+
+        final var jsonOutputWriter = (JsonWriter) outputWriter;
+        final var lineSupplier = getLineSupplier();
+
+        final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
+                lineSupplier,
+                receiveMode == ReceiveMode.MANUAL);
+        handler.handleConnection(c);
+    }
+
     private static ReceiveConfig getReceiveConfig(final Namespace ns) {
         final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
         final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));

From ed746c389cccfe8401d8628141c8acc4c0690301 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 8 Sep 2023 17:53:49 +0200
Subject: [PATCH 188/672] Update libsignal-service

---
 graalvm-config-dir/reflect-config.json        |  4 ++--
 .../asamk/signal/manager/api/TrustLevel.java  |  1 -
 .../signal/manager/helper/StorageHelper.java  | 22 ++++++++-----------
 settings.gradle.kts                           |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index a449c4ff..a1465c18 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1847,7 +1847,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions",
-  "fields":[{"name":"addBannedMembers_"}, {"name":"addMembers_"}, {"name":"addPendingMembers_"}, {"name":"addRequestingMembers_"}, {"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"modifyAddFromInviteLinkAccess_"}, {"name":"modifyAnnouncementsOnly_"}, {"name":"modifyAttributesAccess_"}, {"name":"modifyAvatar_"}, {"name":"modifyDescription_"}, {"name":"modifyDisappearingMessagesTimer_"}, {"name":"modifyInviteLinkPassword_"}, {"name":"modifyMemberAccess_"}, {"name":"modifyMemberProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"modifyTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}, {"name":"sourceUuid_"}]
+  "fields":[{"name":"addBannedMembers_"}, {"name":"addMembers_"}, {"name":"addPendingMembers_"}, {"name":"addRequestingMembers_"}, {"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"modifyAddFromInviteLinkAccess_"}, {"name":"modifyAnnouncementsOnly_"}, {"name":"modifyAttributesAccess_"}, {"name":"modifyAvatar_"}, {"name":"modifyDescription_"}, {"name":"modifyDisappearingMessagesTimer_"}, {"name":"modifyInviteLinkPassword_"}, {"name":"modifyMemberAccess_"}, {"name":"modifyMemberProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"modifyTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}, {"name":"sourceServiceId_"}, {"name":"sourceUuid_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.GroupChange$Actions$AddBannedMemberAction",
@@ -1983,7 +1983,7 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupChange",
-  "fields":[{"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"editor_"}, {"name":"modifiedProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"newAttributeAccess_"}, {"name":"newAvatar_"}, {"name":"newBannedMembers_"}, {"name":"newDescription_"}, {"name":"newInviteLinkAccess_"}, {"name":"newInviteLinkPassword_"}, {"name":"newIsAnnouncementGroup_"}, {"name":"newMemberAccess_"}, {"name":"newMembers_"}, {"name":"newPendingMembers_"}, {"name":"newRequestingMembers_"}, {"name":"newTimer_"}, {"name":"newTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}]
+  "fields":[{"name":"deleteBannedMembers_"}, {"name":"deleteMembers_"}, {"name":"deletePendingMembers_"}, {"name":"deleteRequestingMembers_"}, {"name":"editorServiceIdBytes_"}, {"name":"editor_"}, {"name":"modifiedProfileKeys_"}, {"name":"modifyMemberRoles_"}, {"name":"newAttributeAccess_"}, {"name":"newAvatar_"}, {"name":"newBannedMembers_"}, {"name":"newDescription_"}, {"name":"newInviteLinkAccess_"}, {"name":"newInviteLinkPassword_"}, {"name":"newIsAnnouncementGroup_"}, {"name":"newMemberAccess_"}, {"name":"newMembers_"}, {"name":"newPendingMembers_"}, {"name":"newRequestingMembers_"}, {"name":"newTimer_"}, {"name":"newTitle_"}, {"name":"promotePendingMembers_"}, {"name":"promotePendingPniAciMembers_"}, {"name":"promoteRequestingMembers_"}, {"name":"revision_"}]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo",
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java b/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
index 4016f487..cbfa0bd5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
@@ -22,7 +22,6 @@ public enum TrustLevel {
             case DEFAULT -> TRUSTED_UNVERIFIED;
             case UNVERIFIED -> UNTRUSTED;
             case VERIFIED -> TRUSTED_VERIFIED;
-            case UNRECOGNIZED -> null;
         };
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index a8eb7f50..e8f23cae 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -19,7 +19,6 @@ import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
-import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
 import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
 
 import java.io.IOException;
@@ -80,13 +79,13 @@ public class StorageHelper {
         logger.trace("Reading {} new records", manifest.get().getStorageIds().size());
         for (final var record : getSignalStorageRecords(storageIds)) {
             logger.debug("Reading record of type {}", record.getType());
-            if (record.getType() == ManifestRecord.Identifier.Type.ACCOUNT_VALUE) {
+            if (record.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue()) {
                 readAccountRecord(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV2_VALUE) {
+            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV2.getValue()) {
                 readGroupV2Record(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV1_VALUE) {
+            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV1.getValue()) {
                 readGroupV1Record(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.CONTACT_VALUE) {
+            } else if (record.getType() == ManifestRecord.Identifier.Type.CONTACT.getValue()) {
                 readContactRecord(record);
             }
         }
@@ -256,14 +255,11 @@ public class StorageHelper {
         account.getConfigurationStore()
                 .setUnidentifiedDeliveryIndicators(accountRecord.isSealedSenderIndicatorsEnabled());
         account.getConfigurationStore().setLinkPreviews(accountRecord.isLinkPreviewsEnabled());
-        if (accountRecord.getPhoneNumberSharingMode() != AccountRecord.PhoneNumberSharingMode.UNRECOGNIZED) {
-            account.getConfigurationStore()
-                    .setPhoneNumberSharingMode(switch (accountRecord.getPhoneNumberSharingMode()) {
-                        case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
-                        case NOBODY -> PhoneNumberSharingMode.NOBODY;
-                        default -> PhoneNumberSharingMode.CONTACTS;
-                    });
-        }
+        account.getConfigurationStore().setPhoneNumberSharingMode(switch (accountRecord.getPhoneNumberSharingMode()) {
+            case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
+            case NOBODY -> PhoneNumberSharingMode.NOBODY;
+            case CONTACTS_ONLY -> PhoneNumberSharingMode.CONTACTS;
+        });
         account.getConfigurationStore().setPhoneNumberUnlisted(accountRecord.isPhoneNumberUnlisted());
         account.setUsername(accountRecord.getUsername());
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d47e3272..5c4e81b8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_79")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_80")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")

From 4d93415485038e16c8e0e32a20fbf662e2a06f8b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 8 Sep 2023 17:54:07 +0200
Subject: [PATCH 189/672] Update graalvm buildtools

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0d89c075..09ae2ac1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.25"
+    id("org.graalvm.buildtools.native") version "0.9.26"
 }
 
 version = "0.12.1"

From e626cc0390e0a4a16048915f7738c112b0198cd7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 8 Sep 2023 18:07:43 +0200
Subject: [PATCH 190/672] Update dependencies

---
 client/Cargo.lock                             | 340 +++++++++---------
 client/Cargo.toml                             |   2 +-
 .../asamk/signal/manager/storage/Utils.java   |   4 +
 .../manager/storage/groups/GroupStore.java    |  10 +-
 .../storage/recipients/RecipientStore.java    |   8 +-
 .../storage/sendLog/MessageSendLogStore.java  |   8 +-
 settings.gradle.kts                           |   4 +-
 7 files changed, 198 insertions(+), 178 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 45764a22..94ac898f 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -19,24 +19,23 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "anstream"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is-terminal",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
 
 [[package]]
 name = "anstyle-parse"
@@ -58,9 +57,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -68,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.72"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "async-lock"
@@ -83,13 +82,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.72"
+version = "0.1.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
+checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
 ]
 
 [[package]]
@@ -100,9 +99,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
@@ -115,9 +114,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.2"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
 
 [[package]]
 name = "beef"
@@ -134,12 +133,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "bitflags"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
-
 [[package]]
 name = "bumpalo"
 version = "3.13.0"
@@ -148,15 +141,15 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cc"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "libc",
 ]
@@ -169,46 +162,44 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.3.21"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
+checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6"
 dependencies = [
  "clap_builder",
  "clap_derive",
- "once_cell",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.3.21"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
+checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "once_cell",
  "strsim",
  "terminal_size",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.3.12"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
 
 [[package]]
 name = "colorchoice"
@@ -240,9 +231,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -271,6 +262,15 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "form_urlencoded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+dependencies = [
+ "percent-encoding",
+]
+
 [[package]]
 name = "futures-channel"
 version = "0.3.28"
@@ -294,7 +294,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
 ]
 
 [[package]]
@@ -332,15 +332,15 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.27.3"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "h2"
-version = "0.3.20"
+version = "0.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
 dependencies = [
  "bytes",
  "fnv",
@@ -409,9 +409,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
@@ -453,6 +453,16 @@ dependencies = [
  "tokio-rustls",
 ]
 
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -484,17 +494,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi",
- "rustix 0.38.8",
- "windows-sys",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.9"
@@ -512,9 +511,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f3783308bddc49d0218307f66a09330c106fbd792c58bac5c8dc294fdd0f98"
+checksum = "8002beb64691edce321fc16cdba91916b10d798f9d480a05467b0ee98463c03b"
 dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-http-client",
@@ -525,9 +524,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaa4c4d5fb801dcc316d81f76422db259809037a86b3194ae538dd026b05ed7"
+checksum = "4278372ecb78ebb522c36a242209a29162f4af0997a41158c8b60450b081baf1"
 dependencies = [
  "anyhow",
  "async-lock",
@@ -542,15 +541,14 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "tokio-stream",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa7165efcbfbc951d180162ff28fe91b657ed81925e37a35e4a396ce12109f96"
+checksum = "2393386c97ce214851a9677568c5a38223ae4eada833617cb16d8464d1128f1b"
 dependencies = [
  "async-trait",
  "hyper",
@@ -563,13 +561,14 @@ dependencies = [
  "tokio",
  "tower",
  "tracing",
+ "url",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dc12b1d4f16a86e8c522823c4fab219c88c03eb7c924ec0501a64bf12e058b"
+checksum = "985d4a3753a08aaf120429924567795b2764c5c691489316a7fd076178e708b4"
 dependencies = [
  "heck",
  "proc-macro-crate",
@@ -580,9 +579,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00aa7cc87bc42e04e26c8ac3e7186142f7fd2949c763d9b6a7e64a69672d8fb2"
+checksum = "bbea61f2d95b9592491228db0c4d2b1e43ea1154ed9713bb666169cf3919ea7d"
 dependencies = [
  "anyhow",
  "beef",
@@ -604,23 +603,17 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
-
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "miniz_oxide"
@@ -654,9 +647,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.31.1"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -673,6 +666,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "percent-encoding"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
 [[package]]
 name = "pin-project"
 version = "1.1.3"
@@ -690,14 +689,14 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -726,9 +725,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.32"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -766,32 +765,19 @@ version = "0.37.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys 0.3.8",
- "windows-sys",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
-dependencies = [
- "bitflags 2.3.3",
- "errno",
- "libc",
- "linux-raw-sys 0.4.5",
+ "linux-raw-sys",
  "windows-sys",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.6"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb"
+checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
 dependencies = [
  "log",
  "ring",
@@ -822,9 +808,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.3"
+version = "0.101.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0"
+checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
 dependencies = [
  "ring",
  "untrusted",
@@ -861,7 +847,7 @@ version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -880,29 +866,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.183"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.183"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.104"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
 dependencies = [
  "itoa",
  "ryu",
@@ -928,9 +914,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
@@ -980,9 +966,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.28"
+version = "2.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -995,35 +981,50 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
 dependencies = [
- "rustix 0.37.23",
+ "rustix",
  "windows-sys",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.44"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.44"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
 ]
 
 [[package]]
-name = "tokio"
-version = "1.30.0"
+name = "tinyvec"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1044,7 +1045,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
 ]
 
 [[package]]
@@ -1057,17 +1058,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-stream"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
-dependencies = [
- "futures-core",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.8"
@@ -1090,9 +1080,9 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 
 [[package]]
 name = "toml_edit"
-version = "0.19.14"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
  "indexmap 2.0.0",
  "toml_datetime",
@@ -1147,7 +1137,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
 ]
 
 [[package]]
@@ -1165,18 +1155,44 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
 [[package]]
 name = "untrusted"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
+[[package]]
+name = "url"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -1219,7 +1235,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
  "wasm-bindgen-shared",
 ]
 
@@ -1241,7 +1257,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.28",
+ "syn 2.0.31",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -1295,9 +1311,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -1310,51 +1326,51 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
-version = "0.5.7"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19f495880723d0999eb3500a9064d8dbcf836460b24c17df80ea7b5794053aac"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
 dependencies = [
  "memchr",
 ]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index fb77b86c..17cedc03 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -12,7 +12,7 @@ log = "0.4"
 serde = "1"
 serde_json = "1"
 tokio = { version = "1", features = ["rt", "macros", "net", "rt-multi-thread"] }
-jsonrpsee = { version = "0.19.0", features = [
+jsonrpsee = { version = "0.20.0", features = [
     "macros",
     "async-client",
     "http-client",
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
index 1c75d9cc..de98d7e5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
@@ -113,6 +113,10 @@ public class Utils {
         }, false);
     }
 
+    public static Long getIdMapper(ResultSet resultSet) throws SQLException {
+        return resultSet.getLong("_id");
+    }
+
     public interface ResultSetMapper<T> {
 
         T apply(ResultSet resultSet) throws SQLException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 0b190105..af5ada26 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -241,6 +241,7 @@ public class GroupStore {
             final var sql = """
                             INSERT OR REPLACE INTO %s (_id, group_id, group_id_v2, name, color, expiration_time, blocked, archived)
                             VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                            RETURNING _id
                             """.formatted(TABLE_GROUP_V1);
             try (final var statement = connection.prepareStatement(sql)) {
                 if (internalId == null) {
@@ -255,14 +256,13 @@ public class GroupStore {
                 statement.setLong(6, groupV1.getMessageExpirationTimer());
                 statement.setBoolean(7, groupV1.isBlocked());
                 statement.setBoolean(8, groupV1.archived);
-                statement.executeUpdate();
+                final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
 
                 if (internalId == null) {
-                    final var generatedKeys = statement.getGeneratedKeys();
-                    if (generatedKeys.next()) {
-                        internalId = generatedKeys.getLong(1);
+                    if (generatedKey.isPresent()) {
+                        internalId = generatedKey.get();
                     } else {
-                        throw new RuntimeException("Failed to add new recipient to database");
+                        throw new RuntimeException("Failed to add new group to database");
                     }
                 }
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index d615f4ec..f19111b0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -750,6 +750,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
                 INSERT INTO %s (number, uuid, pni)
                 VALUES (?, ?, ?)
+                RETURNING _id
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
@@ -757,10 +758,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setBytes(2,
                     address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.executeUpdate();
-            final var generatedKeys = statement.getGeneratedKeys();
-            if (generatedKeys.next()) {
-                final var recipientId = new RecipientId(generatedKeys.getLong(1), this);
+            final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
+            if (generatedKey.isPresent()) {
+                final var recipientId = new RecipientId(generatedKey.get(), this);
                 logger.debug("Added new recipient {} with address {}", recipientId, address);
                 return recipientId;
             } else {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index d8c8f5aa..88ebe3b2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -276,6 +276,7 @@ public class MessageSendLogStore implements AutoCloseable {
         final var sql = """
                         INSERT INTO %s (timestamp, group_id, content, content_hint, urgent)
                         VALUES (?,?,?,?,?)
+                        RETURNING _id
                         """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT);
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
@@ -286,10 +287,9 @@ public class MessageSendLogStore implements AutoCloseable {
                 statement.setBytes(3, content.toByteArray());
                 statement.setInt(4, contentHint.getType());
                 statement.setBoolean(5, urgent);
-                statement.executeUpdate();
-                final var generatedKeys = statement.getGeneratedKeys();
-                if (generatedKeys.next()) {
-                    contentId = generatedKeys.getLong(1);
+                final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
+                if (generatedKey.isPresent()) {
+                    contentId = generatedKey.get();
                 } else {
                     contentId = -1;
                 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5c4e81b8..2d3cd01a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,7 +10,7 @@ dependencyResolutionManagement {
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.2")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.0")
-            version("slf4j", "2.0.7")
+            version("slf4j", "2.0.9")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_80")
             library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.42.0.1")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")
         }

From e5aa10a7306252bfdbc07d70f30471c1df663cea Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 16 Sep 2023 11:57:43 +0200
Subject: [PATCH 191/672] Update README

---
 README.md                                            |  6 +++---
 .../manager/storage/identities/IdentityInfo.java     | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 6d857fb6..b546a62c 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,9 @@ signal-cli uses a [patched libsignal-service-java](https://github.com/Turasa/lib
 extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/libsignal/service).
 For registering you need a phone number where you can receive SMS or incoming calls.
 
-signal-cli is primarily intended to be used on servers to notify admins of important events. For this use-case, it has a daemon mode with D-BUS
-interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) and JSON-RPC interface ([documentation](https://github.com/AsamK/signal-cli/wiki/JSON-RPC-service)).
+signal-cli is primarily intended to be used on servers to notify admins of important events.
+For this use-case, it has a daemon mode with JSON-RPC interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-jsonrpc.5.adoc))
+and D-BUS interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) .
 For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust.
 
 ## Installation
@@ -39,7 +40,6 @@ sudo ln -sf /opt/signal-cli-"${VERSION}"/bin/signal-cli /usr/local/bin/
 You can find further instructions on the Wiki:
 
 - [Quickstart](https://github.com/AsamK/signal-cli/wiki/Quickstart)
-- [DBus Service](https://github.com/AsamK/signal-cli/wiki/DBus-service)
 
 ## Usage
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
index 84f7b06f..585ba945 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
@@ -6,22 +6,26 @@ import org.whispersystems.signalservice.api.push.ServiceId;
 
 public class IdentityInfo {
 
-    private final ServiceId serviceId;
+    private final String name;
     private final IdentityKey identityKey;
     private final TrustLevel trustLevel;
     private final long addedTimestamp;
 
     IdentityInfo(
-            final ServiceId serviceId, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp
+            final String name, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp
     ) {
-        this.serviceId = serviceId;
+        this.name = name;
         this.identityKey = identityKey;
         this.trustLevel = trustLevel;
         this.addedTimestamp = addedTimestamp;
     }
 
     public ServiceId getServiceId() {
-        return serviceId;
+        return ServiceId.parseOrThrow(name);
+    }
+
+    public String getName() {
+        return name;
     }
 
     public IdentityKey getIdentityKey() {

From a7744e837c137d03c79e04bdfa2d7ad9264b692c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 16 Sep 2023 12:00:55 +0200
Subject: [PATCH 192/672] Improve robustness in receiving messages

---
 .../helper/IncomingMessageHandler.java        | 14 ++--
 .../signal/manager/helper/ReceiveHelper.java  | 70 +++++++++++--------
 2 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 9ffee5c8..cad112b5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -137,13 +137,17 @@ public final class IncomingMessageHandler {
             final Manager.ReceiveMessageHandler handler
     ) {
         final var actions = new ArrayList<HandleAction>();
-        if (envelope.hasSourceServiceId()) {
-            // Store uuid if we don't have it already
-            // uuid in envelope is sent by server
-            account.getRecipientTrustedResolver().resolveRecipientTrusted(envelope.getSourceAddress());
-        }
         SignalServiceContent content = null;
         Exception exception = null;
+        try {
+            if (envelope.hasSourceServiceId()) {
+                // Store uuid if we don't have it already
+                // uuid in envelope is sent by server
+                account.getRecipientTrustedResolver().resolveRecipientTrusted(envelope.getSourceAddress());
+            }
+        } catch (Exception e) {
+            exception = e;
+        }
         if (!envelope.isReceipt()) {
             try {
                 final var cipherResult = dependencies.getCipher()
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 2f783467..0c003682 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -205,41 +205,49 @@ public class ReceiveHelper {
                 backOffCounter = 0;
                 if (returnOnTimeout) return;
                 continue;
+            } catch (Exception e) {
+                logger.error("Unknown error when receiving messages", e);
+                continue;
             }
 
-            final var result = context.getIncomingMessageHandler().handleEnvelope(envelope, receiveConfig, handler);
-            for (final var h : result.first()) {
-                final var existingAction = queuedActions.get(h);
-                if (existingAction == null) {
-                    queuedActions.put(h, h);
-                } else {
-                    existingAction.mergeOther(h);
-                }
-            }
-            final var exception = result.second();
-
-            if (hasCaughtUpWithOldMessages) {
-                handleQueuedActions(queuedActions.keySet());
-                queuedActions.clear();
-            }
-            if (cachedMessage[0] != null) {
-                if (exception instanceof UntrustedIdentityException) {
-                    logger.debug("Keeping message with untrusted identity in message cache");
-                    final var address = ((UntrustedIdentityException) exception).getSender();
-                    if (!envelope.hasSourceServiceId() && address.uuid().isPresent()) {
-                        final var recipientId = account.getRecipientResolver()
-                                .resolveRecipient(ACI.from(address.uuid().get()));
-                        try {
-                            cachedMessage[0] = account.getMessageCache().replaceSender(cachedMessage[0], recipientId);
-                        } catch (IOException ioException) {
-                            logger.warn("Failed to move cached message to recipient folder: {}",
-                                    ioException.getMessage(),
-                                    ioException);
-                        }
+            try {
+                final var result = context.getIncomingMessageHandler().handleEnvelope(envelope, receiveConfig, handler);
+                for (final var h : result.first()) {
+                    final var existingAction = queuedActions.get(h);
+                    if (existingAction == null) {
+                        queuedActions.put(h, h);
+                    } else {
+                        existingAction.mergeOther(h);
                     }
-                } else {
-                    cachedMessage[0].delete();
                 }
+                final var exception = result.second();
+
+                if (hasCaughtUpWithOldMessages) {
+                    handleQueuedActions(queuedActions.keySet());
+                    queuedActions.clear();
+                }
+                if (cachedMessage[0] != null) {
+                    if (exception instanceof UntrustedIdentityException) {
+                        logger.debug("Keeping message with untrusted identity in message cache");
+                        final var address = ((UntrustedIdentityException) exception).getSender();
+                        if (!envelope.hasSourceServiceId() && address.uuid().isPresent()) {
+                            final var recipientId = account.getRecipientResolver()
+                                    .resolveRecipient(ACI.from(address.uuid().get()));
+                            try {
+                                cachedMessage[0] = account.getMessageCache()
+                                        .replaceSender(cachedMessage[0], recipientId);
+                            } catch (IOException ioException) {
+                                logger.warn("Failed to move cached message to recipient folder: {}",
+                                        ioException.getMessage(),
+                                        ioException);
+                            }
+                        }
+                    } else {
+                        cachedMessage[0].delete();
+                    }
+                }
+            } catch (Exception e) {
+                logger.error("Unknown error when handling messages", e);
             }
         }
     }

From b2a32666e9d75dcc61288a78cfadaaade4867901 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Sep 2023 11:51:50 +0200
Subject: [PATCH 193/672] Store serviceId in protocol stores as TEXT

ServiceIds are no longer just UUIDs, they can now have prefixes like "PNI:"
---
 .../manager/storage/AccountDatabase.java      | 147 +++++++++++++++++-
 .../signal/manager/storage/SignalAccount.java |   3 +-
 .../asamk/signal/manager/storage/Utils.java   |   2 +-
 .../storage/identities/IdentityInfo.java      |  12 +-
 .../storage/identities/IdentityKeyStore.java  |  82 ++++++----
 .../identities/LegacyIdentityKeyStore.java    |   2 +-
 .../identities/SignalIdentityKeyStore.java    |  14 +-
 .../protocol/LegacyJsonIdentityKeyStore.java  |   2 +-
 .../protocol/LegacyJsonSessionStore.java      |   2 +-
 .../storage/recipients/RecipientStore.java    |   5 +-
 .../storage/sendLog/MessageSendLogStore.java  |  20 +--
 .../LegacySenderKeyRecordStore.java           |   4 +-
 .../LegacySenderKeySharedStore.java           |   2 +-
 .../senderKeys/SenderKeyRecordStore.java      |  33 ++--
 .../senderKeys/SenderKeySharedStore.java      |  35 ++---
 .../storage/sessions/LegacySessionStore.java  |   2 +-
 .../storage/sessions/SessionStore.java        |  64 ++++----
 17 files changed, 287 insertions(+), 144 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index f40e23ab..ee202d39 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager.storage;
 
 import com.zaxxer.hikari.HikariDataSource;
 
+import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.storage.groups.GroupStore;
 import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
 import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
@@ -15,16 +16,21 @@ import org.asamk.signal.manager.storage.sessions.SessionStore;
 import org.asamk.signal.manager.storage.stickers.StickerStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.File;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.UUID;
 
 public class AccountDatabase extends Database {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 14;
+    private static final long DATABASE_VERSION = 15;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -346,7 +352,146 @@ public class AccountDatabase extends Database {
                                             """);
                 }
             }
+        }
+        if (oldVersion < 15) {
+            logger.debug("Updating database: Store serviceId as TEXT");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE tmp_mapping_table (
+                                          uuid BLOB NOT NULL,
+                                          address TEXT NOT NULL
+                                        ) STRICT;
+                                        """);
 
+                final var sql = (
+                        """
+                        SELECT r.uuid, r.pni
+                        FROM recipient r
+                        """
+                );
+                final var uuidAddressMapping = new HashMap<UUID, ServiceId>();
+                try (final var preparedStatement = connection.prepareStatement(sql)) {
+                    try (var result = Utils.executeQueryForStream(preparedStatement, (resultSet) -> {
+                        final var pni = Optional.ofNullable(resultSet.getBytes("pni"))
+                                .map(UuidUtil::parseOrNull)
+                                .map(ServiceId.PNI::from);
+                        final var serviceIdUuid = Optional.ofNullable(resultSet.getBytes("uuid"))
+                                .map(UuidUtil::parseOrNull);
+                        final var serviceId = serviceIdUuid.isPresent() && pni.isPresent() && serviceIdUuid.get()
+                                .equals(pni.get().getRawUuid())
+                                ? pni.<ServiceId>map(p -> p)
+                                : serviceIdUuid.<ServiceId>map(ACI::from);
+
+                        return new Pair<>(serviceId, pni);
+                    })) {
+                        result.forEach(p -> {
+                            final var serviceId = p.first();
+                            final var pni = p.second();
+                            if (serviceId.isPresent()) {
+                                uuidAddressMapping.put(serviceId.get().getRawUuid(), serviceId.get());
+                            }
+                            if (pni.isPresent()) {
+                                uuidAddressMapping.put(pni.get().getRawUuid(), pni.get());
+                            }
+                        });
+                    }
+                }
+
+                final var insertSql = """
+                                      INSERT INTO tmp_mapping_table (uuid, address)
+                                      VALUES (?,?)
+                                      """;
+                try (final var insertStatement = connection.prepareStatement(insertSql)) {
+                    for (final var entry : uuidAddressMapping.entrySet()) {
+                        final var uuid = entry.getKey();
+                        final var serviceId = entry.getValue();
+                        insertStatement.setBytes(1, UuidUtil.toByteArray(uuid));
+                        insertStatement.setString(2, serviceId.toString());
+                        insertStatement.execute();
+                    }
+                }
+
+                statement.executeUpdate("""
+                                        CREATE TABLE identity2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          address TEXT UNIQUE NOT NULL,
+                                          identity_key BLOB NOT NULL,
+                                          added_timestamp INTEGER NOT NULL,
+                                          trust_level INTEGER NOT NULL
+                                        ) STRICT;
+                                        INSERT INTO identity2 (_id, address, identity_key, added_timestamp, trust_level)
+                                          SELECT i._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = i.uuid) address, i.identity_key, i.added_timestamp, i.trust_level
+                                          FROM identity i
+                                          WHERE address IS NOT NULL;
+                                        DROP TABLE identity;
+                                        ALTER TABLE identity2 RENAME TO identity;
+
+                                        CREATE TABLE message_send_log2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
+                                          address TEXT NOT NULL,
+                                          device_id INTEGER NOT NULL
+                                        ) STRICT;
+                                        INSERT INTO message_send_log2 (_id, content_id, address, device_id)
+                                          SELECT m._id, m.content_id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = m.uuid) address, m.device_id
+                                          FROM message_send_log m
+                                          WHERE address IS NOT NULL;
+                                        DROP INDEX msl_recipient_index;
+                                        DROP INDEX msl_content_index;
+                                        DROP TABLE message_send_log;
+                                        ALTER TABLE message_send_log2 RENAME TO message_send_log;
+                                        CREATE INDEX msl_recipient_index ON message_send_log (address, device_id, content_id);
+                                        CREATE INDEX msl_content_index ON message_send_log (content_id);
+
+                                        CREATE TABLE sender_key2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          address TEXT NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          distribution_id BLOB NOT NULL,
+                                          record BLOB NOT NULL,
+                                          created_timestamp INTEGER NOT NULL,
+                                          UNIQUE(address, device_id, distribution_id)
+                                        ) STRICT;
+                                        INSERT INTO sender_key2 (_id, address, device_id, distribution_id, record, created_timestamp)
+                                          SELECT s._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = s.uuid) address, s.device_id, s.distribution_id, s.record, s.created_timestamp
+                                          FROM sender_key s
+                                          WHERE address IS NOT NULL;
+                                        DROP TABLE sender_key;
+                                        ALTER TABLE sender_key2 RENAME TO sender_key;
+
+                                        CREATE TABLE sender_key_shared2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          address TEXT NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          distribution_id BLOB NOT NULL,
+                                          timestamp INTEGER NOT NULL,
+                                          UNIQUE(address, device_id, distribution_id)
+                                        ) STRICT;
+                                        INSERT INTO sender_key_shared2 (_id, address, device_id, distribution_id, timestamp)
+                                          SELECT s._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = s.uuid) address, s.device_id, s.distribution_id, s.timestamp
+                                          FROM sender_key_shared s
+                                          WHERE address IS NOT NULL;
+                                        DROP TABLE sender_key_shared;
+                                        ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;
+
+                                        CREATE TABLE session2 (
+                                          _id INTEGER PRIMARY KEY,
+                                          account_id_type INTEGER NOT NULL,
+                                          address TEXT NOT NULL,
+                                          device_id INTEGER NOT NULL,
+                                          record BLOB NOT NULL,
+                                          UNIQUE(account_id_type, address, device_id)
+                                        ) STRICT;
+                                        INSERT INTO session2 (_id, account_id_type, address, device_id, record)
+                                          SELECT s._id, s.account_id_type, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = s.uuid) address, s.device_id, s.record
+                                          FROM session s
+                                          WHERE address IS NOT NULL;
+                                        DROP TABLE session;
+                                        ALTER TABLE session2 RENAME TO session;
+
+                                        DROP TABLE tmp_mapping_table;
+                                        """);
+            }
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 6ae2aaa4..1619eabd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1841,8 +1841,7 @@ public class SignalAccount implements Closeable {
 
         public SignalIdentityKeyStore getIdentityKeyStore() {
             return getOrCreate(() -> identityKeyStore,
-                    () -> identityKeyStore = new SignalIdentityKeyStore(getRecipientResolver(),
-                            () -> identityKeyPair,
+                    () -> identityKeyStore = new SignalIdentityKeyStore(() -> identityKeyPair,
                             localRegistrationId,
                             SignalAccount.this.getIdentityKeyStore()));
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
index de98d7e5..fa2e8916 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
@@ -56,7 +56,7 @@ public class Utils {
         return node;
     }
 
-    public static RecipientAddress getRecipientAddressFromIdentifier(final String identifier) {
+    public static RecipientAddress getRecipientAddressFromLegacyIdentifier(final String identifier) {
         if (UuidUtil.isUuid(identifier)) {
             return new RecipientAddress(ServiceId.parseOrThrow(identifier));
         } else {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
index 585ba945..d00d455c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
@@ -6,26 +6,26 @@ import org.whispersystems.signalservice.api.push.ServiceId;
 
 public class IdentityInfo {
 
-    private final String name;
+    private final String address;
     private final IdentityKey identityKey;
     private final TrustLevel trustLevel;
     private final long addedTimestamp;
 
     IdentityInfo(
-            final String name, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp
+            final String address, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp
     ) {
-        this.name = name;
+        this.address = address;
         this.identityKey = identityKey;
         this.trustLevel = trustLevel;
         this.addedTimestamp = addedTimestamp;
     }
 
     public ServiceId getServiceId() {
-        return ServiceId.parseOrThrow(name);
+        return ServiceId.parseOrThrow(address);
     }
 
-    public String getName() {
-        return name;
+    public String getAddress() {
+        return address;
     }
 
     public IdentityKey getIdentityKey() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index 2f8b4dac..3195df17 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -37,7 +37,7 @@ public class IdentityKeyStore {
             statement.executeUpdate("""
                                     CREATE TABLE identity (
                                       _id INTEGER PRIMARY KEY,
-                                      uuid BLOB UNIQUE NOT NULL,
+                                      address TEXT UNIQUE NOT NULL,
                                       identity_key BLOB NOT NULL,
                                       added_timestamp INTEGER NOT NULL,
                                       trust_level INTEGER NOT NULL
@@ -56,18 +56,22 @@ public class IdentityKeyStore {
     }
 
     public boolean saveIdentity(final ServiceId serviceId, final IdentityKey identityKey) {
+        return saveIdentity(serviceId.toString(), identityKey);
+    }
+
+    boolean saveIdentity(final String address, final IdentityKey identityKey) {
         if (isRetryingDecryption) {
             return false;
         }
         try (final var connection = database.getConnection()) {
-            final var identityInfo = loadIdentity(connection, serviceId);
+            final var identityInfo = loadIdentity(connection, address);
             if (identityInfo != null && identityInfo.getIdentityKey().equals(identityKey)) {
                 // Identity already exists, not updating the trust level
-                logger.trace("Not storing new identity for recipient {}, identity already stored", serviceId);
+                logger.trace("Not storing new identity for recipient {}, identity already stored", address);
                 return false;
             }
 
-            saveNewIdentity(connection, serviceId, identityKey, identityInfo == null);
+            saveNewIdentity(connection, address, identityKey, identityInfo == null);
             return true;
         } catch (SQLException e) {
             throw new RuntimeException("Failed update identity store", e);
@@ -80,7 +84,8 @@ public class IdentityKeyStore {
 
     public boolean setIdentityTrustLevel(ServiceId serviceId, IdentityKey identityKey, TrustLevel trustLevel) {
         try (final var connection = database.getConnection()) {
-            final var identityInfo = loadIdentity(connection, serviceId);
+            final var address = serviceId.toString();
+            final var identityInfo = loadIdentity(connection, address);
             if (identityInfo == null) {
                 logger.debug("Not updating trust level for recipient {}, identity not found", serviceId);
                 return false;
@@ -95,7 +100,7 @@ public class IdentityKeyStore {
             }
 
             logger.debug("Updating trust level for recipient {} with trust {}", serviceId, trustLevel);
-            final var newIdentityInfo = new IdentityInfo(serviceId,
+            final var newIdentityInfo = new IdentityInfo(address,
                     identityKey,
                     trustLevel,
                     identityInfo.getDateAddedTimestamp());
@@ -107,31 +112,35 @@ public class IdentityKeyStore {
     }
 
     public boolean isTrustedIdentity(ServiceId serviceId, IdentityKey identityKey, Direction direction) {
+        return isTrustedIdentity(serviceId.toString(), identityKey, direction);
+    }
+
+    public boolean isTrustedIdentity(String address, IdentityKey identityKey, Direction direction) {
         if (trustNewIdentity == TrustNewIdentity.ALWAYS) {
             return true;
         }
 
         try (final var connection = database.getConnection()) {
             // TODO implement possibility for different handling of incoming/outgoing trust decisions
-            var identityInfo = loadIdentity(connection, serviceId);
+            var identityInfo = loadIdentity(connection, address);
             if (identityInfo == null) {
-                logger.debug("Initial identity found for {}, saving.", serviceId);
-                saveNewIdentity(connection, serviceId, identityKey, true);
-                identityInfo = loadIdentity(connection, serviceId);
+                logger.debug("Initial identity found for {}, saving.", address);
+                saveNewIdentity(connection, address, identityKey, true);
+                identityInfo = loadIdentity(connection, address);
             } else if (!identityInfo.getIdentityKey().equals(identityKey)) {
                 // Identity found, but different
                 if (direction == Direction.SENDING) {
-                    logger.debug("Changed identity found for {}, saving.", serviceId);
-                    saveNewIdentity(connection, serviceId, identityKey, false);
-                    identityInfo = loadIdentity(connection, serviceId);
+                    logger.debug("Changed identity found for {}, saving.", address);
+                    saveNewIdentity(connection, address, identityKey, false);
+                    identityInfo = loadIdentity(connection, address);
                 } else {
-                    logger.trace("Trusting identity for {} for {}: {}", serviceId, direction, false);
+                    logger.trace("Trusting identity for {} for {}: {}", address, direction, false);
                     return false;
                 }
             }
 
             final var isTrusted = identityInfo != null && identityInfo.isTrusted();
-            logger.trace("Trusting identity for {} for {}: {}", serviceId, direction, isTrusted);
+            logger.trace("Trusting identity for {} for {}: {}", address, direction, isTrusted);
             return isTrusted;
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from identity store", e);
@@ -139,8 +148,12 @@ public class IdentityKeyStore {
     }
 
     public IdentityInfo getIdentityInfo(ServiceId serviceId) {
+        return getIdentityInfo(serviceId.toString());
+    }
+
+    public IdentityInfo getIdentityInfo(String address) {
         try (final var connection = database.getConnection()) {
-            return loadIdentity(connection, serviceId);
+            return loadIdentity(connection, address);
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from identity store", e);
         }
@@ -150,7 +163,7 @@ public class IdentityKeyStore {
         try (final var connection = database.getConnection()) {
             final var sql = (
                     """
-                    SELECT i.uuid, i.identity_key, i.added_timestamp, i.trust_level
+                    SELECT i.address, i.identity_key, i.added_timestamp, i.trust_level
                     FROM %s AS i
                     """
             ).formatted(TABLE_IDENTITY);
@@ -166,7 +179,7 @@ public class IdentityKeyStore {
 
     public void deleteIdentity(final ServiceId serviceId) {
         try (final var connection = database.getConnection()) {
-            deleteIdentity(connection, serviceId);
+            deleteIdentity(connection, serviceId.toString());
         } catch (SQLException e) {
             throw new RuntimeException("Failed update identity store", e);
         }
@@ -188,34 +201,37 @@ public class IdentityKeyStore {
     }
 
     private IdentityInfo loadIdentity(
-            final Connection connection, final ServiceId serviceId
+            final Connection connection, final String address
     ) throws SQLException {
         final var sql = (
                 """
-                SELECT i.uuid, i.identity_key, i.added_timestamp, i.trust_level
+                SELECT i.address, i.identity_key, i.added_timestamp, i.trust_level
                 FROM %s AS i
-                WHERE i.uuid = ?
+                WHERE i.address = ?
                 """
         ).formatted(TABLE_IDENTITY);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, serviceId.toByteArray());
+            statement.setString(1, address);
             return Utils.executeQueryForOptional(statement, this::getIdentityInfoFromResultSet).orElse(null);
         }
     }
 
     private void saveNewIdentity(
             final Connection connection,
-            final ServiceId serviceId,
+            final String address,
             final IdentityKey identityKey,
             final boolean firstIdentity
     ) throws SQLException {
         final var trustLevel = trustNewIdentity == TrustNewIdentity.ALWAYS || (
                 trustNewIdentity == TrustNewIdentity.ON_FIRST_USE && firstIdentity
         ) ? TrustLevel.TRUSTED_UNVERIFIED : TrustLevel.UNTRUSTED;
-        logger.debug("Storing new identity for recipient {} with trust {}", serviceId, trustLevel);
-        final var newIdentityInfo = new IdentityInfo(serviceId, identityKey, trustLevel, System.currentTimeMillis());
+        logger.debug("Storing new identity for recipient {} with trust {}", address, trustLevel);
+        final var newIdentityInfo = new IdentityInfo(address, identityKey, trustLevel, System.currentTimeMillis());
         storeIdentity(connection, newIdentityInfo);
-        identityChanges.onNext(serviceId);
+        final var serviceId = ServiceId.parseOrNull(address);
+        if (serviceId != null) {
+            identityChanges.onNext(serviceId);
+        }
     }
 
     private void storeIdentity(final Connection connection, final IdentityInfo identityInfo) throws SQLException {
@@ -225,12 +241,12 @@ public class IdentityKeyStore {
                 identityInfo.getDateAddedTimestamp());
         final var sql = (
                 """
-                INSERT OR REPLACE INTO %s (uuid, identity_key, added_timestamp, trust_level)
+                INSERT OR REPLACE INTO %s (address, identity_key, added_timestamp, trust_level)
                 VALUES (?, ?, ?, ?)
                 """
         ).formatted(TABLE_IDENTITY);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, identityInfo.getServiceId().toByteArray());
+            statement.setString(1, identityInfo.getAddress());
             statement.setBytes(2, identityInfo.getIdentityKey().serialize());
             statement.setLong(3, identityInfo.getDateAddedTimestamp());
             statement.setInt(4, identityInfo.getTrustLevel().ordinal());
@@ -238,27 +254,27 @@ public class IdentityKeyStore {
         }
     }
 
-    private void deleteIdentity(final Connection connection, final ServiceId serviceId) throws SQLException {
+    private void deleteIdentity(final Connection connection, final String address) throws SQLException {
         final var sql = (
                 """
                 DELETE FROM %s AS i
-                WHERE i.uuid = ?
+                WHERE i.address = ?
                 """
         ).formatted(TABLE_IDENTITY);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, serviceId.toByteArray());
+            statement.setString(1, address);
             statement.executeUpdate();
         }
     }
 
     private IdentityInfo getIdentityInfoFromResultSet(ResultSet resultSet) throws SQLException {
         try {
-            final var serviceId = ServiceId.parseOrThrow(resultSet.getBytes("uuid"));
+            final var address = resultSet.getString("address");
             final var id = new IdentityKey(resultSet.getBytes("identity_key"));
             final var trustLevel = TrustLevel.fromInt(resultSet.getInt("trust_level"));
             final var added = resultSet.getLong("added_timestamp");
 
-            return new IdentityInfo(serviceId, id, trustLevel, added);
+            return new IdentityInfo(address, id, trustLevel, added);
         } catch (InvalidKeyException e) {
             logger.warn("Failed to load identity key, resetting: {}", e.getMessage());
             return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
index 88e23e75..27cb6f84 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
@@ -84,7 +84,7 @@ public class LegacyIdentityKeyStore {
             var added = storage.addedTimestamp();
 
             final var serviceId = address.serviceId().get();
-            return new IdentityInfo(serviceId, id, trustLevel, added);
+            return new IdentityInfo(serviceId.toString(), id, trustLevel, added);
         } catch (IOException | InvalidKeyException e) {
             logger.warn("Failed to load identity key: {}", e.getMessage());
             return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java
index 66dfec4e..5a1a676e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java
@@ -1,10 +1,8 @@
 package org.asamk.signal.manager.storage.identities;
 
-import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
-import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.util.function.Supplier;
 
@@ -15,7 +13,6 @@ public class SignalIdentityKeyStore implements org.signal.libsignal.protocol.sta
     private final IdentityKeyStore identityKeyStore;
 
     public SignalIdentityKeyStore(
-            final RecipientResolver resolver,
             final Supplier<IdentityKeyPair> identityKeyPairSupplier,
             final int localRegistrationId,
             final IdentityKeyStore identityKeyStore
@@ -37,22 +34,17 @@ public class SignalIdentityKeyStore implements org.signal.libsignal.protocol.sta
 
     @Override
     public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
-        final var serviceId = ServiceId.parseOrThrow(address.getName());
-
-        return identityKeyStore.saveIdentity(serviceId, identityKey);
+        return identityKeyStore.saveIdentity(address.getName(), identityKey);
     }
 
     @Override
     public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, Direction direction) {
-        final var serviceId = ServiceId.parseOrThrow(address.getName());
-
-        return identityKeyStore.isTrustedIdentity(serviceId, identityKey, direction);
+        return identityKeyStore.isTrustedIdentity(address.getName(), identityKey, direction);
     }
 
     @Override
     public IdentityKey getIdentity(SignalProtocolAddress address) {
-        final var serviceId = ServiceId.parseOrThrow(address.getName());
-        final var identityInfo = identityKeyStore.getIdentityInfo(serviceId);
+        final var identityInfo = identityKeyStore.getIdentityInfo(address.getName());
         return identityInfo == null ? null : identityInfo.getIdentityKey();
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
index 56986333..1e95eaff 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
@@ -100,7 +100,7 @@ public class LegacyJsonIdentityKeyStore {
                             ? UuidUtil.parseOrNull(trustedKey.get("uuid").asText())
                             : null;
                     final var address = uuid == null
-                            ? Utils.getRecipientAddressFromIdentifier(trustedKeyName)
+                            ? Utils.getRecipientAddressFromLegacyIdentifier(trustedKeyName)
                             : new RecipientAddress(ACI.from(uuid), trustedKeyName);
                     try {
                         var id = new IdentityKey(Base64.getDecoder().decode(trustedKey.get("identityKey").asText()), 0);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
index 73a85f76..ee675d78 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
@@ -47,7 +47,7 @@ public class LegacyJsonSessionStore {
 
                     var uuid = session.hasNonNull("uuid") ? UuidUtil.parseOrNull(session.get("uuid").asText()) : null;
                     final var address = uuid == null
-                            ? Utils.getRecipientAddressFromIdentifier(sessionName)
+                            ? Utils.getRecipientAddressFromLegacyIdentifier(sessionName)
                             : new RecipientAddress(ACI.from(uuid), sessionName);
                     final var deviceId = session.get("deviceId").asInt();
                     final var record = Base64.getDecoder().decode(session.get("record").asText());
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index f19111b0..9ef734c7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -151,8 +151,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     @Override
     public RecipientId resolveRecipient(final String identifier) {
-        if (UuidUtil.isUuid(identifier)) {
-            return resolveRecipient(ServiceId.parseOrThrow(identifier));
+        final var serviceId = ServiceId.parseOrNull(identifier);
+        if (serviceId != null) {
+            return resolveRecipient(serviceId);
         } else {
             return resolveRecipientByNumber(identifier);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index 88ebe3b2..08b23933 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -67,7 +67,7 @@ public class MessageSendLogStore implements AutoCloseable {
                                     CREATE TABLE message_send_log (
                                       _id INTEGER PRIMARY KEY,
                                       content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
-                                      uuid BLOB NOT NULL,
+                                      address TEXT NOT NULL,
                                       device_id INTEGER NOT NULL
                                     ) STRICT;
                                     CREATE TABLE message_send_log_content (
@@ -79,7 +79,7 @@ public class MessageSendLogStore implements AutoCloseable {
                                       urgent INTEGER NOT NULL
                                     ) STRICT;
                                     CREATE INDEX mslc_timestamp_index ON message_send_log_content (timestamp);
-                                    CREATE INDEX msl_recipient_index ON message_send_log (uuid, device_id, content_id);
+                                    CREATE INDEX msl_recipient_index ON message_send_log (address, device_id, content_id);
                                     CREATE INDEX msl_content_index ON message_send_log (content_id);
                                     """);
         }
@@ -92,13 +92,13 @@ public class MessageSendLogStore implements AutoCloseable {
                         SELECT group_id, content, content_hint, urgent
                         FROM %s l
                              INNER JOIN %s lc ON l.content_id = lc._id
-                        WHERE l.uuid = ? AND l.device_id = ? AND lc.timestamp = ?
+                        WHERE l.address = ? AND l.device_id = ? AND lc.timestamp = ?
                         """.formatted(TABLE_MESSAGE_SEND_LOG, TABLE_MESSAGE_SEND_LOG_CONTENT);
         try (final var connection = database.getConnection()) {
             deleteOutdatedEntries(connection);
 
             try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBytes(1, serviceId.toByteArray());
+                statement.setString(1, serviceId.toString());
                 statement.setInt(2, deviceId);
                 statement.setLong(3, timestamp);
                 try (var result = Utils.executeQueryForStream(statement, this::getMessageSendLogEntryFromResultSet)) {
@@ -202,13 +202,13 @@ public class MessageSendLogStore implements AutoCloseable {
     public void deleteEntryForRecipientNonGroup(long sentTimestamp, ServiceId serviceId) {
         final var sql = """
                         DELETE FROM %s AS lc
-                        WHERE lc.timestamp = ? AND lc.group_id IS NULL AND lc._id IN (SELECT content_id FROM %s l WHERE l.uuid = ?)
+                        WHERE lc.timestamp = ? AND lc.group_id IS NULL AND lc._id IN (SELECT content_id FROM %s l WHERE l.address = ?)
                         """.formatted(TABLE_MESSAGE_SEND_LOG_CONTENT, TABLE_MESSAGE_SEND_LOG);
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setLong(1, sentTimestamp);
-                statement.setBytes(2, serviceId.toByteArray());
+                statement.setString(2, serviceId.toString());
                 statement.executeUpdate();
             }
 
@@ -226,14 +226,14 @@ public class MessageSendLogStore implements AutoCloseable {
     public void deleteEntriesForRecipient(List<Long> sentTimestamps, ServiceId serviceId, int deviceId) {
         final var sql = """
                         DELETE FROM %s AS l
-                        WHERE l.content_id IN (SELECT _id FROM %s lc WHERE lc.timestamp = ?) AND l.uuid = ? AND l.device_id = ?
+                        WHERE l.content_id IN (SELECT _id FROM %s lc WHERE lc.timestamp = ?) AND l.address = ? AND l.device_id = ?
                         """.formatted(TABLE_MESSAGE_SEND_LOG, TABLE_MESSAGE_SEND_LOG_CONTENT);
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
             try (final var statement = connection.prepareStatement(sql)) {
                 for (final var sentTimestamp : sentTimestamps) {
                     statement.setLong(1, sentTimestamp);
-                    statement.setBytes(2, serviceId.toByteArray());
+                    statement.setString(2, serviceId.toString());
                     statement.setInt(3, deviceId);
                     statement.executeUpdate();
                 }
@@ -342,13 +342,13 @@ public class MessageSendLogStore implements AutoCloseable {
             final long contentId, final List<RecipientDevices> recipientDevices, final Connection connection
     ) throws SQLException {
         final var sql = """
-                        INSERT INTO %s (uuid, device_id, content_id)
+                        INSERT INTO %s (address, device_id, content_id)
                         VALUES (?,?,?)
                         """.formatted(TABLE_MESSAGE_SEND_LOG);
         try (final var statement = connection.prepareStatement(sql)) {
             for (final var recipientDevice : recipientDevices) {
                 for (final var deviceId : recipientDevice.deviceIds()) {
-                    statement.setBytes(1, recipientDevice.serviceId().toByteArray());
+                    statement.setString(1, recipientDevice.serviceId().toString());
                     statement.setInt(2, deviceId);
                     statement.setLong(3, contentId);
                     statement.executeUpdate();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
index d1794156..64928624 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
@@ -41,7 +41,9 @@ public class LegacySenderKeyRecordStore {
             if (record == null || serviceId.isEmpty()) {
                 return null;
             }
-            return new Pair<>(new SenderKeyRecordStore.Key(serviceId.get(), key.deviceId, key.distributionId), record);
+            return new Pair<>(new SenderKeyRecordStore.Key(serviceId.get().toString(),
+                    key.deviceId,
+                    key.distributionId), record);
         }).filter(Objects::nonNull).toList();
 
         senderKeyStore.addLegacySenderKeys(senderKeys);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
index b46f8506..bbd05dea 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
@@ -40,7 +40,7 @@ public class LegacySenderKeySharedStore {
                 if (serviceId.isEmpty()) {
                     continue;
                 }
-                final var entry = new SenderKeySharedEntry(serviceId.get(), senderKey.deviceId);
+                final var entry = new SenderKeySharedEntry(serviceId.get().toString(), senderKey.deviceId);
                 final var distributionId = DistributionId.from(senderKey.distributionId);
                 var entries = sharedSenderKeys.get(distributionId);
                 if (entries == null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
index 5e42a924..e321e9ea 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
@@ -31,12 +31,12 @@ public class SenderKeyRecordStore implements SenderKeyStore {
             statement.executeUpdate("""
                                     CREATE TABLE sender_key (
                                       _id INTEGER PRIMARY KEY,
-                                      uuid BLOB NOT NULL,
+                                      address TEXT NOT NULL,
                                       device_id INTEGER NOT NULL,
                                       distribution_id BLOB NOT NULL,
                                       record BLOB NOT NULL,
                                       created_timestamp INTEGER NOT NULL,
-                                      UNIQUE(uuid, device_id, distribution_id)
+                                      UNIQUE(address, device_id, distribution_id)
                                     ) STRICT;
                                     """);
         }
@@ -75,12 +75,12 @@ public class SenderKeyRecordStore implements SenderKeyStore {
                 """
                 SELECT s.created_timestamp
                 FROM %s AS s
-                WHERE s.uuid = ? AND s.device_id = ? AND s.distribution_id = ?
+                WHERE s.address = ? AND s.device_id = ? AND s.distribution_id = ?
                 """
         ).formatted(TABLE_SENDER_KEY);
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBytes(1, selfServiceId.toByteArray());
+                statement.setString(1, selfServiceId.toString());
                 statement.setInt(2, selfDeviceId);
                 statement.setBytes(3, UuidUtil.toByteArray(distributionId));
                 return Utils.executeQueryForOptional(statement, res -> res.getLong("created_timestamp")).orElse(-1L);
@@ -94,12 +94,12 @@ public class SenderKeyRecordStore implements SenderKeyStore {
         final var sql = (
                 """
                 DELETE FROM %s AS s
-                WHERE s.uuid = ? AND s.distribution_id = ?
+                WHERE s.address = ? AND s.distribution_id = ?
                 """
         ).formatted(TABLE_SENDER_KEY);
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBytes(1, serviceId.toByteArray());
+                statement.setString(1, serviceId.toString());
                 statement.setBytes(2, UuidUtil.toByteArray(distributionId));
                 statement.executeUpdate();
             }
@@ -145,8 +145,7 @@ public class SenderKeyRecordStore implements SenderKeyStore {
     }
 
     private Key getKey(final SignalProtocolAddress address, final UUID distributionId) {
-        final var serviceId = ServiceId.parseOrThrow(address.getName());
-        return new Key(serviceId, address.getDeviceId(), distributionId);
+        return new Key(address.getName(), address.getDeviceId(), distributionId);
     }
 
     private SenderKeyRecord loadSenderKey(final Connection connection, final Key key) throws SQLException {
@@ -154,11 +153,11 @@ public class SenderKeyRecordStore implements SenderKeyStore {
                 """
                 SELECT s.record
                 FROM %s AS s
-                WHERE s.uuid = ? AND s.device_id = ? AND s.distribution_id = ?
+                WHERE s.address = ? AND s.device_id = ? AND s.distribution_id = ?
                 """
         ).formatted(TABLE_SENDER_KEY);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, key.serviceId().toByteArray());
+            statement.setString(1, key.address());
             statement.setInt(2, key.deviceId());
             statement.setBytes(3, UuidUtil.toByteArray(key.distributionId()));
             return Utils.executeQueryForOptional(statement, this::getSenderKeyRecordFromResultSet).orElse(null);
@@ -171,11 +170,11 @@ public class SenderKeyRecordStore implements SenderKeyStore {
         final var sqlUpdate = """
                               UPDATE %s
                               SET record = ?
-                              WHERE uuid = ? AND device_id = ? and distribution_id = ?
+                              WHERE address = ? AND device_id = ? and distribution_id = ?
                               """.formatted(TABLE_SENDER_KEY);
         try (final var statement = connection.prepareStatement(sqlUpdate)) {
             statement.setBytes(1, senderKeyRecord.serialize());
-            statement.setBytes(2, key.serviceId().toByteArray());
+            statement.setString(2, key.address());
             statement.setLong(3, key.deviceId());
             statement.setBytes(4, UuidUtil.toByteArray(key.distributionId()));
             final var rows = statement.executeUpdate();
@@ -187,12 +186,12 @@ public class SenderKeyRecordStore implements SenderKeyStore {
         // Record doesn't exist yet, creating a new one
         final var sqlInsert = (
                 """
-                INSERT OR REPLACE INTO %s (uuid, device_id, distribution_id, record, created_timestamp)
+                INSERT OR REPLACE INTO %s (address, device_id, distribution_id, record, created_timestamp)
                 VALUES (?, ?, ?, ?, ?)
                 """
         ).formatted(TABLE_SENDER_KEY);
         try (final var statement = connection.prepareStatement(sqlInsert)) {
-            statement.setBytes(1, key.serviceId().toByteArray());
+            statement.setString(1, key.address());
             statement.setInt(2, key.deviceId());
             statement.setBytes(3, UuidUtil.toByteArray(key.distributionId()));
             statement.setBytes(4, senderKeyRecord.serialize());
@@ -205,11 +204,11 @@ public class SenderKeyRecordStore implements SenderKeyStore {
         final var sql = (
                 """
                 DELETE FROM %s AS s
-                WHERE s.uuid = ?
+                WHERE s.address = ?
                 """
         ).formatted(TABLE_SENDER_KEY);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, serviceId.toByteArray());
+            statement.setString(1, serviceId.toString());
             statement.executeUpdate();
         }
     }
@@ -225,5 +224,5 @@ public class SenderKeyRecordStore implements SenderKeyStore {
         }
     }
 
-    record Key(ServiceId serviceId, int deviceId, UUID distributionId) {}
+    record Key(String address, int deviceId, UUID distributionId) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
index 112c358c..0b17d479 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
@@ -30,11 +30,11 @@ public class SenderKeySharedStore {
             statement.executeUpdate("""
                                     CREATE TABLE sender_key_shared (
                                       _id INTEGER PRIMARY KEY,
-                                      uuid BLOB NOT NULL,
+                                      address TEXT NOT NULL,
                                       device_id INTEGER NOT NULL,
                                       distribution_id BLOB NOT NULL,
                                       timestamp INTEGER NOT NULL,
-                                      UNIQUE(uuid, device_id, distribution_id)
+                                      UNIQUE(address, device_id, distribution_id)
                                     ) STRICT;
                                     """);
         }
@@ -48,7 +48,7 @@ public class SenderKeySharedStore {
         try (final var connection = database.getConnection()) {
             final var sql = (
                     """
-                    SELECT s.uuid, s.device_id
+                    SELECT s.address, s.device_id
                     FROM %s AS s
                     WHERE s.distribution_id = ?
                     """
@@ -56,7 +56,7 @@ public class SenderKeySharedStore {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setBytes(1, UuidUtil.toByteArray(distributionId.asUuid()));
                 return Utils.executeQueryForStream(statement, this::getSenderKeySharedEntryFromResultSet)
-                        .map(k -> k.serviceId.toProtocolAddress(k.deviceId()))
+                        .map(k -> new SignalProtocolAddress(k.address, k.deviceId()))
                         .collect(Collectors.toSet());
             }
         } catch (SQLException e) {
@@ -68,7 +68,7 @@ public class SenderKeySharedStore {
             final DistributionId distributionId, final Collection<SignalProtocolAddress> addresses
     ) {
         final var newEntries = addresses.stream()
-                .map(a -> new SenderKeySharedEntry(ServiceId.parseOrThrow(a.getName()), a.getDeviceId()))
+                .map(a -> new SenderKeySharedEntry(a.getName(), a.getDeviceId()))
                 .collect(Collectors.toSet());
 
         try (final var connection = database.getConnection()) {
@@ -82,8 +82,7 @@ public class SenderKeySharedStore {
 
     public void clearSenderKeySharedWith(final Collection<SignalProtocolAddress> addresses) {
         final var entriesToDelete = addresses.stream()
-                .filter(a -> UuidUtil.isUuid(a.getName()))
-                .map(a -> new SenderKeySharedEntry(ServiceId.parseOrThrow(a.getName()), a.getDeviceId()))
+                .map(a -> new SenderKeySharedEntry(a.getName(), a.getDeviceId()))
                 .collect(Collectors.toSet());
 
         try (final var connection = database.getConnection()) {
@@ -91,12 +90,12 @@ public class SenderKeySharedStore {
             final var sql = (
                     """
                     DELETE FROM %s AS s
-                    WHERE uuid = ? AND device_id = ?
+                    WHERE address = ? AND device_id = ?
                     """
             ).formatted(TABLE_SENDER_KEY_SHARED);
             try (final var statement = connection.prepareStatement(sql)) {
                 for (final var entry : entriesToDelete) {
-                    statement.setBytes(1, entry.serviceId().toByteArray());
+                    statement.setString(1, entry.address());
                     statement.setInt(2, entry.deviceId());
                     statement.executeUpdate();
                 }
@@ -127,11 +126,11 @@ public class SenderKeySharedStore {
             final var sql = (
                     """
                     DELETE FROM %s AS s
-                    WHERE uuid = ?
+                    WHERE address = ?
                     """
             ).formatted(TABLE_SENDER_KEY_SHARED);
             try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBytes(1, serviceId.toByteArray());
+                statement.setString(1, serviceId.toString());
                 statement.executeUpdate();
             }
         } catch (SQLException e) {
@@ -146,11 +145,11 @@ public class SenderKeySharedStore {
             final var sql = (
                     """
                     DELETE FROM %s AS s
-                    WHERE uuid = ? AND device_id = ? AND distribution_id = ?
+                    WHERE address = ? AND device_id = ? AND distribution_id = ?
                     """
             ).formatted(TABLE_SENDER_KEY_SHARED);
             try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBytes(1, serviceId.toByteArray());
+                statement.setString(1, serviceId.toString());
                 statement.setInt(2, deviceId);
                 statement.setBytes(3, UuidUtil.toByteArray(distributionId.asUuid()));
                 statement.executeUpdate();
@@ -197,13 +196,13 @@ public class SenderKeySharedStore {
     ) throws SQLException {
         final var sql = (
                 """
-                INSERT OR REPLACE INTO %s (uuid, device_id, distribution_id, timestamp)
+                INSERT OR REPLACE INTO %s (address, device_id, distribution_id, timestamp)
                 VALUES (?, ?, ?, ?)
                 """
         ).formatted(TABLE_SENDER_KEY_SHARED);
         try (final var statement = connection.prepareStatement(sql)) {
             for (final var entry : newEntries) {
-                statement.setBytes(1, entry.serviceId().toByteArray());
+                statement.setString(1, entry.toString());
                 statement.setInt(2, entry.deviceId());
                 statement.setBytes(3, UuidUtil.toByteArray(distributionId.asUuid()));
                 statement.setLong(4, System.currentTimeMillis());
@@ -213,10 +212,10 @@ public class SenderKeySharedStore {
     }
 
     private SenderKeySharedEntry getSenderKeySharedEntryFromResultSet(ResultSet resultSet) throws SQLException {
-        final var serviceId = ServiceId.parseOrThrow(resultSet.getBytes("uuid"));
+        final var address = resultSet.getString("address");
         final var deviceId = resultSet.getInt("device_id");
-        return new SenderKeySharedEntry(serviceId, deviceId);
+        return new SenderKeySharedEntry(address, deviceId);
     }
 
-    record SenderKeySharedEntry(ServiceId serviceId, int deviceId) {}
+    record SenderKeySharedEntry(String address, int deviceId) {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
index 71cd9231..517271da 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
@@ -37,7 +37,7 @@ public class LegacySessionStore {
             if (record == null || serviceId.isEmpty()) {
                 return null;
             }
-            return new Pair<>(new SessionStore.Key(serviceId.get(), key.deviceId()), record);
+            return new Pair<>(new SessionStore.Key(serviceId.get().toString(), key.deviceId()), record);
         }).filter(Objects::nonNull).toList();
         sessionStore.addLegacySessions(sessions);
         deleteAllSessions(sessionsPath);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index 3608e0c1..ebbd87aa 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -6,15 +6,12 @@ import org.asamk.signal.manager.storage.Utils;
 import org.signal.libsignal.protocol.NoSessionException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
-import org.signal.libsignal.protocol.message.CiphertextMessage;
 import org.signal.libsignal.protocol.state.SessionRecord;
-import org.signal.libsignal.protocol.util.Hex;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceSessionStore;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
-import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -45,10 +42,10 @@ public class SessionStore implements SignalServiceSessionStore {
                                     CREATE TABLE session (
                                       _id INTEGER PRIMARY KEY,
                                       account_id_type INTEGER NOT NULL,
-                                      uuid BLOB NOT NULL,
+                                      address TEXT NOT NULL,
                                       device_id INTEGER NOT NULL,
                                       record BLOB NOT NULL,
-                                      UNIQUE(account_id_type, uuid, device_id)
+                                      UNIQUE(account_id_type, address, device_id)
                                     ) STRICT;
                                     """);
         }
@@ -107,13 +104,13 @@ public class SessionStore implements SignalServiceSessionStore {
                 """
                 SELECT s.device_id
                 FROM %s AS s
-                WHERE s.account_id_type = ? AND s.uuid = ? AND s.device_id != 1
+                WHERE s.account_id_type = ? AND s.address = ? AND s.device_id != 1
                 """
         ).formatted(TABLE_SESSION);
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
-                statement.setBytes(2, serviceId.toByteArray());
+                statement.setString(2, serviceId.toString());
                 return Utils.executeQueryForStream(statement, res -> res.getInt("device_id")).toList();
             }
         } catch (SQLException e) {
@@ -122,7 +119,7 @@ public class SessionStore implements SignalServiceSessionStore {
     }
 
     public boolean isCurrentRatchetKey(ServiceId serviceId, int deviceId, ECPublicKey ratchetKey) {
-        final var key = new Key(serviceId, deviceId);
+        final var key = new Key(serviceId.toString(), deviceId);
 
         try (final var connection = database.getConnection()) {
             final var session = loadSession(connection, key);
@@ -177,7 +174,7 @@ public class SessionStore implements SignalServiceSessionStore {
 
     public void deleteAllSessions(ServiceId serviceId) {
         try (final var connection = database.getConnection()) {
-            deleteAllSessions(connection, serviceId);
+            deleteAllSessions(connection, serviceId.toString());
         } catch (SQLException e) {
             throw new RuntimeException("Failed update session store", e);
         }
@@ -185,10 +182,6 @@ public class SessionStore implements SignalServiceSessionStore {
 
     @Override
     public void archiveSession(final SignalProtocolAddress address) {
-        if (!UuidUtil.isUuid(address.getName())) {
-            return;
-        }
-
         final var key = getKey(address);
 
         try (final var connection = database.getConnection()) {
@@ -207,15 +200,13 @@ public class SessionStore implements SignalServiceSessionStore {
     @Override
     public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(final List<String> addressNames) {
         final var serviceIdsCommaSeparated = addressNames.stream()
-                .map(ServiceId::parseOrThrow)
-                .map(ServiceId::toByteArray)
-                .map(uuid -> "x'" + Hex.toStringCondensed(uuid) + "'")
+                .map(address -> "'" + address.replaceAll("'", "''") + "'")
                 .collect(Collectors.joining(","));
         final var sql = (
                 """
-                SELECT s.uuid, s.device_id, s.record
+                SELECT s.address, s.device_id, s.record
                 FROM %s AS s
-                WHERE s.account_id_type = ? AND s.uuid IN (%s)
+                WHERE s.account_id_type = ? AND s.address IN (%s)
                 """
         ).formatted(TABLE_SESSION, serviceIdsCommaSeparated);
         try (final var connection = database.getConnection()) {
@@ -225,7 +216,7 @@ public class SessionStore implements SignalServiceSessionStore {
                                 res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
                         .filter(pair -> isActive(pair.second()))
                         .map(Pair::first)
-                        .map(key -> key.serviceId().toProtocolAddress(key.deviceId()))
+                        .map(key -> new SignalProtocolAddress(key.address(), key.deviceId()))
                         .collect(Collectors.toSet());
             }
         } catch (SQLException e) {
@@ -236,7 +227,7 @@ public class SessionStore implements SignalServiceSessionStore {
     public void archiveAllSessions() {
         final var sql = (
                 """
-                SELECT s.uuid, s.device_id, s.record
+                SELECT s.address, s.device_id, s.record
                 FROM %s AS s
                 WHERE s.account_id_type = ?
                 """
@@ -264,9 +255,9 @@ public class SessionStore implements SignalServiceSessionStore {
     public void archiveSessions(final ServiceId serviceId) {
         final var sql = (
                 """
-                SELECT s.uuid, s.device_id, s.record
+                SELECT s.address, s.device_id, s.record
                 FROM %s AS s
-                WHERE s.account_id_type = ? AND s.uuid = ?
+                WHERE s.account_id_type = ? AND s.address = ?
                 """
         ).formatted(TABLE_SESSION);
         try (final var connection = database.getConnection()) {
@@ -274,7 +265,7 @@ public class SessionStore implements SignalServiceSessionStore {
             final List<Pair<Key, SessionRecord>> records;
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
-                statement.setBytes(2, serviceId.toByteArray());
+                statement.setString(2, serviceId.toString());
                 records = Utils.executeQueryForStream(statement,
                                 res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
                         .filter(Objects::nonNull)
@@ -306,8 +297,7 @@ public class SessionStore implements SignalServiceSessionStore {
     }
 
     private Key getKey(final SignalProtocolAddress address) {
-        final var serviceId = ServiceId.parseOrThrow(address.getName());
-        return new Key(serviceId, address.getDeviceId());
+        return new Key(address.getName(), address.getDeviceId());
     }
 
     private SessionRecord loadSession(Connection connection, final Key key) throws SQLException {
@@ -321,21 +311,21 @@ public class SessionStore implements SignalServiceSessionStore {
                 """
                 SELECT s.record
                 FROM %s AS s
-                WHERE s.account_id_type = ? AND s.uuid = ? AND s.device_id = ?
+                WHERE s.account_id_type = ? AND s.address = ? AND s.device_id = ?
                 """
         ).formatted(TABLE_SESSION);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setInt(1, accountIdType);
-            statement.setBytes(2, key.serviceId().toByteArray());
+            statement.setString(2, key.address());
             statement.setInt(3, key.deviceId());
             return Utils.executeQueryForOptional(statement, this::getSessionRecordFromResultSet).orElse(null);
         }
     }
 
     private Key getKeyFromResultSet(ResultSet resultSet) throws SQLException {
-        final var serviceId = ServiceId.parseOrThrow(resultSet.getBytes("uuid"));
+        final var address = resultSet.getString("address");
         final var deviceId = resultSet.getInt("device_id");
-        return new Key(serviceId, deviceId);
+        return new Key(address, deviceId);
     }
 
     private SessionRecord getSessionRecordFromResultSet(ResultSet resultSet) throws SQLException {
@@ -356,19 +346,19 @@ public class SessionStore implements SignalServiceSessionStore {
         }
 
         final var sql = """
-                        INSERT OR REPLACE INTO %s (account_id_type, uuid, device_id, record)
+                        INSERT OR REPLACE INTO %s (account_id_type, address, device_id, record)
                         VALUES (?, ?, ?, ?)
                         """.formatted(TABLE_SESSION);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setInt(1, accountIdType);
-            statement.setBytes(2, key.serviceId().toByteArray());
+            statement.setString(2, key.address());
             statement.setInt(3, key.deviceId());
             statement.setBytes(4, session.serialize());
             statement.executeUpdate();
         }
     }
 
-    private void deleteAllSessions(final Connection connection, final ServiceId serviceId) throws SQLException {
+    private void deleteAllSessions(final Connection connection, final String address) throws SQLException {
         synchronized (cachedSessions) {
             cachedSessions.clear();
         }
@@ -376,12 +366,12 @@ public class SessionStore implements SignalServiceSessionStore {
         final var sql = (
                 """
                 DELETE FROM %s AS s
-                WHERE s.account_id_type = ? AND s.uuid = ?
+                WHERE s.account_id_type = ? AND s.address = ?
                 """
         ).formatted(TABLE_SESSION);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setInt(1, accountIdType);
-            statement.setBytes(2, serviceId.toByteArray());
+            statement.setString(2, address);
             statement.executeUpdate();
         }
     }
@@ -394,12 +384,12 @@ public class SessionStore implements SignalServiceSessionStore {
         final var sql = (
                 """
                 DELETE FROM %s AS s
-                WHERE s.account_id_type = ? AND s.uuid = ? AND s.device_id = ?
+                WHERE s.account_id_type = ? AND s.address = ? AND s.device_id = ?
                 """
         ).formatted(TABLE_SESSION);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setInt(1, accountIdType);
-            statement.setBytes(2, key.serviceId().toByteArray());
+            statement.setString(2, key.address());
             statement.setInt(3, key.deviceId());
             statement.executeUpdate();
         }
@@ -409,5 +399,5 @@ public class SessionStore implements SignalServiceSessionStore {
         return record != null && record.hasSenderChain();
     }
 
-    record Key(ServiceId serviceId, int deviceId) {}
+    record Key(String address, int deviceId) {}
 }

From fd851ba6cb39369f2cb1b5958a90cd023c05426a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Sep 2023 11:52:37 +0200
Subject: [PATCH 194/672] Fix batch response in case of empty responses list

This adapts the implementation to the JSON-RPC specification.
---
 src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index e49b6cd0..27da9b0b 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -95,7 +95,9 @@ public class JsonRpcReader {
                 return handleRequest(requestHandler, request);
             }).filter(Objects::nonNull).toList();
 
-            jsonRpcSender.sendBatchResponses(responseList);
+            if (responseList.size() > 0) {
+                jsonRpcSender.sendBatchResponses(responseList);
+            }
         }
     }
 

From b12a016f3a21650306722862966543954e1d00c3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Sep 2023 11:52:49 +0200
Subject: [PATCH 195/672] Update graalvm build tools

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 09ae2ac1..3298af04 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.26"
+    id("org.graalvm.buildtools.native") version "0.9.27"
 }
 
 version = "0.12.1"

From 0bdc400a309b4f95dd591676884763ab012348c8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Sep 2023 11:54:30 +0200
Subject: [PATCH 196/672] Update java version in ci workflow

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ffd7b48..4a9beabc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '20' ]
+        java: [ '17', '21' ]
 
     steps:
       - uses: actions/checkout@v3

From 67747253e88e78dfc6d8178939ed201987f9fec1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Sep 2023 12:25:30 +0200
Subject: [PATCH 197/672] Improve message cache behavior in case of io error

---
 .../manager/storage/messageCache/MessageCache.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index e78928a8..30452fbb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -51,13 +51,21 @@ public class MessageCache {
     public CachedMessage cacheMessage(SignalServiceEnvelope envelope, RecipientId recipientId) {
         final var now = System.currentTimeMillis();
 
+        File cacheFile;
+        try {
+            cacheFile = getMessageCacheFile(recipientId, now, envelope.getTimestamp());
+        } catch (IOException e) {
+            logger.warn("Failed to create recipient folder in disk cache: {}", e.getMessage());
+            throw new RuntimeException(e);
+        }
+
+        final var cachedMessage = new CachedMessage(cacheFile, envelope);
         try {
-            var cacheFile = getMessageCacheFile(recipientId, now, envelope.getTimestamp());
             MessageCacheUtils.storeEnvelope(envelope, cacheFile);
-            return new CachedMessage(cacheFile, envelope);
+            return cachedMessage;
         } catch (IOException e) {
             logger.warn("Failed to store encrypted message in disk cache, ignoring: {}", e.getMessage());
-            return null;
+            return cachedMessage;
         }
     }
 

From 73b42397448e3d612db62743c7e3609adbda37d9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Sep 2023 12:37:23 +0200
Subject: [PATCH 198/672] Add libsignal_client_path property to override
 libsignal-client jar fiel

---
 lib/build.gradle.kts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 719f8bb0..8c766a81 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -8,8 +8,17 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 
+val libsignalClientPath = project.findProperty("libsignal_client_path")?.toString()
+
 dependencies {
-    implementation(libs.signalservice)
+    if (libsignalClientPath == null) {
+        implementation(libs.signalservice)
+    } else {
+        implementation(libs.signalservice) {
+            exclude(group = "org.signal", module = "libsignal-client")
+        }
+        implementation(files(libsignalClientPath))
+    }
     implementation(libs.jackson.databind)
     implementation(libs.protobuf)
     implementation(libs.bouncycastle)

From f1d735f93db6ec45b391f4fc6bcd20c486d7143c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Sep 2023 16:21:19 +0200
Subject: [PATCH 199/672] Update libsignal-service

---
 graalvm-config-dir/reflect-config.json        | 354 ++----------------
 lib/build.gradle.kts                          |   1 -
 .../SendRetryMessageRequestAction.java        |  14 +-
 .../manager/api/GroupInviteLinkUrl.java       |  36 +-
 .../signal/manager/api/MessageEnvelope.java   |  11 +-
 .../asamk/signal/manager/api/TextStyle.java   |  36 +-
 .../signal/manager/groups/GroupUtils.java     |   2 +-
 .../signal/manager/helper/GroupHelper.java    |  32 +-
 .../signal/manager/helper/GroupV2Helper.java  |  84 ++---
 .../helper/IncomingMessageHandler.java        |  41 +-
 .../signal/manager/helper/SendHelper.java     |  10 +-
 .../signal/manager/helper/SyncHelper.java     |  18 +-
 .../manager/storage/groups/GroupInfoV2.java   |  57 ++-
 .../manager/storage/groups/GroupStore.java    |   9 +-
 .../storage/groups/LegacyGroupStore.java      |   2 +-
 .../storage/sendLog/MessageSendLogEntry.java  |   4 +-
 .../storage/sendLog/MessageSendLogStore.java  |  26 +-
 .../manager/util/MessageCacheUtils.java       |   6 +-
 .../signal/manager/util/PaymentUtils.java     |  24 +-
 .../signal/manager/util/ProfileUtils.java     |  10 +-
 settings.gradle.kts                           |   3 +-
 .../asamk/signal/json/JsonCallMessage.java    |   4 +-
 22 files changed, 229 insertions(+), 555 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index a1465c18..442ad3c2 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -101,55 +101,10 @@
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
-  "name":"com.google.protobuf.AbstractProtobufList",
+  "name":"com.squareup.wire.internal.ImmutableList",
   "allDeclaredFields":true,
-  "allDeclaredMethods":true
-},
-{
-  "name":"com.google.protobuf.ByteString"
-},
-{
-  "name":"com.google.protobuf.DescriptorMessageInfoFactory"
-},
-{
-  "name":"com.google.protobuf.ExtensionRegistry"
-},
-{
-  "name":"com.google.protobuf.ExtensionSchemaFull"
-},
-{
-  "name":"com.google.protobuf.GeneratedMessageLite",
-  "fields":[{"name":"unknownFields"}]
-},
-{
-  "name":"com.google.protobuf.GeneratedMessageV3"
-},
-{
-  "name":"com.google.protobuf.Internal$LongList",
-  "allDeclaredMethods":true
-},
-{
-  "name":"com.google.protobuf.Internal$ProtobufList",
-  "allDeclaredMethods":true
-},
-{
-  "name":"com.google.protobuf.LongArrayList",
-  "allDeclaredFields":true,
-  "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
-},
-{
-  "name":"com.google.protobuf.MapFieldSchemaFull"
-},
-{
-  "name":"com.google.protobuf.NewInstanceSchemaFull"
-},
-{
-  "name":"com.google.protobuf.PrimitiveNonBoxingCollection",
-  "allDeclaredMethods":true
-},
-{
-  "name":"com.google.protobuf.UnknownFieldSetSchema"
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
 },
 {
   "name":"com.sun.crypto.provider.AESCipher$General",
@@ -534,6 +489,16 @@
 {
   "name":"kotlin.String"
 },
+{
+  "name":"kotlin.collections.AbstractCollection",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"kotlin.collections.AbstractList",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"kotlin.collections.List"
 },
@@ -547,6 +512,10 @@
 {
   "name":"kotlin.jvm.internal.DefaultConstructorMarker"
 },
+{
+  "name":"kotlin.jvm.internal.markers.KMappedMarker",
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"kotlin.reflect.jvm.internal.ReflectionFactoryImpl",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -844,31 +813,36 @@
   "name":"org.asamk.signal.json.JsonContactAddress",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"city","parameterTypes":[] }, {"name":"country","parameterTypes":[] }, {"name":"label","parameterTypes":[] }, {"name":"neighborhood","parameterTypes":[] }, {"name":"pobox","parameterTypes":[] }, {"name":"postcode","parameterTypes":[] }, {"name":"region","parameterTypes":[] }, {"name":"street","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactAvatar",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"attachment","parameterTypes":[] }, {"name":"isProfile","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactEmail",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"label","parameterTypes":[] }, {"name":"type","parameterTypes":[] }, {"name":"value","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactName",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"display","parameterTypes":[] }, {"name":"family","parameterTypes":[] }, {"name":"given","parameterTypes":[] }, {"name":"middle","parameterTypes":[] }, {"name":"prefix","parameterTypes":[] }, {"name":"suffix","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactPhone",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"label","parameterTypes":[] }, {"name":"type","parameterTypes":[] }, {"name":"value","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonDataMessage",
@@ -984,7 +958,8 @@
   "name":"org.asamk.signal.json.JsonSharedContact",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"address","parameterTypes":[] }, {"name":"avatar","parameterTypes":[] }, {"name":"email","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"organization","parameterTypes":[] }, {"name":"phone","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonSticker",
@@ -2130,13 +2105,6 @@
 {
   "name":"org.whispersystems.signalservice.api.push.ServiceId$ACI"
 },
-{
-  "name":"org.whispersystems.signalservice.api.push.ServiceId$Companion",
-  "allDeclaredFields":true,
-  "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"fromLibSignal","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }, {"name":"parseOrNull","parameterTypes":["com.google.protobuf.ByteString"] }, {"name":"parseOrNull","parameterTypes":["java.lang.String"] }, {"name":"parseOrNull","parameterTypes":["byte[]"] }, {"name":"parseOrThrow","parameterTypes":["com.google.protobuf.ByteString"] }, {"name":"parseOrThrow","parameterTypes":["java.lang.String"] }, {"name":"parseOrThrow","parameterTypes":["byte[]"] }]
-},
 {
   "name":"org.whispersystems.signalservice.api.push.ServiceId$PNI"
 },
@@ -2534,270 +2502,6 @@
   "name":"org.whispersystems.signalservice.internal.push.SenderCertificate$ByteArrayDesieralizer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$AttachmentPointer",
-  "fields":[{"name":"attachmentIdentifierCase_"}, {"name":"attachmentIdentifier_"}, {"name":"bitField0_"}, {"name":"blurHash_"}, {"name":"caption_"}, {"name":"cdnNumber_"}, {"name":"contentType_"}, {"name":"digest_"}, {"name":"fileName_"}, {"name":"flags_"}, {"name":"height_"}, {"name":"incrementalDigest_"}, {"name":"key_"}, {"name":"size_"}, {"name":"thumbnail_"}, {"name":"uploadTimestamp_"}, {"name":"width_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$BodyRange",
-  "fields":[{"name":"associatedValueCase_"}, {"name":"associatedValue_"}, {"name":"bitField0_"}, {"name":"length_"}, {"name":"start_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage",
-  "fields":[{"name":"answer_"}, {"name":"bitField0_"}, {"name":"busy_"}, {"name":"destinationDeviceId_"}, {"name":"hangup_"}, {"name":"iceUpdate_"}, {"name":"legacyHangup_"}, {"name":"multiRing_"}, {"name":"offer_"}, {"name":"opaque_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Answer",
-  "fields":[{"name":"bitField0_"}, {"name":"id_"}, {"name":"opaque_"}, {"name":"sdp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Hangup",
-  "fields":[{"name":"bitField0_"}, {"name":"deviceId_"}, {"name":"id_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$IceUpdate",
-  "fields":[{"name":"bitField0_"}, {"name":"id_"}, {"name":"line_"}, {"name":"mid_"}, {"name":"opaque_"}, {"name":"sdp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Offer",
-  "fields":[{"name":"bitField0_"}, {"name":"id_"}, {"name":"opaque_"}, {"name":"sdp_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$CallMessage$Opaque",
-  "fields":[{"name":"bitField0_"}, {"name":"data_"}, {"name":"urgency_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails",
-  "fields":[{"name":"aci_"}, {"name":"archived_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"color_"}, {"name":"expireTimer_"}, {"name":"inboxPosition_"}, {"name":"name_"}, {"name":"number_"}, {"name":"profileKey_"}, {"name":"verified_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ContactDetails$Avatar",
-  "fields":[{"name":"bitField0_"}, {"name":"contentType_"}, {"name":"length_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Content",
-  "fields":[{"name":"bitField0_"}, {"name":"callMessage_"}, {"name":"dataMessage_"}, {"name":"decryptionErrorMessage_"}, {"name":"editMessage_"}, {"name":"nullMessage_"}, {"name":"pniSignatureMessage_"}, {"name":"receiptMessage_"}, {"name":"senderKeyDistributionMessage_"}, {"name":"storyMessage_"}, {"name":"syncMessage_"}, {"name":"typingMessage_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage",
-  "fields":[{"name":"attachments_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"body_"}, {"name":"contact_"}, {"name":"delete_"}, {"name":"expireTimer_"}, {"name":"flags_"}, {"name":"giftBadge_"}, {"name":"groupCallUpdate_"}, {"name":"groupV2_"}, {"name":"group_"}, {"name":"isViewOnce_"}, {"name":"payment_"}, {"name":"preview_"}, {"name":"profileKey_"}, {"name":"quote_"}, {"name":"reaction_"}, {"name":"requiredProtocolVersion_"}, {"name":"sticker_"}, {"name":"storyContext_"}, {"name":"timestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact",
-  "fields":[{"name":"address_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"email_"}, {"name":"name_"}, {"name":"number_"}, {"name":"organization_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Avatar",
-  "fields":[{"name":"avatar_"}, {"name":"bitField0_"}, {"name":"isProfile_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Email",
-  "fields":[{"name":"bitField0_"}, {"name":"label_"}, {"name":"type_"}, {"name":"value_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Name",
-  "fields":[{"name":"bitField0_"}, {"name":"displayName_"}, {"name":"familyName_"}, {"name":"givenName_"}, {"name":"middleName_"}, {"name":"prefix_"}, {"name":"suffix_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$Phone",
-  "fields":[{"name":"bitField0_"}, {"name":"label_"}, {"name":"type_"}, {"name":"value_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Contact$PostalAddress",
-  "fields":[{"name":"bitField0_"}, {"name":"city_"}, {"name":"country_"}, {"name":"label_"}, {"name":"neighborhood_"}, {"name":"pobox_"}, {"name":"postcode_"}, {"name":"region_"}, {"name":"street_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Delete",
-  "fields":[{"name":"bitField0_"}, {"name":"targetSentTimestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$GroupCallUpdate",
-  "fields":[{"name":"bitField0_"}, {"name":"eraId_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment",
-  "fields":[{"name":"itemCase_"}, {"name":"item_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment$Notification",
-  "fields":[{"name":"bitField0_"}, {"name":"note_"}, {"name":"transactionCase_"}, {"name":"transaction_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Payment$Notification$MobileCoin",
-  "fields":[{"name":"bitField0_"}, {"name":"receipt_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote",
-  "fields":[{"name":"attachments_"}, {"name":"authorAci_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"id_"}, {"name":"text_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Quote$QuotedAttachment",
-  "fields":[{"name":"bitField0_"}, {"name":"contentType_"}, {"name":"fileName_"}, {"name":"thumbnail_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Reaction",
-  "fields":[{"name":"bitField0_"}, {"name":"emoji_"}, {"name":"remove_"}, {"name":"targetAuthorAci_"}, {"name":"targetSentTimestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$Sticker",
-  "fields":[{"name":"bitField0_"}, {"name":"data_"}, {"name":"emoji_"}, {"name":"packId_"}, {"name":"packKey_"}, {"name":"stickerId_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$DataMessage$StoryContext",
-  "fields":[{"name":"authorAci_"}, {"name":"bitField0_"}, {"name":"sentTimestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$EditMessage",
-  "fields":[{"name":"bitField0_"}, {"name":"dataMessage_"}, {"name":"targetSentTimestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Envelope",
-  "fields":[{"name":"bitField0_"}, {"name":"content_"}, {"name":"destinationServiceId_"}, {"name":"reportingToken_"}, {"name":"serverGuid_"}, {"name":"serverTimestamp_"}, {"name":"sourceDevice_"}, {"name":"sourceServiceId_"}, {"name":"story_"}, {"name":"timestamp_"}, {"name":"type_"}, {"name":"updatedPni_"}, {"name":"urgent_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContext",
-  "fields":[{"name":"avatar_"}, {"name":"bitField0_"}, {"name":"id_"}, {"name":"membersE164_"}, {"name":"members_"}, {"name":"name_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContext$Member",
-  "fields":[{"name":"bitField0_"}, {"name":"e164_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupContextV2",
-  "fields":[{"name":"bitField0_"}, {"name":"groupChange_"}, {"name":"masterKey_"}, {"name":"revision_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails",
-  "fields":[{"name":"active_"}, {"name":"archived_"}, {"name":"avatar_"}, {"name":"bitField0_"}, {"name":"blocked_"}, {"name":"color_"}, {"name":"expireTimer_"}, {"name":"id_"}, {"name":"inboxPosition_"}, {"name":"membersE164_"}, {"name":"members_"}, {"name":"name_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails$Avatar",
-  "fields":[{"name":"bitField0_"}, {"name":"contentType_"}, {"name":"length_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$GroupDetails$Member",
-  "fields":[{"name":"bitField0_"}, {"name":"e164_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$NullMessage",
-  "fields":[{"name":"bitField0_"}, {"name":"padding_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PaymentAddress",
-  "fields":[{"name":"addressCase_"}, {"name":"address_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PaymentAddress$MobileCoinAddress",
-  "fields":[{"name":"address_"}, {"name":"bitField0_"}, {"name":"signature_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$PniSignatureMessage",
-  "fields":[{"name":"bitField0_"}, {"name":"pni_"}, {"name":"signature_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Preview",
-  "fields":[{"name":"bitField0_"}, {"name":"date_"}, {"name":"description_"}, {"name":"image_"}, {"name":"title_"}, {"name":"url_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$ReceiptMessage",
-  "fields":[{"name":"bitField0_"}, {"name":"timestamp_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$StoryMessage",
-  "fields":[{"name":"allowsReplies_"}, {"name":"attachmentCase_"}, {"name":"attachment_"}, {"name":"bitField0_"}, {"name":"bodyRanges_"}, {"name":"group_"}, {"name":"profileKey_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage",
-  "fields":[{"name":"bitField0_"}, {"name":"blocked_"}, {"name":"callEvent_"}, {"name":"callLinkUpdate_"}, {"name":"callLogEvent_"}, {"name":"configuration_"}, {"name":"contacts_"}, {"name":"fetchLatest_"}, {"name":"groups_"}, {"name":"keys_"}, {"name":"messageRequestResponse_"}, {"name":"outgoingPayment_"}, {"name":"padding_"}, {"name":"pniChangeNumber_"}, {"name":"read_"}, {"name":"request_"}, {"name":"sent_"}, {"name":"stickerPackOperation_"}, {"name":"verified_"}, {"name":"viewOnceOpen_"}, {"name":"viewed_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Blocked",
-  "fields":[{"name":"acis_"}, {"name":"groupIds_"}, {"name":"numbers_"}, {"name":"uuids_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$CallEvent",
-  "fields":[{"name":"bitField0_"}, {"name":"conversationId_"}, {"name":"direction_"}, {"name":"event_"}, {"name":"id_"}, {"name":"timestamp_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Configuration",
-  "fields":[{"name":"bitField0_"}, {"name":"linkPreviews_"}, {"name":"provisioningVersion_"}, {"name":"readReceipts_"}, {"name":"typingIndicators_"}, {"name":"unidentifiedDeliveryIndicators_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Contacts",
-  "fields":[{"name":"bitField0_"}, {"name":"blob_"}, {"name":"complete_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$FetchLatest",
-  "fields":[{"name":"bitField0_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Groups",
-  "fields":[{"name":"bitField0_"}, {"name":"blob_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Keys",
-  "fields":[{"name":"bitField0_"}, {"name":"storageService_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$MessageRequestResponse",
-  "fields":[{"name":"bitField0_"}, {"name":"groupId_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment",
-  "fields":[{"name":"bitField0_"}, {"name":"note_"}, {"name":"paymentDetailCase_"}, {"name":"paymentDetail_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$OutgoingPayment$MobileCoin",
-  "fields":[{"name":"amountPicoMob_"}, {"name":"bitField0_"}, {"name":"feePicoMob_"}, {"name":"ledgerBlockIndex_"}, {"name":"ledgerBlockTimestamp_"}, {"name":"outputPublicKeys_"}, {"name":"receipt_"}, {"name":"recipientAddress_"}, {"name":"spentKeyImages_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Read",
-  "fields":[{"name":"bitField0_"}, {"name":"senderAci_"}, {"name":"timestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Request",
-  "fields":[{"name":"bitField0_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationE164_"}, {"name":"destinationServiceId_"}, {"name":"editMessage_"}, {"name":"expirationStartTimestamp_"}, {"name":"isRecipientUpdate_"}, {"name":"message_"}, {"name":"storyMessageRecipients_"}, {"name":"storyMessage_"}, {"name":"timestamp_"}, {"name":"unidentifiedStatus_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$StoryMessageRecipient",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationServiceId_"}, {"name":"distributionListIds_"}, {"name":"isAllowedToReply_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Sent$UnidentifiedDeliveryStatus",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationServiceId_"}, {"name":"unidentified_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$StickerPackOperation",
-  "fields":[{"name":"bitField0_"}, {"name":"packId_"}, {"name":"packKey_"}, {"name":"type_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$ViewOnceOpen",
-  "fields":[{"name":"bitField0_"}, {"name":"timestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage$Viewed",
-  "fields":[{"name":"bitField0_"}, {"name":"senderAci_"}, {"name":"timestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TextAttachment",
-  "fields":[{"name":"backgroundCase_"}, {"name":"background_"}, {"name":"bitField0_"}, {"name":"preview_"}, {"name":"textBackgroundColor_"}, {"name":"textForegroundColor_"}, {"name":"textStyle_"}, {"name":"text_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TextAttachment$Gradient",
-  "fields":[{"name":"angle_"}, {"name":"bitField0_"}, {"name":"colors_"}, {"name":"endColor_"}, {"name":"positions_"}, {"name":"startColor_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$TypingMessage",
-  "fields":[{"name":"action_"}, {"name":"bitField0_"}, {"name":"groupId_"}, {"name":"timestamp_"}]
-},
-{
-  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$Verified",
-  "fields":[{"name":"bitField0_"}, {"name":"destinationAci_"}, {"name":"identityKey_"}, {"name":"nullMessage_"}, {"name":"state_"}]
-},
 {
   "name":"org.whispersystems.signalservice.internal.push.StaleDevices",
   "allDeclaredFields":true,
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 8c766a81..dd765cba 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -20,7 +20,6 @@ dependencies {
         implementation(files(libsignalClientPath))
     }
     implementation(libs.jackson.databind)
-    implementation(libs.protobuf)
     implementation(libs.bouncycastle)
     implementation(libs.slf4j.api)
     implementation(libs.sqlite)
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
index add09e72..1975fd17 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
@@ -8,7 +8,7 @@ import org.signal.libsignal.protocol.message.CiphertextMessage;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.push.ServiceId;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.Envelope;
 
 import java.util.Optional;
 
@@ -62,10 +62,14 @@ public class SendRetryMessageRequestAction implements HandleAction {
     }
 
     private static int envelopeTypeToCiphertextMessageType(int envelopeType) {
-        return switch (envelopeType) {
-            case SignalServiceProtos.Envelope.Type.PREKEY_BUNDLE_VALUE -> CiphertextMessage.PREKEY_TYPE;
-            case SignalServiceProtos.Envelope.Type.UNIDENTIFIED_SENDER_VALUE -> CiphertextMessage.SENDERKEY_TYPE;
-            case SignalServiceProtos.Envelope.Type.PLAINTEXT_CONTENT_VALUE -> CiphertextMessage.PLAINTEXT_CONTENT_TYPE;
+        final var type = Envelope.Type.fromValue(envelopeType);
+        if (type == null) {
+            return CiphertextMessage.WHISPER_TYPE;
+        }
+        return switch (type) {
+            case PREKEY_BUNDLE -> CiphertextMessage.PREKEY_TYPE;
+            case UNIDENTIFIED_SENDER -> CiphertextMessage.SENDERKEY_TYPE;
+            case PLAINTEXT_CONTENT -> CiphertextMessage.PLAINTEXT_CONTENT_TYPE;
             default -> CiphertextMessage.WHISPER_TYPE;
         };
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
index b21aeb97..d44fc982 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.api;
 
-import com.google.protobuf.ByteString;
-
 import org.asamk.signal.manager.groups.GroupLinkPassword;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
@@ -13,6 +11,8 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import okio.ByteString;
+
 public final class GroupInviteLinkUrl {
 
     private static final String GROUP_URL_HOST = "signal.group";
@@ -24,7 +24,7 @@ public final class GroupInviteLinkUrl {
 
     public static GroupInviteLinkUrl forGroup(GroupMasterKey groupMasterKey, DecryptedGroup group) {
         return new GroupInviteLinkUrl(groupMasterKey,
-                GroupLinkPassword.fromBytes(group.getInviteLinkPassword().toByteArray()));
+                GroupLinkPassword.fromBytes(group.inviteLinkPassword.toByteArray()));
     }
 
     /**
@@ -50,19 +50,16 @@ public final class GroupInviteLinkUrl {
             }
 
             var bytes = Base64UrlSafe.decodePaddingAgnostic(encoding);
-            var groupInviteLink = GroupInviteLink.parseFrom(bytes);
+            GroupInviteLink groupInviteLink = GroupInviteLink.ADAPTER.decode(bytes);
 
-            switch (groupInviteLink.getContentsCase()) {
-                case V1CONTENTS -> {
-                    var groupInviteLinkContentsV1 = groupInviteLink.getV1Contents();
-                    var groupMasterKey = new GroupMasterKey(groupInviteLinkContentsV1.getGroupMasterKey()
-                            .toByteArray());
-                    var password = GroupLinkPassword.fromBytes(groupInviteLinkContentsV1.getInviteLinkPassword()
-                            .toByteArray());
+            if (groupInviteLink.v1Contents != null) {
+                var groupInviteLinkContentsV1 = groupInviteLink.v1Contents;
+                var groupMasterKey = new GroupMasterKey(groupInviteLinkContentsV1.groupMasterKey.toByteArray());
+                var password = GroupLinkPassword.fromBytes(groupInviteLinkContentsV1.inviteLinkPassword.toByteArray());
 
-                    return new GroupInviteLinkUrl(groupMasterKey, password);
-                }
-                default -> throw new UnknownGroupLinkVersionException("Url contains no known group link content");
+                return new GroupInviteLinkUrl(groupMasterKey, password);
+            } else {
+                throw new UnknownGroupLinkVersionException("Url contains no known group link content");
             }
         } catch (InvalidInputException | IOException e) {
             throw new InvalidGroupLinkException(e);
@@ -93,13 +90,12 @@ public final class GroupInviteLinkUrl {
     }
 
     private static String createUrl(GroupMasterKey groupMasterKey, GroupLinkPassword password) {
-        var groupInviteLink = GroupInviteLink.newBuilder()
-                .setV1Contents(GroupInviteLink.GroupInviteLinkContentsV1.newBuilder()
-                        .setGroupMasterKey(ByteString.copyFrom(groupMasterKey.serialize()))
-                        .setInviteLinkPassword(ByteString.copyFrom(password.serialize())))
-                .build();
+        var groupInviteLink = new GroupInviteLink.Builder().v1Contents(new GroupInviteLink.GroupInviteLinkContentsV1.Builder().groupMasterKey(
+                        ByteString.of(groupMasterKey.serialize()))
+                .inviteLinkPassword(ByteString.of(password.serialize()))
+                .build()).build();
 
-        var encoding = Base64UrlSafe.encodeBytesWithoutPadding(groupInviteLink.toByteArray());
+        var encoding = Base64UrlSafe.encodeBytesWithoutPadding(groupInviteLink.encode());
 
         return GROUP_URL_PREFIX + encoding;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 1ba25af6..00abd93e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -39,8 +39,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.whispersystems.signalservice.internal.push.SignalServiceProtos.BodyRange;
-
 public record MessageEnvelope(
         Optional<RecipientAddress> sourceAddress,
         int sourceDevice,
@@ -160,7 +158,7 @@ public record MessageEnvelope(
                             .map(a -> a.stream().map(preview -> Preview.from(preview, fileProvider)).toList())
                             .orElse(List.of()),
                     dataMessage.getBodyRanges()
-                            .map(a -> a.stream().filter(BodyRange::hasStyle).map(TextStyle::from).toList())
+                            .map(a -> a.stream().filter(r -> r.style != null).map(TextStyle::from).toList())
                             .orElse(List.of()));
         }
 
@@ -250,7 +248,7 @@ public record MessageEnvelope(
                                 ? List.of()
                                 : quote.getBodyRanges()
                                         .stream()
-                                        .filter(BodyRange::hasStyle)
+                                        .filter(r -> r.style != null)
                                         .map(TextStyle::from)
                                         .toList());
             }
@@ -765,13 +763,12 @@ public record MessageEnvelope(
             }
         }
 
-        public record Hangup(long id, Type type, int deviceId, boolean isLegacy) {
+        public record Hangup(long id, Type type, int deviceId) {
 
             static Hangup from(HangupMessage hangupMessage) {
                 return new Hangup(hangupMessage.getId(),
                         Type.from(hangupMessage.getType()),
-                        hangupMessage.getDeviceId(),
-                        hangupMessage.isLegacy());
+                        hangupMessage.getDeviceId());
             }
 
             public enum Type {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java b/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java
index 48316308..bec504f0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TextStyle.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.api;
 
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.BodyRange;
 
-public record TextStyle(Style style, int start, int length) {
+public record TextStyle(Style style, Integer start, Integer length) {
 
     public enum Style {
         NONE,
@@ -12,7 +12,10 @@ public record TextStyle(Style style, int start, int length) {
         STRIKETHROUGH,
         MONOSPACE;
 
-        static Style fromInternal(SignalServiceProtos.BodyRange.Style style) {
+        static Style fromInternal(BodyRange.Style style) {
+            if (style == null) {
+                return NONE;
+            }
             return switch (style) {
                 case NONE -> NONE;
                 case BOLD -> BOLD;
@@ -35,27 +38,26 @@ public record TextStyle(Style style, int start, int length) {
             };
         }
 
-        SignalServiceProtos.BodyRange.Style toBodyRangeStyle() {
+        BodyRange.Style toBodyRangeStyle() {
             return switch (this) {
-                case NONE -> SignalServiceProtos.BodyRange.Style.NONE;
-                case BOLD -> SignalServiceProtos.BodyRange.Style.BOLD;
-                case ITALIC -> SignalServiceProtos.BodyRange.Style.ITALIC;
-                case SPOILER -> SignalServiceProtos.BodyRange.Style.SPOILER;
-                case STRIKETHROUGH -> SignalServiceProtos.BodyRange.Style.STRIKETHROUGH;
-                case MONOSPACE -> SignalServiceProtos.BodyRange.Style.MONOSPACE;
+                case NONE -> BodyRange.Style.NONE;
+                case BOLD -> BodyRange.Style.BOLD;
+                case ITALIC -> BodyRange.Style.ITALIC;
+                case SPOILER -> BodyRange.Style.SPOILER;
+                case STRIKETHROUGH -> BodyRange.Style.STRIKETHROUGH;
+                case MONOSPACE -> BodyRange.Style.MONOSPACE;
             };
         }
     }
 
-    static TextStyle from(SignalServiceProtos.BodyRange bodyRange) {
-        return new TextStyle(Style.fromInternal(bodyRange.getStyle()), bodyRange.getStart(), bodyRange.getLength());
+    static TextStyle from(BodyRange bodyRange) {
+        return new TextStyle(Style.fromInternal(bodyRange.style), bodyRange.start, bodyRange.length);
     }
 
-    public SignalServiceProtos.BodyRange toBodyRange() {
-        return SignalServiceProtos.BodyRange.newBuilder()
-                .setStart(this.start())
-                .setLength(this.length())
-                .setStyle(this.style().toBodyRangeStyle())
+    public BodyRange toBodyRange() {
+        return new BodyRange.Builder().start(this.start())
+                .length(this.length())
+                .style(this.style().toBodyRangeStyle())
                 .build();
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
index b73be0ab..76352d1a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
@@ -28,7 +28,7 @@ public class GroupUtils {
         } else {
             final var groupInfoV2 = (GroupInfoV2) groupInfo;
             var group = SignalServiceGroupV2.newBuilder(groupInfoV2.getMasterKey())
-                    .withRevision(groupInfoV2.getGroup() == null ? 0 : groupInfoV2.getGroup().getRevision())
+                    .withRevision(groupInfoV2.getGroup() == null ? 0 : groupInfoV2.getGroup().revision)
                     .build();
             messageBuilder.asGroupMessage(group);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index d30c79e4..ef104fa2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -125,11 +125,11 @@ public class GroupHelper {
             groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey, account.getRecipientResolver());
         }
 
-        if (groupInfoV2.getGroup() == null || groupInfoV2.getGroup().getRevision() < revision) {
+        if (groupInfoV2.getGroup() == null || groupInfoV2.getGroup().revision < revision) {
             DecryptedGroup group = null;
             if (signedGroupChange != null
                     && groupInfoV2.getGroup() != null
-                    && groupInfoV2.getGroup().getRevision() + 1 == revision) {
+                    && groupInfoV2.getGroup().revision + 1 == revision) {
                 final var decryptedGroupChange = context.getGroupV2Helper()
                         .getDecryptedGroupChange(signedGroupChange, groupMasterKey);
 
@@ -151,8 +151,8 @@ public class GroupHelper {
             }
             if (group != null) {
                 storeProfileKeysFromMembers(group);
-                final var avatar = group.getAvatar();
-                if (avatar != null && !avatar.isEmpty()) {
+                final var avatar = group.avatar;
+                if (!avatar.isEmpty()) {
                     downloadGroupAvatar(groupId, groupSecretParams, avatar);
                 }
             }
@@ -300,14 +300,14 @@ public class GroupHelper {
         } catch (GroupLinkNotActiveException e) {
             throw new InactiveGroupLinkException("Group link inactive (reason: " + e.getReason() + ")", e);
         }
-        if (groupJoinInfo.getPendingAdminApproval()) {
+        if (groupJoinInfo.pendingAdminApproval) {
             throw new PendingAdminApprovalException("You have already requested to join the group.");
         }
         final var groupChange = context.getGroupV2Helper()
                 .joinGroup(inviteLinkUrl.getGroupMasterKey(), inviteLinkUrl.getPassword(), groupJoinInfo);
         final var group = getOrMigrateGroup(inviteLinkUrl.getGroupMasterKey(),
-                groupJoinInfo.getRevision() + 1,
-                groupChange.toByteArray());
+                groupJoinInfo.revision + 1,
+                groupChange.encode());
 
         if (group.getGroup() == null) {
             // Only requested member, can't send update to group members
@@ -400,8 +400,8 @@ public class GroupHelper {
                     } catch (NotAGroupMemberException ignored) {
                     }
                     storeProfileKeysFromMembers(decryptedGroup);
-                    final var avatar = decryptedGroup.getAvatar();
-                    if (avatar != null && !avatar.isEmpty()) {
+                    final var avatar = decryptedGroup.avatar;
+                    if (!avatar.isEmpty()) {
                         downloadGroupAvatar(groupInfoV2.getGroupId(), groupSecretParams, avatar);
                     }
                 }
@@ -446,8 +446,8 @@ public class GroupHelper {
     }
 
     private void storeProfileKeysFromMembers(final DecryptedGroup group) {
-        for (var member : group.getMembersList()) {
-            final var serviceId = ServiceId.parseOrThrow(member.getAciBytes());
+        for (var member : group.members) {
+            final var serviceId = ServiceId.parseOrThrow(member.aciBytes);
             final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
             final var profileStore = account.getProfileStore();
             if (profileStore.getProfileKey(recipientId) != null) {
@@ -455,7 +455,7 @@ public class GroupHelper {
                 continue;
             }
             try {
-                profileStore.storeProfileKey(recipientId, new ProfileKey(member.getProfileKey().toByteArray()));
+                profileStore.storeProfileKey(recipientId, new ProfileKey(member.profileKey.toByteArray()));
             } catch (InvalidInputException ignored) {
             }
         }
@@ -479,7 +479,7 @@ public class GroupHelper {
             final DecryptedGroup newDecryptedGroup
     ) throws NotAGroupMemberException {
         final var revisionWeWereAdded = context.getGroupV2Helper().findRevisionWeWereAdded(newDecryptedGroup);
-        final var localRevision = localGroup.getGroup() == null ? 0 : localGroup.getGroup().getRevision();
+        final var localRevision = localGroup.getGroup() == null ? 0 : localGroup.getGroup().revision;
         var fromRevision = Math.max(revisionWeWereAdded, localRevision);
         final var newProfileKeys = new HashMap<RecipientId, ProfileKey>();
         while (true) {
@@ -753,7 +753,7 @@ public class GroupHelper {
         groupInfoV2.setGroup(groupGroupChangePair.first());
         account.getGroupStore().updateGroup(groupInfoV2);
 
-        var messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().toByteArray());
+        var messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().encode());
         return sendGroupMessage(messageBuilder,
                 groupInfoV2.getMembersIncludingPendingWithout(account.getSelfRecipientId()),
                 groupInfoV2.getDistributionId());
@@ -782,7 +782,7 @@ public class GroupHelper {
 
     private SignalServiceDataMessage.Builder getGroupUpdateMessageBuilder(GroupInfoV2 g, byte[] signedGroupChange) {
         var group = SignalServiceGroupV2.newBuilder(g.getMasterKey())
-                .withRevision(g.getGroup().getRevision())
+                .withRevision(g.getGroup().revision)
                 .withSignedGroupChange(signedGroupChange);
         return SignalServiceDataMessage.newBuilder()
                 .asGroupMessage(group.build())
@@ -798,7 +798,7 @@ public class GroupHelper {
         members.addAll(group.getMembersIncludingPendingWithout(selfRecipientId));
         account.getGroupStore().updateGroup(group);
 
-        final var messageBuilder = getGroupUpdateMessageBuilder(group, groupChange.toByteArray());
+        final var messageBuilder = getGroupUpdateMessageBuilder(group, groupChange.encode());
         return sendGroupMessage(messageBuilder, members, group.getDistributionId());
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 30de7b19..96ecf2c0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -1,8 +1,5 @@
 package org.asamk.signal.manager.helper;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-
 import org.asamk.signal.manager.api.GroupLinkState;
 import org.asamk.signal.manager.api.GroupPermission;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
@@ -28,7 +25,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
 import org.signal.storageservice.protos.groups.local.DecryptedMember;
 import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
-import org.signal.storageservice.protos.groups.local.DecryptedRequestingMember;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
@@ -59,6 +55,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import okio.ByteString;
+
 class GroupV2Helper {
 
     private final static Logger logger = LoggerFactory.getLogger(GroupV2Helper.class);
@@ -126,12 +124,12 @@ class GroupV2Helper {
     int findRevisionWeWereAdded(DecryptedGroup partialDecryptedGroup) {
         ByteString aciBytes = getSelfAci().toByteString();
         ByteString pniBytes = getSelfPni().toByteString();
-        for (DecryptedMember decryptedMember : partialDecryptedGroup.getMembersList()) {
-            if (decryptedMember.getAciBytes().equals(aciBytes) || decryptedMember.getPniBytes().equals(pniBytes)) {
-                return decryptedMember.getJoinedAtRevision();
+        for (DecryptedMember decryptedMember : partialDecryptedGroup.members) {
+            if (decryptedMember.aciBytes.equals(aciBytes) || decryptedMember.pniBytes.equals(pniBytes)) {
+                return decryptedMember.joinedAtRevision;
             }
         }
-        return partialDecryptedGroup.getRevision();
+        return partialDecryptedGroup.revision;
     }
 
     Pair<GroupInfoV2, DecryptedGroup> createGroup(
@@ -203,19 +201,19 @@ class GroupV2Helper {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
 
-        var change = name != null ? groupOperations.createModifyGroupTitle(name) : GroupChange.Actions.newBuilder();
+        var change = name != null ? groupOperations.createModifyGroupTitle(name) : new GroupChange.Actions.Builder();
 
         if (description != null) {
-            change.setModifyDescription(groupOperations.createModifyGroupDescriptionAction(description));
+            change.modifyDescription(groupOperations.createModifyGroupDescriptionAction(description).build());
         }
 
         if (avatarFile != null) {
             var avatarCdnKey = dependencies.getGroupsV2Api()
                     .uploadAvatar(avatarFile, groupSecretParams, getGroupAuthForToday(groupSecretParams));
-            change.setModifyAvatar(GroupChange.Actions.ModifyAvatarAction.newBuilder().setAvatar(avatarCdnKey));
+            change.modifyAvatar(new GroupChange.Actions.ModifyAvatarAction.Builder().avatar(avatarCdnKey).build());
         }
 
-        change.setSourceServiceId(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -241,7 +239,7 @@ class GroupV2Helper {
         final var aci = getSelfAci();
         final var change = groupOperations.createModifyGroupMembershipChange(candidates, bannedUuids, aci);
 
-        change.setSourceServiceId(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -249,7 +247,7 @@ class GroupV2Helper {
     Pair<DecryptedGroup, GroupChange> leaveGroup(
             GroupInfoV2 groupInfoV2, Set<RecipientId> membersToMakeAdmin
     ) throws IOException {
-        var pendingMembersList = groupInfoV2.getGroup().getPendingMembersList();
+        var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
         final var selfAci = getSelfAci();
         var selfPendingMember = DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, selfAci);
 
@@ -302,7 +300,7 @@ class GroupV2Helper {
     Pair<DecryptedGroup, GroupChange> revokeInvitedMembers(
             GroupInfoV2 groupInfoV2, Set<RecipientId> members
     ) throws IOException {
-        var pendingMembersList = groupInfoV2.getGroup().getPendingMembersList();
+        var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .map(SignalServiceAddress::getServiceId)
@@ -324,9 +322,9 @@ class GroupV2Helper {
 
         final var change = groupOperations.createBanServiceIdsChange(serviceIds,
                 false,
-                groupInfoV2.getGroup().getBannedMembersList());
+                groupInfoV2.getGroup().bannedMembers);
 
-        change.setSourceServiceId(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -342,7 +340,7 @@ class GroupV2Helper {
 
         final var change = groupOperations.createUnbanServiceIdsChange(serviceIds);
 
-        change.setSourceServiceId(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -360,9 +358,8 @@ class GroupV2Helper {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
         final var accessRequired = toAccessControl(state);
-        final var requiresNewPassword = state != GroupLinkState.DISABLED && groupInfoV2.getGroup()
-                .getInviteLinkPassword()
-                .isEmpty();
+        final var requiresNewPassword = state != GroupLinkState.DISABLED
+                && groupInfoV2.getGroup().inviteLinkPassword.toByteArray().length == 0;
 
         final var change = requiresNewPassword ? groupOperations.createModifyGroupLinkPasswordAndRightsChange(
                 GroupLinkPassword.createNew().serialize(),
@@ -393,14 +390,14 @@ class GroupV2Helper {
     Pair<DecryptedGroup, GroupChange> updateSelfProfileKey(GroupInfoV2 groupInfoV2) throws IOException {
         Optional<DecryptedMember> selfInGroup = groupInfoV2.getGroup() == null
                 ? Optional.empty()
-                : DecryptedGroupUtil.findMemberByAci(groupInfoV2.getGroup().getMembersList(), getSelfAci());
+                : DecryptedGroupUtil.findMemberByAci(groupInfoV2.getGroup().members, getSelfAci());
         if (selfInGroup.isEmpty()) {
             logger.trace("Not updating group, self not in group " + groupInfoV2.getGroupId().toBase64());
             return null;
         }
 
         final var profileKey = context.getAccount().getProfileKey();
-        if (Arrays.equals(profileKey.serialize(), selfInGroup.get().getProfileKey().toByteArray())) {
+        if (Arrays.equals(profileKey.serialize(), selfInGroup.get().profileKey.toByteArray())) {
             logger.trace("Not updating group, own Profile Key is already up to date in group "
                     + groupInfoV2.getGroupId().toBase64());
             return null;
@@ -416,7 +413,7 @@ class GroupV2Helper {
 
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var change = groupOperations.createUpdateProfileKeyCredentialChange(profileKeyCredential);
-        change.setSourceServiceId(getSelfAci().toByteString());
+        change.sourceServiceId(getSelfAci().toByteString());
         return commitChange(groupInfoV2, change);
     }
 
@@ -434,17 +431,17 @@ class GroupV2Helper {
             throw new IOException("Cannot join a V2 group as self does not have a versioned profile");
         }
 
-        var requestToJoin = decryptedGroupJoinInfo.getAddFromInviteLink() == AccessControl.AccessRequired.ADMINISTRATOR;
+        var requestToJoin = decryptedGroupJoinInfo.addFromInviteLink == AccessControl.AccessRequired.ADMINISTRATOR;
         var change = requestToJoin
                 ? groupOperations.createGroupJoinRequest(profileKeyCredential)
                 : groupOperations.createGroupJoinDirect(profileKeyCredential);
 
-        change.setSourceServiceId(context.getRecipientHelper()
+        change.sourceServiceId(context.getRecipientHelper()
                 .resolveSignalServiceAddress(selfRecipientId)
                 .getServiceId()
                 .toByteString());
 
-        return commitChange(groupSecretParams, decryptedGroupJoinInfo.getRevision(), change, groupLinkPassword);
+        return commitChange(groupSecretParams, decryptedGroupJoinInfo.revision, change, groupLinkPassword);
     }
 
     Pair<DecryptedGroup, GroupChange> acceptInvite(GroupInfoV2 groupInfoV2) throws IOException {
@@ -459,7 +456,7 @@ class GroupV2Helper {
         final var change = groupOperations.createAcceptInviteChange(profileKeyCredential);
 
         final var aci = context.getRecipientHelper().resolveSignalServiceAddress(selfRecipientId).getServiceId();
-        change.setSourceServiceId(aci.toByteString());
+        change.sourceServiceId(aci.toByteString());
 
         return commitChange(groupInfoV2, change);
     }
@@ -520,7 +517,7 @@ class GroupV2Helper {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var uuidCipherTexts = pendingMembers.stream().map(member -> {
             try {
-                return new UuidCiphertext(member.getServiceIdCipherText().toByteArray());
+                return new UuidCiphertext(member.serviceIdCipherText.toByteArray());
             } catch (InvalidInputException e) {
                 throw new AssertionError(e);
             }
@@ -555,8 +552,8 @@ class GroupV2Helper {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         final var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
         final var previousGroupState = groupInfoV2.getGroup();
-        final var nextRevision = previousGroupState.getRevision() + 1;
-        final var changeActions = change.setRevision(nextRevision).build();
+        final var nextRevision = previousGroupState.revision + 1;
+        final var changeActions = change.revision(nextRevision).build();
         final DecryptedGroupChange decryptedChange;
         final DecryptedGroup decryptedGroupState;
 
@@ -580,7 +577,7 @@ class GroupV2Helper {
             GroupLinkPassword password
     ) throws IOException {
         final var nextRevision = currentRevision + 1;
-        final var changeActions = change.setRevision(nextRevision).build();
+        final var changeActions = change.revision(nextRevision).build();
 
         return dependencies.getGroupsV2Api()
                 .patchGroup(changeActions,
@@ -589,17 +586,16 @@ class GroupV2Helper {
     }
 
     Pair<ServiceId, ProfileKey> getAuthoritativeProfileKeyFromChange(final DecryptedGroupChange change) {
-        UUID editor = UuidUtil.fromByteStringOrNull(change.getEditorServiceIdBytes());
-        final var editorProfileKeyBytes = Stream.concat(Stream.of(change.getNewMembersList().stream(),
-                                change.getPromotePendingMembersList().stream(),
-                                change.getModifiedProfileKeysList().stream())
+        UUID editor = UuidUtil.fromByteStringOrNull(change.editorServiceIdBytes);
+        final var editorProfileKeyBytes = Stream.concat(Stream.of(change.newMembers.stream(),
+                                change.promotePendingMembers.stream(),
+                                change.modifiedProfileKeys.stream())
                         .flatMap(Function.identity())
-                        .filter(m -> UuidUtil.fromByteString(m.getAciBytes()).equals(editor))
-                        .map(DecryptedMember::getProfileKey),
-                change.getNewRequestingMembersList()
-                        .stream()
-                        .filter(m -> UuidUtil.fromByteString(m.getAciBytes()).equals(editor))
-                        .map(DecryptedRequestingMember::getProfileKey)).findFirst();
+                        .filter(m -> UuidUtil.fromByteString(m.aciBytes).equals(editor))
+                        .map(m -> m.profileKey),
+                change.newRequestingMembers.stream()
+                        .filter(m -> UuidUtil.fromByteString(m.aciBytes).equals(editor))
+                        .map(m -> m.profileKey)).findFirst();
 
         if (editorProfileKeyBytes.isEmpty()) {
             return null;
@@ -630,8 +626,8 @@ class GroupV2Helper {
                     .forGroup(GroupSecretParams.deriveFromMasterKey(groupMasterKey));
 
             try {
-                return groupOperations.decryptChange(GroupChange.parseFrom(signedGroupChange), true).orElse(null);
-            } catch (VerificationFailedException | InvalidGroupStateException | InvalidProtocolBufferException e) {
+                return groupOperations.decryptChange(GroupChange.ADAPTER.decode(signedGroupChange), true).orElse(null);
+            } catch (VerificationFailedException | InvalidGroupStateException | IOException e) {
                 return null;
             }
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index cad112b5..aa4bdba3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -70,11 +70,8 @@ import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.Envelope;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
-import org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer;
-import org.whispersystems.signalservice.internal.serialize.SignalServiceMetadataProtobufSerializer;
-import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -213,7 +210,7 @@ public final class IncomingMessageHandler {
     }
 
     private SignalServiceContent validate(
-            SignalServiceProtos.Envelope envelope, SignalServiceCipherResult cipherResult, long serverDeliveredTimestamp
+            Envelope envelope, SignalServiceCipherResult cipherResult, long serverDeliveredTimestamp
     ) throws ProtocolInvalidKeyException, ProtocolInvalidMessageException, UnsupportedDataMessageException, InvalidMessageStructureException {
         final var content = cipherResult.getContent();
         final var envelopeMetadata = cipherResult.getMetadata();
@@ -236,21 +233,15 @@ public final class IncomingMessageHandler {
         final var metadata = new SignalServiceMetadata(new SignalServiceAddress(envelopeMetadata.getSourceServiceId(),
                 Optional.ofNullable(envelopeMetadata.getSourceE164())),
                 envelopeMetadata.getSourceDeviceId(),
-                envelope.getTimestamp(),
-                envelope.getServerTimestamp(),
+                envelope.timestamp,
+                envelope.serverTimestamp,
                 serverDeliveredTimestamp,
                 envelopeMetadata.getSealedSender(),
-                envelope.getServerGuid(),
+                envelope.serverGuid,
                 Optional.ofNullable(envelopeMetadata.getGroupId()),
                 envelopeMetadata.getDestinationServiceId().toString());
 
-        final var contentProto = SignalServiceContentProto.newBuilder()
-                .setLocalAddress(SignalServiceAddressProtobufSerializer.toProtobuf(localAddress))
-                .setMetadata(SignalServiceMetadataProtobufSerializer.toProtobuf(metadata))
-                .setContent(content)
-                .build();
-
-        return SignalServiceContent.createFromProto(contentProto);
+        return SignalServiceContent.createFrom(localAddress, metadata, content);
     }
 
     private List<HandleAction> checkAndHandleMessage(
@@ -635,23 +626,21 @@ public final class IncomingMessageHandler {
         if (syncMessage.getPniChangeNumber().isPresent()) {
             final var pniChangeNumber = syncMessage.getPniChangeNumber().get();
             logger.debug("Received PNI change number sync message, applying.");
-            if (pniChangeNumber.hasIdentityKeyPair()
-                    && pniChangeNumber.hasRegistrationId()
-                    && pniChangeNumber.hasSignedPreKey()
+            if (pniChangeNumber.identityKeyPair != null
+                    && pniChangeNumber.registrationId != null
+                    && pniChangeNumber.signedPreKey != null
                     && !envelope.getUpdatedPni().isEmpty()) {
                 logger.debug("New PNI: {}", envelope.getUpdatedPni());
                 try {
                     final var updatedPni = PNI.parseOrThrow(envelope.getUpdatedPni());
                     context.getAccountHelper()
                             .setPni(updatedPni,
-                                    new IdentityKeyPair(pniChangeNumber.getIdentityKeyPair().toByteArray()),
-                                    pniChangeNumber.hasNewE164() ? pniChangeNumber.getNewE164() : null,
-                                    pniChangeNumber.getRegistrationId(),
-                                    new SignedPreKeyRecord(pniChangeNumber.getSignedPreKey().toByteArray()),
-                                    pniChangeNumber.hasLastResortKyberPreKey()
-                                            ? new KyberPreKeyRecord(pniChangeNumber.getLastResortKyberPreKey()
-                                            .toByteArray())
-                                            : null);
+                                    new IdentityKeyPair(pniChangeNumber.identityKeyPair.toByteArray()),
+                                    pniChangeNumber.newE164,
+                                    pniChangeNumber.registrationId,
+                                    new SignedPreKeyRecord(pniChangeNumber.signedPreKey.toByteArray()),
+                                    pniChangeNumber.lastResortKyberPreKey != null ? new KyberPreKeyRecord(
+                                            pniChangeNumber.lastResortKyberPreKey.toByteArray()) : null);
                 } catch (Exception e) {
                     logger.warn("Failed to handle change number message", e);
                 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 8cd37aa9..51c1e9ca 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.helper;
 
-import com.google.protobuf.ByteString;
-
 import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupNotFoundException;
@@ -54,6 +52,8 @@ import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
+import okio.ByteString;
+
 public class SendHelper {
 
     private final static Logger logger = LoggerFactory.getLogger(SendHelper.class);
@@ -267,10 +267,10 @@ public class SendHelper {
 
         final var senderKeyDistributionMessage = dependencies.getMessageSender()
                 .getOrCreateNewGroupSession(group.getDistributionId());
-        final var distributionBytes = ByteString.copyFrom(senderKeyDistributionMessage.serialize());
+        final var distributionBytes = ByteString.of(senderKeyDistributionMessage.serialize());
         final var contentToSend = messageSendLogEntry.content()
-                .toBuilder()
-                .setSenderKeyDistributionMessage(distributionBytes)
+                .newBuilder()
+                .senderKeyDistributionMessage(distributionBytes)
                 .build();
 
         final var result = handleSendMessage(recipientId,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 47923051..41ae761a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -31,7 +31,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSy
 import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.SyncMessage;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -58,20 +58,20 @@ public class SyncHelper {
     }
 
     public void requestAllSyncData() {
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.GROUPS);
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.CONTACTS);
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.BLOCKED);
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.CONFIGURATION);
+        requestSyncData(SyncMessage.Request.Type.GROUPS);
+        requestSyncData(SyncMessage.Request.Type.CONTACTS);
+        requestSyncData(SyncMessage.Request.Type.BLOCKED);
+        requestSyncData(SyncMessage.Request.Type.CONFIGURATION);
         requestSyncKeys();
         requestSyncPniIdentity();
     }
 
     public void requestSyncKeys() {
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.KEYS);
+        requestSyncData(SyncMessage.Request.Type.KEYS);
     }
 
     public void requestSyncPniIdentity() {
-        requestSyncData(SignalServiceProtos.SyncMessage.Request.Type.PNI_IDENTITY);
+        requestSyncData(SyncMessage.Request.Type.PNI_IDENTITY);
     }
 
     public void sendSyncFetchProfileMessage() {
@@ -346,8 +346,8 @@ public class SyncHelper {
         }
     }
 
-    private void requestSyncData(final SignalServiceProtos.SyncMessage.Request.Type type) {
-        var r = SignalServiceProtos.SyncMessage.Request.newBuilder().setType(type).build();
+    private void requestSyncData(final SyncMessage.Request.Type type) {
+        var r = new SyncMessage.Request.Builder().type(type).build();
         var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
         context.getSendHelper().sendSyncMessage(message);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index 6a8de592..c263aa9b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -21,7 +21,7 @@ public final class GroupInfoV2 extends GroupInfo {
 
     private final GroupIdV2 groupId;
     private final GroupMasterKey masterKey;
-    private DistributionId distributionId;
+    private final DistributionId distributionId;
     private boolean blocked;
     private DecryptedGroup group;
     private boolean permissionDenied;
@@ -84,7 +84,7 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return null;
         }
-        return this.group.getTitle();
+        return this.group.title;
     }
 
     @Override
@@ -92,15 +92,15 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return null;
         }
-        return this.group.getDescription();
+        return this.group.description;
     }
 
     @Override
     public GroupInviteLinkUrl getGroupInviteLink() {
-        if (this.group == null || this.group.getInviteLinkPassword().isEmpty() || (
-                this.group.getAccessControl().getAddFromInviteLink() != AccessControl.AccessRequired.ANY
-                        && this.group.getAccessControl().getAddFromInviteLink()
-                        != AccessControl.AccessRequired.ADMINISTRATOR
+        if (this.group == null || this.group.inviteLinkPassword.toByteArray().length == 0 || (
+                this.group.accessControl != null
+                        && this.group.accessControl.addFromInviteLink != AccessControl.AccessRequired.ANY
+                        && this.group.accessControl.addFromInviteLink != AccessControl.AccessRequired.ADMINISTRATOR
         )) {
             return null;
         }
@@ -113,9 +113,8 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getMembersList()
-                .stream()
-                .map(m -> ServiceId.parseOrThrow(m.getAciBytes()))
+        return group.members.stream()
+                .map(m -> ServiceId.parseOrThrow(m.aciBytes))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -125,9 +124,8 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getBannedMembersList()
-                .stream()
-                .map(m -> ServiceId.parseOrThrow(m.getServiceIdBytes()))
+        return group.bannedMembers.stream()
+                .map(m -> ServiceId.parseOrThrow(m.serviceIdBytes))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -137,9 +135,8 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getPendingMembersList()
-                .stream()
-                .map(m -> ServiceId.parseOrThrow(m.getServiceIdBytes()))
+        return group.pendingMembers.stream()
+                .map(m -> ServiceId.parseOrThrow(m.serviceIdBytes))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -149,9 +146,8 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getRequestingMembersList()
-                .stream()
-                .map(m -> ServiceId.parseOrThrow(m.getAciBytes()))
+        return group.requestingMembers.stream()
+                .map(m -> ServiceId.parseOrThrow(m.aciBytes))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
     }
@@ -161,11 +157,10 @@ public final class GroupInfoV2 extends GroupInfo {
         if (this.group == null) {
             return Set.of();
         }
-        return group.getMembersList()
-                .stream()
-                .filter(m -> m.getRole() == Member.Role.ADMINISTRATOR)
-                .map(m -> new RecipientAddress(ServiceId.ACI.parseOrNull(m.getAciBytes()),
-                        ServiceId.PNI.parseOrNull(m.getPniBytes()),
+        return group.members.stream()
+                .filter(m -> m.role == Member.Role.ADMINISTRATOR)
+                .map(m -> new RecipientAddress(ServiceId.ACI.parseOrNull(m.aciBytes),
+                        ServiceId.PNI.parseOrNull(m.pniBytes),
                         null))
                 .map(recipientResolver::resolveRecipient)
                 .collect(Collectors.toSet());
@@ -183,26 +178,26 @@ public final class GroupInfoV2 extends GroupInfo {
 
     @Override
     public int getMessageExpirationTimer() {
-        return this.group != null && this.group.hasDisappearingMessagesTimer()
-                ? this.group.getDisappearingMessagesTimer().getDuration()
+        return this.group != null && this.group.disappearingMessagesTimer != null
+                ? this.group.disappearingMessagesTimer.duration
                 : 0;
     }
 
     @Override
     public boolean isAnnouncementGroup() {
-        return this.group != null && this.group.getIsAnnouncementGroup() == EnabledState.ENABLED;
+        return this.group != null && this.group.isAnnouncementGroup == EnabledState.ENABLED;
     }
 
     @Override
     public GroupPermission getPermissionAddMember() {
         final var accessControl = getAccessControl();
-        return accessControl == null ? GroupPermission.EVERY_MEMBER : toGroupPermission(accessControl.getMembers());
+        return accessControl == null ? GroupPermission.EVERY_MEMBER : toGroupPermission(accessControl.members);
     }
 
     @Override
     public GroupPermission getPermissionEditDetails() {
         final var accessControl = getAccessControl();
-        return accessControl == null ? GroupPermission.EVERY_MEMBER : toGroupPermission(accessControl.getAttributes());
+        return accessControl == null ? GroupPermission.EVERY_MEMBER : toGroupPermission(accessControl.attributes);
     }
 
     @Override
@@ -219,11 +214,11 @@ public final class GroupInfoV2 extends GroupInfo {
     }
 
     private AccessControl getAccessControl() {
-        if (this.group == null || !this.group.hasAccessControl()) {
+        if (this.group == null || this.group.accessControl == null) {
             return null;
         }
 
-        return this.group.getAccessControl();
+        return this.group.accessControl;
     }
 
     private static GroupPermission toGroupPermission(final AccessControl.AccessRequired permission) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index af5ada26..71fa0f9d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.storage.groups;
 
-import com.google.protobuf.InvalidProtocolBufferException;
-
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupIdV1;
 import org.asamk.signal.manager.api.GroupIdV2;
@@ -19,6 +17,7 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -295,7 +294,7 @@ public class GroupStore {
                 if (groupV2.getGroup() == null) {
                     statement.setNull(4, Types.NUMERIC);
                 } else {
-                    statement.setBytes(4, groupV2.getGroup().toByteArray());
+                    statement.setBytes(4, groupV2.getGroup().encode());
                 }
                 statement.setBytes(5, UuidUtil.toByteArray(groupV2.getDistributionId().asUuid()));
                 statement.setBoolean(6, groupV2.isBlocked());
@@ -349,12 +348,12 @@ public class GroupStore {
             final var permissionDenied = resultSet.getBoolean("permission_denied");
             return new GroupInfoV2(GroupId.v2(groupId),
                     new GroupMasterKey(masterKey),
-                    groupData == null ? null : DecryptedGroup.parseFrom(groupData),
+                    groupData == null ? null : DecryptedGroup.ADAPTER.decode(groupData),
                     DistributionId.from(UuidUtil.parseOrThrow(distributionId)),
                     blocked,
                     permissionDenied,
                     recipientResolver);
-        } catch (InvalidInputException | InvalidProtocolBufferException e) {
+        } catch (InvalidInputException | IOException e) {
             return null;
         }
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index f004ae69..b53b14c0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -113,7 +113,7 @@ public class LegacyGroupStore {
             return null;
         }
         try (var stream = new FileInputStream(groupFile)) {
-            return DecryptedGroup.parseFrom(stream);
+            return DecryptedGroup.ADAPTER.decode(stream);
         } catch (IOException ignored) {
             return null;
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
index c7f37396..b8d951c1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogEntry.java
@@ -2,10 +2,10 @@ package org.asamk.signal.manager.storage.sendLog;
 
 import org.asamk.signal.manager.api.GroupId;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.Content;
 
 import java.util.Optional;
 
 public record MessageSendLogEntry(
-        Optional<GroupId> groupId, SignalServiceProtos.Content content, ContentHint contentHint, boolean urgent
+        Optional<GroupId> groupId, Content content, ContentHint contentHint, boolean urgent
 ) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index 08b23933..751f345b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.ServiceId;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.Content;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -267,7 +267,7 @@ public class MessageSendLogStore implements AutoCloseable {
     private long insert(
             final List<RecipientDevices> recipientDevices,
             final long sentTimestamp,
-            final SignalServiceProtos.Content content,
+            final Content content,
             final ContentHint contentHint,
             final boolean urgent
     ) {
@@ -284,7 +284,7 @@ public class MessageSendLogStore implements AutoCloseable {
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setLong(1, sentTimestamp);
                 statement.setBytes(2, groupId);
-                statement.setBytes(3, content.toByteArray());
+                statement.setBytes(3, content.encode());
                 statement.setInt(4, contentHint.getType());
                 statement.setBoolean(5, urgent);
                 final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
@@ -308,17 +308,15 @@ public class MessageSendLogStore implements AutoCloseable {
         }
     }
 
-    private byte[] getGroupId(final SignalServiceProtos.Content content) {
+    private byte[] getGroupId(final Content content) {
         try {
-            return !content.hasDataMessage()
+            return content.dataMessage == null
                     ? null
-                    : content.getDataMessage().hasGroup()
-                            ? content.getDataMessage().getGroup().getId().toByteArray()
-                            : content.getDataMessage().hasGroupV2()
-                                    ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.getDataMessage()
-                                    .getGroupV2()
-                                    .getMasterKey()
-                                    .toByteArray())).serialize()
+                    : content.dataMessage.group != null && content.dataMessage.group.id != null
+                            ? content.dataMessage.group.id.toByteArray()
+                            : content.dataMessage.groupV2 != null && content.dataMessage.groupV2.masterKey != null
+                                    ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.dataMessage.groupV2.masterKey.toByteArray()))
+                                    .serialize()
                                     : null;
         } catch (InvalidInputException e) {
             logger.warn("Failed to parse groupId id from content");
@@ -385,9 +383,9 @@ public class MessageSendLogStore implements AutoCloseable {
 
     private MessageSendLogEntry getMessageSendLogEntryFromResultSet(ResultSet resultSet) throws SQLException {
         final var groupId = Optional.ofNullable(resultSet.getBytes("group_id")).map(GroupId::unknownVersion);
-        final SignalServiceProtos.Content content;
+        final Content content;
         try {
-            content = SignalServiceProtos.Content.parseFrom(resultSet.getBinaryStream("content"));
+            content = Content.ADAPTER.decode(resultSet.getBinaryStream("content"));
         } catch (IOException e) {
             logger.warn("Failed to parse content from message send log", e);
             return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
index a7682682..b1568bdc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -6,7 +6,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.Envelope;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -34,7 +34,7 @@ public class MessageCacheUtils {
             }
             if (version >= 9) {
                 final var serverReceivedTimestamp = in.readLong();
-                final var envelope = SignalServiceProtos.Envelope.parseFrom(in.readAllBytes());
+                final var envelope = Envelope.ADAPTER.decode(in.readAllBytes());
                 return new SignalServiceEnvelope(envelope, serverReceivedTimestamp);
             } else {
                 var type = in.readInt();
@@ -114,7 +114,7 @@ public class MessageCacheUtils {
             try (var out = new DataOutputStream(f)) {
                 out.writeInt(CURRENT_VERSION); // version
                 out.writeLong(envelope.getServerDeliveredTimestamp());
-                envelope.getProto().writeTo(out);
+                envelope.getProto().encode(out);
             }
         }
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
index 1471d8fe..ca55008c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
@@ -1,14 +1,14 @@
 package org.asamk.signal.manager.util;
 
-import com.google.protobuf.ByteString;
-
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.ecc.ECPrivateKey;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.PaymentAddress;
+
+import okio.ByteString;
 
 public class PaymentUtils {
 
@@ -20,16 +20,13 @@ public class PaymentUtils {
     /**
      * Signs the supplied address bytes with the {@link IdentityKeyPair}'s private key and returns a proto that includes it, and it's signature.
      */
-    public static SignalServiceProtos.PaymentAddress signPaymentsAddress(
+    public static PaymentAddress signPaymentsAddress(
             byte[] publicAddressBytes, ECPrivateKey privateKey
     ) {
         byte[] signature = privateKey.calculateSignature(publicAddressBytes);
 
-        return SignalServiceProtos.PaymentAddress.newBuilder()
-                .setMobileCoinAddress(SignalServiceProtos.PaymentAddress.MobileCoinAddress.newBuilder()
-                        .setAddress(ByteString.copyFrom(publicAddressBytes))
-                        .setSignature(ByteString.copyFrom(signature)))
-                .build();
+        return new PaymentAddress.Builder().mobileCoinAddress(new PaymentAddress.MobileCoinAddress.Builder().address(
+                ByteString.of(publicAddressBytes)).signature(ByteString.of(signature)).build()).build();
     }
 
     /**
@@ -38,15 +35,16 @@ public class PaymentUtils {
      * Returns the validated bytes if so, otherwise returns null.
      */
     public static byte[] verifyPaymentsAddress(
-            SignalServiceProtos.PaymentAddress paymentAddress, ECPublicKey publicKey
+            PaymentAddress paymentAddress, ECPublicKey publicKey
     ) {
-        if (!paymentAddress.hasMobileCoinAddress()) {
+        final var mobileCoinAddress = paymentAddress.mobileCoinAddress;
+        if (mobileCoinAddress == null || mobileCoinAddress.address == null || mobileCoinAddress.signature == null) {
             logger.debug("Got payment address without mobile coin address, ignoring.");
             return null;
         }
 
-        byte[] bytes = paymentAddress.getMobileCoinAddress().getAddress().toByteArray();
-        byte[] signature = paymentAddress.getMobileCoinAddress().getSignature().toByteArray();
+        byte[] bytes = mobileCoinAddress.address.toByteArray();
+        byte[] signature = mobileCoinAddress.signature.toByteArray();
 
         if (signature.length != 64 || !publicKey.verifySignature(bytes, signature)) {
             logger.debug("Got mobile coin address with invalid signature, ignoring.");
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index cfbfc3cc..40fc8f7b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -1,7 +1,5 @@
 package org.asamk.signal.manager.util;
 
-import com.google.protobuf.InvalidProtocolBufferException;
-
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.Profile;
 import org.signal.libsignal.protocol.IdentityKey;
@@ -13,7 +11,7 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;
 import org.whispersystems.signalservice.api.crypto.ProfileCipher;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+import org.whispersystems.signalservice.internal.push.PaymentAddress;
 
 import java.io.IOException;
 import java.util.Base64;
@@ -117,10 +115,10 @@ public class ProfileUtils {
             return null;
         }
 
-        SignalServiceProtos.PaymentAddress paymentAddress;
+        PaymentAddress paymentAddress;
         try {
-            paymentAddress = SignalServiceProtos.PaymentAddress.parseFrom(decrypted);
-        } catch (InvalidProtocolBufferException e) {
+            paymentAddress = PaymentAddress.ADAPTER.decode(decrypted);
+        } catch (IOException e) {
             logger.debug("Failed to parse payment address", e);
             return null;
         }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2d3cd01a..bb2d1974 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,8 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_80")
-            library("protobuf", "com.google.protobuf", "protobuf-javalite").version("3.24.0")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_81")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")
diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
index 70b1951c..3438cf39 100644
--- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
@@ -47,10 +47,10 @@ record JsonCallMessage(
         }
     }
 
-    public record Hangup(long id, String type, int deviceId, boolean isLegacy) {
+    public record Hangup(long id, String type, int deviceId) {
 
         public static Hangup from(final MessageEnvelope.Call.Hangup hangup) {
-            return new Hangup(hangup.id(), hangup.type().name(), hangup.deviceId(), hangup.isLegacy());
+            return new Hangup(hangup.id(), hangup.type().name(), hangup.deviceId());
         }
     }
 

From dced7a14c8e26d8347994231029db3ac4cb72125 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Sep 2023 17:48:03 +0200
Subject: [PATCH 200/672] Remove jetbrains annotation

---
 .../main/java/org/asamk/signal/manager/helper/SyncHelper.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 41ae761a..adc4e1d4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -10,7 +10,6 @@ import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.MimeUtils;
-import org.jetbrains.annotations.NotNull;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -233,7 +232,6 @@ public class SyncHelper {
         context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(stickerMessages));
     }
 
-    @NotNull
     private static StickerPackOperationMessage getStickerPackOperationMessage(
             final StickerPack s, final boolean installed
     ) {

From da7428d6bd82361de781af9506aa9217312b624e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 24 Sep 2023 17:49:00 +0200
Subject: [PATCH 201/672] Switch to zulu java distribution

---
 .github/workflows/ci.yml              | 2 +-
 .github/workflows/codeql-analysis.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a9beabc..a3e7f35b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
           cache: 'gradle'
       - name: Build with Gradle
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f0ddd463..cd83c179 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup Java JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: 'zulu'
           java-version: 17
 
       - name: Checkout repository

From fed2c94431327b71d36ab4306281dee8d83a653a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 24 Sep 2023 18:03:38 +0200
Subject: [PATCH 202/672] Update libsignal-service

---
 .../helper/IncomingMessageHandler.java        | 20 +++++--------------
 settings.gradle.kts                           |  2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index aa4bdba3..51b7c523 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -60,7 +60,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
-import org.whispersystems.signalservice.api.messages.SignalServiceMetadata;
 import org.whispersystems.signalservice.api.messages.SignalServicePniSignatureMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
@@ -228,20 +227,11 @@ public final class IncomingMessageHandler {
             return null;
         }
 
-        final var localAddress = new SignalServiceAddress(envelopeMetadata.getDestinationServiceId(),
-                Optional.ofNullable(account.getNumber()));
-        final var metadata = new SignalServiceMetadata(new SignalServiceAddress(envelopeMetadata.getSourceServiceId(),
-                Optional.ofNullable(envelopeMetadata.getSourceE164())),
-                envelopeMetadata.getSourceDeviceId(),
-                envelope.timestamp,
-                envelope.serverTimestamp,
-                serverDeliveredTimestamp,
-                envelopeMetadata.getSealedSender(),
-                envelope.serverGuid,
-                Optional.ofNullable(envelopeMetadata.getGroupId()),
-                envelopeMetadata.getDestinationServiceId().toString());
-
-        return SignalServiceContent.createFrom(localAddress, metadata, content);
+        return SignalServiceContent.Companion.createFrom(account.getNumber(),
+                envelope,
+                envelopeMetadata,
+                content,
+                serverDeliveredTimestamp);
     }
 
     private List<HandleAction> checkAndHandleMessage(
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bb2d1974..6cdb74fa 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_81")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_82")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")

From 47626b2af4eb6855bafb03979634f4e7b9503bc7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 30 Sep 2023 21:28:02 +0200
Subject: [PATCH 203/672] Update libsignal-service

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6cdb74fa..5800cee8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_82")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_83")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")

From 0dda8b405ec07c7d11fcd74d43e1afa55460008b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 30 Sep 2023 21:36:12 +0200
Subject: [PATCH 204/672] Bump version to 0.12.2

---
 CHANGELOG.md                       | 7 +++++++
 build.gradle.kts                   | 2 +-
 graalvm-config-dir/jni-config.json | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d520e273..235f693d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,16 @@
 
 ## [Unreleased]
 
+## [0.12.2] - 2023-09-30
+**Attention**: Now requires native libsignal-client version 0.32.1
+
 ### Added
 
 - Added `--receive-mode` parameter for `jsonRpc` command
+- Add `libsignal_client_path` build property to override libsignal-client jar file
+
+### Changed
+- `jsonRpc` command now supports multi-account mode including registering and linking
 
 ## [0.12.1] - 2023-08-26
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 3298af04..82e17f7f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.27"
 }
 
-version = "0.12.1"
+version = "0.12.2"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 33dbd070..a7e63038 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -29,6 +29,9 @@
 {
   "name":"java.lang.NoSuchMethodError"
 },
+{
+  "name":"java.lang.String"
+},
 {
   "name":"java.lang.Throwable",
   "methods":[{"name":"getMessage","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]

From 735766669e10a695990ac74dbc707a6aa0ecc3ba Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 30 Sep 2023 22:26:08 +0200
Subject: [PATCH 205/672] Convert classes to records

---
 .../signal/manager/api/StickerPackUrl.java    | 18 +----
 .../manager/config/KeyBackupConfig.java       | 25 +------
 .../config/ServiceEnvironmentConfig.java      | 68 +++----------------
 .../manager/helper/RecipientHelper.java       |  2 +-
 .../signal/manager/internal/ManagerImpl.java  |  4 +-
 .../internal/ProvisioningManagerImpl.java     |  8 +--
 .../internal/RegistrationManagerImpl.java     | 24 +++----
 .../manager/internal/SignalDependencies.java  | 34 +++++-----
 .../signal/manager/storage/SignalAccount.java |  8 +--
 .../profiles/LegacySignalProfileEntry.java    | 41 +----------
 10 files changed, 54 insertions(+), 178 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
index c571a424..7113b4b8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
@@ -11,10 +11,7 @@ import java.nio.charset.StandardCharsets;
 
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
-public final class StickerPackUrl {
-
-    private final StickerPackId packId;
-    private final byte[] packKey;
+public record StickerPackUrl(StickerPackId packId, byte[] packKey) {
 
     /**
      * @throws InvalidStickerPackLinkException If url cannot be parsed.
@@ -48,11 +45,6 @@ public final class StickerPackUrl {
         return new StickerPackUrl(packId, packKey);
     }
 
-    public StickerPackUrl(final StickerPackId packId, final byte[] packKey) {
-        this.packId = packId;
-        this.packKey = packKey;
-    }
-
     public URI getUrl() {
         try {
             return new URI("https",
@@ -67,14 +59,6 @@ public final class StickerPackUrl {
         }
     }
 
-    public StickerPackId getPackId() {
-        return packId;
-    }
-
-    public byte[] getPackKey() {
-        return packKey;
-    }
-
     public final static class InvalidStickerPackLinkException extends Exception {
 
         public InvalidStickerPackLinkException(String message) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/KeyBackupConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/KeyBackupConfig.java
index 60173c1d..8872a2d8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/KeyBackupConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/KeyBackupConfig.java
@@ -1,26 +1,3 @@
 package org.asamk.signal.manager.config;
 
-public class KeyBackupConfig {
-
-    private final String enclaveName;
-    private final byte[] serviceId;
-    private final String mrenclave;
-
-    public KeyBackupConfig(final String enclaveName, final byte[] serviceId, final String mrenclave) {
-        this.enclaveName = enclaveName;
-        this.serviceId = serviceId;
-        this.mrenclave = mrenclave;
-    }
-
-    public String getEnclaveName() {
-        return enclaveName;
-    }
-
-    public byte[] getServiceId() {
-        return serviceId;
-    }
-
-    public String getMrenclave() {
-        return mrenclave;
-    }
-}
+public record KeyBackupConfig(String enclaveName, byte[] serviceId, String mrenclave) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index 64f17589..421bdcc7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -6,62 +6,12 @@ import org.whispersystems.signalservice.internal.configuration.SignalServiceConf
 
 import java.util.Collection;
 
-public class ServiceEnvironmentConfig {
-
-    private final ServiceEnvironment type;
-    private final SignalServiceConfiguration signalServiceConfiguration;
-
-    private final ECPublicKey unidentifiedSenderTrustRoot;
-
-    private final KeyBackupConfig keyBackupConfig;
-    private final Collection<KeyBackupConfig> fallbackKeyBackupConfigs;
-
-    private final String cdsiMrenclave;
-    private final String svr2Mrenclave;
-
-    public ServiceEnvironmentConfig(
-            final ServiceEnvironment type,
-            final SignalServiceConfiguration signalServiceConfiguration,
-            final ECPublicKey unidentifiedSenderTrustRoot,
-            final KeyBackupConfig keyBackupConfig,
-            final Collection<KeyBackupConfig> fallbackKeyBackupConfigs,
-            final String cdsiMrenclave,
-            final String svr2Mrenclave
-    ) {
-        this.type = type;
-        this.signalServiceConfiguration = signalServiceConfiguration;
-        this.unidentifiedSenderTrustRoot = unidentifiedSenderTrustRoot;
-        this.keyBackupConfig = keyBackupConfig;
-        this.fallbackKeyBackupConfigs = fallbackKeyBackupConfigs;
-        this.cdsiMrenclave = cdsiMrenclave;
-        this.svr2Mrenclave = svr2Mrenclave;
-    }
-
-    public ServiceEnvironment getType() {
-        return type;
-    }
-
-    public SignalServiceConfiguration getSignalServiceConfiguration() {
-        return signalServiceConfiguration;
-    }
-
-    public ECPublicKey getUnidentifiedSenderTrustRoot() {
-        return unidentifiedSenderTrustRoot;
-    }
-
-    public KeyBackupConfig getKeyBackupConfig() {
-        return keyBackupConfig;
-    }
-
-    public Collection<KeyBackupConfig> getFallbackKeyBackupConfigs() {
-        return fallbackKeyBackupConfigs;
-    }
-
-    public String getCdsiMrenclave() {
-        return cdsiMrenclave;
-    }
-
-    public String getSvr2Mrenclave() {
-        return svr2Mrenclave;
-    }
-}
+public record ServiceEnvironmentConfig(
+        ServiceEnvironment type,
+        SignalServiceConfiguration signalServiceConfiguration,
+        ECPublicKey unidentifiedSenderTrustRoot,
+        KeyBackupConfig keyBackupConfig,
+        Collection<KeyBackupConfig> fallbackKeyBackupConfigs,
+        String cdsiMrenclave,
+        String svr2Mrenclave
+) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index aff45ed2..89354524 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -162,7 +162,7 @@ public class RecipientHelper {
                             account.getRecipientStore().getServiceIdToProfileKeyMap(),
                             useCompat,
                             Optional.empty(),
-                            serviceEnvironmentConfig.getCdsiMrenclave(),
+                            serviceEnvironmentConfig.cdsiMrenclave(),
                             null,
                             token -> {
                                 // Not storing for partial refresh
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 7db22fb2..d1e96026 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -902,8 +902,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void installStickerPack(StickerPackUrl url) throws IOException {
-        final var packId = url.getPackId();
-        final var packKey = url.getPackKey();
+        final var packId = url.packId();
+        final var packKey = url.packKey();
         try {
             context.getStickerHelper().retrieveStickerPack(packId, packKey);
         } catch (InvalidMessageException e) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 113c2856..405657b0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -82,12 +82,12 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
         password = KeyUtils.createPassword();
         GroupsV2Operations groupsV2Operations;
         try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
+            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
                     ServiceConfig.GROUP_MAX_SIZE);
         } catch (Throwable ignored) {
             groupsV2Operations = null;
         }
-        accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+        accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                 new DynamicCredentialsProvider(null, null, null, password, SignalServiceAddress.DEFAULT_DEVICE_ID),
                 userAgent,
                 groupsV2Operations,
@@ -146,7 +146,7 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
             account = SignalAccount.createOrUpdateLinkedAccount(pathConfig.dataPath(),
                     accountPath,
                     number,
-                    serviceEnvironmentConfig.getType(),
+                    serviceEnvironmentConfig.type(),
                     aci,
                     pni,
                     password,
@@ -221,7 +221,7 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
             }
             if (signalAccount.isRegistered()
                     && signalAccount.getServiceEnvironment() != null
-                    && signalAccount.getServiceEnvironment() != serviceEnvironmentConfig.getType()) {
+                    && signalAccount.getServiceEnvironment() != serviceEnvironmentConfig.type()) {
                 logger.debug("Account is registered in another environment: {}.",
                         signalAccount.getServiceEnvironment());
                 return false;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 3e953631..b3d7eff1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -82,12 +82,12 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
         GroupsV2Operations groupsV2Operations;
         try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
+            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
                     ServiceConfig.GROUP_MAX_SIZE);
         } catch (Throwable ignored) {
             groupsV2Operations = null;
         }
-        this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+        this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                 new DynamicCredentialsProvider(
                         // Using empty UUID, because registering doesn't work otherwise
                         null, null, account.getNumber(), account.getPassword(), SignalServiceAddress.DEFAULT_DEVICE_ID),
@@ -95,19 +95,19 @@ public class RegistrationManagerImpl implements RegistrationManager {
                 groupsV2Operations,
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
         final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
-                serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
-                serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
+                serviceEnvironmentConfig.keyBackupConfig().enclaveName(),
+                serviceEnvironmentConfig.keyBackupConfig().serviceId(),
+                serviceEnvironmentConfig.keyBackupConfig().mrenclave(),
                 10);
-        final var fallbackKeyBackupServices = serviceEnvironmentConfig.getFallbackKeyBackupConfigs()
+        final var fallbackKeyBackupServices = serviceEnvironmentConfig.fallbackKeyBackupConfigs()
                 .stream()
                 .map(config -> accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                        config.getEnclaveName(),
-                        config.getServiceId(),
-                        config.getMrenclave(),
+                        config.enclaveName(),
+                        config.serviceId(),
+                        config.mrenclave(),
                         10))
                 .toList();
-        final var secureValueRecoveryV2 = accountManager.getSecureValueRecoveryV2(serviceEnvironmentConfig.getSvr2Mrenclave());
+        final var secureValueRecoveryV2 = accountManager.getSecureValueRecoveryV2(serviceEnvironmentConfig.svr2Mrenclave());
         this.pinHelper = new PinHelper(keyBackupService, fallbackKeyBackupServices, secureValueRecoveryV2);
     }
 
@@ -117,7 +117,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException {
         if (account.isRegistered()
                 && account.getServiceEnvironment() != null
-                && account.getServiceEnvironment() != serviceEnvironmentConfig.getType()) {
+                && account.getServiceEnvironment() != serviceEnvironmentConfig.type()) {
             throw new IOException("Account is registered in another environment: " + account.getServiceEnvironment());
         }
 
@@ -216,7 +216,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
     private boolean attemptReactivateAccount() {
         try {
-            final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+            final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                     account.getCredentialsProvider(),
                     userAgent,
                     null,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 7b3a5a54..82ffce96 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -94,7 +94,7 @@ public class SignalDependencies {
 
     public SignalServiceAccountManager getAccountManager() {
         return getOrCreate(() -> accountManager,
-                () -> accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                () -> accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                         credentialsProvider,
                         userAgent,
                         getGroupsV2Operations(),
@@ -102,7 +102,7 @@ public class SignalDependencies {
     }
 
     public SignalServiceAccountManager createUnauthenticatedAccountManager(String number, String password) {
-        return new SignalServiceAccountManager(getServiceEnvironmentConfig().getSignalServiceConfiguration(),
+        return new SignalServiceAccountManager(getServiceEnvironmentConfig().signalServiceConfiguration(),
                 null,
                 null,
                 number,
@@ -119,13 +119,13 @@ public class SignalDependencies {
 
     public GroupsV2Operations getGroupsV2Operations() {
         return getOrCreate(() -> groupsV2Operations,
-                () -> groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
+                () -> groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
                         ServiceConfig.GROUP_MAX_SIZE));
     }
 
     private ClientZkOperations getClientZkOperations() {
         return getOrCreate(() -> clientZkOperations,
-                () -> clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()));
+                () -> clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()));
     }
 
     private ClientZkProfileOperations getClientZkProfileOperations() {
@@ -141,7 +141,7 @@ public class SignalDependencies {
                 @Override
                 public WebSocketConnection createWebSocket() {
                     return new WebSocketConnection("normal",
-                            serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                            serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.of(credentialsProvider),
                             userAgent,
                             healthMonitor,
@@ -151,7 +151,7 @@ public class SignalDependencies {
                 @Override
                 public WebSocketConnection createUnidentifiedWebSocket() {
                     return new WebSocketConnection("unidentified",
-                            serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                            serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.empty(),
                             userAgent,
                             healthMonitor,
@@ -165,7 +165,7 @@ public class SignalDependencies {
 
     public SignalServiceMessageReceiver getMessageReceiver() {
         return getOrCreate(() -> messageReceiver,
-                () -> messageReceiver = new SignalServiceMessageReceiver(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                () -> messageReceiver = new SignalServiceMessageReceiver(serviceEnvironmentConfig.signalServiceConfiguration(),
                         credentialsProvider,
                         userAgent,
                         getClientZkProfileOperations(),
@@ -174,7 +174,7 @@ public class SignalDependencies {
 
     public SignalServiceMessageSender getMessageSender() {
         return getOrCreate(() -> messageSender,
-                () -> messageSender = new SignalServiceMessageSender(serviceEnvironmentConfig.getSignalServiceConfiguration(),
+                () -> messageSender = new SignalServiceMessageSender(serviceEnvironmentConfig.signalServiceConfiguration(),
                         credentialsProvider,
                         dataStore,
                         sessionLock,
@@ -190,24 +190,24 @@ public class SignalDependencies {
     public KeyBackupService getKeyBackupService() {
         return getOrCreate(() -> keyBackupService,
                 () -> keyBackupService = getAccountManager().getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                        serviceEnvironmentConfig.getKeyBackupConfig().getEnclaveName(),
-                        serviceEnvironmentConfig.getKeyBackupConfig().getServiceId(),
-                        serviceEnvironmentConfig.getKeyBackupConfig().getMrenclave(),
+                        serviceEnvironmentConfig.keyBackupConfig().enclaveName(),
+                        serviceEnvironmentConfig.keyBackupConfig().serviceId(),
+                        serviceEnvironmentConfig.keyBackupConfig().mrenclave(),
                         10));
     }
 
     public SecureValueRecoveryV2 getSecureValueRecoveryV2() {
         return getOrCreate(() -> secureValueRecoveryV2,
-                () -> secureValueRecoveryV2 = getAccountManager().getSecureValueRecoveryV2(serviceEnvironmentConfig.getSvr2Mrenclave()));
+                () -> secureValueRecoveryV2 = getAccountManager().getSecureValueRecoveryV2(serviceEnvironmentConfig.svr2Mrenclave()));
     }
 
     public Collection<KeyBackupService> getFallbackKeyBackupServices() {
-        return serviceEnvironmentConfig.getFallbackKeyBackupConfigs()
+        return serviceEnvironmentConfig.fallbackKeyBackupConfigs()
                 .stream()
                 .map(config -> getAccountManager().getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                        config.getEnclaveName(),
-                        config.getServiceId(),
-                        config.getMrenclave(),
+                        config.enclaveName(),
+                        config.serviceId(),
+                        config.mrenclave(),
                         10))
                 .toList();
     }
@@ -221,7 +221,7 @@ public class SignalDependencies {
 
     public SignalServiceCipher getCipher() {
         return getOrCreate(() -> cipher, () -> {
-            final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.getUnidentifiedSenderTrustRoot());
+            final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.unidentifiedSenderTrustRoot());
             final var address = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
             final var deviceId = credentialsProvider.getDeviceId();
             cipher = new SignalServiceCipher(address, deviceId, dataStore.aci(), sessionLock, certificateValidator);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 1619eabd..3ff8a864 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -881,10 +881,10 @@ public class SignalAccount implements Closeable {
             var profileStoreNode = rootNode.get("profileStore");
             final var legacyProfileStore = jsonProcessor.convertValue(profileStoreNode, LegacyProfileStore.class);
             for (var profileEntry : legacyProfileStore.getProfileEntries()) {
-                var recipientId = getRecipientResolver().resolveRecipient(profileEntry.getAddress());
+                var recipientId = getRecipientResolver().resolveRecipient(profileEntry.address());
                 // Not migrating profile key credential here, it was changed to expiring profile key credentials
-                getProfileStore().storeProfileKey(recipientId, profileEntry.getProfileKey());
-                final var profile = profileEntry.getProfile();
+                getProfileStore().storeProfileKey(recipientId, profileEntry.profileKey());
+                final var profile = profileEntry.profile();
                 if (profile != null) {
                     final var capabilities = new HashSet<Profile.Capability>();
                     if (profile.getCapabilities() != null) {
@@ -895,7 +895,7 @@ public class SignalAccount implements Closeable {
                             capabilities.add(Profile.Capability.storage);
                         }
                     }
-                    final var newProfile = new Profile(profileEntry.getLastUpdateTimestamp(),
+                    final var newProfile = new Profile(profileEntry.lastUpdateTimestamp(),
                             profile.getGivenName(),
                             profile.getFamilyName(),
                             profile.getAbout(),
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
index 3acad2b1..d4a81183 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java
@@ -3,41 +3,6 @@ package org.asamk.signal.manager.storage.profiles;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 
-public class LegacySignalProfileEntry {
-
-    private final RecipientAddress address;
-
-    private final ProfileKey profileKey;
-
-    private final long lastUpdateTimestamp;
-
-    private final LegacySignalProfile profile;
-
-    public LegacySignalProfileEntry(
-            final RecipientAddress address,
-            final ProfileKey profileKey,
-            final long lastUpdateTimestamp,
-            final LegacySignalProfile profile
-    ) {
-        this.address = address;
-        this.profileKey = profileKey;
-        this.lastUpdateTimestamp = lastUpdateTimestamp;
-        this.profile = profile;
-    }
-
-    public RecipientAddress getAddress() {
-        return address;
-    }
-
-    public ProfileKey getProfileKey() {
-        return profileKey;
-    }
-
-    public long getLastUpdateTimestamp() {
-        return lastUpdateTimestamp;
-    }
-
-    public LegacySignalProfile getProfile() {
-        return profile;
-    }
-}
+public record LegacySignalProfileEntry(
+        RecipientAddress address, ProfileKey profileKey, long lastUpdateTimestamp, LegacySignalProfile profile
+) {}

From 6f63346905bf481e108a338cdcfbe58c8da7bd32 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 30 Sep 2023 22:32:45 +0200
Subject: [PATCH 206/672] Fix log statement

---
 buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt b/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
index 3661a462..eb74acb2 100644
--- a/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
+++ b/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
@@ -36,7 +36,7 @@ class CheckLibVersionsPlugin : Plugin<Project> {
                 println("UPGRADE {\"group\": \"$group\", \"name\": \"$name\", \"current\": \"$version\", \"latest\": \"$newest\"}")
             }
         } catch (e: Throwable) {
-            logger.debug("Unable to download or parse $metaDataUrl: $e.message")
+            logger.debug("Unable to download or parse {}: {}", metaDataUrl, e.message)
         }
     }
 }

From 002a87d3baf8d9a2c1e3bfc8f3dde05ec891173f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 1 Oct 2023 16:01:46 +0200
Subject: [PATCH 207/672] Add pre key cleanup and improve refresh

---
 .../signal/manager/config/ServiceConfig.java  |   5 +
 .../signal/manager/helper/PreKeyHelper.java   | 186 +++++++++++-------
 .../manager/storage/AccountDatabase.java      |  12 +-
 .../signal/manager/storage/SignalAccount.java |  27 ++-
 .../storage/prekeys/KyberPreKeyStore.java     |  86 +++++++-
 .../manager/storage/prekeys/PreKeyStore.java  |  58 +++++-
 .../storage/prekeys/SignedPreKeyStore.java    |  29 +++
 .../storage/protocol/SignalProtocolStore.java |  14 +-
 8 files changed, 329 insertions(+), 88 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 5b6bce47..7b2ba140 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -11,6 +11,7 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.Interceptor;
 
@@ -19,6 +20,10 @@ public class ServiceConfig {
     public final static int PREKEY_MINIMUM_COUNT = 10;
     public final static int PREKEY_BATCH_SIZE = 100;
     public final static int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;
+    public static final long PREKEY_ARCHIVE_AGE = TimeUnit.DAYS.toMillis(30);
+    public static final long PREKEY_STALE_AGE = TimeUnit.DAYS.toMillis(90);
+    public static final long SIGNED_PREKEY_ROTATE_AGE = TimeUnit.DAYS.toMillis(2);
+
     public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
     public final static long MAX_ENVELOPE_SIZE = 0;
     public final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 54eab17b..34d11171 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -5,6 +5,7 @@ import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.InvalidKeyIdException;
 import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
@@ -18,6 +19,9 @@ import org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts;
 import java.io.IOException;
 import java.util.List;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_STALE_AGE;
+import static org.asamk.signal.manager.config.ServiceConfig.SIGNED_PREKEY_ROTATE_AGE;
+
 public class PreKeyHelper {
 
     private final static Logger logger = LoggerFactory.getLogger(PreKeyHelper.class);
@@ -38,30 +42,6 @@ public class PreKeyHelper {
     }
 
     public void refreshPreKeysIfNecessary(ServiceIdType serviceIdType) throws IOException {
-        OneTimePreKeyCounts preKeyCounts;
-        try {
-            preKeyCounts = dependencies.getAccountManager().getPreKeyCounts(serviceIdType);
-        } catch (AuthorizationFailedException e) {
-            logger.debug("Failed to get pre key count, ignoring: " + e.getClass().getSimpleName());
-            preKeyCounts = new OneTimePreKeyCounts(0, 0);
-        }
-        if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
-            logger.debug("Refreshing {} ec pre keys, because only {} of min {} pre keys remain",
-                    serviceIdType,
-                    preKeyCounts.getEcCount(),
-                    ServiceConfig.PREKEY_MINIMUM_COUNT);
-            refreshPreKeys(serviceIdType);
-        }
-        if (preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
-            logger.debug("Refreshing {} kyber pre keys, because only {} of min {} pre keys remain",
-                    serviceIdType,
-                    preKeyCounts.getKyberCount(),
-                    ServiceConfig.PREKEY_MINIMUM_COUNT);
-            refreshKyberPreKeys(serviceIdType);
-        }
-    }
-
-    private void refreshPreKeys(ServiceIdType serviceIdType) throws IOException {
         final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
         if (identityKeyPair == null) {
             return;
@@ -70,28 +50,73 @@ public class PreKeyHelper {
         if (accountId == null) {
             return;
         }
+
+        OneTimePreKeyCounts preKeyCounts;
         try {
-            refreshPreKeys(serviceIdType, identityKeyPair);
+            preKeyCounts = dependencies.getAccountManager().getPreKeyCounts(serviceIdType);
+        } catch (AuthorizationFailedException e) {
+            logger.debug("Failed to get pre key count, ignoring: " + e.getClass().getSimpleName());
+            preKeyCounts = new OneTimePreKeyCounts(0, 0);
+        }
+
+        SignedPreKeyRecord signedPreKeyRecord = null;
+        List<PreKeyRecord> preKeyRecords = null;
+        KyberPreKeyRecord lastResortKyberPreKeyRecord = null;
+        List<KyberPreKeyRecord> kyberPreKeyRecords = null;
+
+        try {
+            if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+                logger.debug("Refreshing {} ec pre keys, because only {} of min {} pre keys remain",
+                        serviceIdType,
+                        preKeyCounts.getEcCount(),
+                        ServiceConfig.PREKEY_MINIMUM_COUNT);
+                preKeyRecords = generatePreKeys(serviceIdType);
+            }
+            if (signedPreKeyNeedsRefresh(serviceIdType)) {
+                logger.debug("Refreshing {} signed pre key.", serviceIdType);
+                signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
+            }
         } catch (Exception e) {
             logger.warn("Failed to store new pre keys, resetting preKey id offset", e);
             account.resetPreKeyOffsets(serviceIdType);
-            refreshPreKeys(serviceIdType, identityKeyPair);
+            preKeyRecords = generatePreKeys(serviceIdType);
+            signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
         }
-    }
 
-    private void refreshPreKeys(
-            final ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
-    ) throws IOException {
-        final var oneTimePreKeys = generatePreKeys(serviceIdType);
-        final var signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
+        try {
+            if (preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+                logger.debug("Refreshing {} kyber pre keys, because only {} of min {} pre keys remain",
+                        serviceIdType,
+                        preKeyCounts.getKyberCount(),
+                        ServiceConfig.PREKEY_MINIMUM_COUNT);
+                kyberPreKeyRecords = generateKyberPreKeys(serviceIdType, identityKeyPair);
+            }
+            if (lastResortKyberPreKeyNeedsRefresh(serviceIdType)) {
+                logger.debug("Refreshing {} last resort kyber pre key.", serviceIdType);
+                lastResortKyberPreKeyRecord = generateLastResortKyberPreKey(serviceIdType, identityKeyPair);
+            }
+        } catch (Exception e) {
+            logger.warn("Failed to store new kyber pre keys, resetting preKey id offset", e);
+            account.resetKyberPreKeyOffsets(serviceIdType);
+            kyberPreKeyRecords = generateKyberPreKeys(serviceIdType, identityKeyPair);
+            lastResortKyberPreKeyRecord = generateLastResortKyberPreKey(serviceIdType, identityKeyPair);
+        }
 
-        final var preKeyUpload = new PreKeyUpload(serviceIdType,
-                identityKeyPair.getPublicKey(),
-                signedPreKeyRecord,
-                oneTimePreKeys,
-                null,
-                null);
-        dependencies.getAccountManager().setPreKeys(preKeyUpload);
+        if (signedPreKeyRecord != null
+                || preKeyRecords != null
+                || lastResortKyberPreKeyRecord != null
+                || kyberPreKeyRecords != null) {
+            final var preKeyUpload = new PreKeyUpload(serviceIdType,
+                    identityKeyPair.getPublicKey(),
+                    signedPreKeyRecord,
+                    preKeyRecords,
+                    lastResortKyberPreKeyRecord,
+                    kyberPreKeyRecords);
+            dependencies.getAccountManager().setPreKeys(preKeyUpload);
+        }
+
+        cleanSignedPreKeys((serviceIdType));
+        cleanOneTimePreKeys(serviceIdType);
     }
 
     private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) {
@@ -103,6 +128,21 @@ public class PreKeyHelper {
         return records;
     }
 
+    private boolean signedPreKeyNeedsRefresh(ServiceIdType serviceIdType) {
+        final var accountData = account.getAccountData(serviceIdType);
+
+        final var activeSignedPreKeyId = accountData.getPreKeyMetadata().getActiveSignedPreKeyId();
+        if (activeSignedPreKeyId == -1) {
+            return true;
+        }
+        try {
+            final var signedPreKeyRecord = accountData.getSignedPreKeyStore().loadSignedPreKey(activeSignedPreKeyId);
+            return signedPreKeyRecord.getTimestamp() < System.currentTimeMillis() - SIGNED_PREKEY_ROTATE_AGE;
+        } catch (InvalidKeyIdException e) {
+            return true;
+        }
+    }
+
     private SignedPreKeyRecord generateSignedPreKey(ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair) {
         final var signedPreKeyId = account.getNextSignedPreKeyId(serviceIdType);
 
@@ -112,39 +152,6 @@ public class PreKeyHelper {
         return record;
     }
 
-    private void refreshKyberPreKeys(ServiceIdType serviceIdType) throws IOException {
-        final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
-        if (identityKeyPair == null) {
-            return;
-        }
-        final var accountId = account.getAccountId(serviceIdType);
-        if (accountId == null) {
-            return;
-        }
-        try {
-            refreshKyberPreKeys(serviceIdType, identityKeyPair);
-        } catch (Exception e) {
-            logger.warn("Failed to store new pre keys, resetting preKey id offset", e);
-            account.resetKyberPreKeyOffsets(serviceIdType);
-            refreshKyberPreKeys(serviceIdType, identityKeyPair);
-        }
-    }
-
-    private void refreshKyberPreKeys(
-            final ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
-    ) throws IOException {
-        final var oneTimePreKeys = generateKyberPreKeys(serviceIdType, identityKeyPair);
-        final var lastResortPreKeyRecord = generateLastResortKyberPreKey(serviceIdType, identityKeyPair);
-
-        final var preKeyUpload = new PreKeyUpload(serviceIdType,
-                identityKeyPair.getPublicKey(),
-                null,
-                null,
-                lastResortPreKeyRecord,
-                oneTimePreKeys);
-        dependencies.getAccountManager().setPreKeys(preKeyUpload);
-    }
-
     private List<KyberPreKeyRecord> generateKyberPreKeys(
             ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
     ) {
@@ -156,6 +163,22 @@ public class PreKeyHelper {
         return records;
     }
 
+    private boolean lastResortKyberPreKeyNeedsRefresh(ServiceIdType serviceIdType) {
+        final var accountData = account.getAccountData(serviceIdType);
+
+        final var activeLastResortKyberPreKeyId = accountData.getPreKeyMetadata().getActiveLastResortKyberPreKeyId();
+        if (activeLastResortKyberPreKeyId == -1) {
+            return true;
+        }
+        try {
+            final var kyberPreKeyRecord = accountData.getKyberPreKeyStore()
+                    .loadKyberPreKey(activeLastResortKyberPreKeyId);
+            return kyberPreKeyRecord.getTimestamp() < System.currentTimeMillis() - SIGNED_PREKEY_ROTATE_AGE;
+        } catch (InvalidKeyIdException e) {
+            return true;
+        }
+    }
+
     private KyberPreKeyRecord generateLastResortKyberPreKey(
             ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair
     ) {
@@ -166,4 +189,23 @@ public class PreKeyHelper {
 
         return record;
     }
+
+    private void cleanSignedPreKeys(ServiceIdType serviceIdType) {
+        final var accountData = account.getAccountData(serviceIdType);
+
+        final var activeSignedPreKeyId = accountData.getPreKeyMetadata().getActiveSignedPreKeyId();
+        accountData.getSignedPreKeyStore().removeOldSignedPreKeys(activeSignedPreKeyId);
+
+        final var activeLastResortKyberPreKeyId = accountData.getPreKeyMetadata().getActiveLastResortKyberPreKeyId();
+        accountData.getKyberPreKeyStore().removeOldLastResortKyberPreKeys(activeLastResortKyberPreKeyId);
+    }
+
+    private void cleanOneTimePreKeys(ServiceIdType serviceIdType) {
+        long threshold = System.currentTimeMillis() - PREKEY_STALE_AGE;
+        int minCount = 200;
+
+        final var accountData = account.getAccountData(serviceIdType);
+        accountData.getPreKeyStore().deleteAllStaleOneTimeEcPreKeys(threshold, minCount);
+        accountData.getKyberPreKeyStore().deleteAllStaleOneTimeKyberPreKeys(threshold, minCount);
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index ee202d39..fb34b440 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -30,7 +30,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 15;
+    private static final long DATABASE_VERSION = 16;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -493,5 +493,15 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 16) {
+            logger.debug("Updating database: Adding stale_timestamp prekey field");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE pre_key ADD COLUMN stale_timestamp INTEGER;
+                                        ALTER TABLE kyber_pre_key ADD COLUMN stale_timestamp INTEGER;
+                                        ALTER TABLE kyber_pre_key ADD COLUMN timestamp INTEGER DEFAULT 0;
+                                        """);
+            }
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 3ff8a864..18a195e6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -622,6 +622,11 @@ public class SignalAccount implements Closeable {
         } else {
             aciAccountData.preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
         }
+        if (rootNode.hasNonNull("activeSignedPreKeyId")) {
+            aciAccountData.preKeyMetadata.activeSignedPreKeyId = rootNode.get("activeSignedPreKeyId").asInt(-1);
+        } else {
+            aciAccountData.preKeyMetadata.activeSignedPreKeyId = -1;
+        }
         if (rootNode.hasNonNull("pniPreKeyIdOffset")) {
             pniAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("pniPreKeyIdOffset").asInt(1);
         } else {
@@ -632,6 +637,11 @@ public class SignalAccount implements Closeable {
         } else {
             pniAccountData.preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
         }
+        if (rootNode.hasNonNull("pniActiveSignedPreKeyId")) {
+            pniAccountData.preKeyMetadata.activeSignedPreKeyId = rootNode.get("pniActiveSignedPreKeyId").asInt(-1);
+        } else {
+            pniAccountData.preKeyMetadata.activeSignedPreKeyId = -1;
+        }
         if (rootNode.hasNonNull("kyberPreKeyIdOffset")) {
             aciAccountData.preKeyMetadata.kyberPreKeyIdOffset = rootNode.get("kyberPreKeyIdOffset").asInt(1);
         } else {
@@ -1003,8 +1013,10 @@ public class SignalAccount implements Closeable {
                     .put("storageManifestVersion", storageManifestVersion == -1 ? null : storageManifestVersion)
                     .put("preKeyIdOffset", aciAccountData.getPreKeyMetadata().preKeyIdOffset)
                     .put("nextSignedPreKeyId", aciAccountData.getPreKeyMetadata().nextSignedPreKeyId)
+                    .put("activeSignedPreKeyId", aciAccountData.getPreKeyMetadata().activeSignedPreKeyId)
                     .put("pniPreKeyIdOffset", pniAccountData.getPreKeyMetadata().preKeyIdOffset)
                     .put("pniNextSignedPreKeyId", pniAccountData.getPreKeyMetadata().nextSignedPreKeyId)
+                    .put("pniActiveSignedPreKeyId", pniAccountData.getPreKeyMetadata().activeSignedPreKeyId)
                     .put("kyberPreKeyIdOffset", aciAccountData.getPreKeyMetadata().kyberPreKeyIdOffset)
                     .put("activeLastResortKyberPreKeyId",
                             aciAccountData.getPreKeyMetadata().activeLastResortKyberPreKeyId)
@@ -1058,6 +1070,7 @@ public class SignalAccount implements Closeable {
         final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
         preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
         preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
+        preKeyMetadata.activeSignedPreKeyId = -1;
         save();
     }
 
@@ -1072,6 +1085,7 @@ public class SignalAccount implements Closeable {
                 records.size(),
                 serviceIdType,
                 preKeyMetadata.preKeyIdOffset);
+        accountData.signalProtocolStore.markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
         for (var record : records) {
             if (preKeyMetadata.preKeyIdOffset != record.getId()) {
                 logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.preKeyIdOffset);
@@ -1095,6 +1109,7 @@ public class SignalAccount implements Closeable {
         }
         accountData.getSignedPreKeyStore().storeSignedPreKey(record.getId(), record);
         preKeyMetadata.nextSignedPreKeyId = (preKeyMetadata.nextSignedPreKeyId + 1) % PREKEY_MAXIMUM_ID;
+        preKeyMetadata.activeSignedPreKeyId = record.getId();
         save();
     }
 
@@ -1112,6 +1127,7 @@ public class SignalAccount implements Closeable {
                 records.size(),
                 serviceIdType,
                 preKeyMetadata.kyberPreKeyIdOffset);
+        accountData.signalProtocolStore.markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
         for (var record : records) {
             if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
                 logger.error("Invalid kyber pre key id {}, expected {}",
@@ -1745,6 +1761,7 @@ public class SignalAccount implements Closeable {
 
         private int preKeyIdOffset = 1;
         private int nextSignedPreKeyId = 1;
+        private int activeSignedPreKeyId = -1;
         private int kyberPreKeyIdOffset = 1;
         private int activeLastResortKyberPreKeyId = -1;
 
@@ -1756,6 +1773,10 @@ public class SignalAccount implements Closeable {
             return nextSignedPreKeyId;
         }
 
+        public int getActiveSignedPreKeyId() {
+            return activeSignedPreKeyId;
+        }
+
         public int getKyberPreKeyIdOffset() {
             return kyberPreKeyIdOffset;
         }
@@ -1819,17 +1840,17 @@ public class SignalAccount implements Closeable {
                             SignalAccount.this::isMultiDevice));
         }
 
-        private PreKeyStore getPreKeyStore() {
+        public PreKeyStore getPreKeyStore() {
             return getOrCreate(() -> preKeyStore,
                     () -> preKeyStore = new PreKeyStore(getAccountDatabase(), serviceIdType));
         }
 
-        private SignedPreKeyStore getSignedPreKeyStore() {
+        public SignedPreKeyStore getSignedPreKeyStore() {
             return getOrCreate(() -> signedPreKeyStore,
                     () -> signedPreKeyStore = new SignedPreKeyStore(getAccountDatabase(), serviceIdType));
         }
 
-        private KyberPreKeyStore getKyberPreKeyStore() {
+        public KyberPreKeyStore getKyberPreKeyStore() {
             return getOrCreate(() -> kyberPreKeyStore,
                     () -> kyberPreKeyStore = new KyberPreKeyStore(getAccountDatabase(), serviceIdType));
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
index 9ce660b2..4067e2fe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
@@ -15,6 +15,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_ARCHIVE_AGE;
+
 public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
 
     private static final String TABLE_KYBER_PRE_KEY = "kyber_pre_key";
@@ -33,6 +35,8 @@ public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
                                       key_id INTEGER NOT NULL,
                                       serialized BLOB NOT NULL,
                                       is_last_resort INTEGER NOT NULL,
+                                      stale_timestamp INTEGER,
+                                      timestamp INTEGER DEFAULT 0,
                                       UNIQUE(account_id_type, key_id)
                                     ) STRICT;
                                     """);
@@ -104,8 +108,8 @@ public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
     public void storeKyberPreKey(final int keyId, final KyberPreKeyRecord record, final boolean isLastResort) {
         final var sql = (
                 """
-                INSERT INTO %s (account_id_type, key_id, serialized, is_last_resort)
-                VALUES (?, ?, ?, ?)
+                INSERT INTO %s (account_id_type, key_id, serialized, is_last_resort, timestamp)
+                VALUES (?, ?, ?, ?, ?)
                 """
         ).formatted(TABLE_KYBER_PRE_KEY);
         try (final var connection = database.getConnection()) {
@@ -114,6 +118,7 @@ public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
                 statement.setInt(2, keyId);
                 statement.setBytes(3, record.serialize());
                 statement.setBoolean(4, isLastResort);
+                statement.setLong(5, record.getTimestamp());
                 statement.executeUpdate();
             }
         } catch (SQLException e) {
@@ -209,13 +214,86 @@ public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
         }
     }
 
+    public void removeOldLastResortKyberPreKeys(int activeLastResortKyberPreKeyId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p._id IN (
+                    SELECT p._id
+                    FROM %s AS p
+                    WHERE p.account_id_type = ?
+                        AND p.is_last_resort = TRUE
+                        AND p.key_id != ?
+                        AND p.timestamp < ?
+                    ORDER BY p.timestamp DESC
+                    LIMIT -1 OFFSET 1
+                )
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY, TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, activeLastResortKyberPreKeyId);
+                statement.setLong(3, System.currentTimeMillis() - PREKEY_ARCHIVE_AGE);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
+    }
+
     @Override
     public void deleteAllStaleOneTimeKyberPreKeys(final long threshold, final int minCount) {
-        //TODO
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ?1
+                    AND p.stale_timestamp < ?2
+                    AND p.is_last_resort = FALSE
+                    AND p._id NOT IN (
+                        SELECT _id
+                        FROM %s p2
+                        WHERE p2.account_id_type = ?1
+                        ORDER BY
+                          CASE WHEN p2.stale_timestamp IS NULL THEN 1 ELSE 0 END DESC,
+                          p2.stale_timestamp DESC,
+                          p2._id DESC
+                        LIMIT ?3
+                    )
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY, TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setLong(2, threshold);
+                statement.setInt(3, minCount);
+                final var rowCount = statement.executeUpdate();
+                if (rowCount > 0) {
+                    logger.debug("Deleted {} stale one time kyber pre keys", rowCount);
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
     }
 
     @Override
     public void markAllOneTimeKyberPreKeysStaleIfNecessary(final long staleTime) {
-        //TODO
+        final var sql = (
+                """
+                UPDATE %s
+                SET stale_timestamp = ?
+                WHERE account_id_type = ? AND stale_timestamp IS NULL AND is_last_resort = FALSE
+                """
+        ).formatted(TABLE_KYBER_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setLong(1, staleTime);
+                statement.setInt(2, accountIdType);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update kyber_pre_key store", e);
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
index f6dc271e..c3ac9632 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
@@ -9,6 +9,7 @@ import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.SignalServicePreKeyStore;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 
 import java.sql.Connection;
@@ -16,7 +17,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
 
-public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeyStore {
+public class PreKeyStore implements SignalServicePreKeyStore {
 
     private static final String TABLE_PRE_KEY = "pre_key";
     private final static Logger logger = LoggerFactory.getLogger(PreKeyStore.class);
@@ -34,6 +35,7 @@ public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeySt
                                       key_id INTEGER NOT NULL,
                                       public_key BLOB NOT NULL,
                                       private_key BLOB NOT NULL,
+                                      stale_timestamp INTEGER,
                                       UNIQUE(account_id_type, key_id)
                                     ) STRICT;
                                     """);
@@ -181,4 +183,58 @@ public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeySt
             return null;
         }
     }
+
+    @Override
+    public void deleteAllStaleOneTimeEcPreKeys(final long threshold, final int minCount) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p.account_id_type = ?1
+                    AND p.stale_timestamp < ?2
+                    AND p._id NOT IN (
+                        SELECT _id
+                        FROM %s AS p2
+                        WHERE p2.account_id_type = ?1
+                        ORDER BY
+                          CASE WHEN p2.stale_timestamp IS NULL THEN 1 ELSE 0 END DESC,
+                          p2.stale_timestamp DESC,
+                          p2._id DESC
+                        LIMIT ?3
+                    )
+                """
+        ).formatted(TABLE_PRE_KEY, TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setLong(2, threshold);
+                statement.setInt(3, minCount);
+                final var rowCount = statement.executeUpdate();
+                if (rowCount > 0) {
+                    logger.debug("Deleted {} stale one time pre keys", rowCount);
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update pre_key store", e);
+        }
+    }
+
+    @Override
+    public void markAllOneTimeEcPreKeysStaleIfNecessary(final long staleTime) {
+        final var sql = (
+                """
+                UPDATE %s
+                SET stale_timestamp = ?
+                WHERE account_id_type = ? AND stale_timestamp IS NULL
+                """
+        ).formatted(TABLE_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setLong(1, staleTime);
+                statement.setInt(2, accountIdType);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update pre_key store", e);
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
index d618f6c3..7c726f16 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
@@ -18,6 +18,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_ARCHIVE_AGE;
+
 public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.SignedPreKeyStore {
 
     private static final String TABLE_SIGNED_PRE_KEY = "signed_pre_key";
@@ -144,6 +146,33 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
         }
     }
 
+    public void removeOldSignedPreKeys(int activePreKeyId) {
+        final var sql = (
+                """
+                DELETE FROM %s AS p
+                WHERE p._id IN (
+                    SELECT p._id
+                    FROM %s AS p
+                    WHERE p.account_id_type = ?
+                        AND p.key_id != ?
+                        AND p.timestamp < ?
+                    ORDER BY p.timestamp DESC
+                    LIMIT -1 OFFSET 1
+                )
+                """
+        ).formatted(TABLE_SIGNED_PRE_KEY, TABLE_SIGNED_PRE_KEY);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setInt(1, accountIdType);
+                statement.setInt(2, activePreKeyId);
+                statement.setLong(3, System.currentTimeMillis() - PREKEY_ARCHIVE_AGE);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update signed_pre_key store", e);
+        }
+    }
+
     void addLegacySignedPreKeys(final Collection<SignedPreKeyRecord> signedPreKeys) {
         logger.debug("Migrating legacy signedPreKeys to database");
         long start = System.nanoTime();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index f042f0e2..ea1a5c6f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -9,12 +9,12 @@ import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
 import org.signal.libsignal.protocol.state.IdentityKeyStore;
 import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
-import org.signal.libsignal.protocol.state.PreKeyStore;
 import org.signal.libsignal.protocol.state.SessionRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
 import org.whispersystems.signalservice.api.SignalServiceKyberPreKeyStore;
+import org.whispersystems.signalservice.api.SignalServicePreKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceSenderKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceSessionStore;
 import org.whispersystems.signalservice.api.push.DistributionId;
@@ -27,7 +27,7 @@ import java.util.function.Supplier;
 
 public class SignalProtocolStore implements SignalServiceAccountDataStore {
 
-    private final PreKeyStore preKeyStore;
+    private final SignalServicePreKeyStore preKeyStore;
     private final SignedPreKeyStore signedPreKeyStore;
     private final SignalServiceKyberPreKeyStore kyberPreKeyStore;
     private final SignalServiceSessionStore sessionStore;
@@ -36,7 +36,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     private final Supplier<Boolean> isMultiDevice;
 
     public SignalProtocolStore(
-            final PreKeyStore preKeyStore,
+            final SignalServicePreKeyStore preKeyStore,
             final SignedPreKeyStore signedPreKeyStore,
             final SignalServiceKyberPreKeyStore kyberPreKeyStore,
             final SignalServiceSessionStore sessionStore,
@@ -254,12 +254,12 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     }
 
     @Override
-    public void deleteAllStaleOneTimeEcPreKeys(final long l, final int i) {
-        // TODO
+    public void deleteAllStaleOneTimeEcPreKeys(final long threshold, final int minCount) {
+        preKeyStore.deleteAllStaleOneTimeEcPreKeys(threshold, minCount);
     }
 
     @Override
-    public void markAllOneTimeEcPreKeysStaleIfNecessary(final long l) {
-        // TODO
+    public void markAllOneTimeEcPreKeysStaleIfNecessary(final long staleTime) {
+        preKeyStore.markAllOneTimeEcPreKeysStaleIfNecessary(staleTime);
     }
 }

From 6b2de3a24d737502000366ef4aa6c97b80e23c53 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 1 Oct 2023 16:30:14 +0200
Subject: [PATCH 208/672] Reduce hikari logging noise

---
 src/main/java/org/asamk/signal/logging/LogConfigurator.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index dc4d3648..943f9929 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -48,6 +48,8 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         rootLogger.addAppender(consoleAppender);
 
         lc.getLogger("org.asamk").setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO);
+        lc.getLogger("com.zaxxer.hikari.pool.PoolBase")
+                .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN);
 
         if (logFile != null) {
             consoleAppender.addFilter(new Filter<>() {

From 310aadbdc07c49cc2386096dd5ca3a89b24cd11d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 1 Oct 2023 17:06:07 +0200
Subject: [PATCH 209/672] Fix handling edit message

---
 graalvm-config-dir/reflect-config.json           |  6 ++++++
 graalvm-config-dir/resource-config.json          | 16 ++++++++++++++++
 .../manager/helper/IncomingMessageHandler.java   |  6 ++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 442ad3c2..3125a44e 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -426,6 +426,9 @@
 {
   "name":"javax.smartcardio.CardPermission"
 },
+{
+  "name":"jdk.internal.misc.Unsafe"
+},
 {
   "name":"kotlin.Any"
 },
@@ -1485,6 +1488,9 @@
   "name":"org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi.Std"
+},
 {
   "name":"org.bouncycastle.jcajce.provider.symmetric.AES$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 8d629bae..e6451e63 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -4,12 +4,26 @@
     "pattern":"\\QMETA-INF/maven/org.xerial/sqlite-jdbc/pom.properties\\E"
   }, {
     "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.net.spi.InetAddressResolverProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.net.spi.URLStreamHandlerProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.sql.Driver\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.util.spi.ResourceBundleControlProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoader\\E"
   }, {
     "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.util.ModuleVisibilityHelper\\E"
   }, {
     "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
   }, {
@@ -180,6 +194,8 @@
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/nfc.nrm\\E"
   }, {
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/uprops.icu\\E"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/uprops.icu\\E"
   }, {
     "pattern":"java.base:\\Qsun/net/idn/uidna.spp\\E"
   }, {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 51b7c523..9d69632e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -344,8 +344,10 @@ public final class IncomingMessageHandler {
             }
         }
 
-        if (content.getDataMessage().isPresent()) {
-            var message = content.getDataMessage().get();
+        if (content.getDataMessage().isPresent() || content.getEditMessage().isPresent()) {
+            var message = content.getDataMessage().isPresent()
+                    ? content.getDataMessage().get()
+                    : content.getEditMessage().get().getDataMessage();
 
             if (content.isNeedsReceipt()) {
                 actions.add(new SendReceiptAction(sender,

From 7f83bfefd6531cd9d9390dcf4a7673c2f368d57d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 2 Oct 2023 12:09:41 +0200
Subject: [PATCH 210/672] Reorganize SignalAccount

---
 .../signal/manager/helper/PreKeyHelper.java   |  12 +-
 .../signal/manager/storage/SignalAccount.java | 282 ++++++++----------
 2 files changed, 138 insertions(+), 156 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 34d11171..e06ebbc1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -120,7 +120,8 @@ public class PreKeyHelper {
     }
 
     private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) {
-        final var offset = account.getPreKeyIdOffset(serviceIdType);
+        final var accountData = account.getAccountData(serviceIdType);
+        final var offset = accountData.getPreKeyMetadata().getPreKeyIdOffset();
 
         var records = KeyUtils.generatePreKeyRecords(offset);
         account.addPreKeys(serviceIdType, records);
@@ -144,7 +145,8 @@ public class PreKeyHelper {
     }
 
     private SignedPreKeyRecord generateSignedPreKey(ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair) {
-        final var signedPreKeyId = account.getNextSignedPreKeyId(serviceIdType);
+        final var accountData = account.getAccountData(serviceIdType);
+        final var signedPreKeyId = accountData.getPreKeyMetadata().getNextSignedPreKeyId();
 
         var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair);
         account.addSignedPreKey(serviceIdType, record);
@@ -155,7 +157,8 @@ public class PreKeyHelper {
     private List<KyberPreKeyRecord> generateKyberPreKeys(
             ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
     ) {
-        final var offset = account.getKyberPreKeyIdOffset(serviceIdType);
+        final var accountData = account.getAccountData(serviceIdType);
+        final var offset = accountData.getPreKeyMetadata().getKyberPreKeyIdOffset();
 
         var records = KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey());
         account.addKyberPreKeys(serviceIdType, records);
@@ -182,7 +185,8 @@ public class PreKeyHelper {
     private KyberPreKeyRecord generateLastResortKyberPreKey(
             ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair
     ) {
-        final var signedPreKeyId = account.getKyberPreKeyIdOffset(serviceIdType);
+        final var accountData = account.getAccountData(serviceIdType);
+        final var signedPreKeyId = accountData.getPreKeyMetadata().getKyberPreKeyIdOffset();
 
         var record = KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
         account.addLastResortKyberPreKey(serviceIdType, record);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 18a195e6..aef1d1c9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -120,25 +120,27 @@ public class SignalAccount implements Closeable {
 
     private File dataPath;
     private String accountPath;
+
     private ServiceEnvironment serviceEnvironment;
     private String number;
     private String username;
     private ACI aci;
     private PNI pni;
-    private String sessionId;
-    private String sessionNumber;
     private String encryptedDeviceName;
     private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
-    private boolean isMultiDevice = false;
     private String password;
     private String registrationLockPin;
     private MasterKey pinMasterKey;
     private StorageKey storageKey;
-    private long storageManifestVersion = -1;
     private ProfileKey profileKey;
-    private Settings settings;
-    private long lastReceiveTimestamp = 0;
 
+    private Settings settings;
+
+    private String sessionId;
+    private String sessionNumber;
+    private long lastReceiveTimestamp = 0;
+    private long storageManifestVersion = -1;
+    private boolean isMultiDevice = false;
     private boolean registered = false;
 
     private final AccountData aciAccountData = new AccountData(ServiceIdType.ACI);
@@ -225,6 +227,57 @@ public class SignalAccount implements Closeable {
         return signalAccount;
     }
 
+    private static SignalAccount createLinkedAccount(
+            File dataPath,
+            String accountPath,
+            String number,
+            ServiceEnvironment serviceEnvironment,
+            ACI aci,
+            PNI pni,
+            String password,
+            String encryptedDeviceName,
+            int deviceId,
+            IdentityKeyPair aciIdentityKey,
+            IdentityKeyPair pniIdentityKey,
+            int registrationId,
+            int pniRegistrationId,
+            ProfileKey profileKey,
+            final Settings settings
+    ) throws IOException {
+        var fileName = getFileName(dataPath, accountPath);
+        IOUtils.createPrivateFile(fileName);
+
+        final var pair = openFileChannel(fileName, true);
+        var signalAccount = new SignalAccount(pair.first(), pair.second());
+
+        signalAccount.dataPath = dataPath;
+        signalAccount.accountPath = accountPath;
+        signalAccount.serviceEnvironment = serviceEnvironment;
+        signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
+        signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
+        signalAccount.settings = settings;
+        signalAccount.setProvisioningData(number,
+                aci,
+                pni,
+                password,
+                encryptedDeviceName,
+                deviceId,
+                aciIdentityKey,
+                pniIdentityKey,
+                profileKey);
+
+        signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
+
+        signalAccount.getRecipientTrustedResolver()
+                .resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
+        signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
+        signalAccount.migrateLegacyConfigs();
+        signalAccount.clearAllPreKeys();
+        signalAccount.save();
+
+        return signalAccount;
+    }
+
     public static SignalAccount createOrUpdateLinkedAccount(
             File dataPath,
             String accountPath,
@@ -281,92 +334,6 @@ public class SignalAccount implements Closeable {
         return signalAccount;
     }
 
-    public void initDatabase() {
-        getAccountDatabase();
-    }
-
-    private void clearAllPreKeys() {
-        clearAllPreKeys(ServiceIdType.ACI);
-        clearAllPreKeys(ServiceIdType.PNI);
-    }
-
-    private void clearAllPreKeys(ServiceIdType serviceIdType) {
-        final var accountData = getAccountData(serviceIdType);
-        resetPreKeyOffsets(serviceIdType);
-        resetKyberPreKeyOffsets(serviceIdType);
-        accountData.getPreKeyStore().removeAllPreKeys();
-        accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
-        accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
-        save();
-    }
-
-    private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyCollection) {
-        final var accountData = getAccountData(serviceIdType);
-        final var preKeyMetadata = accountData.getPreKeyMetadata();
-        preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getSignedPreKey().getId();
-        preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getLastResortKyberPreKey().getId();
-
-        accountData.getPreKeyStore().removeAllPreKeys();
-        accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
-        accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
-
-        addSignedPreKey(serviceIdType, preKeyCollection.getSignedPreKey());
-        addLastResortKyberPreKey(serviceIdType, preKeyCollection.getLastResortKyberPreKey());
-
-        save();
-    }
-
-    private static SignalAccount createLinkedAccount(
-            File dataPath,
-            String accountPath,
-            String number,
-            ServiceEnvironment serviceEnvironment,
-            ACI aci,
-            PNI pni,
-            String password,
-            String encryptedDeviceName,
-            int deviceId,
-            IdentityKeyPair aciIdentityKey,
-            IdentityKeyPair pniIdentityKey,
-            int registrationId,
-            int pniRegistrationId,
-            ProfileKey profileKey,
-            final Settings settings
-    ) throws IOException {
-        var fileName = getFileName(dataPath, accountPath);
-        IOUtils.createPrivateFile(fileName);
-
-        final var pair = openFileChannel(fileName, true);
-        var signalAccount = new SignalAccount(pair.first(), pair.second());
-
-        signalAccount.dataPath = dataPath;
-        signalAccount.accountPath = accountPath;
-        signalAccount.serviceEnvironment = serviceEnvironment;
-        signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
-        signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
-        signalAccount.settings = settings;
-        signalAccount.setProvisioningData(number,
-                aci,
-                pni,
-                password,
-                encryptedDeviceName,
-                deviceId,
-                aciIdentityKey,
-                pniIdentityKey,
-                profileKey);
-
-        signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
-
-        signalAccount.getRecipientTrustedResolver()
-                .resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
-        signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
-        signalAccount.migrateLegacyConfigs();
-        signalAccount.clearAllPreKeys();
-        signalAccount.save();
-
-        return signalAccount;
-    }
-
     private void setProvisioningData(
             final String number,
             final ACI aci,
@@ -399,6 +366,42 @@ public class SignalAccount implements Closeable {
         trustSelfIdentity(ServiceIdType.PNI);
     }
 
+    public void finishRegistration(
+            final ACI aci,
+            final PNI pni,
+            final MasterKey masterKey,
+            final String pin,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
+    ) {
+        this.pinMasterKey = masterKey;
+        this.storageManifestVersion = -1;
+        this.setStorageManifest(null);
+        this.storageKey = null;
+        this.encryptedDeviceName = null;
+        this.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
+        this.isMultiDevice = false;
+        this.registered = true;
+        this.aci = aci;
+        this.pni = pni;
+        this.registrationLockPin = pin;
+        this.lastReceiveTimestamp = 0;
+        save();
+
+        setPreKeys(ServiceIdType.ACI, aciPreKeys);
+        setPreKeys(ServiceIdType.PNI, pniPreKeys);
+        aciAccountData.getSessionStore().archiveAllSessions();
+        pniAccountData.getSessionStore().archiveAllSessions();
+        getSenderKeyStore().deleteAll();
+        getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
+        trustSelfIdentity(ServiceIdType.ACI);
+        trustSelfIdentity(ServiceIdType.PNI);
+    }
+
+    public void initDatabase() {
+        getAccountDatabase();
+    }
+
     private void migrateLegacyConfigs() {
         if (getPassword() == null) {
             setPassword(KeyUtils.createPassword());
@@ -1066,6 +1069,37 @@ public class SignalAccount implements Closeable {
         }
     }
 
+    private void clearAllPreKeys() {
+        clearAllPreKeys(ServiceIdType.ACI);
+        clearAllPreKeys(ServiceIdType.PNI);
+    }
+
+    private void clearAllPreKeys(ServiceIdType serviceIdType) {
+        final var accountData = getAccountData(serviceIdType);
+        resetPreKeyOffsets(serviceIdType);
+        resetKyberPreKeyOffsets(serviceIdType);
+        accountData.getPreKeyStore().removeAllPreKeys();
+        accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
+        accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
+        save();
+    }
+
+    private void setPreKeys(ServiceIdType serviceIdType, PreKeyCollection preKeyCollection) {
+        final var accountData = getAccountData(serviceIdType);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+        preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getSignedPreKey().getId();
+        preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getLastResortKyberPreKey().getId();
+
+        accountData.getPreKeyStore().removeAllPreKeys();
+        accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
+        accountData.getKyberPreKeyStore().removeAllKyberPreKeys();
+
+        addSignedPreKey(serviceIdType, preKeyCollection.getSignedPreKey());
+        addLastResortKyberPreKey(serviceIdType, preKeyCollection.getLastResortKyberPreKey());
+
+        save();
+    }
+
     public void resetPreKeyOffsets(final ServiceIdType serviceIdType) {
         final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
         preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
@@ -1344,7 +1378,7 @@ public class SignalAccount implements Closeable {
 
     public AccountAttributes getAccountAttributes(String registrationLock) {
         return new AccountAttributes(null,
-                getLocalRegistrationId(),
+                aciAccountData.getLocalRegistrationId(),
                 false,
                 false,
                 true,
@@ -1354,7 +1388,7 @@ public class SignalAccount implements Closeable {
                 isDiscoverableByPhoneNumber(),
                 getAccountCapabilities(),
                 encryptedDeviceName,
-                getLocalPniRegistrationId(),
+                pniAccountData.getLocalRegistrationId(),
                 null); // TODO recoveryPassword?
     }
 
@@ -1398,7 +1432,7 @@ public class SignalAccount implements Closeable {
             final int localPniRegistrationId
     ) {
         setPniIdentityKeyPair(pniIdentityKeyPair);
-        setLocalPniRegistrationId(localPniRegistrationId);
+        pniAccountData.setLocalRegistrationId(localPniRegistrationId);
 
         final var preKeyMetadata = getAccountData(ServiceIdType.PNI).getPreKeyMetadata();
         preKeyMetadata.nextSignedPreKeyId = pniSignedPreKey.getId();
@@ -1407,6 +1441,7 @@ public class SignalAccount implements Closeable {
             preKeyMetadata.kyberPreKeyIdOffset = lastResortKyberPreKey.getId();
             addLastResortKyberPreKey(ServiceIdType.PNI, lastResortKyberPreKey);
         }
+        save();
     }
 
     public SignalServiceAddress getSelfAddress() {
@@ -1465,19 +1500,6 @@ public class SignalAccount implements Closeable {
         save();
     }
 
-    public int getLocalRegistrationId() {
-        return aciAccountData.getLocalRegistrationId();
-    }
-
-    public int getLocalPniRegistrationId() {
-        return pniAccountData.getLocalRegistrationId();
-    }
-
-    public void setLocalPniRegistrationId(final int localPniRegistrationId) {
-        pniAccountData.setLocalRegistrationId(localPniRegistrationId);
-        save();
-    }
-
     public String getPassword() {
         return password;
     }
@@ -1604,18 +1626,6 @@ public class SignalAccount implements Closeable {
         return UnidentifiedAccess.deriveAccessKeyFrom(getProfileKey());
     }
 
-    public int getPreKeyIdOffset(ServiceIdType serviceIdType) {
-        return getAccountData(serviceIdType).getPreKeyMetadata().preKeyIdOffset;
-    }
-
-    public int getNextSignedPreKeyId(ServiceIdType serviceIdType) {
-        return getAccountData(serviceIdType).getPreKeyMetadata().nextSignedPreKeyId;
-    }
-
-    public int getKyberPreKeyIdOffset(ServiceIdType serviceIdType) {
-        return getAccountData(serviceIdType).getPreKeyMetadata().kyberPreKeyIdOffset;
-    }
-
     public boolean isRegistered() {
         return registered;
     }
@@ -1656,38 +1666,6 @@ public class SignalAccount implements Closeable {
         return phoneNumberUnlisted == null || !phoneNumberUnlisted;
     }
 
-    public void finishRegistration(
-            final ACI aci,
-            final PNI pni,
-            final MasterKey masterKey,
-            final String pin,
-            final PreKeyCollection aciPreKeys,
-            final PreKeyCollection pniPreKeys
-    ) {
-        this.pinMasterKey = masterKey;
-        this.storageManifestVersion = -1;
-        this.setStorageManifest(null);
-        this.storageKey = null;
-        this.encryptedDeviceName = null;
-        this.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
-        this.isMultiDevice = false;
-        this.registered = true;
-        this.aci = aci;
-        this.pni = pni;
-        this.registrationLockPin = pin;
-        this.lastReceiveTimestamp = 0;
-        save();
-
-        setPreKeys(ServiceIdType.ACI, aciPreKeys);
-        setPreKeys(ServiceIdType.PNI, pniPreKeys);
-        aciAccountData.getSessionStore().archiveAllSessions();
-        pniAccountData.getSessionStore().archiveAllSessions();
-        getSenderKeyStore().deleteAll();
-        getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
-        trustSelfIdentity(ServiceIdType.ACI);
-        trustSelfIdentity(ServiceIdType.PNI);
-    }
-
     private void trustSelfIdentity(ServiceIdType serviceIdType) {
         final var accountData = getAccountData(serviceIdType);
         final var serviceId = accountData.getServiceId();

From 90ec01bfbfee85acc1b3a26e741e439895781cd7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 4 Oct 2023 17:10:16 +0200
Subject: [PATCH 211/672] Only output username if set

---
 .../java/org/asamk/signal/commands/UpdateAccountCommand.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index 2bb2d110..9a67d417 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.commands;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
@@ -71,6 +73,6 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
     }
 
     private record JsonAccountResponse(
-            String username
+            @JsonInclude(JsonInclude.Include.NON_NULL) String username
     ) {}
 }

From c0f771684d517bfd16ea5519dfb555da6a15e09e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 4 Oct 2023 19:44:45 +0200
Subject: [PATCH 212/672] Move configuration store to db

---
 graalvm-config-dir/reflect-config.json        |   7 +
 .../manager/storage/AccountDatabase.java      |  14 +-
 .../signal/manager/storage/SignalAccount.java |  34 ++--
 .../configuration/ConfigurationStore.java     | 101 ++++--------
 .../LegacyConfigurationStore.java             |  33 ++++
 .../storage/keyValue/KeyValueEntry.java       |   8 +
 .../storage/keyValue/KeyValueStore.java       | 153 ++++++++++++++++++
 7 files changed, 264 insertions(+), 86 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/configuration/LegacyConfigurationStore.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueEntry.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 3125a44e..98af166e 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1111,6 +1111,13 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }, {"name":"linkPreviews","parameterTypes":[] }, {"name":"phoneNumberSharingMode","parameterTypes":[] }, {"name":"phoneNumberUnlisted","parameterTypes":[] }, {"name":"readReceipts","parameterTypes":[] }, {"name":"typingIndicators","parameterTypes":[] }, {"name":"unidentifiedDeliveryIndicators","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.manager.storage.configuration.LegacyConfigurationStore$Storage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","java.lang.Boolean","org.asamk.signal.manager.api.PhoneNumberSharingMode"] }]
+},
 {
   "name":"org.asamk.signal.manager.storage.contacts.LegacyContactInfo",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index fb34b440..d9839a18 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -30,7 +30,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 16;
+    private static final long DATABASE_VERSION = 17;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -503,5 +503,17 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 17) {
+            logger.debug("Updating database: Adding key_value table");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE key_value (
+                                                _id INTEGER PRIMARY KEY,
+                                                key TEXT UNIQUE NOT NULL,
+                                                value ANY
+                                        ) STRICT;
+                                        """);
+            }
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index aef1d1c9..16017d5e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -12,6 +12,7 @@ import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.configuration.ConfigurationStore;
+import org.asamk.signal.manager.storage.configuration.LegacyConfigurationStore;
 import org.asamk.signal.manager.storage.contacts.ContactsStore;
 import org.asamk.signal.manager.storage.contacts.LegacyJsonContactsStore;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
@@ -20,6 +21,7 @@ import org.asamk.signal.manager.storage.groups.LegacyGroupStore;
 import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
 import org.asamk.signal.manager.storage.identities.LegacyIdentityKeyStore;
 import org.asamk.signal.manager.storage.identities.SignalIdentityKeyStore;
+import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
 import org.asamk.signal.manager.storage.messageCache.MessageCache;
 import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.LegacyPreKeyStore;
@@ -151,7 +153,7 @@ public class SignalAccount implements Closeable {
     private RecipientStore recipientStore;
     private StickerStore stickerStore;
     private ConfigurationStore configurationStore;
-    private ConfigurationStore.Storage configurationStoreStorage;
+    private KeyValueStore keyValueStore;
 
     private MessageCache messageCache;
     private MessageSendLogStore messageSendLogStore;
@@ -216,7 +218,6 @@ public class SignalAccount implements Closeable {
         signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
         signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
         signalAccount.settings = settings;
-        signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
 
         signalAccount.registered = false;
 
@@ -266,8 +267,6 @@ public class SignalAccount implements Closeable {
                 pniIdentityKey,
                 profileKey);
 
-        signalAccount.configurationStore = new ConfigurationStore(signalAccount::saveConfigurationStore);
-
         signalAccount.getRecipientTrustedResolver()
                 .resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
         signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
@@ -774,12 +773,10 @@ public class SignalAccount implements Closeable {
         }
 
         if (rootNode.hasNonNull("configurationStore")) {
-            configurationStoreStorage = jsonProcessor.convertValue(rootNode.get("configurationStore"),
-                    ConfigurationStore.Storage.class);
-            configurationStore = ConfigurationStore.fromStorage(configurationStoreStorage,
-                    this::saveConfigurationStore);
-        } else {
-            configurationStore = new ConfigurationStore(this::saveConfigurationStore);
+            final var configurationStoreStorage = jsonProcessor.convertValue(rootNode.get("configurationStore"),
+                    LegacyConfigurationStore.Storage.class);
+            LegacyConfigurationStore.migrate(configurationStoreStorage, getConfigurationStore());
+            migratedLegacyConfig = true;
         }
 
         migratedLegacyConfig = loadLegacyThreadStore(rootNode) || migratedLegacyConfig;
@@ -965,11 +962,6 @@ public class SignalAccount implements Closeable {
         return false;
     }
 
-    private void saveConfigurationStore(ConfigurationStore.Storage storage) {
-        this.configurationStoreStorage = storage;
-        save();
-    }
-
     private void save() {
         synchronized (fileChannel) {
             var rootNode = jsonProcessor.createObjectNode();
@@ -1028,8 +1020,7 @@ public class SignalAccount implements Closeable {
                             pniAccountData.getPreKeyMetadata().activeLastResortKyberPreKeyId)
                     .put("profileKey",
                             profileKey == null ? null : Base64.getEncoder().encodeToString(profileKey.serialize()))
-                    .put("registered", registered)
-                    .putPOJO("configurationStore", configurationStoreStorage);
+                    .put("registered", registered);
             try {
                 try (var output = new ByteArrayOutputStream()) {
                     // Write to memory first to prevent corrupting the file in case of serialization errors
@@ -1295,8 +1286,13 @@ public class SignalAccount implements Closeable {
         return getOrCreate(() -> senderKeyStore, () -> senderKeyStore = new SenderKeyStore(getAccountDatabase()));
     }
 
+    private KeyValueStore getKeyValueStore() {
+        return getOrCreate(() -> keyValueStore, () -> keyValueStore = new KeyValueStore(getAccountDatabase()));
+    }
+
     public ConfigurationStore getConfigurationStore() {
-        return configurationStore;
+        return getOrCreate(() -> configurationStore,
+                () -> configurationStore = new ConfigurationStore(getKeyValueStore()));
     }
 
     public MessageCache getMessageCache() {
@@ -1662,7 +1658,7 @@ public class SignalAccount implements Closeable {
     }
 
     public boolean isDiscoverableByPhoneNumber() {
-        final var phoneNumberUnlisted = configurationStore.getPhoneNumberUnlisted();
+        final var phoneNumberUnlisted = getConfigurationStore().getPhoneNumberUnlisted();
         return phoneNumberUnlisted == null || !phoneNumberUnlisted;
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
index b810ea23..f85d3d80 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
@@ -1,106 +1,75 @@
 package org.asamk.signal.manager.storage.configuration;
 
 import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.storage.keyValue.KeyValueEntry;
+import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
 
 public class ConfigurationStore {
 
-    private final Saver saver;
+    private final KeyValueStore keyValueStore;
 
-    private Boolean readReceipts;
-    private Boolean unidentifiedDeliveryIndicators;
-    private Boolean typingIndicators;
-    private Boolean linkPreviews;
-    private Boolean phoneNumberUnlisted;
-    private PhoneNumberSharingMode phoneNumberSharingMode;
+    private final KeyValueEntry<Boolean> readReceipts = new KeyValueEntry<>("config-read-receipts", Boolean.class);
+    private final KeyValueEntry<Boolean> unidentifiedDeliveryIndicators = new KeyValueEntry<>(
+            "config-unidentified-delivery-indicators",
+            Boolean.class);
+    private final KeyValueEntry<Boolean> typingIndicators = new KeyValueEntry<>("config-typing-indicators",
+            Boolean.class);
+    private final KeyValueEntry<Boolean> linkPreviews = new KeyValueEntry<>("config-link-previews", Boolean.class);
+    private final KeyValueEntry<Boolean> phoneNumberUnlisted = new KeyValueEntry<>("config-phone-number-unlisted",
+            Boolean.class);
+    private final KeyValueEntry<PhoneNumberSharingMode> phoneNumberSharingMode = new KeyValueEntry<>(
+            "config-phone-number-sharing-mode",
+            PhoneNumberSharingMode.class);
 
-    public ConfigurationStore(final Saver saver) {
-        this.saver = saver;
-    }
-
-    public static ConfigurationStore fromStorage(Storage storage, Saver saver) {
-        final var store = new ConfigurationStore(saver);
-        store.readReceipts = storage.readReceipts;
-        store.unidentifiedDeliveryIndicators = storage.unidentifiedDeliveryIndicators;
-        store.typingIndicators = storage.typingIndicators;
-        store.linkPreviews = storage.linkPreviews;
-        store.phoneNumberSharingMode = storage.phoneNumberSharingMode;
-        return store;
+    public ConfigurationStore(final KeyValueStore keyValueStore) {
+        this.keyValueStore = keyValueStore;
     }
 
     public Boolean getReadReceipts() {
-        return readReceipts;
+        return keyValueStore.getEntry(readReceipts);
     }
 
-    public void setReadReceipts(final boolean readReceipts) {
-        this.readReceipts = readReceipts;
-        saver.save(toStorage());
+    public void setReadReceipts(final boolean value) {
+        keyValueStore.storeEntry(readReceipts, value);
     }
 
     public Boolean getUnidentifiedDeliveryIndicators() {
-        return unidentifiedDeliveryIndicators;
+        return keyValueStore.getEntry(unidentifiedDeliveryIndicators);
     }
 
-    public void setUnidentifiedDeliveryIndicators(final boolean unidentifiedDeliveryIndicators) {
-        this.unidentifiedDeliveryIndicators = unidentifiedDeliveryIndicators;
-        saver.save(toStorage());
+    public void setUnidentifiedDeliveryIndicators(final boolean value) {
+        keyValueStore.storeEntry(unidentifiedDeliveryIndicators, value);
     }
 
     public Boolean getTypingIndicators() {
-        return typingIndicators;
+        return keyValueStore.getEntry(typingIndicators);
     }
 
-    public void setTypingIndicators(final boolean typingIndicators) {
-        this.typingIndicators = typingIndicators;
-        saver.save(toStorage());
+    public void setTypingIndicators(final boolean value) {
+        keyValueStore.storeEntry(typingIndicators, value);
     }
 
     public Boolean getLinkPreviews() {
-        return linkPreviews;
+        return keyValueStore.getEntry(linkPreviews);
     }
 
-    public void setLinkPreviews(final boolean linkPreviews) {
-        this.linkPreviews = linkPreviews;
-        saver.save(toStorage());
+    public void setLinkPreviews(final boolean value) {
+        keyValueStore.storeEntry(linkPreviews, value);
     }
 
     public Boolean getPhoneNumberUnlisted() {
-        return phoneNumberUnlisted;
+        return keyValueStore.getEntry(phoneNumberUnlisted);
     }
 
-    public void setPhoneNumberUnlisted(final boolean phoneNumberUnlisted) {
-        this.phoneNumberUnlisted = phoneNumberUnlisted;
-        saver.save(toStorage());
+    public void setPhoneNumberUnlisted(final boolean value) {
+        keyValueStore.storeEntry(phoneNumberUnlisted, value);
     }
 
     public PhoneNumberSharingMode getPhoneNumberSharingMode() {
-        return phoneNumberSharingMode;
+        return keyValueStore.getEntry(phoneNumberSharingMode);
     }
 
-    public void setPhoneNumberSharingMode(final PhoneNumberSharingMode phoneNumberSharingMode) {
-        this.phoneNumberSharingMode = phoneNumberSharingMode;
-        saver.save(toStorage());
-    }
-
-    private Storage toStorage() {
-        return new Storage(readReceipts,
-                unidentifiedDeliveryIndicators,
-                typingIndicators,
-                linkPreviews,
-                phoneNumberUnlisted,
-                phoneNumberSharingMode);
-    }
-
-    public record Storage(
-            Boolean readReceipts,
-            Boolean unidentifiedDeliveryIndicators,
-            Boolean typingIndicators,
-            Boolean linkPreviews,
-            Boolean phoneNumberUnlisted,
-            PhoneNumberSharingMode phoneNumberSharingMode
-    ) {}
-
-    public interface Saver {
-
-        void save(Storage storage);
+    public void setPhoneNumberSharingMode(final PhoneNumberSharingMode value) {
+        keyValueStore.storeEntry(phoneNumberSharingMode, value);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/LegacyConfigurationStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/LegacyConfigurationStore.java
new file mode 100644
index 00000000..7c799fe1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/LegacyConfigurationStore.java
@@ -0,0 +1,33 @@
+package org.asamk.signal.manager.storage.configuration;
+
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+
+public class LegacyConfigurationStore {
+
+    public static void migrate(Storage storage, ConfigurationStore configurationStore) {
+        if (storage.readReceipts != null) {
+            configurationStore.setReadReceipts(storage.readReceipts);
+        }
+        if (storage.unidentifiedDeliveryIndicators != null) {
+            configurationStore.setUnidentifiedDeliveryIndicators(storage.unidentifiedDeliveryIndicators);
+        }
+        if (storage.typingIndicators != null) {
+            configurationStore.setTypingIndicators(storage.typingIndicators);
+        }
+        if (storage.linkPreviews != null) {
+            configurationStore.setLinkPreviews(storage.linkPreviews);
+        }
+        if (storage.phoneNumberSharingMode != null) {
+            configurationStore.setPhoneNumberSharingMode(storage.phoneNumberSharingMode);
+        }
+    }
+
+    public record Storage(
+            Boolean readReceipts,
+            Boolean unidentifiedDeliveryIndicators,
+            Boolean typingIndicators,
+            Boolean linkPreviews,
+            Boolean phoneNumberUnlisted,
+            PhoneNumberSharingMode phoneNumberSharingMode
+    ) {}
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueEntry.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueEntry.java
new file mode 100644
index 00000000..3195bc81
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueEntry.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.storage.keyValue;
+
+public record KeyValueEntry<T>(String key, Class<T> clazz, T defaultValue) {
+
+    public KeyValueEntry(String key, Class<T> clazz) {
+        this(key, clazz, null);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
new file mode 100644
index 00000000..5785dfdc
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -0,0 +1,153 @@
+package org.asamk.signal.manager.storage.keyValue;
+
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+public class KeyValueStore {
+
+    private static final String TABLE_KEY_VALUE = "key_value";
+    private final static Logger logger = LoggerFactory.getLogger(KeyValueStore.class);
+
+    private final Database database;
+
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE key_value (
+                                      _id INTEGER PRIMARY KEY,
+                                      key TEXT UNIQUE NOT NULL,
+                                      value ANY
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public KeyValueStore(final Database database) {
+        this.database = database;
+    }
+
+    public <T> T getEntry(KeyValueEntry<T> key) {
+        final var sql = (
+                """
+                SELECT key, value
+                FROM %s p
+                WHERE p.key = ?
+                """
+        ).formatted(TABLE_KEY_VALUE);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setString(1, key.key());
+
+                final var result = Utils.executeQueryForOptional(statement,
+                        resultSet -> readValueFromResultSet(key, resultSet)).orElse(null);
+
+                if (result == null) {
+                    return key.defaultValue();
+                }
+                return result;
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from pre_key store", e);
+        }
+    }
+
+    public <T> void storeEntry(KeyValueEntry<T> key, T value) {
+        final var sql = (
+                """
+                INSERT INTO %s (key, value)
+                VALUES (?1, ?2)
+                ON CONFLICT (key) DO UPDATE SET value=excluded.value
+                """
+        ).formatted(TABLE_KEY_VALUE);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setString(1, key.key());
+                setParameterValue(statement, 2, key.clazz(), value);
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update key_value store", e);
+        }
+    }
+
+    private static <T> T readValueFromResultSet(
+            final KeyValueEntry<T> key, final ResultSet resultSet
+    ) throws SQLException {
+        Object value;
+        final var clazz = key.clazz();
+        if (clazz == int.class || clazz == Integer.class) {
+            value = resultSet.getInt("value");
+        } else if (clazz == long.class || clazz == Long.class) {
+            value = resultSet.getLong("value");
+        } else if (clazz == boolean.class || clazz == Boolean.class) {
+            value = resultSet.getBoolean("value");
+        } else if (clazz == String.class) {
+            value = resultSet.getString("value");
+        } else if (Enum.class.isAssignableFrom(clazz)) {
+            final var name = resultSet.getString("value");
+            if (name == null) {
+                value = null;
+            } else {
+                try {
+                    value = Enum.valueOf((Class<Enum>) key.clazz(), name);
+                } catch (IllegalArgumentException e) {
+                    logger.debug("Read invalid enum value from store, ignoring: {} for {}", name, key.clazz());
+                    value = null;
+                }
+            }
+        } else {
+            throw new AssertionError("Invalid key type " + clazz.getSimpleName());
+        }
+        if (resultSet.wasNull()) {
+            return null;
+        }
+        return (T) value;
+    }
+
+    private static <T> void setParameterValue(
+            final PreparedStatement statement, final int parameterIndex, final Class<T> clazz, final T value
+    ) throws SQLException {
+        if (clazz == int.class || clazz == Integer.class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.INTEGER);
+            } else {
+                statement.setInt(parameterIndex, (int) value);
+            }
+        } else if (clazz == long.class || clazz == Long.class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.INTEGER);
+            } else {
+                statement.setLong(parameterIndex, (long) value);
+            }
+        } else if (clazz == boolean.class || clazz == Boolean.class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.BOOLEAN);
+            } else {
+                statement.setBoolean(parameterIndex, (boolean) value);
+            }
+        } else if (clazz == String.class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.VARCHAR);
+            } else {
+                statement.setString(parameterIndex, (String) value);
+            }
+        } else if (Enum.class.isAssignableFrom(clazz)) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.VARCHAR);
+            } else {
+                statement.setString(parameterIndex, ((Enum<?>) value).name());
+            }
+        } else {
+            throw new AssertionError("Invalid key type " + clazz.getSimpleName());
+        }
+    }
+}

From a0c345185ba91b9aad0dcc7e1f94d0c3269a8cae Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 4 Oct 2023 20:18:42 +0200
Subject: [PATCH 213/672] Move metadata to db

---
 .../signal/manager/storage/SignalAccount.java | 66 ++++++++++---------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 16017d5e..3de3ed1b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -21,6 +21,7 @@ import org.asamk.signal.manager.storage.groups.LegacyGroupStore;
 import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
 import org.asamk.signal.manager.storage.identities.LegacyIdentityKeyStore;
 import org.asamk.signal.manager.storage.identities.SignalIdentityKeyStore;
+import org.asamk.signal.manager.storage.keyValue.KeyValueEntry;
 import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
 import org.asamk.signal.manager.storage.messageCache.MessageCache;
 import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
@@ -138,10 +139,16 @@ public class SignalAccount implements Closeable {
 
     private Settings settings;
 
-    private String sessionId;
-    private String sessionNumber;
-    private long lastReceiveTimestamp = 0;
-    private long storageManifestVersion = -1;
+    private final KeyValueEntry<String> verificationSessionId = new KeyValueEntry<>("verification-session-id",
+            String.class);
+    private final KeyValueEntry<String> verificationSessionNumber = new KeyValueEntry<>("verification-session-number",
+            String.class);
+    private final KeyValueEntry<Long> lastReceiveTimestamp = new KeyValueEntry<>("last-receive-timestamp",
+            long.class,
+            0L);
+    private final KeyValueEntry<Long> storageManifestVersion = new KeyValueEntry<>("storage-manifest-version",
+            long.class,
+            -1L);
     private boolean isMultiDevice = false;
     private boolean registered = false;
 
@@ -356,9 +363,9 @@ public class SignalAccount implements Closeable {
         this.pniAccountData.setIdentityKeyPair(pniIdentity);
         this.registered = true;
         this.isMultiDevice = true;
-        this.lastReceiveTimestamp = 0;
+        getKeyValueStore().storeEntry(lastReceiveTimestamp, 0L);
         this.pinMasterKey = null;
-        this.storageManifestVersion = -1;
+        getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
         this.storageKey = null;
         trustSelfIdentity(ServiceIdType.ACI);
@@ -374,7 +381,7 @@ public class SignalAccount implements Closeable {
             final PreKeyCollection pniPreKeys
     ) {
         this.pinMasterKey = masterKey;
-        this.storageManifestVersion = -1;
+        getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
         this.storageKey = null;
         this.encryptedDeviceName = null;
@@ -384,7 +391,7 @@ public class SignalAccount implements Closeable {
         this.aci = aci;
         this.pni = pni;
         this.registrationLockPin = pin;
-        this.lastReceiveTimestamp = 0;
+        getKeyValueStore().storeEntry(lastReceiveTimestamp, 0L);
         save();
 
         setPreKeys(ServiceIdType.ACI, aciPreKeys);
@@ -564,10 +571,12 @@ public class SignalAccount implements Closeable {
             }
         }
         if (rootNode.hasNonNull("sessionId")) {
-            sessionId = rootNode.get("sessionId").asText();
+            getKeyValueStore().storeEntry(verificationSessionId, rootNode.get("sessionId").asText());
+            migratedLegacyConfig = true;
         }
         if (rootNode.hasNonNull("sessionNumber")) {
-            sessionNumber = rootNode.get("sessionNumber").asText();
+            getKeyValueStore().storeEntry(verificationSessionNumber, rootNode.get("sessionNumber").asText());
+            migratedLegacyConfig = true;
         }
         if (rootNode.hasNonNull("deviceName")) {
             encryptedDeviceName = rootNode.get("deviceName").asText();
@@ -579,7 +588,8 @@ public class SignalAccount implements Closeable {
             isMultiDevice = rootNode.get("isMultiDevice").asBoolean();
         }
         if (rootNode.hasNonNull("lastReceiveTimestamp")) {
-            lastReceiveTimestamp = rootNode.get("lastReceiveTimestamp").asLong();
+            getKeyValueStore().storeEntry(lastReceiveTimestamp, rootNode.get("lastReceiveTimestamp").asLong());
+            migratedLegacyConfig = true;
         }
         int registrationId = 0;
         if (rootNode.hasNonNull("registrationId")) {
@@ -612,7 +622,8 @@ public class SignalAccount implements Closeable {
             storageKey = new StorageKey(Base64.getDecoder().decode(rootNode.get("storageKey").asText()));
         }
         if (rootNode.hasNonNull("storageManifestVersion")) {
-            storageManifestVersion = rootNode.get("storageManifestVersion").asLong();
+            getKeyValueStore().storeEntry(storageManifestVersion, rootNode.get("storageManifestVersion").asLong());
+            migratedLegacyConfig = true;
         }
         if (rootNode.hasNonNull("preKeyIdOffset")) {
             aciAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
@@ -971,12 +982,9 @@ public class SignalAccount implements Closeable {
                     .put("usernameIdentifier", username)
                     .put("uuid", aci == null ? null : aci.toString())
                     .put("pni", pni == null ? null : pni.toStringWithoutPrefix())
-                    .put("sessionId", sessionId)
-                    .put("sessionNumber", sessionNumber)
                     .put("deviceName", encryptedDeviceName)
                     .put("deviceId", deviceId)
                     .put("isMultiDevice", isMultiDevice)
-                    .put("lastReceiveTimestamp", lastReceiveTimestamp)
                     .put("password", password)
                     .put("registrationId", aciAccountData.getLocalRegistrationId())
                     .put("pniRegistrationId", pniAccountData.getLocalRegistrationId())
@@ -1005,7 +1013,6 @@ public class SignalAccount implements Closeable {
                             pinMasterKey == null ? null : Base64.getEncoder().encodeToString(pinMasterKey.serialize()))
                     .put("storageKey",
                             storageKey == null ? null : Base64.getEncoder().encodeToString(storageKey.serialize()))
-                    .put("storageManifestVersion", storageManifestVersion == -1 ? null : storageManifestVersion)
                     .put("preKeyIdOffset", aciAccountData.getPreKeyMetadata().preKeyIdOffset)
                     .put("nextSignedPreKeyId", aciAccountData.getPreKeyMetadata().nextSignedPreKeyId)
                     .put("activeSignedPreKeyId", aciAccountData.getPreKeyMetadata().activeSignedPreKeyId)
@@ -1453,16 +1460,18 @@ public class SignalAccount implements Closeable {
     }
 
     public String getSessionId(final String forNumber) {
+        final var keyValueStore = getKeyValueStore();
+        final var sessionNumber = keyValueStore.getEntry(verificationSessionNumber);
         if (!forNumber.equals(sessionNumber)) {
             return null;
         }
-        return sessionId;
+        return keyValueStore.getEntry(verificationSessionId);
     }
 
     public void setSessionId(final String sessionNumber, final String sessionId) {
-        this.sessionNumber = sessionNumber;
-        this.sessionId = sessionId;
-        save();
+        final var keyValueStore = getKeyValueStore();
+        keyValueStore.storeEntry(verificationSessionNumber, sessionNumber);
+        keyValueStore.storeEntry(verificationSessionId, sessionId);
     }
 
     public void setEncryptedDeviceName(final String encryptedDeviceName) {
@@ -1560,15 +1569,11 @@ public class SignalAccount implements Closeable {
     }
 
     public long getStorageManifestVersion() {
-        return this.storageManifestVersion;
+        return getKeyValueStore().getEntry(storageManifestVersion);
     }
 
-    public void setStorageManifestVersion(final long storageManifestVersion) {
-        if (storageManifestVersion == this.storageManifestVersion) {
-            return;
-        }
-        this.storageManifestVersion = storageManifestVersion;
-        save();
+    public void setStorageManifestVersion(final long value) {
+        getKeyValueStore().storeEntry(storageManifestVersion, value);
     }
 
     public Optional<SignalStorageManifest> getStorageManifest() {
@@ -1644,12 +1649,11 @@ public class SignalAccount implements Closeable {
     }
 
     public long getLastReceiveTimestamp() {
-        return lastReceiveTimestamp;
+        return getKeyValueStore().getEntry(lastReceiveTimestamp);
     }
 
-    public void setLastReceiveTimestamp(final long lastReceiveTimestamp) {
-        this.lastReceiveTimestamp = lastReceiveTimestamp;
-        save();
+    public void setLastReceiveTimestamp(final long value) {
+        getKeyValueStore().storeEntry(lastReceiveTimestamp, value);
     }
 
     public boolean isUnrestrictedUnidentifiedAccess() {

From 6f4d538832b0ee1a4bb45de5d96c9afd5d07f463 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 5 Oct 2023 22:18:13 +0200
Subject: [PATCH 214/672] Execute JSON-RPC requests in parallel

---
 .../asamk/signal/jsonrpc/JsonRpcReader.java   | 76 +++++++++++++------
 src/main/java/org/asamk/signal/util/Util.java | 21 +++++
 2 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index 27da9b0b..16f5fbd0 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -14,7 +14,9 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Objects;
+import java.util.ArrayList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.StreamSupport;
@@ -53,20 +55,25 @@ public class JsonRpcReader {
             return;
         }
 
-        while (!Thread.interrupted()) {
-            String input = lineSupplier.get();
-            if (input == null) {
-                logger.trace("Reached end of JSON-RPC input stream.");
-                break;
-            }
+        final var executor = Executors.newFixedThreadPool(10);
+        try {
+            while (!Thread.interrupted()) {
+                final var input = lineSupplier.get();
+                if (input == null) {
+                    logger.trace("Reached end of JSON-RPC input stream.");
+                    break;
+                }
 
-            logger.trace("Incoming JSON-RPC message: {}", input);
-            JsonRpcMessage message = parseJsonRpcMessage(input);
-            if (message == null) {
-                continue;
-            }
+                logger.trace("Incoming JSON-RPC message: {}", input);
+                final var message = parseJsonRpcMessage(input);
+                if (message == null) {
+                    continue;
+                }
 
-            handleMessage(message, requestHandler, responseHandler);
+                executor.submit(() -> handleMessage(message, requestHandler, responseHandler));
+            }
+        } finally {
+            Util.closeExecutorService(executor);
         }
     }
 
@@ -84,16 +91,41 @@ public class JsonRpcReader {
         } else if (message instanceof JsonRpcResponse jsonRpcResponse) {
             responseHandler.accept(jsonRpcResponse);
         } else {
-            final var responseList = ((JsonRpcBatchMessage) message).getMessages().stream().map(jsonNode -> {
-                final JsonRpcRequest request;
-                try {
-                    request = parseJsonRpcRequest(jsonNode);
-                } catch (JsonRpcException e) {
-                    return JsonRpcResponse.forError(e.getError(), getId(jsonNode));
-                }
+            final var messages = ((JsonRpcBatchMessage) message).getMessages();
+            final var responseList = new ArrayList<JsonRpcResponse>(messages.size());
+            final var executor = Executors.newFixedThreadPool(10);
+            try {
+                final var lock = new ReentrantLock();
+                messages.forEach(jsonNode -> {
+                    final JsonRpcRequest request;
+                    try {
+                        request = parseJsonRpcRequest(jsonNode);
+                    } catch (JsonRpcException e) {
+                        final var response = JsonRpcResponse.forError(e.getError(), getId(jsonNode));
+                        lock.lock();
+                        try {
+                            responseList.add(response);
+                        } finally {
+                            lock.unlock();
+                        }
+                        return;
+                    }
 
-                return handleRequest(requestHandler, request);
-            }).filter(Objects::nonNull).toList();
+                    executor.submit(() -> {
+                        final var response = handleRequest(requestHandler, request);
+                        if (response != null) {
+                            lock.lock();
+                            try {
+                                responseList.add(response);
+                            } finally {
+                                lock.unlock();
+                            }
+                        }
+                    });
+                });
+            } finally {
+                Util.closeExecutorService(executor);
+            }
 
             if (responseList.size() > 0) {
                 jsonRpcSender.sendBatchResponses(responseList);
diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 338c986a..948560af 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -5,6 +5,9 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -13,10 +16,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 public class Util {
 
+    private final static Logger logger = LoggerFactory.getLogger(Util.class);
+
     private Util() {
     }
 
@@ -80,4 +87,18 @@ public class Util {
         return map;
     }
 
+    public static void closeExecutorService(ExecutorService executor) {
+        executor.shutdown();
+        try {
+            if (!executor.awaitTermination(5, TimeUnit.MINUTES)) {
+                executor.shutdownNow();
+                if (!executor.awaitTermination(1, TimeUnit.MINUTES)) {
+                    logger.warn("Failed to shutdown executor service");
+                }
+            }
+        } catch (InterruptedException e) {
+            executor.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+    }
 }

From fae83f8d22063cafe1be94d76c5d9a7ea167f129 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 5 Oct 2023 22:18:36 +0200
Subject: [PATCH 215/672] Extend json-rpc man page

---
 man/signal-cli-jsonrpc.5.adoc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/man/signal-cli-jsonrpc.5.adoc b/man/signal-cli-jsonrpc.5.adoc
index ad9cb538..7f4aeeb3 100644
--- a/man/signal-cli-jsonrpc.5.adoc
+++ b/man/signal-cli-jsonrpc.5.adoc
@@ -13,7 +13,7 @@ signal-cli-jsonrpc - A commandline and dbus interface for the Signal messenger
 
 == Synopsis
 
-*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] daemon [--socket] [--tcp] [--http]
+*signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] daemon [--socket[=SOCKET_PATH]] [--tcp[=HOST:PORT]] [--http[=HOST:PORT]]
 
 *signal-cli* [--verbose] [--config CONFIG] [-a ACCOUNT] jsonRpc
 
@@ -32,6 +32,12 @@ This is intended to make it easier to embed signal-cli in other applications.
 
   `signal-cli -a _ACCOUNT_ daemon --socket` or for multi-account mode `signal-cli daemon --socket`
 
+With `--http` signal-cli exposes three endpoints;
+
+* POST /api/v1/rpc : Expects a single or batch JSON-RPC request
+* GET /api/v1/events : Returns a Server-Sent Events (SSE) stream of incoming messages
+* GET /api/v1/check : Responds with 200 OK if daemon is running
+
 == Basic usage
 
 In JSON-RPC mode, signal-cli will read requests from stdin.

From 889ef66784422e43081492777b6ba71a7fbc03f8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 6 Oct 2023 18:55:13 +0200
Subject: [PATCH 216/672] Update release pipeline

The default libsignal-client jar now contains Linux/macOS/Window native library
---
 .github/workflows/release.yml | 130 ++++++++++++++++++----------------
 1 file changed, 70 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 84f629b2..ea5bf41d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,28 +46,28 @@ jobs:
           tree .
           ARCHIVE_DIR=$(ls signal-cli-archive-*/ -d | tail -n1)
           tar -xzf ./"${ARCHIVE_DIR}"/*.tar.gz
-          mv ./"${ARCHIVE_DIR}"/*.tar.gz signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
+          mv ./"${ARCHIVE_DIR}"/*.tar.gz signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
           rm -rf signal-cli-archive-*/
 
-      - name: Get signal-client jar version
-        id: lib_ver
-        run: |
-          JAR_PREFIX=libsignal-client-
-          jar_file=$(find ./signal-cli-*/lib/ -name "$JAR_PREFIX*.jar")
-          jar_version=$(echo "$jar_file" | xargs basename | sed "s/$JAR_PREFIX//; s/.jar//")
-          echo "$jar_version"
-          echo "signal_client_version=${jar_version}" >> $GITHUB_OUTPUT
-
-      - name: Download signal-client builds
-        env:
-          RELEASES_URL: https://github.com/signalapp/libsignal/releases/download/
-          FILE_NAMES: signal_jni.dll libsignal_jni.dylib
-          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-        run: |
-          for file_name in $FILE_NAMES; do
-            curl -sOL "${RELEASES_URL}/v${SIGNAL_CLIENT_VER}/${file_name}"  # note: added v
-          done
-          tree .
+#      - name: Get signal-client jar version
+#        id: lib_ver
+#        run: |
+#          JAR_PREFIX=libsignal-client-
+#          jar_file=$(find ./signal-cli-*/lib/ -name "$JAR_PREFIX*.jar")
+#          jar_version=$(echo "$jar_file" | xargs basename | sed "s/$JAR_PREFIX//; s/.jar//")
+#          echo "$jar_version"
+#          echo "signal_client_version=${jar_version}" >> $GITHUB_OUTPUT
+#
+#      - name: Download signal-client builds
+#        env:
+#          RELEASES_URL: https://github.com/signalapp/libsignal/releases/download/
+#          FILE_NAMES: signal_jni.dll libsignal_jni.dylib
+#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
+#        run: |
+#          for file_name in $FILE_NAMES; do
+#            curl -sOL "${RELEASES_URL}/v${SIGNAL_CLIENT_VER}/${file_name}"  # note: added v
+#          done
+#          tree .
 
       - name: Compress native app
         env:
@@ -77,24 +77,24 @@ jobs:
           tar -czf signal-cli-${SIGNAL_CLI_VER}-Linux-native.tar.gz -C signal-cli-native signal-cli
           rm -rf signal-cli-native/
 
-      - name: Replace Windows lib
-        env:
-          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
-          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-        run: |
-          mv signal_jni.dll libsignal_jni.so
-          zip -u ./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so
-          tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-*/
-
-      - name: Replace macOS lib
-        env:
-          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
-          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
-        run: |
-          jar_file=./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar
-          zip -d $jar_file libsignal_jni.so
-          zip $jar_file libsignal_jni.dylib
-          tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-*/
+#      - name: Replace Windows lib
+#        env:
+#          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
+#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
+#        run: |
+#          mv signal_jni.dll libsignal_jni.so
+#          zip -u ./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar  ./libsignal_jni.so
+#          tar -czf signal-cli-${SIGNAL_CLI_VER}-Windows.tar.gz signal-cli-*/
+#
+#      - name: Replace macOS lib
+#        env:
+#          SIGNAL_CLI_VER: ${{ steps.cli_ver.outputs.version }}
+#          SIGNAL_CLIENT_VER: ${{ steps.lib_ver.outputs.signal_client_version }}
+#        run: |
+#          jar_file=./signal-cli-*/lib/libsignal-client-${SIGNAL_CLIENT_VER}.jar
+#          zip -d $jar_file libsignal_jni.so
+#          zip $jar_file libsignal_jni.dylib
+#          tar -czf signal-cli-${SIGNAL_CLI_VER}-macOS.tar.gz signal-cli-*/
 
       - name: Create release
         id: create_release
@@ -106,16 +106,26 @@ jobs:
           release_name: v${{ steps.cli_ver.outputs.version }}  # note: added `v`
           draft: true
 
-      - name: Upload Linux archive
+      - name: Upload archive
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
+          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
+          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}.tar.gz
           asset_content_type: application/x-compressed-tar  # .tar.gz
 
+#      - name: Upload Linux archive
+#        uses: actions/upload-release-asset@v1
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          upload_url: ${{ steps.create_release.outputs.upload_url }}
+#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
+#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux.tar.gz
+#          asset_content_type: application/x-compressed-tar  # .tar.gz
+
       - name: Upload Linux native archive
         uses: actions/upload-release-asset@v1
         env:
@@ -126,25 +136,25 @@ jobs:
           asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Linux-native.tar.gz
           asset_content_type: application/x-compressed-tar  # .tar.gz
 
-      - name: Upload windows archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
-          asset_content_type: application/x-compressed-tar  # .tar.gz
-
-      - name: Upload macos archive
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
-          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
-          asset_content_type: application/x-compressed-tar  # .tar.gz
+#      - name: Upload windows archive
+#        uses: actions/upload-release-asset@v1
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          upload_url: ${{ steps.create_release.outputs.upload_url }}
+#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
+#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-Windows.tar.gz
+#          asset_content_type: application/x-compressed-tar  # .tar.gz
+#
+#      - name: Upload macos archive
+#        uses: actions/upload-release-asset@v1
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#        with:
+#          upload_url: ${{ steps.create_release.outputs.upload_url }}
+#          asset_path: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
+#          asset_name: signal-cli-${{ steps.cli_ver.outputs.version }}-macOS.tar.gz
+#          asset_content_type: application/x-compressed-tar  # .tar.gz
 
   build-container:
     needs: ci_wf

From 66161b74a6c38114a9de5355b6775333d86e0328 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 6 Oct 2023 19:53:32 +0200
Subject: [PATCH 217/672] Move aci/pni to account data object

---
 .../signal/manager/storage/SignalAccount.java | 74 +++++++++----------
 1 file changed, 36 insertions(+), 38 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 3de3ed1b..775e55f7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -127,8 +127,6 @@ public class SignalAccount implements Closeable {
     private ServiceEnvironment serviceEnvironment;
     private String number;
     private String username;
-    private ACI aci;
-    private PNI pni;
     private String encryptedDeviceName;
     private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
     private String password;
@@ -152,8 +150,8 @@ public class SignalAccount implements Closeable {
     private boolean isMultiDevice = false;
     private boolean registered = false;
 
-    private final AccountData aciAccountData = new AccountData(ServiceIdType.ACI);
-    private final AccountData pniAccountData = new AccountData(ServiceIdType.PNI);
+    private final AccountData<ACI> aciAccountData = new AccountData<>(ServiceIdType.ACI);
+    private final AccountData<PNI> pniAccountData = new AccountData<>(ServiceIdType.PNI);
     private IdentityKeyStore identityKeyStore;
     private SenderKeyStore senderKeyStore;
     private GroupStore groupStore;
@@ -352,8 +350,8 @@ public class SignalAccount implements Closeable {
             final ProfileKey profileKey
     ) {
         this.number = number;
-        this.aci = aci;
-        this.pni = pni;
+        this.aciAccountData.setServiceId(aci);
+        this.pniAccountData.setServiceId(pni);
         this.password = password;
         this.profileKey = profileKey;
         getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
@@ -388,8 +386,8 @@ public class SignalAccount implements Closeable {
         this.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
         this.isMultiDevice = false;
         this.registered = true;
-        this.aci = aci;
-        this.pni = pni;
+        this.aciAccountData.setServiceId(aci);
+        this.pniAccountData.setServiceId(pni);
         this.registrationLockPin = pin;
         getKeyValueStore().storeEntry(lastReceiveTimestamp, 0L);
         save();
@@ -558,14 +556,14 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.hasNonNull("uuid")) {
             try {
-                aci = ACI.parseOrThrow(rootNode.get("uuid").asText());
+                aciAccountData.setServiceId(ACI.parseOrThrow(rootNode.get("uuid").asText()));
             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid aci/uuid, needs to be a valid UUID", e);
             }
         }
         if (rootNode.hasNonNull("pni")) {
             try {
-                pni = PNI.parseOrThrow(rootNode.get("pni").asText());
+                pniAccountData.setServiceId(PNI.parseOrThrow(rootNode.get("pni").asText()));
             } catch (IllegalArgumentException e) {
                 throw new IOException("Config file contains an invalid pni, needs to be a valid UUID", e);
             }
@@ -980,8 +978,8 @@ public class SignalAccount implements Closeable {
                     .put("username", number)
                     .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
                     .put("usernameIdentifier", username)
-                    .put("uuid", aci == null ? null : aci.toString())
-                    .put("pni", pni == null ? null : pni.toStringWithoutPrefix())
+                    .put("uuid", getAci() == null ? null : getAci().toString())
+                    .put("pni", getPni() == null ? null : getPni().toStringWithoutPrefix())
                     .put("deviceName", encryptedDeviceName)
                     .put("deviceId", deviceId)
                     .put("isMultiDevice", isMultiDevice)
@@ -1195,17 +1193,17 @@ public class SignalAccount implements Closeable {
         return previousStorageVersion;
     }
 
-    public AccountData getAccountData(ServiceIdType serviceIdType) {
+    public AccountData<? extends ServiceId> getAccountData(ServiceIdType serviceIdType) {
         return switch (serviceIdType) {
             case ACI -> aciAccountData;
             case PNI -> pniAccountData;
         };
     }
 
-    public AccountData getAccountData(ServiceId accountIdentifier) {
-        if (accountIdentifier.equals(aci)) {
+    public AccountData<? extends ServiceId> getAccountData(ServiceId accountIdentifier) {
+        if (accountIdentifier.equals(aciAccountData.getServiceId())) {
             return aciAccountData;
-        } else if (accountIdentifier.equals(pni)) {
+        } else if (accountIdentifier.equals(pniAccountData.getServiceId())) {
             return pniAccountData;
         } else {
             throw new IllegalArgumentException("No matching account data found for " + accountIdentifier);
@@ -1216,13 +1214,7 @@ public class SignalAccount implements Closeable {
         return new SignalServiceDataStore() {
             @Override
             public SignalServiceAccountDataStore get(final ServiceId accountIdentifier) {
-                if (accountIdentifier.equals(aci)) {
-                    return aci();
-                } else if (accountIdentifier.equals(pni)) {
-                    return pni();
-                } else {
-                    throw new IllegalArgumentException("No matching store found for " + accountIdentifier);
-                }
+                return getAccountData(accountIdentifier).getSignalServiceAccountDataStore();
             }
 
             @Override
@@ -1327,12 +1319,12 @@ public class SignalAccount implements Closeable {
         return new CredentialsProvider() {
             @Override
             public ACI getAci() {
-                return aci;
+                return aciAccountData.getServiceId();
             }
 
             @Override
             public PNI getPni() {
-                return pni;
+                return pniAccountData.getServiceId();
             }
 
             @Override
@@ -1400,30 +1392,31 @@ public class SignalAccount implements Closeable {
     }
 
     public ServiceId getAccountId(ServiceIdType serviceIdType) {
-        return serviceIdType.equals(ServiceIdType.ACI) ? aci : pni;
+        return getAccountData(serviceIdType).getServiceId();
     }
 
     public ACI getAci() {
-        return aci;
+        return aciAccountData.getServiceId();
     }
 
     public void setAci(final ACI aci) {
-        this.aci = aci;
+        this.aciAccountData.setServiceId(aci);
         save();
     }
 
     public PNI getPni() {
-        return pni;
+        return pniAccountData.getServiceId();
     }
 
     public void setPni(final PNI updatedPni) {
-        if (this.pni != null && !this.pni.equals(updatedPni)) {
+        final var oldPni = pniAccountData.getServiceId();
+        if (oldPni != null && !oldPni.equals(updatedPni)) {
             // Clear data for old PNI
-            identityKeyStore.deleteIdentity(this.pni);
+            identityKeyStore.deleteIdentity(oldPni);
             clearAllPreKeys(ServiceIdType.PNI);
         }
 
-        this.pni = updatedPni;
+        this.pniAccountData.setServiceId(updatedPni);
         trustSelfIdentity(ServiceIdType.PNI);
         save();
     }
@@ -1448,11 +1441,11 @@ public class SignalAccount implements Closeable {
     }
 
     public SignalServiceAddress getSelfAddress() {
-        return new SignalServiceAddress(aci, number);
+        return new SignalServiceAddress(getAci(), number);
     }
 
     public RecipientAddress getSelfRecipientAddress() {
-        return new RecipientAddress(aci, pni, number, username);
+        return new RecipientAddress(getAci(), getPni(), number, username);
     }
 
     public RecipientId getSelfRecipientId() {
@@ -1764,9 +1757,10 @@ public class SignalAccount implements Closeable {
         }
     }
 
-    public class AccountData {
+    public class AccountData<SERVICE_ID extends ServiceId> {
 
         private final ServiceIdType serviceIdType;
+        private SERVICE_ID serviceId;
         private IdentityKeyPair identityKeyPair;
         private int localRegistrationId;
         private final PreKeyMetadata preKeyMetadata = new PreKeyMetadata();
@@ -1778,12 +1772,16 @@ public class SignalAccount implements Closeable {
         private SessionStore sessionStore;
         private SignalIdentityKeyStore identityKeyStore;
 
-        public AccountData(final ServiceIdType serviceIdType) {
+        private AccountData(final ServiceIdType serviceIdType) {
             this.serviceIdType = serviceIdType;
         }
 
-        public ServiceId getServiceId() {
-            return getAccountId(serviceIdType);
+        public SERVICE_ID getServiceId() {
+            return serviceId;
+        }
+
+        private void setServiceId(final SERVICE_ID serviceId) {
+            this.serviceId = serviceId;
         }
 
         public IdentityKeyPair getIdentityKeyPair() {

From 04de0010b57b4d5ab5cdda5cb79507cf7c7dbabe Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 6 Oct 2023 19:58:09 +0200
Subject: [PATCH 218/672] Update libsignal-service-java

---
 graalvm-config-dir/reflect-config.json         | 10 ++++++++++
 settings.gradle.kts                            |  2 +-
 src/main/java/org/asamk/signal/BaseConfig.java |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 98af166e..5cec6508 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -538,6 +538,9 @@
 {
   "name":"long[]"
 },
+{
+  "name":"okio.ByteString"
+},
 {
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
@@ -2118,6 +2121,13 @@
 {
   "name":"org.whispersystems.signalservice.api.push.ServiceId$ACI"
 },
+{
+  "name":"org.whispersystems.signalservice.api.push.ServiceId$Companion",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"fromLibSignal","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }, {"name":"parseOrNull","parameterTypes":["java.lang.String"] }, {"name":"parseOrNull","parameterTypes":["okio.ByteString"] }, {"name":"parseOrNull","parameterTypes":["byte[]"] }, {"name":"parseOrThrow","parameterTypes":["java.lang.String"] }, {"name":"parseOrThrow","parameterTypes":["okio.ByteString"] }, {"name":"parseOrThrow","parameterTypes":["byte[]"] }]
+},
 {
   "name":"org.whispersystems.signalservice.api.push.ServiceId$PNI"
 },
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5800cee8..ab937133 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_83")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_84")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 339d7c7e..1509dd83 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -5,7 +5,7 @@ public class BaseConfig {
     public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
     public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.28.1";
+    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.36.0";
     final static String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 54c3b19052eeb12544462e696922e5f47671b11c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 6 Oct 2023 21:42:28 +0200
Subject: [PATCH 219/672] Support serviceId based safety number for scannable
 safety numbers

---
 .../asamk/signal/manager/helper/IdentityHelper.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index 61973f33..c1e22c97 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -58,22 +58,25 @@ public class IdentityHelper {
     }
 
     public String computeSafetyNumber(ServiceId serviceId, IdentityKey theirIdentityKey) {
-        final Fingerprint fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey);
+        final var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, false);
         return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
     }
 
     public ScannableFingerprint computeSafetyNumberForScanning(ServiceId serviceId, IdentityKey theirIdentityKey) {
-        final Fingerprint fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey);
+        var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, false);
+        if (fingerprint == null) {
+            fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, true);
+        }
         return fingerprint == null ? null : fingerprint.getScannableFingerprint();
     }
 
     private Fingerprint computeSafetyNumberFingerprint(
-            final ServiceId serviceId, final IdentityKey theirIdentityKey
+            final ServiceId serviceId, final IdentityKey theirIdentityKey, boolean useServiceId
     ) {
         final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
         final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
 
-        if (false) {
+        if (useServiceId) {
             if (serviceId.isUnknown()) {
                 return null;
             }

From af3cae5f3d698d813d91abd681e68b4b44f90c97 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 9 Oct 2023 19:08:19 +0200
Subject: [PATCH 220/672] Restructure account save file

---
 graalvm-config-dir/reflect-config.json        |  14 +
 .../signal/manager/storage/SignalAccount.java | 331 +++++++++---------
 2 files changed, 187 insertions(+), 158 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 5cec6508..75d45253 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1093,6 +1093,20 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true
 },
+{
+  "name":"org.asamk.signal.manager.storage.SignalAccount$Storage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"aciAccountData","parameterTypes":[] }, {"name":"deviceId","parameterTypes":[] }, {"name":"encryptedDeviceName","parameterTypes":[] }, {"name":"isMultiDevice","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"password","parameterTypes":[] }, {"name":"pinMasterKey","parameterTypes":[] }, {"name":"pniAccountData","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"registered","parameterTypes":[] }, {"name":"registrationLockPin","parameterTypes":[] }, {"name":"serviceEnvironment","parameterTypes":[] }, {"name":"storageKey","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","int","java.lang.String","java.lang.String","int","int","int","int","int"] }, {"name":"activeLastResortKyberPreKeyId","parameterTypes":[] }, {"name":"activeSignedPreKeyId","parameterTypes":[] }, {"name":"identityPrivateKey","parameterTypes":[] }, {"name":"identityPublicKey","parameterTypes":[] }, {"name":"nextKyberPreKeyId","parameterTypes":[] }, {"name":"nextPreKeyId","parameterTypes":[] }, {"name":"nextSignedPreKeyId","parameterTypes":[] }, {"name":"registrationId","parameterTypes":[] }, {"name":"serviceId","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.manager.storage.accounts.AccountsStorage",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 775e55f7..2d1956fe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -100,6 +100,7 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
@@ -110,7 +111,7 @@ public class SignalAccount implements Closeable {
     private final static Logger logger = LoggerFactory.getLogger(SignalAccount.class);
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
-    private static final int CURRENT_STORAGE_VERSION = 7;
+    private static final int CURRENT_STORAGE_VERSION = 8;
 
     private final Object LOCK = new Object();
 
@@ -216,6 +217,7 @@ public class SignalAccount implements Closeable {
         signalAccount.number = number;
         signalAccount.serviceEnvironment = serviceEnvironment;
         signalAccount.profileKey = profileKey;
+        signalAccount.password = KeyUtils.createPassword();
 
         signalAccount.dataPath = dataPath;
         signalAccount.aciAccountData.setIdentityKeyPair(aciIdentityKey);
@@ -228,6 +230,7 @@ public class SignalAccount implements Closeable {
 
         signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
         signalAccount.migrateLegacyConfigs();
+        signalAccount.clearAllPreKeys();
         signalAccount.save();
 
         return signalAccount;
@@ -407,15 +410,6 @@ public class SignalAccount implements Closeable {
     }
 
     private void migrateLegacyConfigs() {
-        if (getPassword() == null) {
-            setPassword(KeyUtils.createPassword());
-        }
-
-        if (getProfileKey() == null) {
-            // Old config file, creating new profile key
-            setProfileKey(KeyUtils.createProfileKey());
-        }
-        getProfileStore().storeProfileKey(getSelfRecipientId(), getProfileKey());
         if (isPrimaryDevice() && getPniIdentityKeyPair() == null) {
             setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         }
@@ -459,46 +453,6 @@ public class SignalAccount implements Closeable {
         return new File(getUserPath(dataPath, account), "msg-cache");
     }
 
-    private static File getGroupCachePath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "group-cache");
-    }
-
-    private static File getAciPreKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "pre-keys");
-    }
-
-    private static File getAciSignedPreKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "signed-pre-keys");
-    }
-
-    private static File getPniPreKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "pre-keys-pni");
-    }
-
-    private static File getPniSignedPreKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "signed-pre-keys-pni");
-    }
-
-    private static File getIdentitiesPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "identities");
-    }
-
-    private static File getSessionsPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "sessions");
-    }
-
-    private static File getSenderKeysPath(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "sender-keys");
-    }
-
-    private static File getSharedSenderKeysFile(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "shared-sender-keys-store");
-    }
-
-    private static File getRecipientsStoreFile(File dataPath, String account) {
-        return new File(getUserPath(dataPath, account), "recipients-store");
-    }
-
     private static File getStorageManifestFile(File dataPath, String account) {
         return new File(getUserPath(dataPath, account), "storage-manifest");
     }
@@ -543,13 +497,89 @@ public class SignalAccount implements Closeable {
             }
         }
 
+        if (previousStorageVersion < 8) {
+            final var userPath = getUserPath(dataPath, accountPath);
+            loadLegacyFile(userPath, rootNode);
+            migratedLegacyConfig = true;
+        } else {
+            final var storage = jsonProcessor.convertValue(rootNode, Storage.class);
+            serviceEnvironment = ServiceEnvironment.valueOf(storage.serviceEnvironment);
+            registered = storage.registered;
+            number = storage.number;
+            username = storage.username;
+            encryptedDeviceName = storage.encryptedDeviceName;
+            deviceId = storage.deviceId;
+            isMultiDevice = storage.isMultiDevice;
+            password = storage.password;
+            setAccountData(aciAccountData, storage.aciAccountData, ACI::parseOrThrow);
+            setAccountData(pniAccountData, storage.pniAccountData, PNI::parseOrThrow);
+            registrationLockPin = storage.registrationLockPin;
+            final var base64 = Base64.getDecoder();
+            if (storage.pinMasterKey != null) {
+                pinMasterKey = new MasterKey(base64.decode(storage.pinMasterKey));
+            }
+            if (storage.storageKey != null) {
+                storageKey = new StorageKey(base64.decode(storage.storageKey));
+            }
+            if (storage.profileKey != null) {
+                try {
+                    profileKey = new ProfileKey(base64.decode(storage.profileKey));
+                } catch (InvalidInputException e) {
+                    throw new IOException(
+                            "Config file contains an invalid profileKey, needs to be base64 encoded array of 32 bytes",
+                            e);
+                }
+            }
+
+        }
+
+        if (migratedLegacyConfig) {
+            save();
+        }
+    }
+
+    private <SERVICE_ID extends ServiceId> void setAccountData(
+            AccountData<SERVICE_ID> accountData,
+            Storage.AccountData storage,
+            Function<String, SERVICE_ID> serviceIdParser
+    ) throws IOException {
+        if (storage.serviceId != null) {
+            try {
+                accountData.setServiceId(serviceIdParser.apply(storage.serviceId));
+            } catch (IllegalArgumentException e) {
+                throw new IOException("Config file contains an invalid serviceId, needs to be a valid UUID", e);
+            }
+        }
+        accountData.setLocalRegistrationId(storage.registrationId);
+        if (storage.identityPrivateKey != null && storage.identityPublicKey != null) {
+            final var base64 = Base64.getDecoder();
+            final var publicKeyBytes = base64.decode(storage.identityPublicKey);
+            final var privateKeyBytes = base64.decode(storage.identityPrivateKey);
+            final var keyPair = KeyUtils.getIdentityKeyPair(publicKeyBytes, privateKeyBytes);
+            accountData.setIdentityKeyPair(keyPair);
+        }
+        accountData.preKeyMetadata.preKeyIdOffset = storage.nextPreKeyId;
+        accountData.preKeyMetadata.nextSignedPreKeyId = storage.nextSignedPreKeyId;
+        accountData.preKeyMetadata.activeSignedPreKeyId = storage.activeSignedPreKeyId;
+        accountData.preKeyMetadata.kyberPreKeyIdOffset = storage.nextKyberPreKeyId;
+        accountData.preKeyMetadata.activeLastResortKyberPreKeyId = storage.activeLastResortKyberPreKeyId;
+    }
+
+    private void loadLegacyFile(final File userPath, final JsonNode rootNode) throws IOException {
         number = Utils.getNotNullNode(rootNode, "username").asText();
         if (rootNode.hasNonNull("password")) {
             password = rootNode.get("password").asText();
         }
+        if (password == null) {
+            password = KeyUtils.createPassword();
+        }
+
         if (rootNode.hasNonNull("serviceEnvironment")) {
             serviceEnvironment = ServiceEnvironment.valueOf(rootNode.get("serviceEnvironment").asText());
         }
+        if (serviceEnvironment == null) {
+            serviceEnvironment = ServiceEnvironment.LIVE;
+        }
         registered = Utils.getNotNullNode(rootNode, "registered").asBoolean();
         if (rootNode.hasNonNull("usernameIdentifier")) {
             username = rootNode.get("usernameIdentifier").asText();
@@ -570,11 +600,9 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.hasNonNull("sessionId")) {
             getKeyValueStore().storeEntry(verificationSessionId, rootNode.get("sessionId").asText());
-            migratedLegacyConfig = true;
         }
         if (rootNode.hasNonNull("sessionNumber")) {
             getKeyValueStore().storeEntry(verificationSessionNumber, rootNode.get("sessionNumber").asText());
-            migratedLegacyConfig = true;
         }
         if (rootNode.hasNonNull("deviceName")) {
             encryptedDeviceName = rootNode.get("deviceName").asText();
@@ -587,7 +615,6 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.hasNonNull("lastReceiveTimestamp")) {
             getKeyValueStore().storeEntry(lastReceiveTimestamp, rootNode.get("lastReceiveTimestamp").asLong());
-            migratedLegacyConfig = true;
         }
         int registrationId = 0;
         if (rootNode.hasNonNull("registrationId")) {
@@ -621,7 +648,6 @@ public class SignalAccount implements Closeable {
         }
         if (rootNode.hasNonNull("storageManifestVersion")) {
             getKeyValueStore().storeEntry(storageManifestVersion, rootNode.get("storageManifestVersion").asLong());
-            migratedLegacyConfig = true;
         }
         if (rootNode.hasNonNull("preKeyIdOffset")) {
             aciAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
@@ -684,54 +710,52 @@ public class SignalAccount implements Closeable {
                         e);
             }
         }
+        if (profileKey == null) {
+            // Old config file, creating new profile key
+            setProfileKey(KeyUtils.createProfileKey());
+        }
+        getProfileStore().storeProfileKey(getSelfRecipientId(), getProfileKey());
 
         if (previousStorageVersion < 5) {
-            final var legacyRecipientsStoreFile = getRecipientsStoreFile(dataPath, accountPath);
+            final var legacyRecipientsStoreFile = new File(userPath, "recipients-store");
             if (legacyRecipientsStoreFile.exists()) {
                 LegacyRecipientStore2.migrate(legacyRecipientsStoreFile, getRecipientStore());
                 // Ensure our profile key is stored in profile store
                 getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
-                migratedLegacyConfig = true;
             }
         }
         if (previousStorageVersion < 6) {
             getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
         }
-        final var legacyAciPreKeysPath = getAciPreKeysPath(dataPath, accountPath);
+        final var legacyAciPreKeysPath = new File(userPath, "pre-keys");
         if (legacyAciPreKeysPath.exists()) {
             LegacyPreKeyStore.migrate(legacyAciPreKeysPath, aciAccountData.getPreKeyStore());
-            migratedLegacyConfig = true;
         }
-        final var legacyPniPreKeysPath = getPniPreKeysPath(dataPath, accountPath);
+        final var legacyPniPreKeysPath = new File(userPath, "pre-keys-pni");
         if (legacyPniPreKeysPath.exists()) {
             LegacyPreKeyStore.migrate(legacyPniPreKeysPath, pniAccountData.getPreKeyStore());
-            migratedLegacyConfig = true;
         }
-        final var legacyAciSignedPreKeysPath = getAciSignedPreKeysPath(dataPath, accountPath);
+        final var legacyAciSignedPreKeysPath = new File(userPath, "signed-pre-keys");
         if (legacyAciSignedPreKeysPath.exists()) {
             LegacySignedPreKeyStore.migrate(legacyAciSignedPreKeysPath, aciAccountData.getSignedPreKeyStore());
-            migratedLegacyConfig = true;
         }
-        final var legacyPniSignedPreKeysPath = getPniSignedPreKeysPath(dataPath, accountPath);
+        final var legacyPniSignedPreKeysPath = new File(userPath, "signed-pre-keys-pni");
         if (legacyPniSignedPreKeysPath.exists()) {
             LegacySignedPreKeyStore.migrate(legacyPniSignedPreKeysPath, pniAccountData.getSignedPreKeyStore());
-            migratedLegacyConfig = true;
         }
-        final var legacySessionsPath = getSessionsPath(dataPath, accountPath);
+        final var legacySessionsPath = new File(userPath, "sessions");
         if (legacySessionsPath.exists()) {
             LegacySessionStore.migrate(legacySessionsPath,
                     getRecipientResolver(),
                     getRecipientAddressResolver(),
                     aciAccountData.getSessionStore());
-            migratedLegacyConfig = true;
         }
-        final var legacyIdentitiesPath = getIdentitiesPath(dataPath, accountPath);
+        final var legacyIdentitiesPath = new File(userPath, "identities");
         if (legacyIdentitiesPath.exists()) {
             LegacyIdentityKeyStore.migrate(legacyIdentitiesPath,
                     getRecipientResolver(),
                     getRecipientAddressResolver(),
                     getIdentityKeyStore());
-            migratedLegacyConfig = true;
         }
         final var legacySignalProtocolStore = rootNode.hasNonNull("axolotlStore")
                 ? jsonProcessor.convertValue(Utils.getNotNullNode(rootNode, "axolotlStore"),
@@ -740,65 +764,54 @@ public class SignalAccount implements Closeable {
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacyIdentityKeyStore() != null) {
             aciIdentityKeyPair = legacySignalProtocolStore.getLegacyIdentityKeyStore().getIdentityKeyPair();
             registrationId = legacySignalProtocolStore.getLegacyIdentityKeyStore().getLocalRegistrationId();
-            migratedLegacyConfig = true;
         }
 
         this.aciAccountData.setIdentityKeyPair(aciIdentityKeyPair);
         this.aciAccountData.setLocalRegistrationId(registrationId);
 
-        migratedLegacyConfig = loadLegacyStores(rootNode, legacySignalProtocolStore) || migratedLegacyConfig;
+        loadLegacyStores(rootNode, legacySignalProtocolStore);
 
-        final var legacySenderKeysPath = getSenderKeysPath(dataPath, accountPath);
+        final var legacySenderKeysPath = new File(userPath, "sender-keys");
         if (legacySenderKeysPath.exists()) {
             LegacySenderKeyRecordStore.migrate(legacySenderKeysPath,
                     getRecipientResolver(),
                     getRecipientAddressResolver(),
                     getSenderKeyStore());
-            migratedLegacyConfig = true;
         }
-        final var legacySenderKeysSharedPath = getSharedSenderKeysFile(dataPath, accountPath);
+        final var legacySenderKeysSharedPath = new File(userPath, "shared-sender-keys-store");
         if (legacySenderKeysSharedPath.exists()) {
             LegacySenderKeySharedStore.migrate(legacySenderKeysSharedPath,
                     getRecipientResolver(),
                     getRecipientAddressResolver(),
                     getSenderKeyStore());
-            migratedLegacyConfig = true;
         }
         if (rootNode.hasNonNull("groupStore")) {
             final var groupStoreStorage = jsonProcessor.convertValue(rootNode.get("groupStore"),
                     LegacyGroupStore.Storage.class);
             LegacyGroupStore.migrate(groupStoreStorage,
-                    getGroupCachePath(dataPath, accountPath),
+                    new File(userPath, "group-cache"),
                     getRecipientResolver(),
                     getGroupStore());
-            migratedLegacyConfig = true;
         }
 
         if (rootNode.hasNonNull("stickerStore")) {
             final var storage = jsonProcessor.convertValue(rootNode.get("stickerStore"),
                     LegacyStickerStore.Storage.class);
             LegacyStickerStore.migrate(storage, getStickerStore());
-            migratedLegacyConfig = true;
         }
 
         if (rootNode.hasNonNull("configurationStore")) {
             final var configurationStoreStorage = jsonProcessor.convertValue(rootNode.get("configurationStore"),
                     LegacyConfigurationStore.Storage.class);
             LegacyConfigurationStore.migrate(configurationStoreStorage, getConfigurationStore());
-            migratedLegacyConfig = true;
         }
 
-        migratedLegacyConfig = loadLegacyThreadStore(rootNode) || migratedLegacyConfig;
-
-        if (migratedLegacyConfig) {
-            save();
-        }
+        loadLegacyThreadStore(rootNode);
     }
 
-    private boolean loadLegacyStores(
+    private void loadLegacyStores(
             final JsonNode rootNode, final LegacyJsonSignalProtocolStore legacySignalProtocolStore
     ) {
-        var migrated = false;
         var legacyRecipientStoreNode = rootNode.get("recipientStore");
         if (legacyRecipientStoreNode != null) {
             logger.debug("Migrating legacy recipient store.");
@@ -808,7 +821,6 @@ public class SignalAccount implements Closeable {
                         .forEach(recipient -> getRecipientStore().resolveRecipientTrusted(recipient));
             }
             getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
-            migrated = true;
         }
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacyPreKeyStore() != null) {
@@ -820,7 +832,6 @@ public class SignalAccount implements Closeable {
                     logger.warn("Failed to migrate pre key, ignoring", e);
                 }
             }
-            migrated = true;
         }
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacySignedPreKeyStore() != null) {
@@ -833,7 +844,6 @@ public class SignalAccount implements Closeable {
                     logger.warn("Failed to migrate signed pre key, ignoring", e);
                 }
             }
-            migrated = true;
         }
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacySessionStore() != null) {
@@ -847,7 +857,6 @@ public class SignalAccount implements Closeable {
                     logger.warn("Failed to migrate session, ignoring", e);
                 }
             }
-            migrated = true;
         }
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacyIdentityKeyStore() != null) {
@@ -862,7 +871,6 @@ public class SignalAccount implements Closeable {
                         identity.getIdentityKey(),
                         identity.getTrustLevel());
             }
-            migrated = true;
         }
 
         if (rootNode.hasNonNull("contactStore")) {
@@ -892,7 +900,6 @@ public class SignalAccount implements Closeable {
                     }
                 }
             }
-            migrated = true;
         }
 
         if (rootNode.hasNonNull("profileStore")) {
@@ -931,11 +938,9 @@ public class SignalAccount implements Closeable {
                 }
             }
         }
-
-        return migrated;
     }
 
-    private boolean loadLegacyThreadStore(final JsonNode rootNode) {
+    private void loadLegacyThreadStore(final JsonNode rootNode) {
         var threadStoreNode = rootNode.get("threadStore");
         if (threadStoreNode != null && !threadStoreNode.isNull()) {
             var threadStore = jsonProcessor.convertValue(threadStoreNode, LegacyJsonThreadStore.class);
@@ -965,71 +970,31 @@ public class SignalAccount implements Closeable {
                     logger.warn("Failed to read legacy thread info: {}", e.getMessage());
                 }
             }
-            return true;
         }
-
-        return false;
     }
 
     private void save() {
         synchronized (fileChannel) {
-            var rootNode = jsonProcessor.createObjectNode();
-            rootNode.put("version", CURRENT_STORAGE_VERSION)
-                    .put("username", number)
-                    .put("serviceEnvironment", serviceEnvironment == null ? null : serviceEnvironment.name())
-                    .put("usernameIdentifier", username)
-                    .put("uuid", getAci() == null ? null : getAci().toString())
-                    .put("pni", getPni() == null ? null : getPni().toStringWithoutPrefix())
-                    .put("deviceName", encryptedDeviceName)
-                    .put("deviceId", deviceId)
-                    .put("isMultiDevice", isMultiDevice)
-                    .put("password", password)
-                    .put("registrationId", aciAccountData.getLocalRegistrationId())
-                    .put("pniRegistrationId", pniAccountData.getLocalRegistrationId())
-                    .put("identityPrivateKey",
-                            Base64.getEncoder()
-                                    .encodeToString(aciAccountData.getIdentityKeyPair().getPrivateKey().serialize()))
-                    .put("identityKey",
-                            Base64.getEncoder()
-                                    .encodeToString(aciAccountData.getIdentityKeyPair().getPublicKey().serialize()))
-                    .put("pniIdentityPrivateKey",
-                            pniAccountData.getIdentityKeyPair() == null
-                                    ? null
-                                    : Base64.getEncoder()
-                                            .encodeToString(pniAccountData.getIdentityKeyPair()
-                                                    .getPrivateKey()
-                                                    .serialize()))
-                    .put("pniIdentityKey",
-                            pniAccountData.getIdentityKeyPair() == null
-                                    ? null
-                                    : Base64.getEncoder()
-                                            .encodeToString(pniAccountData.getIdentityKeyPair()
-                                                    .getPublicKey()
-                                                    .serialize()))
-                    .put("registrationLockPin", registrationLockPin)
-                    .put("pinMasterKey",
-                            pinMasterKey == null ? null : Base64.getEncoder().encodeToString(pinMasterKey.serialize()))
-                    .put("storageKey",
-                            storageKey == null ? null : Base64.getEncoder().encodeToString(storageKey.serialize()))
-                    .put("preKeyIdOffset", aciAccountData.getPreKeyMetadata().preKeyIdOffset)
-                    .put("nextSignedPreKeyId", aciAccountData.getPreKeyMetadata().nextSignedPreKeyId)
-                    .put("activeSignedPreKeyId", aciAccountData.getPreKeyMetadata().activeSignedPreKeyId)
-                    .put("pniPreKeyIdOffset", pniAccountData.getPreKeyMetadata().preKeyIdOffset)
-                    .put("pniNextSignedPreKeyId", pniAccountData.getPreKeyMetadata().nextSignedPreKeyId)
-                    .put("pniActiveSignedPreKeyId", pniAccountData.getPreKeyMetadata().activeSignedPreKeyId)
-                    .put("kyberPreKeyIdOffset", aciAccountData.getPreKeyMetadata().kyberPreKeyIdOffset)
-                    .put("activeLastResortKyberPreKeyId",
-                            aciAccountData.getPreKeyMetadata().activeLastResortKyberPreKeyId)
-                    .put("pniKyberPreKeyIdOffset", pniAccountData.getPreKeyMetadata().kyberPreKeyIdOffset)
-                    .put("pniActiveLastResortKyberPreKeyId",
-                            pniAccountData.getPreKeyMetadata().activeLastResortKyberPreKeyId)
-                    .put("profileKey",
-                            profileKey == null ? null : Base64.getEncoder().encodeToString(profileKey.serialize()))
-                    .put("registered", registered);
+            final var base64 = Base64.getEncoder();
+            final var storage = new Storage(CURRENT_STORAGE_VERSION,
+                    serviceEnvironment.name(),
+                    registered,
+                    number,
+                    username,
+                    encryptedDeviceName,
+                    deviceId,
+                    isMultiDevice,
+                    password,
+                    Storage.AccountData.from(aciAccountData),
+                    Storage.AccountData.from(pniAccountData),
+                    registrationLockPin,
+                    pinMasterKey == null ? null : base64.encodeToString(pinMasterKey.serialize()),
+                    storageKey == null ? null : base64.encodeToString(storageKey.serialize()),
+                    profileKey == null ? null : base64.encodeToString(profileKey.serialize()));
             try {
                 try (var output = new ByteArrayOutputStream()) {
                     // Write to memory first to prevent corrupting the file in case of serialization errors
-                    jsonProcessor.writeValue(output, rootNode);
+                    jsonProcessor.writeValue(output, storage);
                     var input = new ByteArrayInputStream(output.toByteArray());
                     fileChannel.position(0);
                     input.transferTo(Channels.newOutputStream(fileChannel));
@@ -1115,7 +1080,8 @@ public class SignalAccount implements Closeable {
                 records.size(),
                 serviceIdType,
                 preKeyMetadata.preKeyIdOffset);
-        accountData.signalProtocolStore.markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
+        accountData.getSignalServiceAccountDataStore()
+                .markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
         for (var record : records) {
             if (preKeyMetadata.preKeyIdOffset != record.getId()) {
                 logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.preKeyIdOffset);
@@ -1157,7 +1123,8 @@ public class SignalAccount implements Closeable {
                 records.size(),
                 serviceIdType,
                 preKeyMetadata.kyberPreKeyIdOffset);
-        accountData.signalProtocolStore.markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
+        accountData.getSignalServiceAccountDataStore()
+                .markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
         for (var record : records) {
             if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
                 logger.error("Invalid kyber pre key id {}, expected {}",
@@ -1502,11 +1469,6 @@ public class SignalAccount implements Closeable {
         return password;
     }
 
-    private void setPassword(final String password) {
-        this.password = password;
-        save();
-    }
-
     public void setRegistrationLockPin(final String registrationLockPin) {
         this.registrationLockPin = registrationLockPin;
         save();
@@ -1843,4 +1805,57 @@ public class SignalAccount implements Closeable {
                             SignalAccount.this.getIdentityKeyStore()));
         }
     }
+
+    public record Storage(
+            int version,
+            String serviceEnvironment,
+            boolean registered,
+            String number,
+            String username,
+            String encryptedDeviceName,
+            int deviceId,
+            boolean isMultiDevice,
+            String password,
+            AccountData aciAccountData,
+            AccountData pniAccountData,
+            String registrationLockPin,
+            String pinMasterKey,
+            String storageKey,
+            String profileKey
+    ) {
+
+        public record AccountData(
+                String serviceId,
+                int registrationId,
+                String identityPrivateKey,
+                String identityPublicKey,
+
+                int nextPreKeyId,
+                int nextSignedPreKeyId,
+                int activeSignedPreKeyId,
+                int nextKyberPreKeyId,
+                int activeLastResortKyberPreKeyId
+        ) {
+
+            private static AccountData from(final SignalAccount.AccountData<?> accountData) {
+                final var base64 = Base64.getEncoder();
+                final var preKeyMetadata = accountData.getPreKeyMetadata();
+                return new AccountData(accountData.getServiceId() == null
+                        ? null
+                        : accountData.getServiceId().toString(),
+                        accountData.getLocalRegistrationId(),
+                        accountData.getIdentityKeyPair() == null
+                                ? null
+                                : base64.encodeToString(accountData.getIdentityKeyPair().getPrivateKey().serialize()),
+                        accountData.getIdentityKeyPair() == null
+                                ? null
+                                : base64.encodeToString(accountData.getIdentityKeyPair().getPublicKey().serialize()),
+                        preKeyMetadata.getPreKeyIdOffset(),
+                        preKeyMetadata.getNextSignedPreKeyId(),
+                        preKeyMetadata.getActiveSignedPreKeyId(),
+                        preKeyMetadata.getKyberPreKeyIdOffset(),
+                        preKeyMetadata.getActiveLastResortKyberPreKeyId());
+            }
+        }
+    }
 }

From c2ea7045f5e92610f5f5d6cd62d064a7944a41cf Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 9 Oct 2023 19:08:32 +0200
Subject: [PATCH 221/672] Prevent deleting self recipient

---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 2d1956fe..4092bd79 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -424,6 +424,9 @@ public class SignalAccount implements Closeable {
 
     public void removeRecipient(final RecipientId recipientId) {
         final var recipientAddress = getRecipientStore().resolveRecipientAddress(recipientId);
+        if (recipientAddress.matches(getSelfRecipientAddress())) {
+            throw new RuntimeException("Can't delete self recipient");
+        }
         getRecipientStore().deleteRecipientData(recipientId);
         getMessageCache().deleteMessages(recipientId);
         if (recipientAddress.serviceId().isPresent()) {

From 91ab0b12b07ebd11ed61c620ab2704c27d812859 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 9 Oct 2023 19:08:48 +0200
Subject: [PATCH 222/672] Rename pre key id offset field

---
 .../signal/manager/helper/PreKeyHelper.java   |  6 +-
 .../internal/RegistrationManagerImpl.java     |  2 +-
 .../signal/manager/storage/SignalAccount.java | 68 +++++++++----------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index e06ebbc1..3d298e35 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -121,7 +121,7 @@ public class PreKeyHelper {
 
     private List<PreKeyRecord> generatePreKeys(ServiceIdType serviceIdType) {
         final var accountData = account.getAccountData(serviceIdType);
-        final var offset = accountData.getPreKeyMetadata().getPreKeyIdOffset();
+        final var offset = accountData.getPreKeyMetadata().getNextPreKeyId();
 
         var records = KeyUtils.generatePreKeyRecords(offset);
         account.addPreKeys(serviceIdType, records);
@@ -158,7 +158,7 @@ public class PreKeyHelper {
             ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
     ) {
         final var accountData = account.getAccountData(serviceIdType);
-        final var offset = accountData.getPreKeyMetadata().getKyberPreKeyIdOffset();
+        final var offset = accountData.getPreKeyMetadata().getNextKyberPreKeyId();
 
         var records = KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey());
         account.addKyberPreKeys(serviceIdType, records);
@@ -186,7 +186,7 @@ public class PreKeyHelper {
             ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair
     ) {
         final var accountData = account.getAccountData(serviceIdType);
-        final var signedPreKeyId = accountData.getPreKeyMetadata().getKyberPreKeyIdOffset();
+        final var signedPreKeyId = accountData.getPreKeyMetadata().getNextKyberPreKeyId();
 
         var record = KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
         account.addLastResortKyberPreKey(serviceIdType, record);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index b3d7eff1..88151be2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -270,7 +270,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
         final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair);
 
         final var privateKey = keyPair.getPrivateKey();
-        final var kyberPreKeyIdOffset = preKeyMetadata.getKyberPreKeyIdOffset();
+        final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId();
         final var lastResortKyberPreKey = KeyUtils.generateKyberPreKeyRecord(kyberPreKeyIdOffset, privateKey);
 
         return new PreKeyCollection(keyPair.getPublicKey(), signedPreKey, lastResortKyberPreKey);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 4092bd79..a7954ca2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -561,10 +561,10 @@ public class SignalAccount implements Closeable {
             final var keyPair = KeyUtils.getIdentityKeyPair(publicKeyBytes, privateKeyBytes);
             accountData.setIdentityKeyPair(keyPair);
         }
-        accountData.preKeyMetadata.preKeyIdOffset = storage.nextPreKeyId;
+        accountData.preKeyMetadata.nextPreKeyId = storage.nextPreKeyId;
         accountData.preKeyMetadata.nextSignedPreKeyId = storage.nextSignedPreKeyId;
         accountData.preKeyMetadata.activeSignedPreKeyId = storage.activeSignedPreKeyId;
-        accountData.preKeyMetadata.kyberPreKeyIdOffset = storage.nextKyberPreKeyId;
+        accountData.preKeyMetadata.nextKyberPreKeyId = storage.nextKyberPreKeyId;
         accountData.preKeyMetadata.activeLastResortKyberPreKeyId = storage.activeLastResortKyberPreKeyId;
     }
 
@@ -653,9 +653,9 @@ public class SignalAccount implements Closeable {
             getKeyValueStore().storeEntry(storageManifestVersion, rootNode.get("storageManifestVersion").asLong());
         }
         if (rootNode.hasNonNull("preKeyIdOffset")) {
-            aciAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("preKeyIdOffset").asInt(1);
+            aciAccountData.preKeyMetadata.nextPreKeyId = rootNode.get("preKeyIdOffset").asInt(1);
         } else {
-            aciAccountData.preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
+            aciAccountData.preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("nextSignedPreKeyId")) {
             aciAccountData.preKeyMetadata.nextSignedPreKeyId = rootNode.get("nextSignedPreKeyId").asInt(1);
@@ -668,9 +668,9 @@ public class SignalAccount implements Closeable {
             aciAccountData.preKeyMetadata.activeSignedPreKeyId = -1;
         }
         if (rootNode.hasNonNull("pniPreKeyIdOffset")) {
-            pniAccountData.preKeyMetadata.preKeyIdOffset = rootNode.get("pniPreKeyIdOffset").asInt(1);
+            pniAccountData.preKeyMetadata.nextPreKeyId = rootNode.get("pniPreKeyIdOffset").asInt(1);
         } else {
-            pniAccountData.preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
+            pniAccountData.preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("pniNextSignedPreKeyId")) {
             pniAccountData.preKeyMetadata.nextSignedPreKeyId = rootNode.get("pniNextSignedPreKeyId").asInt(1);
@@ -683,9 +683,9 @@ public class SignalAccount implements Closeable {
             pniAccountData.preKeyMetadata.activeSignedPreKeyId = -1;
         }
         if (rootNode.hasNonNull("kyberPreKeyIdOffset")) {
-            aciAccountData.preKeyMetadata.kyberPreKeyIdOffset = rootNode.get("kyberPreKeyIdOffset").asInt(1);
+            aciAccountData.preKeyMetadata.nextKyberPreKeyId = rootNode.get("kyberPreKeyIdOffset").asInt(1);
         } else {
-            aciAccountData.preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+            aciAccountData.preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("activeLastResortKyberPreKeyId")) {
             aciAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = rootNode.get("activeLastResortKyberPreKeyId")
@@ -694,9 +694,9 @@ public class SignalAccount implements Closeable {
             aciAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = -1;
         }
         if (rootNode.hasNonNull("pniKyberPreKeyIdOffset")) {
-            pniAccountData.preKeyMetadata.kyberPreKeyIdOffset = rootNode.get("pniKyberPreKeyIdOffset").asInt(1);
+            pniAccountData.preKeyMetadata.nextKyberPreKeyId = rootNode.get("pniKyberPreKeyIdOffset").asInt(1);
         } else {
-            pniAccountData.preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+            pniAccountData.preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
         }
         if (rootNode.hasNonNull("pniActiveLastResortKyberPreKeyId")) {
             pniAccountData.preKeyMetadata.activeLastResortKyberPreKeyId = rootNode.get(
@@ -1052,7 +1052,7 @@ public class SignalAccount implements Closeable {
         final var accountData = getAccountData(serviceIdType);
         final var preKeyMetadata = accountData.getPreKeyMetadata();
         preKeyMetadata.nextSignedPreKeyId = preKeyCollection.getSignedPreKey().getId();
-        preKeyMetadata.kyberPreKeyIdOffset = preKeyCollection.getLastResortKyberPreKey().getId();
+        preKeyMetadata.nextKyberPreKeyId = preKeyCollection.getLastResortKyberPreKey().getId();
 
         accountData.getPreKeyStore().removeAllPreKeys();
         accountData.getSignedPreKeyStore().removeAllSignedPreKeys();
@@ -1066,7 +1066,7 @@ public class SignalAccount implements Closeable {
 
     public void resetPreKeyOffsets(final ServiceIdType serviceIdType) {
         final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
-        preKeyMetadata.preKeyIdOffset = getRandomPreKeyIdOffset();
+        preKeyMetadata.nextPreKeyId = getRandomPreKeyIdOffset();
         preKeyMetadata.nextSignedPreKeyId = getRandomPreKeyIdOffset();
         preKeyMetadata.activeSignedPreKeyId = -1;
         save();
@@ -1082,16 +1082,16 @@ public class SignalAccount implements Closeable {
         logger.debug("Adding {} {} pre keys with offset {}",
                 records.size(),
                 serviceIdType,
-                preKeyMetadata.preKeyIdOffset);
+                preKeyMetadata.nextPreKeyId);
         accountData.getSignalServiceAccountDataStore()
                 .markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
         for (var record : records) {
-            if (preKeyMetadata.preKeyIdOffset != record.getId()) {
-                logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.preKeyIdOffset);
+            if (preKeyMetadata.nextPreKeyId != record.getId()) {
+                logger.error("Invalid pre key id {}, expected {}", record.getId(), preKeyMetadata.nextPreKeyId);
                 throw new AssertionError("Invalid pre key id");
             }
             accountData.getPreKeyStore().storePreKey(record.getId(), record);
-            preKeyMetadata.preKeyIdOffset = (preKeyMetadata.preKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+            preKeyMetadata.nextPreKeyId = (preKeyMetadata.nextPreKeyId + 1) % PREKEY_MAXIMUM_ID;
         }
         save();
     }
@@ -1114,7 +1114,7 @@ public class SignalAccount implements Closeable {
 
     public void resetKyberPreKeyOffsets(final ServiceIdType serviceIdType) {
         final var preKeyMetadata = getAccountData(serviceIdType).getPreKeyMetadata();
-        preKeyMetadata.kyberPreKeyIdOffset = getRandomPreKeyIdOffset();
+        preKeyMetadata.nextKyberPreKeyId = getRandomPreKeyIdOffset();
         preKeyMetadata.activeLastResortKyberPreKeyId = -1;
         save();
     }
@@ -1125,18 +1125,18 @@ public class SignalAccount implements Closeable {
         logger.debug("Adding {} {} kyber pre keys with offset {}",
                 records.size(),
                 serviceIdType,
-                preKeyMetadata.kyberPreKeyIdOffset);
+                preKeyMetadata.nextKyberPreKeyId);
         accountData.getSignalServiceAccountDataStore()
                 .markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
         for (var record : records) {
-            if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
+            if (preKeyMetadata.nextKyberPreKeyId != record.getId()) {
                 logger.error("Invalid kyber pre key id {}, expected {}",
                         record.getId(),
-                        preKeyMetadata.kyberPreKeyIdOffset);
+                        preKeyMetadata.nextKyberPreKeyId);
                 throw new AssertionError("Invalid kyber pre key id");
             }
             accountData.getKyberPreKeyStore().storeKyberPreKey(record.getId(), record);
-            preKeyMetadata.kyberPreKeyIdOffset = (preKeyMetadata.kyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+            preKeyMetadata.nextKyberPreKeyId = (preKeyMetadata.nextKyberPreKeyId + 1) % PREKEY_MAXIMUM_ID;
         }
         save();
     }
@@ -1146,16 +1146,16 @@ public class SignalAccount implements Closeable {
         final var preKeyMetadata = accountData.getPreKeyMetadata();
         logger.debug("Adding {} last resort kyber pre key with offset {}",
                 serviceIdType,
-                preKeyMetadata.kyberPreKeyIdOffset);
-        if (preKeyMetadata.kyberPreKeyIdOffset != record.getId()) {
+                preKeyMetadata.nextKyberPreKeyId);
+        if (preKeyMetadata.nextKyberPreKeyId != record.getId()) {
             logger.error("Invalid last resort kyber pre key id {}, expected {}",
                     record.getId(),
-                    preKeyMetadata.kyberPreKeyIdOffset);
+                    preKeyMetadata.nextKyberPreKeyId);
             throw new AssertionError("Invalid last resort kyber pre key id");
         }
         accountData.getKyberPreKeyStore().storeLastResortKyberPreKey(record.getId(), record);
         preKeyMetadata.activeLastResortKyberPreKeyId = record.getId();
-        preKeyMetadata.kyberPreKeyIdOffset = (preKeyMetadata.kyberPreKeyIdOffset + 1) % PREKEY_MAXIMUM_ID;
+        preKeyMetadata.nextKyberPreKeyId = (preKeyMetadata.nextKyberPreKeyId + 1) % PREKEY_MAXIMUM_ID;
         save();
     }
 
@@ -1404,7 +1404,7 @@ public class SignalAccount implements Closeable {
         preKeyMetadata.nextSignedPreKeyId = pniSignedPreKey.getId();
         addSignedPreKey(ServiceIdType.PNI, pniSignedPreKey);
         if (lastResortKyberPreKey != null) {
-            preKeyMetadata.kyberPreKeyIdOffset = lastResortKyberPreKey.getId();
+            preKeyMetadata.nextKyberPreKeyId = lastResortKyberPreKey.getId();
             addLastResortKyberPreKey(ServiceIdType.PNI, lastResortKyberPreKey);
         }
         save();
@@ -1695,14 +1695,14 @@ public class SignalAccount implements Closeable {
 
     public static class PreKeyMetadata {
 
-        private int preKeyIdOffset = 1;
+        private int nextPreKeyId = 1;
         private int nextSignedPreKeyId = 1;
         private int activeSignedPreKeyId = -1;
-        private int kyberPreKeyIdOffset = 1;
+        private int nextKyberPreKeyId = 1;
         private int activeLastResortKyberPreKeyId = -1;
 
-        public int getPreKeyIdOffset() {
-            return preKeyIdOffset;
+        public int getNextPreKeyId() {
+            return nextPreKeyId;
         }
 
         public int getNextSignedPreKeyId() {
@@ -1713,8 +1713,8 @@ public class SignalAccount implements Closeable {
             return activeSignedPreKeyId;
         }
 
-        public int getKyberPreKeyIdOffset() {
-            return kyberPreKeyIdOffset;
+        public int getNextKyberPreKeyId() {
+            return nextKyberPreKeyId;
         }
 
         public int getActiveLastResortKyberPreKeyId() {
@@ -1853,10 +1853,10 @@ public class SignalAccount implements Closeable {
                         accountData.getIdentityKeyPair() == null
                                 ? null
                                 : base64.encodeToString(accountData.getIdentityKeyPair().getPublicKey().serialize()),
-                        preKeyMetadata.getPreKeyIdOffset(),
+                        preKeyMetadata.getNextPreKeyId(),
                         preKeyMetadata.getNextSignedPreKeyId(),
                         preKeyMetadata.getActiveSignedPreKeyId(),
-                        preKeyMetadata.getKyberPreKeyIdOffset(),
+                        preKeyMetadata.getNextKyberPreKeyId(),
                         preKeyMetadata.getActiveLastResortKyberPreKeyId());
             }
         }

From 7b5b5776f014db0ad18fb6af909c63bbf2293c88 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 10 Oct 2023 19:54:45 +0200
Subject: [PATCH 223/672] Add --quote-attachment paramter to send command

Fixes #1318
---
 client/src/cli.rs                             |  3 +
 client/src/jsonrpc.rs                         |  1 +
 client/src/main.rs                            |  2 +
 graalvm-config-dir/reflect-config.json        |  6 +-
 .../org/asamk/signal/manager/api/Message.java |  8 ++-
 .../signal/manager/internal/ManagerImpl.java  |  9 ++-
 .../asamk/signal/commands/SendCommand.java    | 57 +++++++++++++------
 7 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 6a8dd361..0b513268 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -164,6 +164,9 @@ pub enum CliCommands {
         #[arg(long)]
         quote_mention: Vec<String>,
 
+        #[arg(long)]
+        quote_attachment: Vec<String>,
+
         #[arg(long)]
         sticker: Option<String>,
 
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index cd257305..e3031bf3 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -143,6 +143,7 @@ pub trait Rpc {
         #[allow(non_snake_case)] quoteAuthor: Option<String>,
         #[allow(non_snake_case)] quoteMessage: Option<String>,
         #[allow(non_snake_case)] quoteMention: Vec<String>,
+        #[allow(non_snake_case)] quoteAttachment: Vec<String>,
         sticker: Option<String>,
         #[allow(non_snake_case)] storyTimestamp: Option<u64>,
         #[allow(non_snake_case)] storyAuthor: Option<String>,
diff --git a/client/src/main.rs b/client/src/main.rs
index c840fd5e..958d9d9f 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -140,6 +140,7 @@ async fn handle_command(
             quote_author,
             quote_message,
             quote_mention,
+            quote_attachment,
             sticker,
             story_timestamp,
             story_author,
@@ -158,6 +159,7 @@ async fn handle_command(
                     quote_author,
                     quote_message,
                     quote_mention,
+                    quote_attachment,
                     sticker,
                     story_timestamp,
                     story_author,
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 75d45253..6aec194b 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -544,7 +544,8 @@
 {
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
-  "allDeclaredClasses":true
+  "allDeclaredClasses":true,
+  "methods":[{"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }]
 },
 {
   "name":"org.asamk.Signal$Configuration",
@@ -1747,7 +1748,8 @@
 {
   "name":"org.freedesktop.dbus.interfaces.Introspectable",
   "allDeclaredMethods":true,
-  "allDeclaredClasses":true
+  "allDeclaredClasses":true,
+  "methods":[{"name":"Introspect","parameterTypes":[] }]
 },
 {
   "name":"org.freedesktop.dbus.interfaces.Peer",
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Message.java b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
index ac9e4999..48277e6d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Message.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
@@ -21,8 +21,12 @@ public record Message(
             RecipientIdentifier.Single author,
             String message,
             List<Mention> mentions,
-            List<TextStyle> textStyles
-    ) {}
+            List<TextStyle> textStyles,
+            List<Attachment> attachments
+    ) {
+
+        public record Attachment(String contentType, String filename, String preview) {}
+    }
 
     public record Sticker(byte[] packId, int stickerId) {}
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index d1e96026..bfb52ebf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -627,12 +627,19 @@ public class ManagerImpl implements Manager {
         }
         if (message.quote().isPresent()) {
             final var quote = message.quote().get();
+            final var quotedAttachments = new ArrayList<SignalServiceDataMessage.Quote.QuotedAttachment>();
+            for (final var a : quote.attachments()) {
+                final var quotedAttachment = new SignalServiceDataMessage.Quote.QuotedAttachment(a.contentType(),
+                        a.filename(),
+                        a.preview() == null ? null : context.getAttachmentHelper().uploadAttachment(a.preview()));
+                quotedAttachments.add(quotedAttachment);
+            }
             messageBuilder.withQuote(new SignalServiceDataMessage.Quote(quote.timestamp(),
                     context.getRecipientHelper()
                             .resolveSignalServiceAddress(context.getRecipientHelper().resolveRecipient(quote.author()))
                             .getServiceId(),
                     quote.message(),
-                    List.of(),
+                    quotedAttachments,
                     resolveMentions(quote.mentions()),
                     SignalServiceDataMessage.Quote.Type.NORMAL,
                     quote.textStyles().stream().map(TextStyle::toBodyRange).toList()));
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 56a26253..1c3d91ba 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -78,6 +78,9 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--quote-mention")
                 .nargs("*")
                 .help("Quote with mention of another group member (syntax: start:length:recipientNumber)");
+        subparser.addArgument("--quote-attachment")
+                .nargs("*")
+                .help("Specify the attachments of the original message (syntax: contentType[:filename[:previewFile]], e.g. 'audio/aac' or 'image/png:test.png:/tmp/preview.jpg'.");
         subparser.addArgument("--quote-text-style")
                 .nargs("*")
                 .help("Quote with style parts of the message text (syntax: start:length:STYLE)");
@@ -145,19 +148,19 @@ public class SendCommand implements JsonRpcLocalCommand {
             messageText = "";
         }
 
-        List<String> attachments = ns.getList("attachment");
+        var attachments = ns.<String>getList("attachment");
         if (attachments == null) {
             attachments = List.of();
         }
 
         final var selfNumber = m.getSelfNumber();
 
-        List<String> mentionStrings = ns.getList("mention");
+        final var mentionStrings = ns.<String>getList("mention");
         final var mentions = mentionStrings == null
                 ? List.<Message.Mention>of()
                 : parseMentions(selfNumber, mentionStrings);
 
-        List<String> textStyleStrings = ns.getList("text-style");
+        final var textStyleStrings = ns.<String>getList("text-style");
         final var textStyles = textStyleStrings == null ? List.<TextStyle>of() : parseTextStyles(textStyleStrings);
 
         final Message.Quote quote;
@@ -165,29 +168,34 @@ public class SendCommand implements JsonRpcLocalCommand {
         if (quoteTimestamp != null) {
             final var quoteAuthor = ns.getString("quote-author");
             final var quoteMessage = ns.getString("quote-message");
-            List<String> quoteMentionStrings = ns.getList("quote-mention");
+            final var quoteMentionStrings = ns.<String>getList("quote-mention");
             final var quoteMentions = quoteMentionStrings == null
                     ? List.<Message.Mention>of()
                     : parseMentions(selfNumber, quoteMentionStrings);
-            List<String> quoteTextStyleStrings = ns.getList("quote-text-style");
+            final var quoteTextStyleStrings = ns.<String>getList("quote-text-style");
+            final var quoteAttachmentStrings = ns.<String>getList("quote-attachment");
             final var quoteTextStyles = quoteTextStyleStrings == null
                     ? List.<TextStyle>of()
                     : parseTextStyles(quoteTextStyleStrings);
+            final var quoteAttachments = quoteAttachmentStrings == null
+                    ? List.<Message.Quote.Attachment>of()
+                    : parseQuoteAttachments(quoteAttachmentStrings);
             quote = new Message.Quote(quoteTimestamp,
                     CommandUtil.getSingleRecipientIdentifier(quoteAuthor, selfNumber),
                     quoteMessage == null ? "" : quoteMessage,
                     quoteMentions,
-                    quoteTextStyles);
+                    quoteTextStyles,
+                    quoteAttachments);
         } else {
             quote = null;
         }
 
         final List<Message.Preview> previews;
-        String previewUrl = ns.getString("preview-url");
+        final var previewUrl = ns.getString("preview-url");
         if (previewUrl != null) {
-            String previewTitle = ns.getString("preview-title");
-            String previewDescription = ns.getString("preview-description");
-            String previewImage = ns.getString("preview-image");
+            final var previewTitle = ns.getString("preview-title");
+            final var previewDescription = ns.getString("preview-description");
+            final var previewImage = ns.getString("preview-image");
             previews = List.of(new Message.Preview(previewUrl,
                     Optional.ofNullable(previewTitle).orElse(""),
                     Optional.ofNullable(previewDescription).orElse(""),
@@ -241,9 +249,8 @@ public class SendCommand implements JsonRpcLocalCommand {
     private List<Message.Mention> parseMentions(
             final String selfNumber, final List<String> mentionStrings
     ) throws UserErrorException {
-        List<Message.Mention> mentions;
-        final Pattern mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
-        mentions = new ArrayList<>();
+        final var mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
+        final var mentions = new ArrayList<Message.Mention>();
         for (final var mention : mentionStrings) {
             final var matcher = mentionPattern.matcher(mention);
             if (!matcher.matches()) {
@@ -261,9 +268,8 @@ public class SendCommand implements JsonRpcLocalCommand {
     private List<TextStyle> parseTextStyles(
             final List<String> textStylesStrings
     ) throws UserErrorException {
-        List<TextStyle> textStyles;
-        final Pattern textStylePattern = Pattern.compile("(\\d+):(\\d+):(.+)");
-        textStyles = new ArrayList<>();
+        final var textStylePattern = Pattern.compile("(\\d+):(\\d+):(.+)");
+        final var textStyles = new ArrayList<TextStyle>();
         for (final var textStyle : textStylesStrings) {
             final var matcher = textStylePattern.matcher(textStyle);
             if (!matcher.matches()) {
@@ -283,7 +289,7 @@ public class SendCommand implements JsonRpcLocalCommand {
     }
 
     private Message.Sticker parseSticker(final String stickerString) throws UserErrorException {
-        final Pattern stickerPattern = Pattern.compile("([\\da-f]+):(\\d+)");
+        final var stickerPattern = Pattern.compile("([\\da-f]+):(\\d+)");
         final var matcher = stickerPattern.matcher(stickerString);
         if (!matcher.matches() || matcher.group(1).length() % 2 != 0) {
             throw new UserErrorException("Invalid sticker syntax ("
@@ -292,4 +298,21 @@ public class SendCommand implements JsonRpcLocalCommand {
         }
         return new Message.Sticker(Hex.toByteArray(matcher.group(1)), Integer.parseInt(matcher.group(2)));
     }
+
+    private List<Message.Quote.Attachment> parseQuoteAttachments(
+            final List<String> attachmentStrings
+    ) throws UserErrorException {
+        final var attachmentPattern = Pattern.compile("([^:]+)(:([^:]+)(:(.+))?)?");
+        final var attachments = new ArrayList<Message.Quote.Attachment>();
+        for (final var attachment : attachmentStrings) {
+            final var matcher = attachmentPattern.matcher(attachment);
+            if (!matcher.matches()) {
+                throw new UserErrorException("Invalid attachment syntax ("
+                        + attachment
+                        + ") expected 'contentType[:filename[:previewFile]]'");
+            }
+            attachments.add(new Message.Quote.Attachment(matcher.group(1), matcher.group(3), matcher.group(5)));
+        }
+        return attachments;
+    }
 }

From a66dd0dc79330b095a1bc0353ea183d7846fb945 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 10 Oct 2023 20:21:40 +0200
Subject: [PATCH 224/672] Implement EditMessageReceived signal for dbus

---
 graalvm-config-dir/reflect-config.json        |  7 ++-
 src/main/java/org/asamk/Signal.java           | 52 +++++++++++++++++++
 .../asamk/signal/dbus/DbusManagerImpl.java    | 45 ++++++++++++++++
 .../dbus/DbusReceiveMessageHandler.java       | 21 ++++++++
 4 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 6aec194b..1af2fbf0 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -545,7 +545,7 @@
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
   "allDeclaredClasses":true,
-  "methods":[{"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }]
+  "methods":[{"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.Signal$Configuration",
@@ -557,6 +557,11 @@
   "allDeclaredMethods":true,
   "allDeclaredClasses":true
 },
+{
+  "name":"org.asamk.Signal$EditMessageReceived",
+  "queryAllDeclaredConstructors":true,
+  "queryAllPublicConstructors":true
+},
 {
   "name":"org.asamk.Signal$Error$AttachmentInvalid",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index 9bffd6af..c4e3a26e 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -235,6 +235,58 @@ public interface Signal extends DBusInterface {
         }
     }
 
+    class EditMessageReceived extends DBusSignal {
+
+        private final long timestamp;
+        private final long targetSentTimestamp;
+        private final String sender;
+        private final byte[] groupId;
+        private final String message;
+        private final Map<String, Variant<?>> extras;
+
+        public EditMessageReceived(
+                String objectpath,
+                long timestamp,
+                final long targetSentTimestamp,
+                String sender,
+                byte[] groupId,
+                String message,
+                final Map<String, Variant<?>> extras
+        ) throws DBusException {
+            super(objectpath, timestamp, targetSentTimestamp, sender, groupId, message, extras);
+            this.timestamp = timestamp;
+            this.targetSentTimestamp = targetSentTimestamp;
+            this.sender = sender;
+            this.groupId = groupId;
+            this.message = message;
+            this.extras = extras;
+        }
+
+        public long getTimestamp() {
+            return timestamp;
+        }
+
+        public long getTargetSentTimestamp() {
+            return targetSentTimestamp;
+        }
+
+        public String getSender() {
+            return sender;
+        }
+
+        public byte[] getGroupId() {
+            return groupId;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public Map<String, Variant<?>> getExtras() {
+            return extras;
+        }
+    }
+
     class MessageReceived extends DBusSignal {
 
         private final long timestamp;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 9b7908b7..d6cd52fa 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -83,6 +83,7 @@ public class DbusManagerImpl implements Manager {
     private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();
     private final List<Runnable> closedListeners = new ArrayList<>();
     private DBusSigHandler<Signal.MessageReceivedV2> dbusMsgHandler;
+    private DBusSigHandler<Signal.EditMessageReceived> dbusEditMsgHandler;
     private DBusSigHandler<Signal.ReceiptReceivedV2> dbusRcptHandler;
     private DBusSigHandler<Signal.SyncMessageReceivedV2> dbusSyncHandler;
 
@@ -799,6 +800,49 @@ public class DbusManagerImpl implements Manager {
                 notifyMessageHandlers(envelope);
             };
             connection.addSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);
+            this.dbusEditMsgHandler = messageReceived -> {
+                final var extras = messageReceived.getExtras();
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
+                        messageReceived.getSender())),
+                        0,
+                        messageReceived.getTimestamp(),
+                        0,
+                        0,
+                        false,
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.of(new MessageEnvelope.Edit(messageReceived.getTargetSentTimestamp(),
+                                new MessageEnvelope.Data(messageReceived.getTimestamp(),
+                                        messageReceived.getGroupId().length > 0
+                                                ? Optional.of(new MessageEnvelope.Data.GroupContext(GroupId.unknownVersion(
+                                                messageReceived.getGroupId()), false, 0))
+                                                : Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.of(messageReceived.getMessage()),
+                                        0,
+                                        false,
+                                        false,
+                                        false,
+                                        false,
+                                        false,
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        getAttachments(extras),
+                                        Optional.empty(),
+                                        Optional.empty(),
+                                        List.of(),
+                                        List.of(),
+                                        List.of(),
+                                        List.of()))),
+                        Optional.empty(),
+                        Optional.empty(),
+                        Optional.empty());
+                notifyMessageHandlers(envelope);
+            };
+            connection.addSigHandler(Signal.EditMessageReceived.class, signal, this.dbusEditMsgHandler);
 
             this.dbusRcptHandler = receiptReceived -> {
                 final var type = switch (receiptReceived.getReceiptType()) {
@@ -901,6 +945,7 @@ public class DbusManagerImpl implements Manager {
         try {
             signal.unsubscribeReceive();
             connection.removeSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);
+            connection.removeSigHandler(Signal.EditMessageReceived.class, signal, this.dbusEditMsgHandler);
             connection.removeSigHandler(Signal.ReceiptReceivedV2.class, signal, this.dbusRcptHandler);
             connection.removeSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
index 3176620d..6aac76a8 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
@@ -74,6 +74,27 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
                         getMessageExtras(message)));
             }
         }
+        if (envelope.edit().isPresent()) {
+            var editMessage = envelope.edit().get();
+            var message = editMessage.dataMessage();
+
+            var groupId = message.groupContext()
+                    .map(MessageEnvelope.Data.GroupContext::groupId)
+                    .map(GroupId::serialize)
+                    .orElseGet(() -> new byte[0]);
+            var isGroupUpdate = message.groupContext()
+                    .map(MessageEnvelope.Data.GroupContext::isGroupUpdate)
+                    .orElse(false);
+            if (!message.isEndSession() && !isGroupUpdate) {
+                conn.sendMessage(new Signal.EditMessageReceived(objectPath,
+                        message.timestamp(),
+                        editMessage.targetSentTimestamp(),
+                        senderString,
+                        groupId,
+                        message.body().orElse(""),
+                        getMessageExtras(message)));
+            }
+        }
         if (envelope.sync().isPresent()) {
             var syncMessage = envelope.sync().get();
             if (syncMessage.sent().isPresent()) {

From 527e1aefc9b2db97bd129b8d782fe5843b24d972 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 12 Oct 2023 21:15:13 +0200
Subject: [PATCH 225/672] Refactor generateSignedPreKeyRecord

---
 .../java/org/asamk/signal/manager/helper/PreKeyHelper.java    | 2 +-
 .../signal/manager/internal/RegistrationManagerImpl.java      | 2 +-
 lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 3d298e35..1961fc56 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -148,7 +148,7 @@ public class PreKeyHelper {
         final var accountData = account.getAccountData(serviceIdType);
         final var signedPreKeyId = accountData.getPreKeyMetadata().getNextSignedPreKeyId();
 
-        var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair);
+        var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
         account.addSignedPreKey(serviceIdType, record);
 
         return record;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 88151be2..793f2f49 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -267,7 +267,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
         final var preKeyMetadata = accountData.getPreKeyMetadata();
 
         final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId();
-        final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair);
+        final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair.getPrivateKey());
 
         final var privateKey = keyPair.getPrivateKey();
         final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId();
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 3fd6e308..758831fc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -61,12 +61,12 @@ public class KeyUtils {
     }
 
     public static SignedPreKeyRecord generateSignedPreKeyRecord(
-            final int signedPreKeyId, final IdentityKeyPair identityKeyPair
+            final int signedPreKeyId, final ECPrivateKey privateKey
     ) {
         var keyPair = Curve.generateKeyPair();
         byte[] signature;
         try {
-            signature = Curve.calculateSignature(identityKeyPair.getPrivateKey(), keyPair.getPublicKey().serialize());
+            signature = Curve.calculateSignature(privateKey, keyPair.getPublicKey().serialize());
         } catch (InvalidKeyException e) {
             throw new AssertionError(e);
         }

From af4709255ab553419cc78863479894361151484b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 13 Oct 2023 12:01:15 +0200
Subject: [PATCH 226/672] Fix creation of key_value table for new accounts

---
 .../java/org/asamk/signal/manager/storage/AccountDatabase.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index d9839a18..3545eaa7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -5,6 +5,7 @@ import com.zaxxer.hikari.HikariDataSource;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.storage.groups.GroupStore;
 import org.asamk.signal.manager.storage.identities.IdentityKeyStore;
+import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
 import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.PreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.SignedPreKeyStore;
@@ -53,6 +54,7 @@ public class AccountDatabase extends Database {
         IdentityKeyStore.createSql(connection);
         SenderKeyRecordStore.createSql(connection);
         SenderKeySharedStore.createSql(connection);
+        KeyValueStore.createSql(connection);
     }
 
     @Override

From 56ee173d03baf8feede7c14aea5d9d670a047ae7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 13 Oct 2023 19:35:29 +0200
Subject: [PATCH 227/672] Implement exit code for rate limiting error

Closes #1240
---
 .../asamk/signal/manager/api/SendMessageResults.java   |  7 +++++++
 man/signal-cli.1.adoc                                  |  1 +
 src/main/java/org/asamk/signal/Main.java               |  3 +++
 .../org/asamk/signal/commands/RegisterCommand.java     |  5 +++--
 .../commands/exceptions/RateLimitErrorException.java   | 10 ++++++++++
 .../org/asamk/signal/util/SendMessageResultUtils.java  |  7 ++++++-
 6 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/commands/exceptions/RateLimitErrorException.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java
index 5b8cfc03..de250163 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResults.java
@@ -19,4 +19,11 @@ public record SendMessageResults(long timestamp, Map<RecipientIdentifier, List<S
                 .allMatch(identityFailure -> identityFailure)
                 && results.values().stream().mapToInt(List::size).sum() > 0;
     }
+
+    public boolean hasOnlyRateLimitFailure() {
+        return results.values()
+                .stream()
+                .flatMap(res -> res.stream().map(SendMessageResult::isRateLimitFailure))
+                .allMatch(r -> r) && results.values().stream().mapToInt(List::size).sum() > 0;
+    }
 }
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 0fbbe855..b3431341 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -788,6 +788,7 @@ signal-cli -a ACCOUNT trust -a NUMBER
 * *2*: Some unexpected error
 * *3*: Server or IO error
 * *4*: Sending failed due to untrusted key
+* *5*: Server rate limiting error
 
 == Files
 
diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 429cdc93..0a30d202 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -24,6 +24,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
@@ -116,6 +117,8 @@ public class Main {
             return 3;
         } else if (e instanceof UntrustedKeyErrorException) {
             return 4;
+        } else if (e instanceof RateLimitErrorException) {
+            return 5;
         } else {
             return 2;
         }
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 5018b7e0..1ca7bee2 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -9,6 +9,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
@@ -64,7 +65,7 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
 
     private void register(
             final RegistrationManager m, final boolean voiceVerification, final String captcha
-    ) throws UserErrorException, IOErrorException {
+    ) throws CommandException {
         try {
             m.register(voiceVerification, captcha);
         } catch (RateLimitException e) {
@@ -72,7 +73,7 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
             if (e.getNextAttemptTimestamp() > 0) {
                 message += "\nNext attempt may be tried at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
             }
-            throw new UserErrorException(message);
+            throw new RateLimitErrorException(message, e);
         } catch (CaptchaRequiredException e) {
             String message;
             if (captcha == null) {
diff --git a/src/main/java/org/asamk/signal/commands/exceptions/RateLimitErrorException.java b/src/main/java/org/asamk/signal/commands/exceptions/RateLimitErrorException.java
new file mode 100644
index 00000000..a2eb567e
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/exceptions/RateLimitErrorException.java
@@ -0,0 +1,10 @@
+package org.asamk.signal.commands.exceptions;
+
+import org.asamk.signal.manager.api.RateLimitException;
+
+public final class RateLimitErrorException extends CommandException {
+
+    public RateLimitErrorException(final String message, final RateLimitException cause) {
+        super(message, cause);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
index cf2b282f..ecc669e8 100644
--- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
+++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
@@ -1,10 +1,12 @@
 package org.asamk.signal.util;
 
 import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.json.JsonSendMessageResult;
 import org.asamk.signal.manager.api.ProofRequiredException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResult;
@@ -51,6 +53,9 @@ public class SendMessageResultUtils {
         if (!sendMessageResults.hasSuccess()) {
             if (sendMessageResults.hasOnlyUntrustedIdentity()) {
                 throw new UntrustedKeyErrorException("Failed to send message due to untrusted identities");
+            } else if (sendMessageResults.hasOnlyRateLimitFailure()) {
+                throw new RateLimitErrorException("Failed to send message due to rate limiting",
+                        new RateLimitException(0));
             } else {
                 throw new UserErrorException("Failed to send message");
             }
@@ -111,7 +116,7 @@ public class SendMessageResultUtils {
     }
 
     public static void printSendMessageResultErrors(PlainTextWriter writer, List<String> errors) {
-        if (errors.size() == 0) {
+        if (errors.isEmpty()) {
             return;
         }
         writer.println("Failed to send (some) messages:");

From 33c4e17c0d295d437438f6e1d8fbfd1ae6640f3c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 12 Oct 2023 21:15:00 +0200
Subject: [PATCH 228/672] Implement change phone number

Closes #1240
---
 graalvm-config-dir/reflect-config.json        |  14 +-
 .../org/asamk/signal/manager/Manager.java     |  13 ++
 .../signal/manager/helper/AccountHelper.java  | 149 ++++++++++++++++--
 .../helper/IncomingMessageHandler.java        |  26 +--
 .../signal/manager/helper/PreKeyHelper.java   |   7 +-
 .../signal/manager/internal/ManagerImpl.java  |  25 +++
 .../signal/manager/storage/SignalAccount.java |   6 +-
 .../manager/util/NumberVerificationUtils.java |   7 +-
 .../org/asamk/signal/manager/util/Utils.java  |   6 +
 .../org/asamk/signal/commands/Commands.java   |   2 +
 .../commands/FinishChangeNumberCommand.java   |  58 +++++++
 .../signal/commands/RegisterCommand.java      |  22 +--
 .../commands/StartChangeNumberCommand.java    |  64 ++++++++
 .../asamk/signal/dbus/DbusManagerImpl.java    |  19 +++
 .../org/asamk/signal/util/CommandUtil.java    |  27 ++++
 15 files changed, 382 insertions(+), 63 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
 create mode 100644 src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 1af2fbf0..d24416d9 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -380,6 +380,9 @@
   "name":"java.util.Locale",
   "methods":[{"name":"getUnicodeLocaleType","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"java.util.Map"
+},
 {
   "name":"java.util.Optional",
   "allDeclaredFields":true,
@@ -505,9 +508,15 @@
 {
   "name":"kotlin.collections.List"
 },
+{
+  "name":"kotlin.collections.Map"
+},
 {
   "name":"kotlin.collections.MutableList"
 },
+{
+  "name":"kotlin.collections.MutableMap"
+},
 {
   "name":"kotlin.jvm.JvmStatic",
   "queryAllDeclaredMethods":true
@@ -545,7 +554,7 @@
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
   "allDeclaredClasses":true,
-  "methods":[{"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }]
+  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.Signal$Configuration",
@@ -2049,9 +2058,10 @@
 {
   "name":"org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest",
   "allDeclaredFields":true,
+  "allDeclaredClasses":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"getNumber","parameterTypes":[] }, {"name":"getRegistrationLock","parameterTypes":[] }]
+  "methods":[{"name":"getDeviceMessages","parameterTypes":[] }, {"name":"getDevicePniSignedPrekeys","parameterTypes":[] }, {"name":"getNumber","parameterTypes":[] }, {"name":"getPniIdentityKey","parameterTypes":[] }, {"name":"getPniRegistrationIds","parameterTypes":[] }, {"name":"getRegistrationLock","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.CredentialResponse",
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 264922a8..7cba24f8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
@@ -13,16 +14,20 @@ import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.Recipient;
 import org.asamk.signal.manager.api.RecipientIdentifier;
@@ -107,6 +112,14 @@ public interface Manager extends Closeable {
      */
     void deleteUsername() throws IOException;
 
+    void startChangeNumber(
+            String newNumber, boolean voiceVerification, String captcha
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException;
+
+    void finishChangeNumber(
+            String newNumber, String verificationCode, String pin
+    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException;
+
     void unregister() throws IOException;
 
     void deleteAccount() throws IOException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 5ff11b34..e021cc37 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -14,16 +14,20 @@ import org.asamk.signal.manager.util.NumberVerificationUtils;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
+import org.signal.libsignal.protocol.util.KeyHelper;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest;
+import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
+import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
@@ -31,16 +35,21 @@ import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionExc
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
+import org.whispersystems.signalservice.internal.push.SyncMessage;
+import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevicesException;
 import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
+import okio.ByteString;
+
+import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
 public class AccountHelper {
@@ -139,7 +148,7 @@ public class AccountHelper {
     }
 
     public void startChangeNumber(
-            String newNumber, String captcha, boolean voiceVerification
+            String newNumber, boolean voiceVerification, String captcha
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException {
         final var accountManager = dependencies.createUnauthenticatedAccountManager(newNumber, account.getPassword());
         String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
@@ -153,12 +162,92 @@ public class AccountHelper {
     public void finishChangeNumber(
             String newNumber, String verificationCode, String pin
     ) throws IncorrectPinException, PinLockedException, IOException {
-        // TODO create new PNI identity key
-        final List<OutgoingPushMessage> deviceMessages = null;
-        final Map<String, SignedPreKeyEntity> devicePniSignedPreKeys = null;
-        final Map<String, KyberPreKeyEntity> devicePniLastResortKyberPrekeys = null;
-        final Map<String, Integer> pniRegistrationIds = null;
-        var sessionId = account.getSessionId(account.getNumber());
+        for (var attempts = 0; attempts < 5; attempts++) {
+            try {
+                finishChangeNumberInternal(newNumber, verificationCode, pin);
+                break;
+            } catch (MismatchedDevicesException e) {
+                logger.debug("Change number failed with mismatched devices, retrying.");
+                try {
+                    dependencies.getMessageSender().handleChangeNumberMismatchDevices(e.getMismatchedDevices());
+                } catch (UntrustedIdentityException ex) {
+                    throw new AssertionError(ex);
+                }
+            }
+        }
+    }
+
+    private void finishChangeNumberInternal(
+            String newNumber, String verificationCode, String pin
+    ) throws IncorrectPinException, PinLockedException, IOException {
+        final var pniIdentity = KeyUtils.generateIdentityKeyPair();
+        final var encryptedDeviceMessages = new ArrayList<OutgoingPushMessage>();
+        final var devicePniSignedPreKeys = new HashMap<Integer, SignedPreKeyEntity>();
+        final var devicePniLastResortKyberPreKeys = new HashMap<Integer, KyberPreKeyEntity>();
+        final var pniRegistrationIds = new HashMap<Integer, Integer>();
+
+        final var selfDeviceId = account.getDeviceId();
+        SyncMessage.PniChangeNumber selfChangeNumber = null;
+
+        final var deviceIds = new ArrayList<Integer>();
+        deviceIds.add(SignalServiceAddress.DEFAULT_DEVICE_ID);
+        final var aci = account.getAci();
+        final var accountDataStore = account.getSignalServiceDataStore().aci();
+        final var subDeviceSessions = accountDataStore.getSubDeviceSessions(aci.toString())
+                .stream()
+                .filter(deviceId -> accountDataStore.containsSession(new SignalProtocolAddress(aci.toString(),
+                        deviceId)))
+                .toList();
+        deviceIds.addAll(subDeviceSessions);
+
+        final var messageSender = dependencies.getMessageSender();
+        for (final var deviceId : deviceIds) {
+            // Signed Prekey
+            final var signedPreKeyRecord = KeyUtils.generateSignedPreKeyRecord(KeyUtils.getRandomInt(PREKEY_MAXIMUM_ID),
+                    pniIdentity.getPrivateKey());
+            final var signedPreKeyEntity = new SignedPreKeyEntity(signedPreKeyRecord.getId(),
+                    signedPreKeyRecord.getKeyPair().getPublicKey(),
+                    signedPreKeyRecord.getSignature());
+            devicePniSignedPreKeys.put(deviceId, signedPreKeyEntity);
+
+            // Last-resort kyber prekey
+            final var lastResortKyberPreKeyRecord = KeyUtils.generateKyberPreKeyRecord(KeyUtils.getRandomInt(
+                    PREKEY_MAXIMUM_ID), pniIdentity.getPrivateKey());
+            final var kyberPreKeyEntity = new KyberPreKeyEntity(lastResortKyberPreKeyRecord.getId(),
+                    lastResortKyberPreKeyRecord.getKeyPair().getPublicKey(),
+                    lastResortKyberPreKeyRecord.getSignature());
+            devicePniLastResortKyberPreKeys.put(deviceId, kyberPreKeyEntity);
+
+            // Registration Id
+            var pniRegistrationId = -1;
+            while (pniRegistrationId < 0 || pniRegistrationIds.containsValue(pniRegistrationId)) {
+                pniRegistrationId = KeyHelper.generateRegistrationId(false);
+            }
+            pniRegistrationIds.put(deviceId, pniRegistrationId);
+
+            // Device Message
+            final var pniChangeNumber = new SyncMessage.PniChangeNumber.Builder().identityKeyPair(ByteString.of(
+                            pniIdentity.serialize()))
+                    .signedPreKey(ByteString.of(signedPreKeyRecord.serialize()))
+                    .lastResortKyberPreKey(ByteString.of(lastResortKyberPreKeyRecord.serialize()))
+                    .registrationId(pniRegistrationId)
+                    .newE164(newNumber)
+                    .build();
+
+            if (deviceId == selfDeviceId) {
+                selfChangeNumber = pniChangeNumber;
+            } else {
+                try {
+                    final var message = messageSender.getEncryptedSyncPniInitializeDeviceMessage(deviceId,
+                            pniChangeNumber);
+                    encryptedDeviceMessages.add(message);
+                } catch (UntrustedIdentityException | IOException | InvalidKeyException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+
+        final var sessionId = account.getSessionId(newNumber);
         final var result = NumberVerificationUtils.verifyNumber(sessionId,
                 verificationCode,
                 pin,
@@ -166,7 +255,7 @@ public class AccountHelper {
                 (sessionId1, verificationCode1, registrationLock) -> {
                     final var accountManager = dependencies.getAccountManager();
                     try {
-                        Utils.handleResponseException(accountManager.verifyAccount(verificationCode, sessionId1));
+                        Utils.handleResponseException(accountManager.verifyAccount(verificationCode1, sessionId1));
                     } catch (AlreadyVerifiedException e) {
                         // Already verified so can continue changing number
                     }
@@ -175,14 +264,42 @@ public class AccountHelper {
                             null,
                             newNumber,
                             registrationLock,
-                            account.getPniIdentityKeyPair().getPublicKey(),
-                            deviceMessages,
-                            devicePniSignedPreKeys,
-                            devicePniLastResortKyberPrekeys,
-                            pniRegistrationIds)));
+                            pniIdentity.getPublicKey(),
+                            encryptedDeviceMessages,
+                            Utils.mapKeys(devicePniSignedPreKeys, Object::toString),
+                            Utils.mapKeys(devicePniLastResortKyberPreKeys, Object::toString),
+                            Utils.mapKeys(pniRegistrationIds, Object::toString))));
                 });
-        // TODO handle response
-        updateSelfIdentifiers(newNumber, account.getAci(), PNI.parseOrThrow(result.first().getPni()));
+
+        final var updatePni = PNI.parseOrThrow(result.first().getPni());
+        if (updatePni.equals(account.getPni())) {
+            logger.debug("PNI is unchanged after change number");
+            return;
+        }
+
+        handlePniChangeNumberMessage(selfChangeNumber, updatePni);
+    }
+
+    public void handlePniChangeNumberMessage(
+            final SyncMessage.PniChangeNumber pniChangeNumber, final PNI updatedPni
+    ) {
+        if (pniChangeNumber.identityKeyPair != null
+                && pniChangeNumber.registrationId != null
+                && pniChangeNumber.signedPreKey != null) {
+            logger.debug("New PNI: {}", updatedPni);
+            try {
+                setPni(updatedPni,
+                        new IdentityKeyPair(pniChangeNumber.identityKeyPair.toByteArray()),
+                        pniChangeNumber.newE164,
+                        pniChangeNumber.registrationId,
+                        new SignedPreKeyRecord(pniChangeNumber.signedPreKey.toByteArray()),
+                        pniChangeNumber.lastResortKyberPreKey != null
+                                ? new KyberPreKeyRecord(pniChangeNumber.lastResortKyberPreKey.toByteArray())
+                                : null);
+            } catch (Exception e) {
+                logger.warn("Failed to handle change number message", e);
+            }
+        }
     }
 
     public static final int USERNAME_MIN_LENGTH = 3;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 9d69632e..3f0abc48 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -40,12 +40,9 @@ import org.signal.libsignal.metadata.ProtocolInvalidMessageException;
 import org.signal.libsignal.metadata.ProtocolNoSessionException;
 import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
 import org.signal.libsignal.metadata.SelfSendException;
-import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
-import org.signal.libsignal.protocol.state.KyberPreKeyRecord;
-import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
@@ -67,7 +64,6 @@ import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSy
 import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
-import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.internal.push.Envelope;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
@@ -618,24 +614,10 @@ public final class IncomingMessageHandler {
         if (syncMessage.getPniChangeNumber().isPresent()) {
             final var pniChangeNumber = syncMessage.getPniChangeNumber().get();
             logger.debug("Received PNI change number sync message, applying.");
-            if (pniChangeNumber.identityKeyPair != null
-                    && pniChangeNumber.registrationId != null
-                    && pniChangeNumber.signedPreKey != null
-                    && !envelope.getUpdatedPni().isEmpty()) {
-                logger.debug("New PNI: {}", envelope.getUpdatedPni());
-                try {
-                    final var updatedPni = PNI.parseOrThrow(envelope.getUpdatedPni());
-                    context.getAccountHelper()
-                            .setPni(updatedPni,
-                                    new IdentityKeyPair(pniChangeNumber.identityKeyPair.toByteArray()),
-                                    pniChangeNumber.newE164,
-                                    pniChangeNumber.registrationId,
-                                    new SignedPreKeyRecord(pniChangeNumber.signedPreKey.toByteArray()),
-                                    pniChangeNumber.lastResortKyberPreKey != null ? new KyberPreKeyRecord(
-                                            pniChangeNumber.lastResortKyberPreKey.toByteArray()) : null);
-                } catch (Exception e) {
-                    logger.warn("Failed to handle change number message", e);
-                }
+            final var updatedPniString = envelope.getUpdatedPni();
+            if (updatedPniString != null && !updatedPniString.isEmpty()) {
+                final var updatedPni = ServiceId.PNI.parseOrThrow(updatedPniString);
+                context.getAccountHelper().handlePniChangeNumberMessage(pniChangeNumber, updatedPni);
             }
         }
         return actions;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 1961fc56..c08da92c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -112,7 +112,12 @@ public class PreKeyHelper {
                     preKeyRecords,
                     lastResortKyberPreKeyRecord,
                     kyberPreKeyRecords);
-            dependencies.getAccountManager().setPreKeys(preKeyUpload);
+            try {
+                dependencies.getAccountManager().setPreKeys(preKeyUpload);
+            } catch (AuthorizationFailedException e) {
+                // This can happen when the primary device has changed phone number
+                logger.warn("Failed to updated pre keys: {}", e.getMessage());
+            }
         }
 
         cleanSignedPreKeys((serviceIdType));
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index bfb52ebf..a91a6099 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -19,6 +19,7 @@ package org.asamk.signal.manager.internal;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
@@ -30,17 +31,21 @@ import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.Recipient;
 import org.asamk.signal.manager.api.RecipientIdentifier;
@@ -317,6 +322,26 @@ public class ManagerImpl implements Manager {
         context.getAccountHelper().deleteUsername();
     }
 
+    @Override
+    public void startChangeNumber(
+            String newNumber, boolean voiceVerification, String captcha
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
+        context.getAccountHelper().startChangeNumber(newNumber, voiceVerification, captcha);
+    }
+
+    @Override
+    public void finishChangeNumber(
+            String newNumber, String verificationCode, String pin
+    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
+        context.getAccountHelper().finishChangeNumber(newNumber, verificationCode, pin);
+    }
+
     @Override
     public void unregister() throws IOException {
         context.getAccountHelper().unregister();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index a7954ca2..6b63920e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1383,7 +1383,6 @@ public class SignalAccount implements Closeable {
         if (oldPni != null && !oldPni.equals(updatedPni)) {
             // Clear data for old PNI
             identityKeyStore.deleteIdentity(oldPni);
-            clearAllPreKeys(ServiceIdType.PNI);
         }
 
         this.pniAccountData.setServiceId(updatedPni);
@@ -1400,11 +1399,14 @@ public class SignalAccount implements Closeable {
         setPniIdentityKeyPair(pniIdentityKeyPair);
         pniAccountData.setLocalRegistrationId(localPniRegistrationId);
 
-        final var preKeyMetadata = getAccountData(ServiceIdType.PNI).getPreKeyMetadata();
+        final AccountData<? extends ServiceId> accountData = getAccountData(ServiceIdType.PNI);
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
         preKeyMetadata.nextSignedPreKeyId = pniSignedPreKey.getId();
+        accountData.getSignedPreKeyStore().removeSignedPreKey(pniSignedPreKey.getId());
         addSignedPreKey(ServiceIdType.PNI, pniSignedPreKey);
         if (lastResortKyberPreKey != null) {
             preKeyMetadata.nextKyberPreKeyId = lastResortKyberPreKey.getId();
+            accountData.getKyberPreKeyStore().removeKyberPreKey(lastResortKyberPreKey.getId());
             addLastResortKyberPreKey(ServiceIdType.PNI, lastResortKyberPreKey);
         }
         save();
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index f8a14c05..62474e66 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -7,6 +7,8 @@ import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.helper.PinHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException;
@@ -24,6 +26,8 @@ import java.util.function.Consumer;
 
 public class NumberVerificationUtils {
 
+    private final static Logger logger = LoggerFactory.getLogger(NumberVerificationUtils.class);
+
     public static String handleVerificationSession(
             SignalServiceAccountManager accountManager,
             String sessionId,
@@ -143,7 +147,7 @@ public class NumberVerificationUtils {
 
     private static RegistrationSessionMetadataResponse requestValidSession(
             final SignalServiceAccountManager accountManager
-    ) throws NoSuchSessionException, IOException {
+    ) throws IOException {
         return Utils.handleResponseException(accountManager.createRegistrationSession(null, "", ""));
     }
 
@@ -153,6 +157,7 @@ public class NumberVerificationUtils {
         try {
             return validateSession(accountManager, sessionId);
         } catch (NoSuchSessionException e) {
+            logger.debug("No registration session, creating new one.");
             return requestValidSession(accountManager);
         }
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 16e80e45..6e9c701e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -25,6 +25,8 @@ import java.util.Spliterator;
 import java.util.Spliterators;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -122,6 +124,10 @@ public class Utils {
         }, leftStream.isParallel() || rightStream.isParallel());
     }
 
+    public static <OK, NK, V> Map<NK, V> mapKeys(Map<OK, V> map, Function<OK, NK> keyMapper) {
+        return map.entrySet().stream().collect(Collectors.toMap(e -> keyMapper.apply(e.getKey()), Map.Entry::getValue));
+    }
+
     public static Map<String, String> getQueryMap(String query) {
         var params = query.split("&");
         var map = new HashMap<String, String>();
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 2783ca37..719ba132 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -14,6 +14,7 @@ public class Commands {
         addCommand(new BlockCommand());
         addCommand(new DaemonCommand());
         addCommand(new DeleteLocalAccountDataCommand());
+        addCommand(new FinishChangeNumberCommand());
         addCommand(new FinishLinkCommand());
         addCommand(new GetAttachmentCommand());
         addCommand(new GetUserStatusCommand());
@@ -43,6 +44,7 @@ public class Commands {
         addCommand(new SendTypingCommand());
         addCommand(new SetPinCommand());
         addCommand(new SubmitRateLimitChallengeCommand());
+        addCommand(new StartChangeNumberCommand());
         addCommand(new StartLinkCommand());
         addCommand(new TrustCommand());
         addCommand(new UnblockCommand());
diff --git a/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
new file mode 100644
index 00000000..c2c18dde
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
@@ -0,0 +1,58 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.IncorrectPinException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.output.OutputWriter;
+
+import java.io.IOException;
+
+public class FinishChangeNumberCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "finishChangeNumber";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Verify the new number using the code received via SMS or voice.");
+        subparser.addArgument("number").help("The new phone number in E164 format.").required(true);
+        subparser.addArgument("-v", "--verification-code")
+                .help("The verification code you received via sms or voice call.")
+                .required(true);
+        subparser.addArgument("-p", "--pin").help("The registration lock PIN, that was set by the user (Optional)");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var newNumber = ns.getString("number");
+        final var verificationCode = ns.getString("verification-code");
+        final var pin = ns.getString("pin");
+
+        try {
+            m.finishChangeNumber(newNumber, verificationCode, pin);
+        } catch (PinLockedException e) {
+            throw new UserErrorException(
+                    "Verification failed! This number is locked with a pin. Hours remaining until reset: "
+                            + (e.getTimeRemaining() / 1000 / 60 / 60)
+                            + "\nUse '--pin PIN_CODE' to specify the registration lock PIN");
+        } catch (IncorrectPinException e) {
+            throw new UserErrorException("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to change number: %s (%s)".formatted(e.getMessage(),
+                    e.getClass().getSimpleName()), e);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 1ca7bee2..876d1a8a 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -16,7 +16,7 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.output.JsonWriter;
-import org.asamk.signal.util.DateUtils;
+import org.asamk.signal.util.CommandUtil;
 
 import java.io.IOException;
 import java.util.List;
@@ -69,26 +69,10 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
         try {
             m.register(voiceVerification, captcha);
         } catch (RateLimitException e) {
-            String message = "Rate limit reached";
-            if (e.getNextAttemptTimestamp() > 0) {
-                message += "\nNext attempt may be tried at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
-            }
+            final var message = CommandUtil.getRateLimitMessage(e);
             throw new RateLimitErrorException(message, e);
         } catch (CaptchaRequiredException e) {
-            String message;
-            if (captcha == null) {
-                message = """
-                          Captcha required for verification, use --captcha CAPTCHA
-                          To get the token, go to https://signalcaptchas.org/registration/generate.html
-                          Check the developer tools (F12) console for a failed redirect to signalcaptcha://
-                          Everything after signalcaptcha:// is the captcha token.""";
-            } else {
-                message = "Invalid captcha given.";
-            }
-            if (e.getNextAttemptTimestamp() > 0) {
-                message += "\nNext Captcha may be provided at "
-                        + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
-            }
+            final var message = CommandUtil.getCaptchaRequiredMessage(e, captcha != null);
             throw new UserErrorException(message);
         } catch (NonNormalizedPhoneNumberException e) {
             throw new UserErrorException("Failed to register: " + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
new file mode 100644
index 00000000..7b18dbf0
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
@@ -0,0 +1,64 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;
+
+import java.io.IOException;
+
+public class StartChangeNumberCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "startChangeNumber";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Change account to a new phone number with SMS or voice verification.");
+        subparser.addArgument("number").help("The new phone number in E164 format.").required(true);
+        subparser.addArgument("-v", "--voice")
+                .help("The verification should be done over voice, not SMS.")
+                .action(Arguments.storeTrue());
+        subparser.addArgument("--captcha")
+                .help("The captcha token, required if change number failed with a captcha required error.");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var newNumber = ns.getString("number");
+        final var voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice"));
+        final var captcha = ns.getString("captcha");
+
+        try {
+            m.startChangeNumber(newNumber, voiceVerification, captcha);
+        } catch (RateLimitException e) {
+            final var message = CommandUtil.getRateLimitMessage(e);
+            throw new RateLimitErrorException(message, e);
+        } catch (CaptchaRequiredException e) {
+            final var message = CommandUtil.getCaptchaRequiredMessage(e, captcha != null);
+            throw new UserErrorException(message);
+        } catch (NonNormalizedPhoneNumberException e) {
+            throw new UserErrorException("Failed to change number: " + e.getMessage(), e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to change number: %s (%s)".formatted(e.getMessage(),
+                    e.getClass().getSimpleName()), e);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index d6cd52fa..2e30417c 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -4,6 +4,7 @@ import org.asamk.Signal;
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Device;
@@ -17,15 +18,19 @@ import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.Identity;
 import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
+import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.Recipient;
 import org.asamk.signal.manager.api.RecipientAddress;
@@ -166,6 +171,20 @@ public class DbusManagerImpl implements Manager {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void startChangeNumber(
+            final String newNumber, final boolean voiceVerification, final String captcha
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void finishChangeNumber(
+            final String newNumber, final String verificationCode, final String pin
+    ) throws IncorrectPinException, PinLockedException, IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void unregister() throws IOException {
         signal.unregister();
diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java
index 311b78af..3fa9aecd 100644
--- a/src/main/java/org/asamk/signal/util/CommandUtil.java
+++ b/src/main/java/org/asamk/signal/util/CommandUtil.java
@@ -2,9 +2,11 @@ package org.asamk.signal.util;
 
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupIdFormatException;
 import org.asamk.signal.manager.api.InvalidNumberException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 
 import java.util.Collection;
@@ -96,4 +98,29 @@ public class CommandUtil {
             throw new UserErrorException("Invalid phone number '" + recipientString + "': " + e.getMessage(), e);
         }
     }
+
+    public static String getCaptchaRequiredMessage(final CaptchaRequiredException e, final boolean captchaProvided) {
+        String message;
+        if (!captchaProvided) {
+            message = """
+                      Captcha required for verification, use --captcha CAPTCHA
+                      To get the token, go to https://signalcaptchas.org/registration/generate.html
+                      Check the developer tools (F12) console for a failed redirect to signalcaptcha://
+                      Everything after signalcaptcha:// is the captcha token.""";
+        } else {
+            message = "Invalid captcha given.";
+        }
+        if (e.getNextAttemptTimestamp() > 0) {
+            message += "\nNext Captcha may be provided at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
+        }
+        return message;
+    }
+
+    public static String getRateLimitMessage(final RateLimitException e) {
+        String message = "Rate limit reached";
+        if (e.getNextAttemptTimestamp() > 0) {
+            message += "\nNext attempt may be tried at " + DateUtils.formatTimestamp(e.getNextAttemptTimestamp());
+        }
+        return message;
+    }
 }

From a675631965e3cf928412130b05887ce199da09da Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 15 Oct 2023 18:53:24 +0200
Subject: [PATCH 229/672] Resolve self address after setting new PNI

---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 6b63920e..2cfd5cd7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1386,6 +1386,7 @@ public class SignalAccount implements Closeable {
         }
 
         this.pniAccountData.setServiceId(updatedPni);
+        getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
         trustSelfIdentity(ServiceIdType.PNI);
         save();
     }

From 7cd24a74af29468f67ebfdaed450bda06753b851 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 15 Oct 2023 19:02:59 +0200
Subject: [PATCH 230/672] Improve handling of CDSI resource exhaustion

---
 .../main/java/org/asamk/signal/manager/Manager.java |  2 +-
 .../asamk/signal/manager/internal/ManagerImpl.java  | 13 +++++++++++--
 .../asamk/signal/commands/GetUserStatusCommand.java |  6 ++++++
 .../java/org/asamk/signal/dbus/DbusSignalImpl.java  |  8 +++++++-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 7cba24f8..defe7155 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -86,7 +86,7 @@ public interface Manager extends Closeable {
      * @return A map of numbers to canonicalized number and uuid. If a number is not registered the uuid is null.
      * @throws IOException if it's unable to get the contacts to check if they're registered
      */
-    Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException;
+    Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException;
 
     void updateAccountAttributes(String deviceName) throws IOException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index a91a6099..189e4fe9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -64,6 +64,7 @@ import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.helper.RecipientHelper.RegisteredUser;
 import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
@@ -89,6 +90,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
+import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
@@ -216,7 +218,7 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException {
+    public Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException {
         final var canonicalizedNumbers = numbers.stream().collect(Collectors.toMap(n -> n, n -> {
             try {
                 final var canonicalizedNumber = PhoneNumberFormatter.formatNumber(n, account.getNumber());
@@ -234,7 +236,14 @@ public class ManagerImpl implements Manager {
                 .stream()
                 .filter(s -> !s.isEmpty())
                 .collect(Collectors.toSet());
-        final var registeredUsers = context.getRecipientHelper().getRegisteredUsers(canonicalizedNumbersSet);
+
+        final Map<String, RegisteredUser> registeredUsers;
+        try {
+            registeredUsers = context.getRecipientHelper().getRegisteredUsers(canonicalizedNumbersSet);
+        } catch (CdsiResourceExhaustedException e) {
+            logger.debug("CDSI resource exhausted: {}", e.getMessage());
+            throw new RateLimitException(System.currentTimeMillis() + e.getRetryAfterSeconds() * 1000L);
+        }
 
         return numbers.stream().collect(Collectors.toMap(n -> n, n -> {
             final var number = canonicalizedNumbers.get(n);
diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 8c89dd4f..30fe7bf2 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -5,11 +5,14 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.CommandUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,6 +43,9 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
         Map<String, UserStatus> registered;
         try {
             registered = m.getUserStatus(new HashSet<>(ns.getList("recipient")));
+        } catch (RateLimitException e) {
+            final var message = CommandUtil.getRateLimitMessage(e);
+            throw new RateLimitErrorException(message, e);
         } catch (IOException e) {
             throw new IOErrorException("Unable to check if users are registered: "
                     + e.getMessage()
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 608ed581..2223c96a 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -21,6 +21,7 @@ import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.RecipientAddress;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendMessageResult;
@@ -31,6 +32,7 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.SendMessageResultUtils;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -681,6 +683,10 @@ public class DbusSignalImpl implements Signal {
             registered = m.getUserStatus(new HashSet<>(numbers));
         } catch (IOException e) {
             throw new Error.Failure(e.getMessage());
+        } catch (RateLimitException e) {
+            throw new Error.Failure(e.getMessage()
+                    + ", retry at "
+                    + DateUtils.formatTimestamp(e.getNextAttemptTimestamp()));
         }
 
         return numbers.stream().map(number -> registered.get(number).uuid() != null).toList();
@@ -893,7 +899,7 @@ public class DbusSignalImpl implements Signal {
         }
 
         var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results);
-        if (errors.size() == 0 || errors.size() < results.size()) {
+        if (errors.isEmpty() || errors.size() < results.size()) {
             return;
         }
 

From 5c39344cff49befe4f48e34fc84be8238a4df4fa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 15 Oct 2023 22:36:45 +0200
Subject: [PATCH 231/672] Implement full CDSI refresh

---
 .../manager/helper/RecipientHelper.java       |  61 +++++--
 .../manager/storage/AccountDatabase.java      |  16 +-
 .../signal/manager/storage/SignalAccount.java |  15 ++
 .../storage/keyValue/KeyValueStore.java       |   8 +
 .../manager/storage/recipients/CdsiStore.java | 170 ++++++++++++++++++
 .../storage/recipients/RecipientStore.java    |  19 ++
 6 files changed, 278 insertions(+), 11 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 89354524..322bd032 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -14,6 +14,7 @@ import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException;
 import org.whispersystems.signalservice.api.services.CdsiV2Service;
 import org.whispersystems.util.Base64UrlSafe;
 
@@ -115,6 +116,10 @@ public class RecipientHelper {
         }
     }
 
+    public void refreshUsers() throws IOException {
+        getRegisteredUsers(account.getRecipientStore().getAllNumbers(), false);
+    }
+
     public RecipientId refreshRegisteredUser(RecipientId recipientId) throws IOException, UnregisteredRecipientException {
         final var address = resolveSignalServiceAddress(recipientId);
         if (address.getNumber().isEmpty()) {
@@ -126,8 +131,16 @@ public class RecipientHelper {
                 .resolveRecipientTrusted(new SignalServiceAddress(serviceId, number));
     }
 
-    public Map<String, RegisteredUser> getRegisteredUsers(final Set<String> numbers) throws IOException {
-        Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, true);
+    public Map<String, RegisteredUser> getRegisteredUsers(
+            final Set<String> numbers
+    ) throws IOException {
+        return getRegisteredUsers(numbers, true);
+    }
+
+    private Map<String, RegisteredUser> getRegisteredUsers(
+            final Set<String> numbers, final boolean isPartialRefresh
+    ) throws IOException {
+        Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, isPartialRefresh, true);
 
         // Store numbers as recipients, so we have the number/uuid association
         registeredUsers.forEach((number, u) -> account.getRecipientTrustedResolver()
@@ -139,7 +152,7 @@ public class RecipientHelper {
     private ServiceId getRegisteredUserByNumber(final String number) throws IOException, UnregisteredRecipientException {
         final Map<String, RegisteredUser> aciMap;
         try {
-            aciMap = getRegisteredUsers(Set.of(number));
+            aciMap = getRegisteredUsers(Set.of(number), true);
         } catch (NumberFormatException e) {
             throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null, number));
         }
@@ -151,22 +164,50 @@ public class RecipientHelper {
     }
 
     private Map<String, RegisteredUser> getRegisteredUsersV2(
-            final Set<String> numbers, boolean useCompat
+            final Set<String> numbers, boolean isPartialRefresh, boolean useCompat
     ) throws IOException {
-        // Only partial refresh is implemented here
+        final var previousNumbers = isPartialRefresh ? Set.<String>of() : account.getCdsiStore().getAllNumbers();
+        final var newNumbers = new HashSet<>(numbers) {{
+            removeAll(previousNumbers);
+        }};
+        if (newNumbers.isEmpty() && previousNumbers.isEmpty()) {
+            logger.debug("No new numbers to query.");
+            return Map.of();
+        }
+        logger.trace("Querying CDSI for {} new numbers ({} previous)", newNumbers.size(), previousNumbers.size());
+        final var token = previousNumbers.isEmpty()
+                ? Optional.<byte[]>empty()
+                : Optional.ofNullable(account.getCdsiToken());
+
         final CdsiV2Service.Response response;
         try {
             response = dependencies.getAccountManager()
-                    .getRegisteredUsersWithCdsi(Set.of(),
-                            numbers,
+                    .getRegisteredUsersWithCdsi(previousNumbers,
+                            newNumbers,
                             account.getRecipientStore().getServiceIdToProfileKeyMap(),
                             useCompat,
-                            Optional.empty(),
+                            token,
                             serviceEnvironmentConfig.cdsiMrenclave(),
                             null,
-                            token -> {
-                                // Not storing for partial refresh
+                            newToken -> {
+                                if (isPartialRefresh) {
+                                    account.getCdsiStore().updateAfterPartialCdsQuery(newNumbers);
+                                    // Not storing newToken for partial refresh
+                                } else {
+                                    final var fullNumbers = new HashSet<>(previousNumbers) {{
+                                        addAll(newNumbers);
+                                    }};
+                                    final var seenNumbers = new HashSet<>(numbers) {{
+                                        addAll(newNumbers);
+                                    }};
+                                    account.getCdsiStore().updateAfterFullCdsQuery(fullNumbers, seenNumbers);
+                                    account.setCdsiToken(newToken);
+                                }
                             });
+        } catch (CdsiInvalidTokenException e) {
+            account.setCdsiToken(null);
+            account.getCdsiStore().clearAll();
+            throw e;
         } catch (NumberFormatException e) {
             throw new IOException(e);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 3545eaa7..e09cd4c2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -9,6 +9,7 @@ import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
 import org.asamk.signal.manager.storage.prekeys.KyberPreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.PreKeyStore;
 import org.asamk.signal.manager.storage.prekeys.SignedPreKeyStore;
+import org.asamk.signal.manager.storage.recipients.CdsiStore;
 import org.asamk.signal.manager.storage.recipients.RecipientStore;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogStore;
 import org.asamk.signal.manager.storage.senderKeys.SenderKeyRecordStore;
@@ -31,7 +32,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 17;
+    private static final long DATABASE_VERSION = 18;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -55,6 +56,7 @@ public class AccountDatabase extends Database {
         SenderKeyRecordStore.createSql(connection);
         SenderKeySharedStore.createSql(connection);
         KeyValueStore.createSql(connection);
+        CdsiStore.createSql(connection);
     }
 
     @Override
@@ -517,5 +519,17 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 18) {
+            logger.debug("Updating database: Adding cdsi table");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE cdsi (
+                                          _id INTEGER PRIMARY KEY,
+                                          number TEXT NOT NULL UNIQUE,
+                                          last_seen_at INTEGER NOT NULL
+                                        ) STRICT;
+                                        """);
+            }
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 2cfd5cd7..fbfd88f6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -33,6 +33,7 @@ import org.asamk.signal.manager.storage.profiles.LegacyProfileStore;
 import org.asamk.signal.manager.storage.profiles.ProfileStore;
 import org.asamk.signal.manager.storage.protocol.LegacyJsonSignalProtocolStore;
 import org.asamk.signal.manager.storage.protocol.SignalProtocolStore;
+import org.asamk.signal.manager.storage.recipients.CdsiStore;
 import org.asamk.signal.manager.storage.recipients.LegacyRecipientStore;
 import org.asamk.signal.manager.storage.recipients.LegacyRecipientStore2;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
@@ -145,6 +146,7 @@ public class SignalAccount implements Closeable {
     private final KeyValueEntry<Long> lastReceiveTimestamp = new KeyValueEntry<>("last-receive-timestamp",
             long.class,
             0L);
+    private final KeyValueEntry<byte[]> cdsiToken = new KeyValueEntry<>("cdsi-token", byte[].class);
     private final KeyValueEntry<Long> storageManifestVersion = new KeyValueEntry<>("storage-manifest-version",
             long.class,
             -1L);
@@ -160,6 +162,7 @@ public class SignalAccount implements Closeable {
     private StickerStore stickerStore;
     private ConfigurationStore configurationStore;
     private KeyValueStore keyValueStore;
+    private CdsiStore cdsiStore;
 
     private MessageCache messageCache;
     private MessageSendLogStore messageSendLogStore;
@@ -1220,6 +1223,10 @@ public class SignalAccount implements Closeable {
         return getRecipientStore();
     }
 
+    public CdsiStore getCdsiStore() {
+        return getOrCreate(() -> cdsiStore, () -> cdsiStore = new CdsiStore(getAccountDatabase()));
+    }
+
     private RecipientIdCreator getRecipientIdCreator() {
         return recipientId -> getRecipientStore().create(recipientId);
     }
@@ -1571,6 +1578,14 @@ public class SignalAccount implements Closeable {
         }
     }
 
+    public byte[] getCdsiToken() {
+        return getKeyValueStore().getEntry(cdsiToken);
+    }
+
+    public void setCdsiToken(final byte[] value) {
+        getKeyValueStore().storeEntry(cdsiToken, value);
+    }
+
     public ProfileKey getProfileKey() {
         return profileKey;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index 5785dfdc..90c932af 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -90,6 +90,8 @@ public class KeyValueStore {
             value = resultSet.getLong("value");
         } else if (clazz == boolean.class || clazz == Boolean.class) {
             value = resultSet.getBoolean("value");
+        } else if (clazz == byte[].class || clazz == Byte[].class) {
+            value = resultSet.getBytes("value");
         } else if (clazz == String.class) {
             value = resultSet.getString("value");
         } else if (Enum.class.isAssignableFrom(clazz)) {
@@ -134,6 +136,12 @@ public class KeyValueStore {
             } else {
                 statement.setBoolean(parameterIndex, (boolean) value);
             }
+        } else if (clazz == byte[].class || clazz == Byte[].class) {
+            if (value == null) {
+                statement.setNull(parameterIndex, Types.BLOB);
+            } else {
+                statement.setBytes(parameterIndex, (byte[]) value);
+            }
         } else if (clazz == String.class) {
             if (value == null) {
                 statement.setNull(parameterIndex, Types.VARCHAR);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
new file mode 100644
index 00000000..fd0846e9
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
@@ -0,0 +1,170 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.asamk.signal.manager.storage.Database;
+import org.asamk.signal.manager.storage.Utils;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class CdsiStore {
+
+    private static final String TABLE_CDSI = "cdsi";
+
+    private final Database database;
+
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE cdsi (
+                                      _id INTEGER PRIMARY KEY,
+                                      number TEXT NOT NULL UNIQUE,
+                                      last_seen_at INTEGER NOT NULL
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public CdsiStore(final Database database) {
+        this.database = database;
+    }
+
+    public Set<String> getAllNumbers() {
+        try (final var connection = database.getConnection()) {
+            return getAllNumbers(connection);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from cdsi store", e);
+        }
+    }
+
+    /**
+     * Saves the set of e164 numbers used after a full refresh.
+     *
+     * @param fullNumbers All the e164 numbers used in the last CDS query (previous and new).
+     * @param seenNumbers The E164 numbers that were seen in either the system contacts or recipients table. This is different from fullNumbers in that fullNumbers
+     *                    includes every number we've ever seen, even if it's not in our contacts anymore.
+     */
+    public void updateAfterFullCdsQuery(Set<String> fullNumbers, Set<String> seenNumbers) {
+        final var lastSeen = System.currentTimeMillis();
+        try (final var connection = database.getConnection()) {
+            final var existingNumbers = getAllNumbers(connection);
+
+            final var removedNumbers = new HashSet<>(existingNumbers) {{
+                removeAll(fullNumbers);
+            }};
+            removeNumbers(connection, removedNumbers);
+
+            final var addedNumbers = new HashSet<>(fullNumbers) {{
+                removeAll(existingNumbers);
+            }};
+            addNumbers(connection, addedNumbers, lastSeen);
+
+            updateLastSeen(connection, seenNumbers, lastSeen);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update cdsi store", e);
+        }
+    }
+
+    /**
+     * Updates after a partial CDS query. Will not insert new entries.
+     * Instead, this will simply update the lastSeen timestamp of any entry we already have.
+     *
+     * @param seenNumbers The newly-added E164 numbers that we hadn't previously queried for.
+     */
+    public void updateAfterPartialCdsQuery(Set<String> seenNumbers) {
+        final var lastSeen = System.currentTimeMillis();
+
+        try (final var connection = database.getConnection()) {
+            updateLastSeen(connection, seenNumbers, lastSeen);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update cdsi store", e);
+        }
+    }
+
+    private static Set<String> getAllNumbers(final Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT c.number
+                FROM %s c
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var statement = connection.prepareStatement(sql)) {
+            try (var result = Utils.executeQueryForStream(statement, r -> r.getString("number"))) {
+                return result.collect(Collectors.toSet());
+            }
+        }
+    }
+
+    private static void removeNumbers(
+            final Connection connection, final Set<String> numbers
+    ) throws SQLException {
+        final var sql = (
+                """
+                DELETE FROM %s
+                WHERE number = ?
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var number : numbers) {
+                statement.setString(1, number);
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    private static void addNumbers(
+            final Connection connection, final Set<String> numbers, final long lastSeen
+    ) throws SQLException {
+        final var sql = (
+                """
+                INSERT INTO %s (number, last_seen_at)
+                VALUES (?, ?)
+                ON CONFLICT (number) DO UPDATE SET last_seen_at = excluded.last_seen_at
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var number : numbers) {
+                statement.setString(1, number);
+                statement.setLong(2, lastSeen);
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    private static void updateLastSeen(
+            final Connection connection, final Set<String> numbers, final long lastSeen
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET last_seen_at = ?
+                WHERE number = ?
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var number : numbers) {
+                statement.setLong(1, lastSeen);
+                statement.setString(2, number);
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public void clearAll() {
+        final var sql = (
+                """
+                TRUNCATE %s
+                """
+        ).formatted(TABLE_CDSI);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update cdsi store", e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 9ef734c7..62ab525a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -383,6 +383,25 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    public Set<String> getAllNumbers() {
+        final var sql = (
+                """
+                SELECT r.number
+                FROM %s r
+                WHERE r.number IS NOT NULL
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var connection = database.getConnection()) {
+            try (final var statement = connection.prepareStatement(sql)) {
+                return Utils.executeQueryForStream(statement, resultSet -> resultSet.getString("number"))
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toSet());
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from recipient store", e);
+        }
+    }
+
     public Map<ServiceId, ProfileKey> getServiceIdToProfileKeyMap() {
         final var sql = (
                 """

From bb78e9aaebffd8a891dbf4350cb8f9db02b5eb41 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 15 Oct 2023 22:37:01 +0200
Subject: [PATCH 232/672] Update libsignal-service-java

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index ab937133..9238ea43 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_84")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_85")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")

From 24069c8277cca7f8e94aa3f083980e85dca25269 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 15 Oct 2023 22:37:46 +0200
Subject: [PATCH 233/672] Update documentation

---
 README.md                                     |  4 +--
 man/signal-cli.1.adoc                         | 36 +++++++++++++++++++
 .../asamk/signal/commands/SendCommand.java    |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b546a62c..a254e267 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,8 @@ See [latest version](https://github.com/AsamK/signal-cli/releases).
 
 ```sh
 export VERSION=<latest version, format "x.y.z">
-wget https://github.com/AsamK/signal-cli/releases/download/v"${VERSION}"/signal-cli-"${VERSION}"-Linux.tar.gz
-sudo tar xf signal-cli-"${VERSION}"-Linux.tar.gz -C /opt
+wget https://github.com/AsamK/signal-cli/releases/download/v"${VERSION}"/signal-cli-"${VERSION}".tar.gz
+sudo tar xf signal-cli-"${VERSION}".tar.gz -C /opt
 sudo ln -sf /opt/signal-cli-"${VERSION}"/bin/signal-cli /usr/local/bin/
 ```
 
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index b3431341..2b545fa2 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -96,6 +96,7 @@ If the account was deleted (with --delete-account) it cannot be reactivated.
 
 *-v*, *--voice*::
 The verification should be done over voice, not SMS.
+Voice verification only works if an SMS verification has been attempted before.
 
 *--captcha*::
 The captcha token, required if registration failed with a captcha required error.
@@ -146,6 +147,38 @@ Can fix problems with receiving messages.
 *-n* NAME, *--device-name* NAME::
 Set a new device name for the primary or linked device
 
+=== startChangeNumber
+
+Change an account to a new phone number with SMS or voice verification.
+Use the finishChangeNumber command to complete the verification.
+
+NUMBER::
+The new phone number.
+
+*-v*, *--voice*::
+The verification should be done over voice, not SMS.
+Voice verification only works if an SMS verification has been attempted before.
+
+*--captcha*::
+The captcha token, required if registration failed with a captcha required error.
+To get the token, go to https://signalcaptchas.org/registration/generate.html
+For the staging environment, use: https://signalcaptchas.org/staging/registration/generate.html
+Check the developer tools for a redirect starting with signalcaptcha:// Everything after signalcaptcha:// is the captcha token.
+
+=== finishChangeNumber
+
+Verify the number using the code received via SMS or voice.
+
+NUMBER::
+The new phone number.
+
+*-v*, *--verification-code*::
+The verification code.
+
+*-p* PIN, *--pin* PIN::
+The registration lock PIN, that was set by the user.
+Only required if a PIN was set.
+
 === updateConfiguration
 
 Update signal configs and sync them to linked devices.
@@ -272,6 +305,9 @@ Specify the mentions of the original message (same format as `--mention`).
 *--quote-text-style*::
 Style parts of the original message text (same format as `--text-style`).
 
+*--quote-attachment*::
+Specify the attachments of the original message (syntax: contentType[:filename[:previewFile]]), e.g. 'audio/aac' or 'image/png:test.png:/tmp/preview.jpg'.
+
 *--preview-url*::
 Specify the url for the link preview.
 The same url must also appear in the message body, otherwise the preview won't be displayed by the apps.
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 1c3d91ba..51f1fa1e 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -80,7 +80,7 @@ public class SendCommand implements JsonRpcLocalCommand {
                 .help("Quote with mention of another group member (syntax: start:length:recipientNumber)");
         subparser.addArgument("--quote-attachment")
                 .nargs("*")
-                .help("Specify the attachments of the original message (syntax: contentType[:filename[:previewFile]], e.g. 'audio/aac' or 'image/png:test.png:/tmp/preview.jpg'.");
+                .help("Specify the attachments of the original message (syntax: contentType[:filename[:previewFile]]), e.g. 'audio/aac' or 'image/png:test.png:/tmp/preview.jpg'.");
         subparser.addArgument("--quote-text-style")
                 .nargs("*")
                 .help("Quote with style parts of the message text (syntax: start:length:STYLE)");

From 505de39d2acabed2bffd396ab44219e3957c051d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 16 Oct 2023 17:34:28 +0200
Subject: [PATCH 234/672] Use partial cdsi request only for a maximum of 3
 numbers

Fixes #1239
---
 .../signal/manager/config/ServiceConfig.java     |  1 +
 .../signal/manager/helper/RecipientHelper.java   | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 7b2ba140..bf45f8cd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -29,6 +29,7 @@ public class ServiceConfig {
     public final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
     public final static boolean AUTOMATIC_NETWORK_RETRY = true;
     public final static int GROUP_MAX_SIZE = 1001;
+    public final static int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
 
     private final static KeyStore iasKeyStore;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 322bd032..133aab5b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -26,6 +26,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
+import static org.asamk.signal.manager.config.ServiceConfig.MAXIMUM_ONE_OFF_REQUEST_SIZE;
+
 public class RecipientHelper {
 
     private final static Logger logger = LoggerFactory.getLogger(RecipientHelper.class);
@@ -134,7 +136,14 @@ public class RecipientHelper {
     public Map<String, RegisteredUser> getRegisteredUsers(
             final Set<String> numbers
     ) throws IOException {
-        return getRegisteredUsers(numbers, true);
+        if (numbers.size() > MAXIMUM_ONE_OFF_REQUEST_SIZE) {
+            final var allNumbers = new HashSet<>(account.getRecipientStore().getAllNumbers()) {{
+                addAll(numbers);
+            }};
+            return getRegisteredUsers(allNumbers, false);
+        } else {
+            return getRegisteredUsers(numbers, true);
+        }
     }
 
     private Map<String, RegisteredUser> getRegisteredUsers(
@@ -174,7 +183,10 @@ public class RecipientHelper {
             logger.debug("No new numbers to query.");
             return Map.of();
         }
-        logger.trace("Querying CDSI for {} new numbers ({} previous)", newNumbers.size(), previousNumbers.size());
+        logger.trace("Querying CDSI for {} new numbers ({} previous), isPartialRefresh={}",
+                newNumbers.size(),
+                previousNumbers.size(),
+                isPartialRefresh);
         final var token = previousNumbers.isEmpty()
                 ? Optional.<byte[]>empty()
                 : Optional.ofNullable(account.getCdsiToken());

From dd3326f03897839fe10103bf429c0ac77105bd0c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 16 Oct 2023 17:43:03 +0200
Subject: [PATCH 235/672] Do a full recipients refresh every day

---
 .../signal/manager/helper/RecipientHelper.java      |  1 +
 .../asamk/signal/manager/internal/ManagerImpl.java  | 13 +++++++++++++
 .../asamk/signal/manager/storage/SignalAccount.java | 12 ++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 133aab5b..a27aca64 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -214,6 +214,7 @@ public class RecipientHelper {
                                     }};
                                     account.getCdsiStore().updateAfterFullCdsQuery(fullNumbers, seenNumbers);
                                     account.setCdsiToken(newToken);
+                                    account.setLastRecipientsRefresh(System.currentTimeMillis());
                                 }
                             });
         } catch (CdsiInvalidTokenException e) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 189e4fe9..841fd791 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -115,6 +115,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
@@ -215,6 +216,18 @@ public class ManagerImpl implements Manager {
 
     public void checkAccountState() throws IOException {
         context.getAccountHelper().checkAccountState();
+        final var lastRecipientsRefresh = account.getLastRecipientsRefresh();
+        if (lastRecipientsRefresh == null
+                || lastRecipientsRefresh < System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1)) {
+            try {
+                context.getRecipientHelper().refreshUsers();
+            } catch (Exception e) {
+                logger.warn("Full CDSI recipients refresh failed, ignoring: {} ({})",
+                        e.getMessage(),
+                        e.getClass().getSimpleName());
+                logger.debug("Full CDSI refresh failed", e);
+            }
+        }
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index fbfd88f6..a51136a0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -147,6 +147,8 @@ public class SignalAccount implements Closeable {
             long.class,
             0L);
     private final KeyValueEntry<byte[]> cdsiToken = new KeyValueEntry<>("cdsi-token", byte[].class);
+    private final KeyValueEntry<Long> lastRecipientsRefresh = new KeyValueEntry<>("last-recipients-refresh",
+            long.class);
     private final KeyValueEntry<Long> storageManifestVersion = new KeyValueEntry<>("storage-manifest-version",
             long.class,
             -1L);
@@ -374,6 +376,7 @@ public class SignalAccount implements Closeable {
         this.storageKey = null;
         trustSelfIdentity(ServiceIdType.ACI);
         trustSelfIdentity(ServiceIdType.PNI);
+        getKeyValueStore().storeEntry(lastRecipientsRefresh, null);
     }
 
     public void finishRegistration(
@@ -406,6 +409,7 @@ public class SignalAccount implements Closeable {
         getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
         trustSelfIdentity(ServiceIdType.ACI);
         trustSelfIdentity(ServiceIdType.PNI);
+        getKeyValueStore().storeEntry(lastRecipientsRefresh, null);
     }
 
     public void initDatabase() {
@@ -1586,6 +1590,14 @@ public class SignalAccount implements Closeable {
         getKeyValueStore().storeEntry(cdsiToken, value);
     }
 
+    public Long getLastRecipientsRefresh() {
+        return getKeyValueStore().getEntry(lastRecipientsRefresh);
+    }
+
+    public void setLastRecipientsRefresh(final Long value) {
+        getKeyValueStore().storeEntry(lastRecipientsRefresh, value);
+    }
+
     public ProfileKey getProfileKey() {
         return profileKey;
     }

From 400dcf28990e75f395b44b80c70279ae132e877b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 16 Oct 2023 18:28:08 +0200
Subject: [PATCH 236/672] Refactor creating linked account files

---
 .../signal/manager/SignalAccountFiles.java    |   5 -
 .../internal/ProvisioningManagerImpl.java     |  54 +++----
 .../signal/manager/storage/SignalAccount.java | 145 +++++-------------
 3 files changed, 64 insertions(+), 140 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
index da8a3f3a..ef160621 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
@@ -14,7 +14,6 @@ import org.asamk.signal.manager.internal.RegistrationManagerImpl;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.asamk.signal.manager.util.KeyUtils;
-import org.signal.libsignal.protocol.util.KeyHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
@@ -160,8 +159,6 @@ public class SignalAccountFiles {
             final var newAccountPath = accountPath == null ? accountsStore.addAccount(number, null) : accountPath;
             var aciIdentityKey = KeyUtils.generateIdentityKeyPair();
             var pniIdentityKey = KeyUtils.generateIdentityKeyPair();
-            var registrationId = KeyHelper.generateRegistrationId(false);
-            var pniRegistrationId = KeyHelper.generateRegistrationId(false);
 
             var profileKey = KeyUtils.createProfileKey();
             var account = SignalAccount.create(pathConfig.dataPath(),
@@ -170,8 +167,6 @@ public class SignalAccountFiles {
                     serviceEnvironment,
                     aciIdentityKey,
                     pniIdentityKey,
-                    registrationId,
-                    pniRegistrationId,
                     profileKey,
                     settings);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 405657b0..155756c9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -27,12 +27,12 @@ import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.signal.libsignal.protocol.util.KeyHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
@@ -59,8 +59,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
 
     private final SignalServiceAccountManager accountManager;
     private final IdentityKeyPair tempIdentityKey;
-    private final int registrationId;
-    private final int pniRegistrationId;
     private final String password;
 
     public ProvisioningManagerImpl(
@@ -77,8 +75,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
         this.accountsStore = accountsStore;
 
         tempIdentityKey = KeyUtils.generateIdentityKeyPair();
-        registrationId = KeyHelper.generateRegistrationId(false);
-        pniRegistrationId = KeyHelper.generateRegistrationId(false);
         password = KeyUtils.createPassword();
         GroupsV2Operations groupsV2Operations;
         try {
@@ -114,9 +110,9 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
         if (accountPath == null) {
             accountPath = accountsStore.getPathByNumber(number);
         }
-        if (accountPath != null
-                && SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)
-                && !canRelinkExistingAccount(accountPath)) {
+        final var accountExists = accountPath != null && SignalAccount.accountFileExists(pathConfig.dataPath(),
+                accountPath);
+        if (accountExists && !canRelinkExistingAccount(accountPath)) {
             throw new UserAlreadyExistsException(number, SignalAccount.getFileName(pathConfig.dataPath(), accountPath));
         }
         if (accountPath == null) {
@@ -128,38 +124,42 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
         var encryptedDeviceName = deviceName == null
                 ? null
                 : DeviceNameUtil.encryptDeviceName(deviceName, ret.getAciIdentity().getPrivateKey());
-
-        logger.debug("Finishing new device registration");
-        var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
-                new ConfirmCodeMessage(false,
-                        true,
-                        registrationId,
-                        pniRegistrationId,
-                        encryptedDeviceName,
-                        getCapabilities(false)));
-
         // Create new account with the synced identity
         var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();
 
         SignalAccount account = null;
         try {
-            account = SignalAccount.createOrUpdateLinkedAccount(pathConfig.dataPath(),
-                    accountPath,
-                    number,
-                    serviceEnvironmentConfig.type(),
+            if (!accountExists) {
+                account = SignalAccount.createLinkedAccount(pathConfig.dataPath(),
+                        accountPath,
+                        serviceEnvironmentConfig.type(),
+                        Settings.DEFAULT);
+            } else {
+                account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, Settings.DEFAULT);
+            }
+
+            account.setProvisioningData(number,
                     aci,
                     pni,
                     password,
                     encryptedDeviceName,
-                    deviceId,
                     ret.getAciIdentity(),
                     ret.getPniIdentity(),
-                    registrationId,
-                    pniRegistrationId,
-                    profileKey,
-                    Settings.DEFAULT);
+                    profileKey);
+
             account.getConfigurationStore().setReadReceipts(ret.isReadReceipts());
 
+            logger.debug("Finishing new device registration");
+            var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
+                    new ConfirmCodeMessage(false,
+                            true,
+                            account.getAccountData(ServiceIdType.ACI).getLocalRegistrationId(),
+                            account.getAccountData(ServiceIdType.PNI).getLocalRegistrationId(),
+                            encryptedDeviceName,
+                            getCapabilities(false)));
+
+            account.finishLinking(deviceId);
+
             ManagerImpl m = null;
             try {
                 m = new ManagerImpl(account,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index a51136a0..57300b11 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -130,7 +130,7 @@ public class SignalAccount implements Closeable {
     private String number;
     private String username;
     private String encryptedDeviceName;
-    private int deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
+    private int deviceId = 0;
     private String password;
     private String registrationLockPin;
     private MasterKey pinMasterKey;
@@ -204,8 +204,6 @@ public class SignalAccount implements Closeable {
             ServiceEnvironment serviceEnvironment,
             IdentityKeyPair aciIdentityKey,
             IdentityKeyPair pniIdentityKey,
-            int registrationId,
-            int pniRegistrationId,
             ProfileKey profileKey,
             final Settings settings
     ) throws IOException {
@@ -223,160 +221,91 @@ public class SignalAccount implements Closeable {
         signalAccount.serviceEnvironment = serviceEnvironment;
         signalAccount.profileKey = profileKey;
         signalAccount.password = KeyUtils.createPassword();
+        signalAccount.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID;
 
         signalAccount.dataPath = dataPath;
         signalAccount.aciAccountData.setIdentityKeyPair(aciIdentityKey);
         signalAccount.pniAccountData.setIdentityKeyPair(pniIdentityKey);
-        signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
-        signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
+        signalAccount.aciAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        signalAccount.pniAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
         signalAccount.settings = settings;
 
         signalAccount.registered = false;
 
         signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
         signalAccount.migrateLegacyConfigs();
-        signalAccount.clearAllPreKeys();
         signalAccount.save();
 
         return signalAccount;
     }
 
-    private static SignalAccount createLinkedAccount(
-            File dataPath,
-            String accountPath,
-            String number,
-            ServiceEnvironment serviceEnvironment,
-            ACI aci,
-            PNI pni,
-            String password,
-            String encryptedDeviceName,
-            int deviceId,
-            IdentityKeyPair aciIdentityKey,
-            IdentityKeyPair pniIdentityKey,
-            int registrationId,
-            int pniRegistrationId,
-            ProfileKey profileKey,
-            final Settings settings
-    ) throws IOException {
-        var fileName = getFileName(dataPath, accountPath);
-        IOUtils.createPrivateFile(fileName);
-
-        final var pair = openFileChannel(fileName, true);
-        var signalAccount = new SignalAccount(pair.first(), pair.second());
-
-        signalAccount.dataPath = dataPath;
-        signalAccount.accountPath = accountPath;
-        signalAccount.serviceEnvironment = serviceEnvironment;
-        signalAccount.aciAccountData.setLocalRegistrationId(registrationId);
-        signalAccount.pniAccountData.setLocalRegistrationId(pniRegistrationId);
-        signalAccount.settings = settings;
-        signalAccount.setProvisioningData(number,
-                aci,
-                pni,
-                password,
-                encryptedDeviceName,
-                deviceId,
-                aciIdentityKey,
-                pniIdentityKey,
-                profileKey);
-
-        signalAccount.getRecipientTrustedResolver()
-                .resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
-        signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
-        signalAccount.migrateLegacyConfigs();
-        signalAccount.clearAllPreKeys();
-        signalAccount.save();
-
-        return signalAccount;
-    }
-
-    public static SignalAccount createOrUpdateLinkedAccount(
-            File dataPath,
-            String accountPath,
-            String number,
-            ServiceEnvironment serviceEnvironment,
-            ACI aci,
-            PNI pni,
-            String password,
-            String encryptedDeviceName,
-            int deviceId,
-            IdentityKeyPair aciIdentityKey,
-            IdentityKeyPair pniIdentityKey,
-            int registrationId,
-            int pniRegistrationId,
-            ProfileKey profileKey,
+    public static SignalAccount createLinkedAccount(
+            final File dataPath,
+            final String accountPath,
+            final ServiceEnvironment serviceEnvironment,
             final Settings settings
     ) throws IOException {
         IOUtils.createPrivateDirectories(dataPath);
         var fileName = getFileName(dataPath, accountPath);
-        if (!fileName.exists()) {
-            return createLinkedAccount(dataPath,
-                    accountPath,
-                    number,
-                    serviceEnvironment,
-                    aci,
-                    pni,
-                    password,
-                    encryptedDeviceName,
-                    deviceId,
-                    aciIdentityKey,
-                    pniIdentityKey,
-                    registrationId,
-                    pniRegistrationId,
-                    profileKey,
-                    settings);
-        }
+        IOUtils.createPrivateFile(fileName);
+
+        final var pair = openFileChannel(fileName, true);
+        final var signalAccount = new SignalAccount(pair.first(), pair.second());
+
+        signalAccount.dataPath = dataPath;
+        signalAccount.accountPath = accountPath;
+        signalAccount.serviceEnvironment = serviceEnvironment;
+        signalAccount.aciAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        signalAccount.pniAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        signalAccount.settings = settings;
+
+        signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
 
-        final var signalAccount = load(dataPath, accountPath, true, settings);
-        signalAccount.setProvisioningData(number,
-                aci,
-                pni,
-                password,
-                encryptedDeviceName,
-                deviceId,
-                aciIdentityKey,
-                pniIdentityKey,
-                profileKey);
-        signalAccount.getRecipientTrustedResolver()
-                .resolveSelfRecipientTrusted(signalAccount.getSelfRecipientAddress());
-        signalAccount.aciAccountData.getSessionStore().archiveAllSessions();
-        signalAccount.pniAccountData.getSessionStore().archiveAllSessions();
-        signalAccount.getSenderKeyStore().deleteAll();
-        signalAccount.clearAllPreKeys();
         return signalAccount;
     }
 
-    private void setProvisioningData(
+    public void setProvisioningData(
             final String number,
             final ACI aci,
             final PNI pni,
             final String password,
             final String encryptedDeviceName,
-            final int deviceId,
             final IdentityKeyPair aciIdentity,
             final IdentityKeyPair pniIdentity,
             final ProfileKey profileKey
     ) {
+        this.deviceId = 0;
         this.number = number;
         this.aciAccountData.setServiceId(aci);
         this.pniAccountData.setServiceId(pni);
+        getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
         this.password = password;
         this.profileKey = profileKey;
         getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
         this.encryptedDeviceName = encryptedDeviceName;
-        this.deviceId = deviceId;
         this.aciAccountData.setIdentityKeyPair(aciIdentity);
         this.pniAccountData.setIdentityKeyPair(pniIdentity);
-        this.registered = true;
+        this.registered = false;
         this.isMultiDevice = true;
         getKeyValueStore().storeEntry(lastReceiveTimestamp, 0L);
         this.pinMasterKey = null;
         getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
         this.storageKey = null;
+        getSenderKeyStore().deleteAll();
         trustSelfIdentity(ServiceIdType.ACI);
         trustSelfIdentity(ServiceIdType.PNI);
+        aciAccountData.getSessionStore().archiveAllSessions();
+        pniAccountData.getSessionStore().archiveAllSessions();
+        clearAllPreKeys();
         getKeyValueStore().storeEntry(lastRecipientsRefresh, null);
+        save();
+    }
+
+    public void finishLinking(final int deviceId) {
+        this.registered = true;
+        this.deviceId = deviceId;
+        save();
     }
 
     public void finishRegistration(
@@ -476,7 +405,7 @@ public class SignalAccount implements Closeable {
             return false;
         }
         var f = getFileName(dataPath, account);
-        return !(!f.exists() || f.isDirectory());
+        return f.exists() && !f.isDirectory() && f.length() > 0L;
     }
 
     private void load(

From 5cc20ace1f65c3c08be1b0812ba54b034d499c61 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 13:34:09 +0200
Subject: [PATCH 237/672] Ignore failures from SVR v1 pin

---
 .../signal/manager/helper/AccountHelper.java  |  3 ++
 .../asamk/signal/manager/helper/Context.java  |  7 ++--
 .../signal/manager/helper/PinHelper.java      | 32 ++++---------------
 .../internal/RegistrationManagerImpl.java     |  5 ++-
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index e021cc37..f2002347 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -416,12 +416,14 @@ public class AccountHelper {
         var masterKey = account.getOrCreatePinMasterKey();
 
         context.getPinHelper().migrateRegistrationLockPin(account.getRegistrationLockPin(), masterKey);
+        dependencies.getAccountManager().enableRegistrationLock(masterKey);
     }
 
     public void setRegistrationPin(String pin) throws IOException {
         var masterKey = account.getOrCreatePinMasterKey();
 
         context.getPinHelper().setRegistrationLockPin(pin, masterKey);
+        dependencies.getAccountManager().enableRegistrationLock(masterKey);
 
         account.setRegistrationLockPin(pin);
     }
@@ -429,6 +431,7 @@ public class AccountHelper {
     public void removeRegistrationPin() throws IOException {
         // Remove KBS Pin
         context.getPinHelper().removeRegistrationLockPin();
+        dependencies.getAccountManager().disableRegistrationLock();
 
         account.setRegistrationLockPin(null);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index a11ea470..ed0cf391 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
+import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV1;
 
 import java.util.function.Supplier;
 
@@ -115,9 +116,9 @@ public class Context {
 
     PinHelper getPinHelper() {
         return getOrCreate(() -> pinHelper,
-                () -> pinHelper = new PinHelper(dependencies.getKeyBackupService(),
-                        dependencies.getFallbackKeyBackupServices(),
-                        dependencies.getSecureValueRecoveryV2()));
+                () -> pinHelper = new PinHelper(new SecureValueRecoveryV1(dependencies.getKeyBackupService()),
+                        dependencies.getSecureValueRecoveryV2(),
+                        dependencies.getFallbackKeyBackupServices()));
     }
 
     public PreKeyHelper getPreKeyHelper() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index dcd89f20..d8c801be 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -5,11 +5,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.signalservice.api.kbs.PinHashUtil;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
 import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV1;
 import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2;
-import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 import org.whispersystems.signalservice.internal.push.AuthCredentials;
 import org.whispersystems.signalservice.internal.push.LockedException;
 
@@ -20,35 +18,24 @@ public class PinHelper {
 
     private final static Logger logger = LoggerFactory.getLogger(PinHelper.class);
 
-    private final KeyBackupService keyBackupService;
     private final SecureValueRecoveryV1 secureValueRecoveryV1;
     private final SecureValueRecoveryV2 secureValueRecoveryV2;
     private final Collection<KeyBackupService> fallbackKeyBackupServices;
 
     public PinHelper(
-            final KeyBackupService keyBackupService,
-            final Collection<KeyBackupService> fallbackKeyBackupServices,
-            SecureValueRecoveryV2 secureValueRecoveryV2
+            final SecureValueRecoveryV1 secureValueRecoveryV1,
+            final SecureValueRecoveryV2 secureValueRecoveryV2,
+            final Collection<KeyBackupService> fallbackKeyBackupServices
     ) {
-        this.keyBackupService = keyBackupService;
         this.fallbackKeyBackupServices = fallbackKeyBackupServices;
-        this.secureValueRecoveryV1 = new SecureValueRecoveryV1(keyBackupService);
+        this.secureValueRecoveryV1 = secureValueRecoveryV1;
         this.secureValueRecoveryV2 = secureValueRecoveryV2;
     }
 
     public void setRegistrationLockPin(
             String pin, MasterKey masterKey
     ) throws IOException {
-        final var pinChangeSession = keyBackupService.newPinChangeSession();
-        final var hashedPin = PinHashUtil.hashPin(pin, pinChangeSession.hashSalt());
-
-        try {
-            pinChangeSession.setPin(hashedPin, masterKey);
-        } catch (UnauthenticatedResponseException e) {
-            throw new IOException(e);
-        }
-        pinChangeSession.enableRegistrationLock(masterKey);
-
+        secureValueRecoveryV1.setPin(pin, masterKey).execute();
         final var backupResponse = secureValueRecoveryV2.setPin(pin, masterKey).execute();
         if (backupResponse instanceof SecureValueRecovery.BackupResponse.Success) {
         } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.ServerRejected) {
@@ -80,14 +67,7 @@ public class PinHelper {
     }
 
     public void removeRegistrationLockPin() throws IOException {
-        final var pinChangeSession = keyBackupService.newPinChangeSession();
-        pinChangeSession.disableRegistrationLock();
-        try {
-            pinChangeSession.removePin();
-        } catch (UnauthenticatedResponseException e) {
-            throw new IOException(e);
-        }
-
+        secureValueRecoveryV1.deleteData();
         final var deleteResponse = secureValueRecoveryV2.deleteData();
         if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.Success) {
         } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.ServerRejected) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 793f2f49..815cc8f1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -45,6 +45,7 @@ import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
+import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV1;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
@@ -108,7 +109,9 @@ public class RegistrationManagerImpl implements RegistrationManager {
                         10))
                 .toList();
         final var secureValueRecoveryV2 = accountManager.getSecureValueRecoveryV2(serviceEnvironmentConfig.svr2Mrenclave());
-        this.pinHelper = new PinHelper(keyBackupService, fallbackKeyBackupServices, secureValueRecoveryV2);
+        this.pinHelper = new PinHelper(new SecureValueRecoveryV1(keyBackupService),
+                secureValueRecoveryV2,
+                fallbackKeyBackupServices);
     }
 
     @Override

From ca2e6adedb1ce2d4e80ecce14f1bc44ef567bc03 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 14:18:35 +0200
Subject: [PATCH 238/672] Update dependencies

---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9238ea43..01104694 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,9 +7,9 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk15on").version("1.70")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.2")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.3")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
-            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.0")
+            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.1")
             version("slf4j", "2.0.9")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
@@ -17,7 +17,7 @@ dependencyResolutionManagement {
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_85")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.0.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")
         }

From 733c14bbc8d7b89b58c972a2ac7d332f04985179 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 14:19:32 +0200
Subject: [PATCH 239/672] Ignore invalid recipient numbers

---
 .../signal/manager/storage/recipients/RecipientStore.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 62ab525a..9731496e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -395,6 +395,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             try (final var statement = connection.prepareStatement(sql)) {
                 return Utils.executeQueryForStream(statement, resultSet -> resultSet.getString("number"))
                         .filter(Objects::nonNull)
+                        .filter(n -> {
+                            try {
+                                Long.parseLong(n);
+                                return true;
+                            } catch (NumberFormatException e) {
+                                return false;
+                            }
+                        })
                         .collect(Collectors.toSet());
             }
         } catch (SQLException e) {

From 1addffe6226416bdca4fc15e98c07e24b394b3dc Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 14:58:15 +0200
Subject: [PATCH 240/672] Store username aci link in recipient store

---
 .../storage/recipients/RecipientStore.java    | 21 ++++++-------------
 .../recipients/RecipientTrustedResolver.java  |  7 +++----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 9731496e..816ac791 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -229,7 +229,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public RecipientId resolveRecipientByUsername(
-            final String username, Supplier<ServiceId> serviceIdSupplier
+            final String username, Supplier<ACI> aciSupplier
     ) throws UnregisteredRecipientException {
         final Optional<RecipientWithAddress> byUsername;
         try (final var connection = database.getConnection()) {
@@ -238,14 +238,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             throw new RuntimeException("Failed read from recipient store", e);
         }
         if (byUsername.isEmpty() || byUsername.get().address().serviceId().isEmpty()) {
-            final var serviceId = serviceIdSupplier.get();
-            if (serviceId == null) {
+            final var aci = aciSupplier.get();
+            if (aci == null) {
                 throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
                         null,
                         username));
             }
 
-            return resolveRecipient(serviceId);
+            return resolveRecipientTrusted(aci, username);
         }
         return byUsername.get().id();
     }
@@ -287,17 +287,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     @Override
-    public RecipientId resolveRecipientTrusted(final ServiceId serviceId, final String username) {
-        return resolveRecipientTrusted(new RecipientAddress(serviceId, null, null, username), false);
-    }
-
-    public RecipientId resolveRecipientTrusted(
-            final ACI aci, final String username
-    ) {
-        return resolveRecipientTrusted(new RecipientAddress(Optional.of(aci),
-                Optional.empty(),
-                Optional.empty(),
-                Optional.of(username)), false);
+    public RecipientId resolveRecipientTrusted(final ACI aci, final String username) {
+        return resolveRecipientTrusted(new RecipientAddress(aci, null, null, username), false);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
index 54e5d5d1..21708551 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
@@ -1,6 +1,5 @@
 package org.asamk.signal.manager.storage.recipients;
 
-import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@@ -16,7 +15,7 @@ public interface RecipientTrustedResolver {
 
     RecipientId resolveRecipientTrusted(Optional<ACI> aci, Optional<PNI> pni, Optional<String> number);
 
-    RecipientId resolveRecipientTrusted(ServiceId serviceId, String username);
+    RecipientId resolveRecipientTrusted(ACI aci, String username);
 
     class RecipientTrustedResolverWrapper implements RecipientTrustedResolver {
 
@@ -44,8 +43,8 @@ public interface RecipientTrustedResolver {
         }
 
         @Override
-        public RecipientId resolveRecipientTrusted(final ServiceId serviceId, final String username) {
-            return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(serviceId, username);
+        public RecipientId resolveRecipientTrusted(final ACI aci, final String username) {
+            return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(aci, username);
         }
     }
 }

From 2c5edbc9815088357ebd94d0a5a15a5a2f239154 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 15:20:14 +0200
Subject: [PATCH 241/672] Add cache for serviceId to recipient id/address
 mapping

---
 .../storage/recipients/RecipientStore.java    | 117 ++++++++++++------
 1 file changed, 76 insertions(+), 41 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 816ac791..44c0bafa 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -47,6 +47,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     private final Object recipientsLock = new Object();
     private final Map<Long, Long> recipientsMerged = new HashMap<>();
 
+    private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = new HashMap<>();
+
     public static void createSql(Connection connection) throws SQLException {
         // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
         try (final var statement = connection.createStatement()) {
@@ -176,15 +178,18 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     @Override
     public RecipientId resolveRecipient(final ServiceId serviceId) {
         synchronized (recipientsLock) {
-            final RecipientId recipientId;
+            final var recipientWithAddress = recipientAddressCache.get(serviceId);
+            if (recipientWithAddress != null) {
+                return recipientWithAddress.id();
+            }
             try (final var connection = database.getConnection()) {
                 connection.setAutoCommit(false);
-                recipientId = resolveRecipientLocked(connection, serviceId);
+                final var recipientId = resolveRecipientLocked(connection, serviceId);
                 connection.commit();
+                return recipientId;
             } catch (SQLException e) {
                 throw new RuntimeException("Failed read recipient store", e);
             }
-            return recipientId;
         }
     }
 
@@ -357,7 +362,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 FROM %s r
                 WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL) AND %s
                 """
-        ).formatted(TABLE_RECIPIENT, sqlWhere.size() == 0 ? "TRUE" : String.join(" AND ", sqlWhere));
+        ).formatted(TABLE_RECIPIENT, sqlWhere.isEmpty() ? "TRUE" : String.join(" AND ", sqlWhere));
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 if (blocked.isPresent()) {
@@ -429,16 +434,22 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     public void deleteRecipientData(RecipientId recipientId) {
         logger.debug("Deleting recipient data for {}", recipientId);
-        try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            storeContact(connection, recipientId, null);
-            storeProfile(connection, recipientId, null);
-            storeProfileKey(connection, recipientId, null, false);
-            storeExpiringProfileKeyCredential(connection, recipientId, null);
-            deleteRecipient(connection, recipientId);
-            connection.commit();
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed update recipient store", e);
+        synchronized (recipientsLock) {
+            recipientAddressCache.entrySet()
+                    .stream()
+                    .filter(e -> e.getValue().id().equals(recipientId))
+                    .forEach(e -> recipientAddressCache.remove(e.getKey()));
+            try (final var connection = database.getConnection()) {
+                connection.setAutoCommit(false);
+                storeContact(connection, recipientId, null);
+                storeProfile(connection, recipientId, null);
+                storeProfileKey(connection, recipientId, null, false);
+                storeExpiringProfileKeyCredential(connection, recipientId, null);
+                deleteRecipient(connection, recipientId);
+                connection.commit();
+            } catch (SQLException e) {
+                throw new RuntimeException("Failed update recipient store", e);
+            }
         }
     }
 
@@ -691,11 +702,17 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             }
         }
 
-        if (pair.second().size() > 0) {
+        if (!pair.second().isEmpty()) {
             try (final var connection = database.getConnection()) {
                 for (final var toBeMergedRecipientId : pair.second()) {
                     recipientMergeHandler.mergeRecipients(connection, pair.first(), toBeMergedRecipientId);
                     deleteRecipient(connection, toBeMergedRecipientId);
+                    synchronized (recipientsLock) {
+                        recipientAddressCache.entrySet()
+                                .stream()
+                                .filter(e -> e.getValue().id().equals(toBeMergedRecipientId))
+                                .forEach(e -> recipientAddressCache.remove(e.getKey()));
+                    }
                 }
             } catch (SQLException e) {
                 throw new RuntimeException("Failed update recipient store", e);
@@ -789,37 +806,49 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private void removeRecipientAddress(Connection connection, RecipientId recipientId) throws SQLException {
-        final var sql = (
-                """
-                UPDATE %s
-                SET number = NULL, uuid = NULL, pni = NULL
-                WHERE _id = ?
-                """
-        ).formatted(TABLE_RECIPIENT);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setLong(1, recipientId.id());
-            statement.executeUpdate();
+        synchronized (recipientsLock) {
+            recipientAddressCache.entrySet()
+                    .stream()
+                    .filter(e -> e.getValue().id().equals(recipientId))
+                    .forEach(e -> recipientAddressCache.remove(e.getKey()));
+            final var sql = (
+                    """
+                    UPDATE %s
+                    SET number = NULL, uuid = NULL, pni = NULL
+                    WHERE _id = ?
+                    """
+            ).formatted(TABLE_RECIPIENT);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setLong(1, recipientId.id());
+                statement.executeUpdate();
+            }
         }
     }
 
     private void updateRecipientAddress(
             Connection connection, RecipientId recipientId, final RecipientAddress address
     ) throws SQLException {
-        final var sql = (
-                """
-                UPDATE %s
-                SET number = ?, uuid = ?, pni = ?, username = ?
-                WHERE _id = ?
-                """
-        ).formatted(TABLE_RECIPIENT);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setString(1, address.number().orElse(null));
-            statement.setBytes(2,
-                    address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setString(4, address.username().orElse(null));
-            statement.setLong(5, recipientId.id());
-            statement.executeUpdate();
+        synchronized (recipientsLock) {
+            recipientAddressCache.entrySet()
+                    .stream()
+                    .filter(e -> e.getValue().id().equals(recipientId))
+                    .forEach(e -> recipientAddressCache.remove(e.getKey()));
+            final var sql = (
+                    """
+                    UPDATE %s
+                    SET number = ?, uuid = ?, pni = ?, username = ?
+                    WHERE _id = ?
+                    """
+            ).formatted(TABLE_RECIPIENT);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setString(1, address.number().orElse(null));
+                statement.setBytes(2,
+                        address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+                statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+                statement.setString(4, address.username().orElse(null));
+                statement.setLong(5, recipientId.id());
+                statement.executeUpdate();
+            }
         }
     }
 
@@ -900,6 +929,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     private Optional<RecipientWithAddress> findByServiceId(
             final Connection connection, final ServiceId serviceId
     ) throws SQLException {
+        var recipientWithAddress = Optional.ofNullable(recipientAddressCache.get(serviceId));
+        if (recipientWithAddress.isPresent()) {
+            return recipientWithAddress;
+        }
         final var sql = """
                         SELECT r._id, r.number, r.uuid, r.pni, r.username
                         FROM %s r
@@ -908,7 +941,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setBytes(1, UuidUtil.toByteArray(serviceId.getRawUuid()));
-            return Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
+            recipientWithAddress = Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
+            recipientWithAddress.ifPresent(r -> recipientAddressCache.put(serviceId, r));
+            return recipientWithAddress;
         }
     }
 

From fb7c63c5079aed53c43d9f1a0f7913218a6865e1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 15:21:18 +0200
Subject: [PATCH 242/672] Reduce sqlite logging

---
 src/main/java/org/asamk/signal/logging/LogConfigurator.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 943f9929..7401bf2c 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -50,6 +50,8 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         lc.getLogger("org.asamk").setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO);
         lc.getLogger("com.zaxxer.hikari.pool.PoolBase")
                 .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN);
+        lc.getLogger("org.sqlite.core.NativeDB")
+                .setLevel(verboseLevel > 3 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN);
 
         if (logFile != null) {
             consoleAppender.addFilter(new Filter<>() {

From 1ed5148624a1054c944072f6e2a50297b2828667 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 15:21:28 +0200
Subject: [PATCH 243/672] Bump version to 0.12.3

---
 CHANGELOG.md     | 21 +++++++++++++++++++++
 build.gradle.kts |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 235f693d..e5158f41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,28 @@
 
 ## [Unreleased]
 
+## [0.12.3] - 2023-10-17
+
+### Added
+
+- Added `startChangeNumber` and `finishChangeNumber` commands to switch to another phone number
+- Added `--quote-attachment` paramter to `send` command
+- Added support for scannable safety numbers based on serviceId
+- Added `EditMessageReceived` signal for D-Bus interface
+- Added new exit code `5` for rate limit failures
+- Added full CDSI refresh to get current ACI/PNIs for known numbers regularly
+
+### Fixed
+
+- Correctly respond with delivery receipts for edit messages
+
+### Changed
+
+- JSON-RPC requests are now executed in parallel.
+  Clients should make sure to use the `id` field to get the correct response for a request.
+
 ## [0.12.2] - 2023-09-30
+
 **Attention**: Now requires native libsignal-client version 0.32.1
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 82e17f7f..2879633f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.27"
 }
 
-version = "0.12.2"
+version = "0.12.3"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17

From 5b5644574114a898b66277e144dbe279ef58effe Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 19:21:41 +0200
Subject: [PATCH 244/672] Update github checkout action

---
 .github/workflows/ci.yml              | 4 ++--
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/release.yml         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3e7f35b..06ffe066 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         java: [ '17', '21' ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
           version: 'latest'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index cd83c179..9bb10c38 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -27,7 +27,7 @@ jobs:
           java-version: 17
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ea5bf41d..35c40a9d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -164,7 +164,7 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download signal-cli build from CI workflow
         uses: actions/download-artifact@v3
 
@@ -214,7 +214,7 @@ jobs:
       packages: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download signal-cli build from CI workflow
         uses: actions/download-artifact@v3
 

From b9e644269b073937202ca3ba6c9327e1ba46e2c3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 19:22:09 +0200
Subject: [PATCH 245/672] Use gradle-build-action for caching and dependency
 submission

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06ffe066..fd5a938d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,10 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          dependency-graph: generate-and-submit
       - name: Build with Gradle
         run: ./gradlew --no-daemon build
       - name: Compress archive

From 9ec942ea1da34cfb2d5f986b33e27b2be5699ce7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 19:34:42 +0200
Subject: [PATCH 246/672] Update workflow permission

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd5a938d..08390721 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
   workflow_call:
 
 permissions:
-  contents: read # to fetch code (actions/checkout)
+  contents: write # to fetch code (actions/checkout) and submit dependency graph (gradle/gradle-build-action)
 
 jobs:
   build:

From 9ba70c18088ebb9b44c91fd18de5b6ff1adbe9f4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 19:47:14 +0200
Subject: [PATCH 247/672] Update bouncycastle dependency

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 01104694..1d87bc3d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("libs") {
-            library("bouncycastle", "org.bouncycastle", "bcprov-jdk15on").version("1.70")
+            library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.76")
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.3")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.1")

From d51dd7ae575222b0baea7265c18ebc79f4a7b001 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 20:01:59 +0200
Subject: [PATCH 248/672] Use .isEmpty() for checking lists and strings

---
 .../manager/api/GroupInviteLinkUrl.java       |  4 +--
 .../signal/manager/helper/GroupHelper.java    | 20 ++++++-------
 .../signal/manager/helper/SendHelper.java     | 10 +++----
 .../signal/manager/helper/StorageHelper.java  |  2 +-
 .../signal/manager/internal/ManagerImpl.java  | 16 +++++-----
 .../asamk/signal/ReceiveMessageHandler.java   | 30 +++++++++----------
 .../signal/commands/ListGroupsCommand.java    |  2 +-
 .../asamk/signal/dbus/DbusCommandHandler.java |  2 +-
 .../asamk/signal/dbus/DbusManagerImpl.java    | 14 ++++-----
 .../dbus/DbusReceiveMessageHandler.java       |  6 ++--
 .../signal/http/ServerSentEventSender.java    |  2 +-
 .../asamk/signal/json/JsonDataMessage.java    | 10 +++----
 .../java/org/asamk/signal/json/JsonQuote.java |  6 ++--
 .../asamk/signal/json/JsonSharedContact.java  |  6 ++--
 .../asamk/signal/json/JsonSyncMessage.java    |  2 +-
 .../asamk/signal/jsonrpc/JsonRpcReader.java   |  4 +--
 src/main/java/org/asamk/signal/util/Util.java |  4 +--
 17 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
index d44fc982..cc3690f4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
@@ -39,13 +39,13 @@ public final class GroupInviteLinkUrl {
         }
 
         try {
-            if (!"/".equals(uri.getPath()) && uri.getPath().length() > 0) {
+            if (!"/".equals(uri.getPath()) && !uri.getPath().isEmpty()) {
                 throw new InvalidGroupLinkException("No path was expected in uri");
             }
 
             var encoding = uri.getFragment();
 
-            if (encoding == null || encoding.length() == 0) {
+            if (encoding == null || encoding.isEmpty()) {
                 throw new InvalidGroupLinkException("No reference was in the uri");
             }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index ef104fa2..697786fc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -594,14 +594,14 @@ public class GroupHelper {
         if (members != null) {
             final var requestingMembers = new HashSet<>(members);
             requestingMembers.retainAll(group.getRequestingMembers());
-            if (requestingMembers.size() > 0) {
+            if (!requestingMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.approveJoinRequestMembers(group, requestingMembers);
                 result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
             final var newMembers = new HashSet<>(members);
             newMembers.removeAll(group.getMembers());
             newMembers.removeAll(group.getRequestingMembers());
-            if (newMembers.size() > 0) {
+            if (!newMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.addMembers(group, newMembers);
                 result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
@@ -617,20 +617,20 @@ public class GroupHelper {
                 existingRemoveMembers.removeAll(members);
             }
             existingRemoveMembers.remove(account.getSelfRecipientId());// self can be removed with sendQuitGroupMessage
-            if (existingRemoveMembers.size() > 0) {
+            if (!existingRemoveMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.removeMembers(group, existingRemoveMembers);
                 result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
 
             var pendingRemoveMembers = new HashSet<>(removeMembers);
             pendingRemoveMembers.retainAll(group.getPendingMembers());
-            if (pendingRemoveMembers.size() > 0) {
+            if (!pendingRemoveMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.revokeInvitedMembers(group, pendingRemoveMembers);
                 result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
             var requestingRemoveMembers = new HashSet<>(removeMembers);
             requestingRemoveMembers.retainAll(group.getRequestingMembers());
-            if (requestingRemoveMembers.size() > 0) {
+            if (!requestingRemoveMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.refuseJoinRequestMembers(group, requestingRemoveMembers);
                 result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
@@ -640,7 +640,7 @@ public class GroupHelper {
             final var newAdmins = new HashSet<>(admins);
             newAdmins.retainAll(group.getMembers());
             newAdmins.removeAll(group.getAdminMembers());
-            if (newAdmins.size() > 0) {
+            if (!newAdmins.isEmpty()) {
                 for (var admin : newAdmins) {
                     var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, true);
                     result = sendUpdateGroupV2Message(group,
@@ -653,7 +653,7 @@ public class GroupHelper {
         if (removeAdmins != null) {
             final var existingRemoveAdmins = new HashSet<>(removeAdmins);
             existingRemoveAdmins.retainAll(group.getAdminMembers());
-            if (existingRemoveAdmins.size() > 0) {
+            if (!existingRemoveAdmins.isEmpty()) {
                 for (var admin : existingRemoveAdmins) {
                     var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, false);
                     result = sendUpdateGroupV2Message(group,
@@ -666,7 +666,7 @@ public class GroupHelper {
         if (banMembers != null) {
             final var newlyBannedMembers = new HashSet<>(banMembers);
             newlyBannedMembers.removeAll(group.getBannedMembers());
-            if (newlyBannedMembers.size() > 0) {
+            if (!newlyBannedMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.banMembers(group, newlyBannedMembers);
                 result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
@@ -675,7 +675,7 @@ public class GroupHelper {
         if (unbanMembers != null) {
             var existingUnbanMembers = new HashSet<>(unbanMembers);
             existingUnbanMembers.retainAll(group.getBannedMembers());
-            if (existingUnbanMembers.size() > 0) {
+            if (!existingUnbanMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.unbanMembers(group, existingUnbanMembers);
                 result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
@@ -745,7 +745,7 @@ public class GroupHelper {
         if (currentAdmins.contains(account.getSelfRecipientId())
                 && currentAdmins.size() == 1
                 && groupInfoV2.getMembers().size() > 1
-                && newAdmins.size() == 0) {
+                && newAdmins.isEmpty()) {
             // Last admin can't leave the group, unless she's also the last member
             throw new LastGroupAdminException(groupInfoV2.getGroupId(), groupInfoV2.getTitle());
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 51c1e9ca..49758486 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -465,7 +465,7 @@ public class SendHelper {
                 : getSenderKeyCapableRecipientIds(recipientIds);
         final var allResults = new ArrayList<SendMessageResult>(recipientIds.size());
 
-        if (senderKeyTargets.size() > 0) {
+        if (!senderKeyTargets.isEmpty()) {
             final var results = sendGroupMessageInternalWithSenderKey(senderKeySender,
                     senderKeyTargets,
                     distributionId,
@@ -479,7 +479,7 @@ public class SendHelper {
                         .filter(r -> !r.isSuccess())
                         .map(r -> context.getRecipientHelper().resolveRecipient(r.getAddress()))
                         .toList();
-                if (failedTargets.size() > 0) {
+                if (!failedTargets.isEmpty()) {
                     senderKeyTargets = new HashSet<>(senderKeyTargets);
                     failedTargets.forEach(senderKeyTargets::remove);
                 }
@@ -490,8 +490,8 @@ public class SendHelper {
         legacyTargets.removeAll(senderKeyTargets);
         final boolean onlyTargetIsSelfWithLinkedDevice = recipientIds.isEmpty() && account.isMultiDevice();
 
-        if (legacyTargets.size() > 0 || onlyTargetIsSelfWithLinkedDevice) {
-            if (legacyTargets.size() > 0) {
+        if (!legacyTargets.isEmpty() || onlyTargetIsSelfWithLinkedDevice) {
+            if (!legacyTargets.isEmpty()) {
                 logger.debug("Need to do {} legacy sends.", legacyTargets.size());
             } else {
                 logger.debug("Need to do a legacy send to send a sync message for a group of only ourselves.");
@@ -499,7 +499,7 @@ public class SendHelper {
 
             final List<SendMessageResult> results = sendGroupMessageInternalWithLegacy(legacySender,
                     legacyTargets,
-                    isRecipientUpdate || allResults.size() > 0);
+                    isRecipientUpdate || !allResults.isEmpty());
             allResults.addAll(results);
         }
         final var duration = Duration.ofMillis(System.currentTimeMillis() - startTime);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index e8f23cae..113a6920 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -298,7 +298,7 @@ public class StorageHelper {
             logger.warn("Failed to read storage records, ignoring.");
             return null;
         }
-        return records.size() > 0 ? records.get(0) : null;
+        return !records.isEmpty() ? records.get(0) : null;
     }
 
     private List<SignalStorageRecord> getSignalStorageRecords(final Collection<StorageId> storageIds) throws IOException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 841fd791..a2c90aa4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -663,13 +663,13 @@ public class ManagerImpl implements Manager {
         } else {
             messageBuilder.withBody(message.messageText());
         }
-        if (message.attachments().size() > 0) {
+        if (!message.attachments().isEmpty()) {
             messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
         }
-        if (message.mentions().size() > 0) {
+        if (!message.mentions().isEmpty()) {
             messageBuilder.withMentions(resolveMentions(message.mentions()));
         }
-        if (message.textStyles().size() > 0) {
+        if (!message.textStyles().isEmpty()) {
             messageBuilder.withBodyRanges(message.textStyles().stream().map(TextStyle::toBodyRange).toList());
         }
         if (message.quote().isPresent()) {
@@ -715,7 +715,7 @@ public class ManagerImpl implements Manager {
                     manifestSticker.emoji(),
                     AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty())));
         }
-        if (message.previews().size() > 0) {
+        if (!message.previews().isEmpty()) {
             final var previews = new ArrayList<SignalServicePreview>(message.previews().size());
             for (final var p : message.previews()) {
                 final var image = p.image().isPresent() ? context.getAttachmentHelper()
@@ -874,7 +874,7 @@ public class ManagerImpl implements Manager {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
         }
-        if (recipients.size() == 0) {
+        if (recipients.isEmpty()) {
             return;
         }
         final var recipientIds = context.getRecipientHelper().resolveRecipients(recipients);
@@ -906,7 +906,7 @@ public class ManagerImpl implements Manager {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
         }
-        if (groupIds.size() == 0) {
+        if (groupIds.isEmpty()) {
             return;
         }
         boolean shouldRotateProfileKey = false;
@@ -1083,7 +1083,7 @@ public class ManagerImpl implements Manager {
             return true;
         }
         synchronized (messageHandlers) {
-            return messageHandlers.size() > 0;
+            return !messageHandlers.isEmpty();
         }
     }
 
@@ -1113,7 +1113,7 @@ public class ManagerImpl implements Manager {
             synchronized (messageHandlers) {
                 receiveThread = null;
                 isReceivingSynchronous = false;
-                if (messageHandlers.size() > 0) {
+                if (!messageHandlers.isEmpty()) {
                     startReceiveThreadIfRequired();
                 }
             }
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index faea75dc..ef7a8359 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -127,7 +127,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             final var groupCallUpdate = message.groupCallUpdate().get();
             writer.indentedWriter().println("Era id: {}", groupCallUpdate.eraId());
         }
-        if (message.previews().size() > 0) {
+        if (!message.previews().isEmpty()) {
             writer.println("Previews:");
             final var previews = message.previews();
             for (var preview : previews) {
@@ -135,7 +135,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                 printPreview(writer.indentedWriter(), preview);
             }
         }
-        if (message.sharedContacts().size() > 0) {
+        if (!message.sharedContacts().isEmpty()) {
             writer.println("Contacts:");
             for (var contact : message.sharedContacts()) {
                 writer.println("- Contact:");
@@ -176,19 +176,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             final var remoteDelete = message.remoteDeleteId().get();
             writer.println("Remote delete message: timestamp = {}", remoteDelete);
         }
-        if (message.mentions().size() > 0) {
+        if (!message.mentions().isEmpty()) {
             writer.println("Mentions:");
             for (var mention : message.mentions()) {
                 printMention(writer, mention);
             }
         }
-        if (message.textStyles().size() > 0) {
+        if (!message.textStyles().isEmpty()) {
             writer.println("Text styles:");
             for (var textStyle : message.textStyles()) {
                 printTextStyle(writer, textStyle);
             }
         }
-        if (message.attachments().size() > 0) {
+        if (!message.attachments().isEmpty()) {
             writer.println("Attachments:");
             for (var attachment : message.attachments()) {
                 writer.println("- Attachment:");
@@ -283,7 +283,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             var hangupMessage = callMessage.hangup().get();
             writer.println("Hangup message: {}", hangupMessage.id());
         }
-        if (callMessage.iceUpdate().size() > 0) {
+        if (!callMessage.iceUpdate().isEmpty()) {
             writer.println("Ice update messages:");
             var iceUpdateMessages = callMessage.iceUpdate();
             for (var iceUpdateMessage : iceUpdateMessages) {
@@ -313,7 +313,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (syncMessage.groups().isPresent()) {
             writer.println("Received sync groups.");
         }
-        if (syncMessage.read().size() > 0) {
+        if (!syncMessage.read().isEmpty()) {
             writer.println("Received sync read messages list");
             for (var rm : syncMessage.read()) {
                 writer.println("- From: {} Message timestamp: {}",
@@ -321,7 +321,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                         DateUtils.formatTimestamp(rm.timestamp()));
             }
         }
-        if (syncMessage.viewed().size() > 0) {
+        if (!syncMessage.viewed().isEmpty()) {
             writer.println("Received sync viewed messages list");
             for (var vm : syncMessage.viewed()) {
                 writer.println("- From: {} Message timestamp: {}",
@@ -335,7 +335,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             String to;
             if (sentTranscriptMessage.destination().isPresent()) {
                 to = formatContact(sentTranscriptMessage.destination().get());
-            } else if (sentTranscriptMessage.recipients().size() > 0) {
+            } else if (!sentTranscriptMessage.recipients().isEmpty()) {
                 to = sentTranscriptMessage.recipients()
                         .stream()
                         .map(this::formatContact)
@@ -429,13 +429,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (quote.text().isPresent()) {
             writer.println("Text: {}", quote.text().get());
         }
-        if (quote.mentions() != null && quote.mentions().size() > 0) {
+        if (quote.mentions() != null && !quote.mentions().isEmpty()) {
             writer.println("Mentions:");
             for (var mention : quote.mentions()) {
                 printMention(writer, mention);
             }
         }
-        if (quote.attachments().size() > 0) {
+        if (!quote.attachments().isEmpty()) {
             writer.println("Attachments:");
             for (var attachment : quote.attachments()) {
                 writer.println("- Attachment:");
@@ -478,7 +478,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             writer.println("Organisation: {}", contact.organization().get());
         }
 
-        if (contact.phone().size() > 0) {
+        if (!contact.phone().isEmpty()) {
             writer.println("Phone details:");
             for (var phone : contact.phone()) {
                 writer.println("- Phone:");
@@ -492,7 +492,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             }
         }
 
-        if (contact.email().size() > 0) {
+        if (!contact.email().isEmpty()) {
             writer.println("Email details:");
             for (var email : contact.email()) {
                 writer.println("- Email:");
@@ -506,7 +506,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             }
         }
 
-        if (contact.address().size() > 0) {
+        if (!contact.address().isEmpty()) {
             writer.println("Address details:");
             for (var address : contact.address()) {
                 writer.println("- Address:");
@@ -615,7 +615,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (attachment.isGif()) {
             flags.add("video gif");
         }
-        if (flags.size() > 0) {
+        if (!flags.isEmpty()) {
             writer.println("Flags: {}", String.join(", ", flags));
         }
         if (attachment.width().isPresent() || attachment.height().isPresent()) {
diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index 91272da5..b22ace6c 100644
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -85,7 +85,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
 
         final var groupIdStrings = ns.<String>getList("group-id");
         final var groupIds = CommandUtil.getGroupIds(groupIdStrings);
-        if (groupIds.size() > 0) {
+        if (!groupIds.isEmpty()) {
             groups = groups.stream().filter(g -> groupIds.contains(g.groupId())).toList();
         }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
index 1ab7cb22..6e7a6ee1 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
@@ -65,7 +65,7 @@ public class DbusCommandHandler {
                 SignalControl.class);
         try {
             final var accounts = control.listAccounts();
-            if (accounts.size() == 0) {
+            if (accounts.isEmpty()) {
                 throw new UserErrorException("No local users found, you first need to register or link an account");
             } else if (accounts.size() > 1) {
                 throw new UserErrorException(
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 2e30417c..290ab647 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -244,7 +244,7 @@ public class DbusManagerImpl implements Manager {
     public SendGroupMessageResults quitGroup(
             final GroupId groupId, final Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {
-        if (groupAdmins.size() > 0) {
+        if (!groupAdmins.isEmpty()) {
             throw new UnsupportedOperationException();
         }
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
@@ -522,7 +522,7 @@ public class DbusManagerImpl implements Manager {
             if (isWeakListener) {
                 weakHandlers.add(handler);
             } else {
-                if (messageHandlers.size() == 0) {
+                if (messageHandlers.isEmpty()) {
                     installMessageHandlers();
                 }
                 messageHandlers.add(handler);
@@ -535,7 +535,7 @@ public class DbusManagerImpl implements Manager {
         synchronized (messageHandlers) {
             weakHandlers.remove(handler);
             messageHandlers.remove(handler);
-            if (messageHandlers.size() == 0) {
+            if (messageHandlers.isEmpty()) {
                 uninstallMessageHandlers();
             }
         }
@@ -544,7 +544,7 @@ public class DbusManagerImpl implements Manager {
     @Override
     public boolean isReceiving() {
         synchronized (messageHandlers) {
-            return messageHandlers.size() > 0;
+            return !messageHandlers.isEmpty();
         }
     }
 
@@ -622,7 +622,7 @@ public class DbusManagerImpl implements Manager {
                 return null;
             }
             final var contactName = signal.getContactName(n);
-            if (onlyContacts && contactName.length() == 0) {
+            if (onlyContacts && contactName.isEmpty()) {
                 return null;
             }
             if (name.isPresent() && !name.get().equals(contactName)) {
@@ -721,7 +721,7 @@ public class DbusManagerImpl implements Manager {
             this.notify();
         }
         synchronized (messageHandlers) {
-            if (messageHandlers.size() > 0) {
+            if (!messageHandlers.isEmpty()) {
                 uninstallMessageHandlers();
             }
             weakHandlers.clear();
@@ -745,7 +745,7 @@ public class DbusManagerImpl implements Manager {
                 .map(RecipientIdentifier.Single.class::cast)
                 .map(RecipientIdentifier.Single::getIdentifier)
                 .toList();
-        if (singleRecipients.size() > 0) {
+        if (!singleRecipients.isEmpty()) {
             timestamp = recipientsHandler.apply(singleRecipients);
         }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
index 6aac76a8..0ce114cd 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
@@ -131,7 +131,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
 
     private List<String> getAttachments(MessageEnvelope.Data message) {
         var attachments = new ArrayList<String>();
-        if (message.attachments().size() > 0) {
+        if (!message.attachments().isEmpty()) {
             for (var attachment : message.attachments()) {
                 if (attachment.file().isPresent()) {
                     attachments.add(attachment.file().get().getAbsolutePath());
@@ -143,7 +143,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
 
     private HashMap<String, Variant<?>> getMessageExtras(MessageEnvelope.Data message) {
         var extras = new HashMap<String, Variant<?>>();
-        if (message.attachments().size() > 0) {
+        if (!message.attachments().isEmpty()) {
             var attachments = message.attachments()
                     .stream()
                     .filter(a -> a.id().isPresent())
@@ -151,7 +151,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
                     .toList();
             extras.put("attachments", new Variant<>(attachments, "aa{sv}"));
         }
-        if (message.mentions().size() > 0) {
+        if (!message.mentions().isEmpty()) {
             var mentions = message.mentions().stream().map(this::getMentionMap).toList();
             extras.put("mentions", new Variant<>(mentions, "aa{sv}"));
         }
diff --git a/src/main/java/org/asamk/signal/http/ServerSentEventSender.java b/src/main/java/org/asamk/signal/http/ServerSentEventSender.java
index b33d3310..a1452a63 100644
--- a/src/main/java/org/asamk/signal/http/ServerSentEventSender.java
+++ b/src/main/java/org/asamk/signal/http/ServerSentEventSender.java
@@ -35,7 +35,7 @@ public class ServerSentEventSender {
             writer.write(event);
             writer.write("\n");
         }
-        if (data.size() == 0) {
+        if (data.isEmpty()) {
             writer.write("data\n");
         } else {
             for (final var d : data) {
diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 6da7145a..ef742585 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -38,27 +38,27 @@ record JsonDataMessage(
         final var reaction = dataMessage.reaction().map(JsonReaction::from).orElse(null);
         final var quote = dataMessage.quote().isPresent() ? JsonQuote.from(dataMessage.quote().get()) : null;
         final var payment = dataMessage.payment().isPresent() ? JsonPayment.from(dataMessage.payment().get()) : null;
-        final var mentions = dataMessage.mentions().size() > 0 ? dataMessage.mentions()
+        final var mentions = !dataMessage.mentions().isEmpty() ? dataMessage.mentions()
                 .stream()
                 .map(JsonMention::from)
                 .toList() : null;
-        final var previews = dataMessage.previews().size() > 0 ? dataMessage.previews()
+        final var previews = !dataMessage.previews().isEmpty() ? dataMessage.previews()
                 .stream()
                 .map(JsonPreview::from)
                 .toList() : null;
         final var remoteDelete = dataMessage.remoteDeleteId().isPresent()
                 ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get())
                 : null;
-        final var attachments = dataMessage.attachments().size() > 0 ? dataMessage.attachments()
+        final var attachments = !dataMessage.attachments().isEmpty() ? dataMessage.attachments()
                 .stream()
                 .map(JsonAttachment::from)
                 .toList() : null;
         final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
-        final var contacts = dataMessage.sharedContacts().size() > 0 ? dataMessage.sharedContacts()
+        final var contacts = !dataMessage.sharedContacts().isEmpty() ? dataMessage.sharedContacts()
                 .stream()
                 .map(JsonSharedContact::from)
                 .toList() : null;
-        final var textStyles = dataMessage.textStyles().size() > 0 ? dataMessage.textStyles()
+        final var textStyles = !dataMessage.textStyles().isEmpty() ? dataMessage.textStyles()
                 .stream()
                 .map(JsonTextStyle::from)
                 .toList() : null;
diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index 94f3f52c..514f3db9 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -26,16 +26,16 @@ public record JsonQuote(
         final var authorUuid = address.uuid().map(UUID::toString).orElse(null);
         final var text = quote.text().orElse(null);
 
-        final var mentions = quote.mentions().size() > 0
+        final var mentions = !quote.mentions().isEmpty()
                 ? quote.mentions().stream().map(JsonMention::from).toList()
                 : null;
 
-        final var attachments = quote.attachments().size() > 0 ? quote.attachments()
+        final var attachments = !quote.attachments().isEmpty() ? quote.attachments()
                 .stream()
                 .map(JsonQuotedAttachment::from)
                 .toList() : List.<JsonQuotedAttachment>of();
 
-        final var textStyles = quote.textStyles().size() > 0 ? quote.textStyles()
+        final var textStyles = !quote.textStyles().isEmpty() ? quote.textStyles()
                 .stream()
                 .map(JsonTextStyle::from)
                 .toList() : null;
diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
index e71feda6..d898c63f 100644
--- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
@@ -19,15 +19,15 @@ public record JsonSharedContact(
         final var name = JsonContactName.from(contact.name());
         final var avatar = contact.avatar().isPresent() ? JsonContactAvatar.from(contact.avatar().get()) : null;
 
-        final var phone = contact.phone().size() > 0
+        final var phone = !contact.phone().isEmpty()
                 ? contact.phone().stream().map(JsonContactPhone::from).toList()
                 : null;
 
-        final var email = contact.email().size() > 0
+        final var email = !contact.email().isEmpty()
                 ? contact.email().stream().map(JsonContactEmail::from).toList()
                 : null;
 
-        final var address = contact.address().size() > 0 ? contact.address()
+        final var address = !contact.address().isEmpty() ? contact.address()
                 .stream()
                 .map(JsonContactAddress::from)
                 .toList() : null;
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index 98c3571e..fbe11daf 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -45,7 +45,7 @@ record JsonSyncMessage(
             blockedGroupIds = null;
         }
 
-        final var readMessages = syncMessage.read().size() > 0 ? syncMessage.read()
+        final var readMessages = !syncMessage.read().isEmpty() ? syncMessage.read()
                 .stream()
                 .map(JsonSyncReadMessage::from)
                 .toList() : null;
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index 16f5fbd0..25e5c66c 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -127,7 +127,7 @@ public class JsonRpcReader {
                 Util.closeExecutorService(executor);
             }
 
-            if (responseList.size() > 0) {
+            if (!responseList.isEmpty()) {
                 jsonRpcSender.sendBatchResponses(responseList);
             }
         }
@@ -193,7 +193,7 @@ public class JsonRpcReader {
                     null), null));
             return null;
         } else if (jsonNode.isArray()) {
-            if (jsonNode.size() == 0) {
+            if (jsonNode.isEmpty()) {
                 jsonRpcSender.sendResponse(JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
                         "invalid request",
                         null), null));
diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 948560af..e193d253 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -41,12 +41,12 @@ public class Util {
     }
 
     private static String toCamelCaseString(List<String> strings) {
-        if (strings.size() == 0) {
+        if (strings.isEmpty()) {
             return "";
         }
         return strings.get(0) + strings.stream()
                 .skip(1)
-                .filter(s -> s.length() > 0)
+                .filter(s -> !s.isEmpty())
                 .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))
                 .collect(Collectors.joining());
     }

From fc2e9bbfaec8dbe6e317b951c0d28fa2e9421347 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 20:00:47 +0200
Subject: [PATCH 249/672] Fix inspections

---
 graalvm-config-dir/reflect-config.json        | 28 ++++++++++++
 .../org/asamk/signal/manager/Manager.java     | 10 ++---
 .../org/asamk/signal/manager/Settings.java    |  2 +-
 .../SendRetryMessageRequestAction.java        |  4 +-
 .../signal/manager/api/MessageEnvelope.java   | 44 +++++++++++--------
 .../signal/manager/helper/GroupHelper.java    |  4 +-
 .../signal/manager/helper/IdentityHelper.java |  9 +---
 .../signal/manager/helper/ProfileHelper.java  |  9 ++--
 .../signal/manager/helper/SyncHelper.java     | 34 +++++++-------
 .../internal/MultiAccountManagerImpl.java     |  6 +--
 .../signal/manager/storage/Database.java      |  2 +-
 .../signal/manager/storage/SignalAccount.java |  6 +--
 .../storage/accounts/AccountsStore.java       | 20 ++++-----
 .../storage/protocol/LegacyIdentityInfo.java  |  6 +--
 .../storage/protocol/LegacySessionInfo.java   |  6 +--
 .../recipients/RecipientWithAddress.java      |  2 +-
 .../storage/sessions/SessionStore.java        |  2 +-
 .../threads/LegacyJsonThreadStore.java        |  2 +-
 .../manager/util/MessageCacheUtils.java       |  2 +-
 .../recipients/MergeRecipientHelperTest.java  |  8 ++--
 man/signal-cli-dbus.5.adoc                    |  5 ++-
 src/main/java/org/asamk/Signal.java           | 22 +++++-----
 src/main/java/org/asamk/signal/App.java       | 32 +++++++-------
 .../signal/commands/SendReceiptCommand.java   | 23 ++++------
 .../commands/UpdateConfigurationCommand.java  |  4 --
 .../asamk/signal/dbus/DbusManagerImpl.java    |  2 +-
 .../org/asamk/signal/dbus/DbusSignalImpl.java | 22 ++--------
 27 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index d24416d9..401727f6 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1363,6 +1363,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.DSTU4145$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.Dilithium$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.EC$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1371,6 +1375,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.ECGOST$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.EXTERNAL$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.EdEC$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1379,6 +1387,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.ElGamal$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.Falcon$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.GM$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1391,10 +1403,22 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.IES$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.LMS$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.NTRU$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.RSA$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.SPHINCSPlus$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.X509$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1419,6 +1443,10 @@
   "name":"org.bouncycastle.jcajce.provider.digest.Blake2s$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.digest.Blake3$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.digest.DSTU7564$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index defe7155..41e08fb6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -92,7 +92,7 @@ public interface Manager extends Closeable {
 
     Configuration getConfiguration();
 
-    void updateConfiguration(Configuration configuration) throws IOException, NotPrimaryDeviceException;
+    void updateConfiguration(Configuration configuration) throws NotPrimaryDeviceException;
 
     /**
      * Update the user's profile.
@@ -160,11 +160,11 @@ public interface Manager extends Closeable {
 
     SendMessageResults sendReadReceipt(
             RecipientIdentifier.Single sender, List<Long> messageIds
-    ) throws IOException;
+    );
 
     SendMessageResults sendViewedReceipt(
             RecipientIdentifier.Single sender, List<Long> messageIds
-    ) throws IOException;
+    );
 
     SendMessageResults sendMessage(
             Message message, Set<RecipientIdentifier> recipients
@@ -199,7 +199,7 @@ public interface Manager extends Closeable {
 
     void setContactName(
             RecipientIdentifier.Single recipient, String givenName, final String familyName
-    ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException;
+    ) throws NotPrimaryDeviceException, UnregisteredRecipientException;
 
     void setContactsBlocked(
             Collection<RecipientIdentifier.Single> recipient, boolean blocked
@@ -299,7 +299,7 @@ public interface Manager extends Closeable {
     InputStream retrieveAttachment(final String id) throws IOException;
 
     @Override
-    void close() throws IOException;
+    void close();
 
     interface ReceiveMessageHandler {
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/Settings.java b/lib/src/main/java/org/asamk/signal/manager/Settings.java
index 87854514..5fd4e36b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Settings.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Settings.java
@@ -4,5 +4,5 @@ import org.asamk.signal.manager.api.TrustNewIdentity;
 
 public record Settings(TrustNewIdentity trustNewIdentity, boolean disableMessageSendLog) {
 
-    public static Settings DEFAULT = new Settings(TrustNewIdentity.ON_FIRST_USE, false);
+    public static final Settings DEFAULT = new Settings(TrustNewIdentity.ON_FIRST_USE, false);
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
index 1975fd17..865f062f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
@@ -50,7 +50,9 @@ public class SendRetryMessageRequestAction implements HandleAction {
             envelopeType = messageContent.getType();
         } else {
             originalContent = envelope.getContent();
-            envelopeType = envelopeTypeToCiphertextMessageType(envelope.getType());
+            envelopeType = envelope.getType() == null
+                    ? CiphertextMessage.WHISPER_TYPE
+                    : envelopeTypeToCiphertextMessageType(envelope.getType());
         }
 
         DecryptionErrorMessage decryptionErrorMessage = DecryptionErrorMessage.forOriginalMessage(originalContent,
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 00abd93e..f4b63324 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -34,6 +34,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.ViewOnceOpenMes
 import org.whispersystems.signalservice.api.messages.multidevice.ViewedMessage;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -234,7 +235,7 @@ public record MessageEnvelope(
                 return new Quote(quote.getId(),
                         addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(quote.getAuthor()))
                                 .toApiRecipientAddress(),
-                        Optional.ofNullable(quote.getText()),
+                        Optional.of(quote.getText()),
                         quote.getMentions() == null
                                 ? List.of()
                                 : quote.getMentions()
@@ -291,9 +292,9 @@ public record MessageEnvelope(
                 boolean isBorderless
         ) {
 
-            static Attachment from(SignalServiceAttachment attachment, AttachmentFileProvider fileProvider) {
-                if (attachment.isPointer()) {
-                    final var a = attachment.asPointer();
+            static Attachment from(SignalServiceAttachment signalAttachment, AttachmentFileProvider fileProvider) {
+                if (signalAttachment.isPointer()) {
+                    final var a = signalAttachment.asPointer();
                     final var attachmentFile = fileProvider.getFile(a);
                     return new Attachment(Optional.of(attachmentFile.getName()),
                             Optional.of(attachmentFile),
@@ -310,21 +311,26 @@ public record MessageEnvelope(
                             a.isGif(),
                             a.isBorderless());
                 } else {
-                    final var a = attachment.asStream();
-                    return new Attachment(Optional.empty(),
-                            Optional.empty(),
-                            a.getFileName(),
-                            a.getContentType(),
-                            a.getUploadTimestamp() == 0 ? Optional.empty() : Optional.of(a.getUploadTimestamp()),
-                            Optional.of(a.getLength()),
-                            a.getPreview(),
-                            Optional.empty(),
-                            a.getCaption(),
-                            a.getWidth() == 0 ? Optional.empty() : Optional.of(a.getWidth()),
-                            a.getHeight() == 0 ? Optional.empty() : Optional.of(a.getHeight()),
-                            a.getVoiceNote(),
-                            a.isGif(),
-                            a.isBorderless());
+                    Attachment attachment = null;
+                    try (final var a = signalAttachment.asStream()) {
+                        attachment = new Attachment(Optional.empty(),
+                                Optional.empty(),
+                                a.getFileName(),
+                                a.getContentType(),
+                                a.getUploadTimestamp() == 0 ? Optional.empty() : Optional.of(a.getUploadTimestamp()),
+                                Optional.of(a.getLength()),
+                                a.getPreview(),
+                                Optional.empty(),
+                                a.getCaption(),
+                                a.getWidth() == 0 ? Optional.empty() : Optional.of(a.getWidth()),
+                                a.getHeight() == 0 ? Optional.empty() : Optional.of(a.getHeight()),
+                                a.getVoiceNote(),
+                                a.isGif(),
+                                a.isBorderless());
+                        return attachment;
+                    } catch (IOException e) {
+                        return attachment;
+                    }
                 }
             }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 697786fc..5991202e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -822,8 +822,8 @@ public class GroupHelper {
         if (avatarFile == null) {
             return null;
         }
-        try (final var avatar = Utils.createStreamDetails(avatarFile).first().getStream()) {
-            return IOUtils.readFully(avatar);
+        try (final var avatar = Utils.createStreamDetails(avatarFile).first()) {
+            return IOUtils.readFully(avatar.getStream());
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index c1e22c97..b9281889 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -14,7 +14,6 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.ServiceId;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.function.BiFunction;
 
@@ -112,12 +111,8 @@ public class IdentityHelper {
         }
 
         account.getIdentityKeyStore().setIdentityTrustLevel(serviceId, identity.getIdentityKey(), trustLevel);
-        try {
-            context.getSyncHelper()
-                    .sendVerifiedMessage(address.toSignalServiceAddress(), identity.getIdentityKey(), trustLevel);
-        } catch (IOException e) {
-            logger.warn("Failed to send verification sync message: {}", e.getMessage());
-        }
+        context.getSyncHelper()
+                .sendVerifiedMessage(address.toSignalServiceAddress(), identity.getIdentityKey(), trustLevel);
 
         return true;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 6d5f2aa1..1631ad9d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -212,10 +212,11 @@ public final class ProfileHelper {
 
         if (avatar != null) {
             if (avatar.isPresent()) {
-                final var streamDetails = Utils.createStreamDetails(avatar.get()).first();
-                context.getAvatarStore()
-                        .storeProfileAvatar(account.getSelfRecipientAddress(),
-                                outputStream -> IOUtils.copyStream(streamDetails.getStream(), outputStream));
+                try (final var streamDetails = Utils.createStreamDetails(avatar.get()).first()) {
+                    context.getAvatarStore()
+                            .storeProfileAvatar(account.getSelfRecipientAddress(),
+                                    outputStream -> IOUtils.copyStream(streamDetails.getStream(), outputStream));
+                }
             } else {
                 context.getAvatarStore().deleteProfileAvatar(account.getSelfRecipientAddress());
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index adc4e1d4..77aa2657 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -13,6 +13,7 @@ import org.asamk.signal.manager.util.MimeUtils;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
@@ -73,8 +74,8 @@ public class SyncHelper {
         requestSyncData(SyncMessage.Request.Type.PNI_IDENTITY);
     }
 
-    public void sendSyncFetchProfileMessage() {
-        context.getSendHelper()
+    public SendMessageResult sendSyncFetchProfileMessage() {
+        return context.getSendHelper()
                 .sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
     }
 
@@ -193,7 +194,7 @@ public class SyncHelper {
         }
     }
 
-    public void sendBlockedList() {
+    public SendMessageResult sendBlockedList() {
         var addresses = new ArrayList<SignalServiceAddress>();
         for (var record : account.getContactStore().getContacts()) {
             if (record.second().isBlocked()) {
@@ -206,30 +207,33 @@ public class SyncHelper {
                 groupIds.add(record.getGroupId().serialize());
             }
         }
-        context.getSendHelper()
+        return context.getSendHelper()
                 .sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
     }
 
-    public void sendVerifiedMessage(
+    public SendMessageResult sendVerifiedMessage(
             SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel
-    ) throws IOException {
+    ) {
         var verifiedMessage = new VerifiedMessage(destination,
                 identityKey,
                 trustLevel.toVerifiedState(),
                 System.currentTimeMillis());
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forVerified(verifiedMessage));
     }
 
-    public void sendKeysMessage() {
+    public SendMessageResult sendKeysMessage() {
         var keysMessage = new KeysMessage(Optional.ofNullable(account.getStorageKey()));
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
     }
 
-    public void sendStickerOperationsMessage(List<StickerPack> installStickers, List<StickerPack> removeStickers) {
+    public SendMessageResult sendStickerOperationsMessage(
+            List<StickerPack> installStickers, List<StickerPack> removeStickers
+    ) {
         var installStickerMessages = installStickers.stream().map(s -> getStickerPackOperationMessage(s, true));
         var removeStickerMessages = removeStickers.stream().map(s -> getStickerPackOperationMessage(s, false));
         var stickerMessages = Stream.concat(installStickerMessages, removeStickerMessages).toList();
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(stickerMessages));
+        return context.getSendHelper()
+                .sendSyncMessage(SignalServiceSyncMessage.forStickerPackOperations(stickerMessages));
     }
 
     private static StickerPackOperationMessage getStickerPackOperationMessage(
@@ -240,13 +244,13 @@ public class SyncHelper {
                 installed ? StickerPackOperationMessage.Type.INSTALL : StickerPackOperationMessage.Type.REMOVE);
     }
 
-    public void sendConfigurationMessage() {
+    public SendMessageResult sendConfigurationMessage() {
         final var config = account.getConfigurationStore();
         var configurationMessage = new ConfigurationMessage(Optional.ofNullable(config.getReadReceipts()),
                 Optional.ofNullable(config.getUnidentifiedDeliveryIndicators()),
                 Optional.ofNullable(config.getTypingIndicators()),
                 Optional.ofNullable(config.getLinkPreviews()));
-        context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forConfiguration(configurationMessage));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forConfiguration(configurationMessage));
     }
 
     public void handleSyncDeviceGroups(final InputStream input) {
@@ -344,10 +348,10 @@ public class SyncHelper {
         }
     }
 
-    private void requestSyncData(final SyncMessage.Request.Type type) {
+    private SendMessageResult requestSyncData(final SyncMessage.Request.Type type) {
         var r = new SyncMessage.Request.Builder().type(type).build();
         var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
-        context.getSendHelper().sendSyncMessage(message);
+        return context.getSendHelper().sendSyncMessage(message);
     }
 
     private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(RecipientAddress address) throws IOException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
index 0461254a..4dc1ede2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
@@ -125,11 +125,7 @@ public class MultiAccountManagerImpl implements MultiAccountManager {
     public void close() {
         synchronized (managers) {
             for (var m : new ArrayList<>(managers)) {
-                try {
-                    m.close();
-                } catch (IOException e) {
-                    logger.warn("Cleanup failed", e);
-                }
+                m.close();
             }
             managers.clear();
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
index 3d0d9374..71704698 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
@@ -47,7 +47,7 @@ public abstract class Database implements AutoCloseable {
     }
 
     @Override
-    public void close() throws SQLException {
+    public void close() {
         dataSource.close();
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 57300b11..2d33555d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1610,11 +1610,7 @@ public class SignalAccount implements Closeable {
     public void close() {
         synchronized (fileChannel) {
             if (accountDatabase != null) {
-                try {
-                    accountDatabase.close();
-                } catch (SQLException e) {
-                    logger.warn("Failed to close account database: {}", e.getMessage(), e);
-                }
+                accountDatabase.close();
             }
             if (messageSendLogStore != null) {
                 messageSendLogStore.close();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
index 0e9fc5fc..55c5adf0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
@@ -252,18 +252,14 @@ public class AccountsStore {
     }
 
     private void saveAccountsLocked(FileChannel fileChannel, AccountsStorage accountsStorage) throws IOException {
-        try {
-            try (var output = new ByteArrayOutputStream()) {
-                // Write to memory first to prevent corrupting the file in case of serialization errors
-                objectMapper.writeValue(output, accountsStorage);
-                var input = new ByteArrayInputStream(output.toByteArray());
-                fileChannel.position(0);
-                input.transferTo(Channels.newOutputStream(fileChannel));
-                fileChannel.truncate(fileChannel.position());
-                fileChannel.force(false);
-            }
-        } catch (Exception e) {
-            logger.error("Error saving accounts file: {}", e.getMessage(), e);
+        try (var output = new ByteArrayOutputStream()) {
+            // Write to memory first to prevent corrupting the file in case of serialization errors
+            objectMapper.writeValue(output, accountsStorage);
+            var input = new ByteArrayInputStream(output.toByteArray());
+            fileChannel.position(0);
+            input.transferTo(Channels.newOutputStream(fileChannel));
+            fileChannel.truncate(fileChannel.position());
+            fileChannel.force(false);
         }
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java
index 85ebcd2b..0d555291 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java
@@ -9,9 +9,9 @@ import java.util.Date;
 public class LegacyIdentityInfo {
 
     RecipientAddress address;
-    IdentityKey identityKey;
-    TrustLevel trustLevel;
-    Date added;
+    final IdentityKey identityKey;
+    final TrustLevel trustLevel;
+    final Date added;
 
     LegacyIdentityInfo(RecipientAddress address, IdentityKey identityKey, TrustLevel trustLevel, Date added) {
         this.address = address;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacySessionInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacySessionInfo.java
index 2cb984fb..c6097cd9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacySessionInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacySessionInfo.java
@@ -4,11 +4,11 @@ import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 
 public class LegacySessionInfo {
 
-    public RecipientAddress address;
+    public final RecipientAddress address;
 
-    public int deviceId;
+    public final int deviceId;
 
-    public byte[] sessionRecord;
+    public final byte[] sessionRecord;
 
     LegacySessionInfo(final RecipientAddress address, final int deviceId, final byte[] sessionRecord) {
         this.address = address;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java
index 6885a8af..0fc00113 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientWithAddress.java
@@ -1,3 +1,3 @@
 package org.asamk.signal.manager.storage.recipients;
 
-record RecipientWithAddress(RecipientId id, RecipientAddress address) {}
+public record RecipientWithAddress(RecipientId id, RecipientAddress address) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index ebbd87aa..b8c0a322 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -328,7 +328,7 @@ public class SessionStore implements SignalServiceSessionStore {
         return new Key(address, deviceId);
     }
 
-    private SessionRecord getSessionRecordFromResultSet(ResultSet resultSet) throws SQLException {
+    private SessionRecord getSessionRecordFromResultSet(ResultSet resultSet) {
         try {
             final var record = resultSet.getBytes("record");
             return new SessionRecord(record);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
index 7e5fd242..428e9e95 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
@@ -25,7 +25,7 @@ public class LegacyJsonThreadStore {
     @JsonProperty("threads")
     @JsonSerialize(using = MapToListSerializer.class)
     @JsonDeserialize(using = ThreadsDeserializer.class)
-    private Map<String, LegacyThreadInfo> threads = new HashMap<>();
+    private final Map<String, LegacyThreadInfo> threads = new HashMap<>();
 
     public List<LegacyThreadInfo> getThreads() {
         return new ArrayList<>(threads.values());
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
index b1568bdc..b3c9457b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -69,7 +69,7 @@ public class MessageCacheUtils {
                 if (version >= 2) {
                     serverReceivedTimestamp = in.readLong();
                     uuid = in.readUTF();
-                    if ("".equals(uuid)) {
+                    if (uuid.isEmpty()) {
                         uuid = null;
                     }
                 }
diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
index a617ce93..770054f3 100644
--- a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
@@ -27,14 +27,14 @@ class MergeRecipientHelperTest {
     static final PartialAddresses ADDR_A = new PartialAddresses(SERVICE_ID_A, PNI_A, NUMBER_A);
     static final PartialAddresses ADDR_B = new PartialAddresses(SERVICE_ID_B, PNI_B, NUMBER_B);
 
-    static T[] testInstancesNone = new T[]{
+    static final T[] testInstancesNone = new T[]{
             new T(Set.of(), ADDR_A.FULL, Set.of(rec(1000000, ADDR_A.FULL))),
             new T(Set.of(), ADDR_A.ACI_NUM, Set.of(rec(1000000, ADDR_A.ACI_NUM))),
             new T(Set.of(), ADDR_A.ACI_PNI, Set.of(rec(1000000, ADDR_A.ACI_PNI))),
             new T(Set.of(), ADDR_A.PNI_NUM, Set.of(rec(1000000, ADDR_A.PNI_NUM))),
     };
 
-    static T[] testInstancesSingle = new T[]{
+    static final T[] testInstancesSingle = new T[]{
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
@@ -74,7 +74,7 @@ class MergeRecipientHelperTest {
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_B.FULL, Set.of(rec(1, ADDR_A.FULL), rec(1000000, ADDR_B.FULL))),
     };
 
-    static T[] testInstancesTwo = new T[]{
+    static final T[] testInstancesTwo = new T[]{
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI_NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
@@ -100,7 +100,7 @@ class MergeRecipientHelperTest {
             new T(Set.of(rec(1, ADDR_A.PNI), rec(2, ADDR_A.ACI_NUM)), ADDR_A.ACI_PNI, Set.of(rec(2, ADDR_A.FULL))),
     };
 
-    static T[] testInstancesThree = new T[]{
+    static final T[] testInstancesThree = new T[]{
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
                     ADDR_A.FULL,
                     Set.of(rec(1, ADDR_A.FULL))),
diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc
index 1f2caa18..cd73b9f0 100644
--- a/man/signal-cli-dbus.5.adoc
+++ b/man/signal-cli-dbus.5.adoc
@@ -68,9 +68,10 @@ This can be piped to a QR encoder to create a display that can be captured by a
 
 For example:
 
-```
+[source]
+----
 dbus-send --session --dest=org.asamk.Signal --type=method_call --print-reply /org/asamk/Signal org.asamk.Signal.link string:"My secondary client" | tr '\n' '\0' | sed 's/.*string //g' | sed 's/\"//g' | qrencode -s10 -tANSI256
-```
+----
 
 listAccounts() -> accountList<as>::
 * accountList : Array of all attached accounts in DBus object path form
diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index c4e3a26e..1fab8102 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -138,9 +138,9 @@ public interface Signal extends DBusInterface {
 
     DBusPath getDevice(long deviceId);
 
-    public DBusPath getIdentity(String number);
+    DBusPath getIdentity(String number);
 
-    public List<StructIdentity> listIdentities();
+    List<StructIdentity> listIdentities();
 
     List<StructDevice> listDevices() throws Error.Failure;
 
@@ -497,13 +497,13 @@ public interface Signal extends DBusInterface {
     class StructDevice extends Struct {
 
         @Position(0)
-        DBusPath objectPath;
+        final DBusPath objectPath;
 
         @Position(1)
-        Long id;
+        final Long id;
 
         @Position(2)
-        String name;
+        final String name;
 
         public StructDevice(final DBusPath objectPath, final Long id, final String name) {
             this.objectPath = objectPath;
@@ -542,13 +542,13 @@ public interface Signal extends DBusInterface {
     class StructGroup extends Struct {
 
         @Position(0)
-        DBusPath objectPath;
+        final DBusPath objectPath;
 
         @Position(1)
-        byte[] id;
+        final byte[] id;
 
         @Position(2)
-        String name;
+        final String name;
 
         public StructGroup(final DBusPath objectPath, final byte[] id, final String name) {
             this.objectPath = objectPath;
@@ -610,13 +610,13 @@ public interface Signal extends DBusInterface {
     class StructIdentity extends Struct {
 
         @Position(0)
-        DBusPath objectPath;
+        final DBusPath objectPath;
 
         @Position(1)
-        String uuid;
+        final String uuid;
 
         @Position(2)
-        String number;
+        final String number;
 
         public StructIdentity(final DBusPath objectPath, final String uuid, final String number) {
             this.objectPath = objectPath;
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 9ac4b190..f0ebbfae 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -165,20 +165,7 @@ public class App {
                 return;
             }
 
-            Set<String> accounts;
-            try {
-                accounts = signalAccountFiles.getAllLocalAccountNumbers();
-            } catch (IOException e) {
-                throw new IOErrorException("Failed to load local accounts file", e);
-            }
-            if (accounts.size() == 0) {
-                throw new UserErrorException("No local users found, you first need to register or link an account");
-            } else if (accounts.size() > 1) {
-                throw new UserErrorException(
-                        "Multiple users found, you need to specify an account (phone number) with -a");
-            }
-
-            account = accounts.stream().findFirst().get();
+            account = getAccountIfOnlyOne(signalAccountFiles);
         } else if (!Manager.isValidNumber(account, null)) {
             throw new UserErrorException("Invalid account (phone number), make sure you include the country code.");
         }
@@ -196,6 +183,21 @@ public class App {
         throw new UserErrorException("Command only works in multi-account mode");
     }
 
+    private static String getAccountIfOnlyOne(final SignalAccountFiles signalAccountFiles) throws IOErrorException, UserErrorException {
+        Set<String> accounts;
+        try {
+            accounts = signalAccountFiles.getAllLocalAccountNumbers();
+        } catch (IOException e) {
+            throw new IOErrorException("Failed to load local accounts file", e);
+        }
+        if (accounts.isEmpty()) {
+            throw new UserErrorException("No local users found, you first need to register or link an account");
+        } else if (accounts.size() > 1) {
+            throw new UserErrorException("Multiple users found, you need to specify an account (phone number) with -a");
+        }
+        return accounts.stream().findFirst().get();
+    }
+
     private OutputWriter getOutputWriter(final Command command) throws UserErrorException {
         final var outputTypeInput = ns.<OutputType>get("output");
         final var outputType = outputTypeInput == null ? command.getSupportedOutputTypes()
@@ -274,8 +276,6 @@ public class App {
     ) throws CommandException {
         try (var m = loadManager(account, signalAccountFiles)) {
             commandHandler.handleLocalCommand(command, m);
-        } catch (IOException e) {
-            logger.warn("Cleanup failed", e);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
index 1eec6c99..adae7c4d 100644
--- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
@@ -10,8 +10,6 @@ import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
-import java.io.IOException;
-
 import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class SendReceiptCommand implements JsonRpcLocalCommand {
@@ -45,19 +43,14 @@ public class SendReceiptCommand implements JsonRpcLocalCommand {
         final var targetTimestamps = ns.<Long>getList("target-timestamp");
         final var type = ns.getString("type");
 
-        try {
-            final SendMessageResults results;
-            if (type == null || "read".equals(type)) {
-                results = m.sendReadReceipt(recipient, targetTimestamps);
-            } else if ("viewed".equals(type)) {
-                results = m.sendViewedReceipt(recipient, targetTimestamps);
-            } else {
-                throw new UserErrorException("Unknown receipt type: " + type);
-            }
-            outputResult(outputWriter, results);
-        } catch (IOException e) {
-            throw new UserErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
-                    .getSimpleName() + ")");
+        final SendMessageResults results;
+        if (type == null || "read".equals(type)) {
+            results = m.sendReadReceipt(recipient, targetTimestamps);
+        } else if ("viewed".equals(type)) {
+            results = m.sendViewedReceipt(recipient, targetTimestamps);
+        } else {
+            throw new UserErrorException("Unknown receipt type: " + type);
         }
+        outputResult(outputWriter, results);
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
index 73bac056..d1feff8a 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
@@ -4,14 +4,12 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
-import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.output.OutputWriter;
 
-import java.io.IOException;
 import java.util.Optional;
 
 public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
@@ -51,8 +49,6 @@ public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
                     Optional.ofNullable(unidentifiedDeliveryIndicators),
                     Optional.ofNullable(typingIndicators),
                     Optional.ofNullable(linkPreviews)));
-        } catch (IOException e) {
-            throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e);
         } catch (NotPrimaryDeviceException e) {
             throw new UserErrorException("This command doesn't work on linked devices.");
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 290ab647..49aa0e27 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -136,7 +136,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public void updateConfiguration(Configuration newConfiguration) throws IOException {
+    public void updateConfiguration(Configuration newConfiguration) {
         final var configuration = getRemoteObject(new DBusPath(signal.getObjectPath() + "/Configuration"),
                 Signal.Configuration.class);
         newConfiguration.readReceipts()
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 2223c96a..95acd2cb 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -351,26 +351,16 @@ public class DbusSignalImpl implements Signal {
     public void sendReadReceipt(
             final String recipient, final List<Long> messageIds
     ) throws Error.Failure, Error.UntrustedIdentity {
-        try {
-            final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
-                    messageIds);
-            checkSendMessageResults(results);
-        } catch (IOException e) {
-            throw new Error.Failure(e.getMessage());
-        }
+        final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+        checkSendMessageResults(results);
     }
 
     @Override
     public void sendViewedReceipt(
             final String recipient, final List<Long> messageIds
     ) throws Error.Failure, Error.UntrustedIdentity {
-        try {
-            final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()),
-                    messageIds);
-            checkSendMessageResults(results);
-        } catch (IOException e) {
-            throw new Error.Failure(e.getMessage());
-        }
+        final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
+        checkSendMessageResults(results);
     }
 
     @Override
@@ -532,8 +522,6 @@ public class DbusSignalImpl implements Signal {
             m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
         } catch (NotPrimaryDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");
-        } catch (IOException e) {
-            throw new Error.Failure("Contact is not registered.");
         } catch (UnregisteredRecipientException e) {
             throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
         }
@@ -1238,8 +1226,6 @@ public class DbusSignalImpl implements Signal {
                         Optional.ofNullable(unidentifiedDeliveryIndicators),
                         Optional.ofNullable(typingIndicators),
                         Optional.ofNullable(linkPreviews)));
-            } catch (IOException e) {
-                throw new Error.Failure("UpdateAccount error: " + e.getMessage());
             } catch (NotPrimaryDeviceException e) {
                 throw new Error.Failure("This command doesn't work on linked devices.");
             }

From 2852b2ea6dc26ba062ac22dd526bf6793b38253c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 21:56:24 +0200
Subject: [PATCH 250/672] Extend log scrubber for dbus serviceIds

---
 src/main/java/org/asamk/signal/logging/Scrubber.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/logging/Scrubber.java b/src/main/java/org/asamk/signal/logging/Scrubber.java
index 2c60faa5..c1d66893 100644
--- a/src/main/java/org/asamk/signal/logging/Scrubber.java
+++ b/src/main/java/org/asamk/signal/logging/Scrubber.java
@@ -50,7 +50,7 @@ public final class Scrubber {
      * The middle group will be censored.
      */
     private static final Pattern UUID_PATTERN = Pattern.compile(
-            "(JOB::)?([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{10})([0-9a-f]{2})",
+            "(JOB::)?([0-9a-f]{8}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{10})([0-9a-f]{2})",
             Pattern.CASE_INSENSITIVE);
     private static final String UUID_CENSOR = "********-****-****-****-**********";
 

From 19b5c761544e355c8668d25de9b9671061b5b81c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@monkeyseemonkeydo.lv>
Date: Wed, 18 Oct 2023 08:47:10 +0300
Subject: [PATCH 251/672] Fix typo (#1348)

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5158f41..8da82a31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 ### Added
 
 - Added `startChangeNumber` and `finishChangeNumber` commands to switch to another phone number
-- Added `--quote-attachment` paramter to `send` command
+- Added `--quote-attachment` parameter to `send` command
 - Added support for scannable safety numbers based on serviceId
 - Added `EditMessageReceived` signal for D-Bus interface
 - Added new exit code `5` for rate limit failures

From 24ec25ac62cc30b99f0a14777d15f362700fc4e5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 18 Oct 2023 22:57:51 +0200
Subject: [PATCH 252/672] Fix typo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8da82a31..12527f61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -661,7 +661,7 @@ Bug fixes and small improvements
 - Fix linking of new devices
 
 ## [0.5.3] - 2017-01-29
-* New commandline paramter for receive: --ignore-attachments
+* New commandline parameter for receive: --ignore-attachments
 * Updated dependencies
 
 ## [0.5.2] - 2016-12-16

From 62c71eaafaf2e323e52c7f1c605805102633d8cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 08:01:22 +0200
Subject: [PATCH 253/672] Bump rustix from 0.37.23 to 0.37.25 in /client
 (#1350)

Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.37.23 to 0.37.25.
- [Release notes](https://github.com/bytecodealliance/rustix/releases)
- [Commits](https://github.com/bytecodealliance/rustix/compare/v0.37.23...v0.37.25)

---
updated-dependencies:
- dependency-name: rustix
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 client/Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 94ac898f..db4cebf1 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -761,9 +761,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.37.23"
+version = "0.37.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035"
 dependencies = [
  "bitflags",
  "errno",

From e829dd8b5cde58b555944378e09b5aa831212cc4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 19 Oct 2023 23:17:49 +0200
Subject: [PATCH 254/672] Update graalvm reflect-config

Fixes #1352
---
 graalvm-config-dir/reflect-config.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 401727f6..e34bdcfc 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2501,6 +2501,13 @@
   "allDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.ProofRequiredResponse",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.ProvisioningMessage",
   "allDeclaredFields":true,

From 3ae6f7ab7cc3fb89c4960415e4a98305c2694b1f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 19 Oct 2023 23:26:46 +0200
Subject: [PATCH 255/672] Update graalvm reflect-config

---
 graalvm-config-dir/reflect-config.json | 6 ++++++
 run_tests.sh                           | 1 +
 2 files changed, 7 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index e34bdcfc..24763591 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2598,6 +2598,12 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.SubmitRecaptchaChallengePayload",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.UpdateVerificationSessionRequestBody",
   "allDeclaredFields":true,
diff --git a/run_tests.sh b/run_tests.sh
index 605ba892..dbd01df9 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -190,6 +190,7 @@ run_main -a "$NUMBER_1" receive
 run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
 run_main -a "$NUMBER_1" block -g "$GROUP_ID"
 run_main -a "$NUMBER_1" unblock -g "$GROUP_ID"
+run_main -a "$NUMBER_1" submitRateLimitChallenge --challenge 8xxxxxx8-0xx2-4xx9-9xx2-4xxxxxxxxxx7 --captcha signal-hcaptcha
 
 ## Basic send/receive
 for OUTPUT in "plain-text" "json"; do

From bf168852783c451f478721e28074d7b57e6f24b3 Mon Sep 17 00:00:00 2001
From: Vladimir Glinskikh <englearn48@gmail.com>
Date: Sat, 21 Oct 2023 13:49:28 +0300
Subject: [PATCH 256/672] Bump upgrade gradle from 8.3 to 8.4 (#1353)

---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew                                  | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac72c34e..3fa8f862 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 0adc8e1a..1aa94a42 100755
--- a/gradlew
+++ b/gradlew
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

From 314159c273cc109a2aa4130fb43123c9387510c3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 19 Oct 2023 21:36:19 +0200
Subject: [PATCH 257/672] Update libsignal-service-java

---
 graalvm-config-dir/resource-config.json       |   2 ++
 .../manager/api/GroupInviteLinkUrl.java       |   6 ++--
 .../signal/manager/config/IasTrustStore.java  |  18 ----------
 .../signal/manager/config/LiveConfig.java     |  24 -------------
 .../signal/manager/config/ServiceConfig.java  |  30 ----------------
 .../config/ServiceEnvironmentConfig.java      |   4 ---
 .../signal/manager/config/StagingConfig.java  |  24 -------------
 .../signal/manager/helper/AccountHelper.java  |   6 ++--
 .../asamk/signal/manager/helper/Context.java  |   6 +---
 .../signal/manager/helper/PinHelper.java      |  32 +-----------------
 .../manager/helper/RecipientHelper.java       |   4 +--
 .../signal/manager/helper/StorageHelper.java  |   3 +-
 .../signal/manager/helper/SyncHelper.java     |   3 +-
 .../internal/RegistrationManagerImpl.java     |  18 +---------
 .../manager/internal/SignalDependencies.java  |  23 -------------
 .../org/asamk/signal/manager/config/ias.store | Bin 1441 -> 0 bytes
 settings.gradle.kts                           |   2 +-
 17 files changed, 17 insertions(+), 188 deletions(-)
 delete mode 100644 lib/src/main/java/org/asamk/signal/manager/config/IasTrustStore.java
 delete mode 100644 lib/src/main/resources/org/asamk/signal/manager/config/ias.store

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index e6451e63..8f11b81b 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -4,6 +4,8 @@
     "pattern":"\\QMETA-INF/maven/org.xerial/sqlite-jdbc/pom.properties\\E"
   }, {
     "pattern":"\\QMETA-INF/services/ch.qos.logback.classic.spi.Configurator\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/com.sun.net.httpserver.spi.HttpServerProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
   }, {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
index cc3690f4..0c00b309 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
@@ -1,11 +1,11 @@
 package org.asamk.signal.manager.api;
 
 import org.asamk.signal.manager.groups.GroupLinkPassword;
+import org.signal.core.util.Base64;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.storageservice.protos.groups.GroupInviteLink;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;
 import java.net.URI;
@@ -49,7 +49,7 @@ public final class GroupInviteLinkUrl {
                 throw new InvalidGroupLinkException("No reference was in the uri");
             }
 
-            var bytes = Base64UrlSafe.decodePaddingAgnostic(encoding);
+            var bytes = Base64.decode(encoding);
             GroupInviteLink groupInviteLink = GroupInviteLink.ADAPTER.decode(bytes);
 
             if (groupInviteLink.v1Contents != null) {
@@ -95,7 +95,7 @@ public final class GroupInviteLinkUrl {
                 .inviteLinkPassword(ByteString.of(password.serialize()))
                 .build()).build();
 
-        var encoding = Base64UrlSafe.encodeBytesWithoutPadding(groupInviteLink.encode());
+        var encoding = Base64.encodeUrlSafeWithoutPadding(groupInviteLink.encode());
 
         return GROUP_URL_PREFIX + encoding;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/IasTrustStore.java b/lib/src/main/java/org/asamk/signal/manager/config/IasTrustStore.java
deleted file mode 100644
index 4d70809b..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/config/IasTrustStore.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.asamk.signal.manager.config;
-
-import org.whispersystems.signalservice.api.push.TrustStore;
-
-import java.io.InputStream;
-
-class IasTrustStore implements TrustStore {
-
-    @Override
-    public InputStream getKeyStoreInputStream() {
-        return IasTrustStore.class.getResourceAsStream("ias.store");
-    }
-
-    @Override
-    public String getKeyStorePassword() {
-        return "whisper";
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 285b7c93..2756f292 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -1,13 +1,11 @@
 package org.asamk.signal.manager.config;
 
-import org.bouncycastle.util.encoders.Hex;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
-import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
@@ -15,7 +13,6 @@ import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;
 
 import java.util.Base64;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -30,19 +27,9 @@ class LiveConfig {
     private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
     private final static String SVR2_MRENCLAVE = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";
 
-    private final static String KEY_BACKUP_ENCLAVE_NAME = "e18376436159cda3ad7a45d9320e382e4a497f26b0dca34d8eab0bd0139483b5";
-    private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
-            "3a485adb56e2058ef7737764c738c4069dd62bc457637eafb6bbce1ce29ddb89");
-    private final static String KEY_BACKUP_MRENCLAVE = "45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c";
-    private final static String FALLBACK_KEY_BACKUP_ENCLAVE_NAME = "0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f";
-    private final static byte[] FALLBACK_KEY_BACKUP_SERVICE_ID = Hex.decode(
-            "187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39");
-    private final static String FALLBACK_KEY_BACKUP_MRENCLAVE = "ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba";
-
     private final static String URL = "https://chat.signal.org";
     private final static String CDN_URL = "https://cdn.signal.org";
     private final static String CDN2_URL = "https://cdn2.signal.org";
-    private final static String SIGNAL_KEY_BACKUP_URL = "https://api.backup.signal.org";
     private final static String STORAGE_URL = "https://storage.signal.org";
     private final static String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
     private final static String SIGNAL_SVR2_URL = "https://svr2.signal.org";
@@ -64,7 +51,6 @@ class LiveConfig {
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
                 new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)},
@@ -83,16 +69,6 @@ class LiveConfig {
         }
     }
 
-    static KeyBackupConfig createKeyBackupConfig() {
-        return new KeyBackupConfig(KEY_BACKUP_ENCLAVE_NAME, KEY_BACKUP_SERVICE_ID, KEY_BACKUP_MRENCLAVE);
-    }
-
-    static Collection<KeyBackupConfig> createFallbackKeyBackupConfigs() {
-        return List.of(new KeyBackupConfig(FALLBACK_KEY_BACKUP_ENCLAVE_NAME,
-                FALLBACK_KEY_BACKUP_SERVICE_ID,
-                FALLBACK_KEY_BACKUP_MRENCLAVE));
-    }
-
     static String getCdsiMrenclave() {
         return CDSI_MRENCLAVE;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index bf45f8cd..5cafbdc2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -3,13 +3,7 @@ package org.asamk.signal.manager.config;
 import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.signal.libsignal.protocol.util.Medium;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
-import org.whispersystems.signalservice.api.push.TrustStore;
 
-import java.io.IOException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -31,31 +25,11 @@ public class ServiceConfig {
     public final static int GROUP_MAX_SIZE = 1001;
     public final static int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
 
-    private final static KeyStore iasKeyStore;
-
-    static {
-        try {
-            TrustStore contactTrustStore = new IasTrustStore();
-
-            var keyStore = KeyStore.getInstance("BKS");
-            keyStore.load(contactTrustStore.getKeyStoreInputStream(),
-                    contactTrustStore.getKeyStorePassword().toCharArray());
-
-            iasKeyStore = keyStore;
-        } catch (KeyStoreException | CertificateException | IOException | NoSuchAlgorithmException e) {
-            throw new AssertionError(e);
-        }
-    }
-
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var giftBadges = !isPrimaryDevice;
         return new AccountAttributes.Capabilities(false, true, true, true, true, giftBadges, false, false);
     }
 
-    public static KeyStore getIasKeyStore() {
-        return iasKeyStore;
-    }
-
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
             ServiceEnvironment serviceEnvironment, String userAgent
     ) {
@@ -70,15 +44,11 @@ public class ServiceConfig {
             case LIVE -> new ServiceEnvironmentConfig(serviceEnvironment,
                     LiveConfig.createDefaultServiceConfiguration(interceptors),
                     LiveConfig.getUnidentifiedSenderTrustRoot(),
-                    LiveConfig.createKeyBackupConfig(),
-                    LiveConfig.createFallbackKeyBackupConfigs(),
                     LiveConfig.getCdsiMrenclave(),
                     LiveConfig.getSvr2Mrenclave());
             case STAGING -> new ServiceEnvironmentConfig(serviceEnvironment,
                     StagingConfig.createDefaultServiceConfiguration(interceptors),
                     StagingConfig.getUnidentifiedSenderTrustRoot(),
-                    StagingConfig.createKeyBackupConfig(),
-                    StagingConfig.createFallbackKeyBackupConfigs(),
                     StagingConfig.getCdsiMrenclave(),
                     StagingConfig.getSvr2Mrenclave());
         };
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index 421bdcc7..9664dcae 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -4,14 +4,10 @@ import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
-import java.util.Collection;
-
 public record ServiceEnvironmentConfig(
         ServiceEnvironment type,
         SignalServiceConfiguration signalServiceConfiguration,
         ECPublicKey unidentifiedSenderTrustRoot,
-        KeyBackupConfig keyBackupConfig,
-        Collection<KeyBackupConfig> fallbackKeyBackupConfigs,
         String cdsiMrenclave,
         String svr2Mrenclave
 ) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 4e40a14b..af196303 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -1,13 +1,11 @@
 package org.asamk.signal.manager.config;
 
-import org.bouncycastle.util.encoders.Hex;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
-import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
@@ -15,7 +13,6 @@ import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;
 
 import java.util.Base64;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -30,19 +27,9 @@ class StagingConfig {
     private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
     private final static String SVR2_MRENCLAVE = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";
 
-    private final static String KEY_BACKUP_ENCLAVE_NAME = "39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b";
-    private final static byte[] KEY_BACKUP_SERVICE_ID = Hex.decode(
-            "ee1d0d972b7ea903615670de43ab1b6e7a825e811c70a29bb5fe0f819e0975fa");
-    private final static String KEY_BACKUP_MRENCLAVE = "45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c";
-    private final static String FALLBACK_KEY_BACKUP_ENCLAVE_NAME = "dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99";
-    private final static byte[] FALLBACK_KEY_BACKUP_SERVICE_ID = Hex.decode(
-            "4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a");
-    private final static String FALLBACK_KEY_BACKUP_MRENCLAVE = "ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba";
-
     private final static String URL = "https://chat.staging.signal.org";
     private final static String CDN_URL = "https://cdn-staging.signal.org";
     private final static String CDN2_URL = "https://cdn2-staging.signal.org";
-    private final static String SIGNAL_KEY_BACKUP_URL = "https://api-staging.backup.signal.org";
     private final static String STORAGE_URL = "https://storage-staging.signal.org";
     private final static String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
     private final static String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
@@ -64,7 +51,6 @@ class StagingConfig {
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
-                new SignalKeyBackupServiceUrl[]{new SignalKeyBackupServiceUrl(SIGNAL_KEY_BACKUP_URL, TRUST_STORE)},
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
                 new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)},
@@ -83,16 +69,6 @@ class StagingConfig {
         }
     }
 
-    static KeyBackupConfig createKeyBackupConfig() {
-        return new KeyBackupConfig(KEY_BACKUP_ENCLAVE_NAME, KEY_BACKUP_SERVICE_ID, KEY_BACKUP_MRENCLAVE);
-    }
-
-    static Collection<KeyBackupConfig> createFallbackKeyBackupConfigs() {
-        return List.of(new KeyBackupConfig(FALLBACK_KEY_BACKUP_ENCLAVE_NAME,
-                FALLBACK_KEY_BACKUP_SERVICE_ID,
-                FALLBACK_KEY_BACKUP_MRENCLAVE));
-    }
-
     static String getCdsiMrenclave() {
         return CDSI_MRENCLAVE;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index f2002347..4e4eb165 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -12,6 +12,7 @@ import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
 import org.asamk.signal.manager.util.Utils;
+import org.signal.core.util.Base64;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.SignalProtocolAddress;
@@ -37,7 +38,6 @@ import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
 import org.whispersystems.signalservice.internal.push.SyncMessage;
 import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevicesException;
-import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -318,7 +318,7 @@ public class AccountHelper {
         final var candidates = Username.candidatesFrom(nickname, USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH);
         final var candidateHashes = new ArrayList<String>();
         for (final var candidate : candidates) {
-            candidateHashes.add(Base64UrlSafe.encodeBytesWithoutPadding(candidate.getHash()));
+            candidateHashes.add(Base64.encodeUrlSafeWithoutPadding(candidate.getHash()));
         }
 
         final var response = dependencies.getAccountManager().reserveUsername(candidateHashes);
@@ -348,7 +348,7 @@ public class AccountHelper {
         final var whoAmIResponse = dependencies.getAccountManager().getWhoAmI();
         final var serverUsernameHash = whoAmIResponse.getUsernameHash();
         final var hasServerUsername = !isEmpty(serverUsernameHash);
-        final var localUsernameHash = Base64UrlSafe.encodeBytesWithoutPadding(new Username(localUsername).getHash());
+        final var localUsernameHash = Base64.encodeUrlSafeWithoutPadding(new Username(localUsername).getHash());
 
         if (!hasServerUsername) {
             logger.debug("No remote username is set.");
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index ed0cf391..e5824a5a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -6,7 +6,6 @@ import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
-import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV1;
 
 import java.util.function.Supplier;
 
@@ -115,10 +114,7 @@ public class Context {
     }
 
     PinHelper getPinHelper() {
-        return getOrCreate(() -> pinHelper,
-                () -> pinHelper = new PinHelper(new SecureValueRecoveryV1(dependencies.getKeyBackupService()),
-                        dependencies.getSecureValueRecoveryV2(),
-                        dependencies.getFallbackKeyBackupServices()));
+        return getOrCreate(() -> pinHelper, () -> pinHelper = new PinHelper(dependencies.getSecureValueRecoveryV2()));
     }
 
     public PreKeyHelper getPreKeyHelper() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index d8c801be..3b3a5c6f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -3,39 +3,27 @@ package org.asamk.signal.manager.helper;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
-import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV1;
 import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2;
 import org.whispersystems.signalservice.internal.push.AuthCredentials;
 import org.whispersystems.signalservice.internal.push.LockedException;
 
 import java.io.IOException;
-import java.util.Collection;
 
 public class PinHelper {
 
     private final static Logger logger = LoggerFactory.getLogger(PinHelper.class);
 
-    private final SecureValueRecoveryV1 secureValueRecoveryV1;
     private final SecureValueRecoveryV2 secureValueRecoveryV2;
-    private final Collection<KeyBackupService> fallbackKeyBackupServices;
 
-    public PinHelper(
-            final SecureValueRecoveryV1 secureValueRecoveryV1,
-            final SecureValueRecoveryV2 secureValueRecoveryV2,
-            final Collection<KeyBackupService> fallbackKeyBackupServices
-    ) {
-        this.fallbackKeyBackupServices = fallbackKeyBackupServices;
-        this.secureValueRecoveryV1 = secureValueRecoveryV1;
+    public PinHelper(final SecureValueRecoveryV2 secureValueRecoveryV2) {
         this.secureValueRecoveryV2 = secureValueRecoveryV2;
     }
 
     public void setRegistrationLockPin(
             String pin, MasterKey masterKey
     ) throws IOException {
-        secureValueRecoveryV1.setPin(pin, masterKey).execute();
         final var backupResponse = secureValueRecoveryV2.setPin(pin, masterKey).execute();
         if (backupResponse instanceof SecureValueRecovery.BackupResponse.Success) {
         } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.ServerRejected) {
@@ -55,19 +43,9 @@ public class PinHelper {
 
     public void migrateRegistrationLockPin(String pin, MasterKey masterKey) throws IOException {
         setRegistrationLockPin(pin, masterKey);
-
-        for (final var keyBackupService : fallbackKeyBackupServices) {
-            try {
-                final var pinChangeSession = keyBackupService.newPinChangeSession();
-                pinChangeSession.removePin();
-            } catch (Exception e) {
-                logger.warn("Failed to remove PIN from fallback KBS: {}", e.getMessage());
-            }
-        }
     }
 
     public void removeRegistrationLockPin() throws IOException {
-        secureValueRecoveryV1.deleteData();
         final var deleteResponse = secureValueRecoveryV2.deleteData();
         if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.Success) {
         } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.ServerRejected) {
@@ -86,14 +64,6 @@ public class PinHelper {
     public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
             String pin, LockedException e
     ) throws IOException, IncorrectPinException {
-        var svr1Credentials = e.getSvr1Credentials();
-        if (svr1Credentials != null) {
-            final var registrationLockData = getRegistrationLockData(secureValueRecoveryV1, svr1Credentials, pin);
-            if (registrationLockData != null) {
-                return registrationLockData;
-            }
-        }
-
         var svr2Credentials = e.getSvr2Credentials();
         if (svr2Credentials != null) {
             return getRegistrationLockData(secureValueRecoveryV2, svr2Credentials, pin);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index a27aca64..4694c099 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.signal.core.util.Base64;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
@@ -16,7 +17,6 @@ import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException;
 import org.whispersystems.signalservice.api.services.CdsiV2Service;
-import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -235,7 +235,7 @@ public class RecipientHelper {
 
     private ACI getRegisteredUserByUsername(String username) throws IOException, BaseUsernameException {
         return dependencies.getAccountManager()
-                .getAciByUsernameHash(Base64UrlSafe.encodeBytesWithoutPadding(new Username(username).getHash()));
+                .getAciByUsernameHash(Base64.encodeUrlSafeWithoutPadding(new Username(username).getHash()));
     }
 
     public record RegisteredUser(Optional<ACI> aci, Optional<PNI> pni) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 113a6920..e9a8d681 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -257,8 +257,7 @@ public class StorageHelper {
         account.getConfigurationStore().setLinkPreviews(accountRecord.isLinkPreviewsEnabled());
         account.getConfigurationStore().setPhoneNumberSharingMode(switch (accountRecord.getPhoneNumberSharingMode()) {
             case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
-            case NOBODY -> PhoneNumberSharingMode.NOBODY;
-            case CONTACTS_ONLY -> PhoneNumberSharingMode.CONTACTS;
+            case NOBODY, UNKNOWN -> PhoneNumberSharingMode.NOBODY;
         });
         account.getConfigurationStore().setPhoneNumberUnlisted(accountRecord.isPhoneNumberUnlisted());
         account.setUsername(accountRecord.getUsername());
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 77aa2657..1be5a268 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -222,7 +222,8 @@ public class SyncHelper {
     }
 
     public SendMessageResult sendKeysMessage() {
-        var keysMessage = new KeysMessage(Optional.ofNullable(account.getStorageKey()));
+        var keysMessage = new KeysMessage(Optional.ofNullable(account.getStorageKey()),
+                Optional.ofNullable(account.getOrCreatePinMasterKey()));
         return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 815cc8f1..679056df 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -45,7 +45,6 @@ import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
-import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV1;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
@@ -95,23 +94,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
                 userAgent,
                 groupsV2Operations,
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
-        final var keyBackupService = accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                serviceEnvironmentConfig.keyBackupConfig().enclaveName(),
-                serviceEnvironmentConfig.keyBackupConfig().serviceId(),
-                serviceEnvironmentConfig.keyBackupConfig().mrenclave(),
-                10);
-        final var fallbackKeyBackupServices = serviceEnvironmentConfig.fallbackKeyBackupConfigs()
-                .stream()
-                .map(config -> accountManager.getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                        config.enclaveName(),
-                        config.serviceId(),
-                        config.mrenclave(),
-                        10))
-                .toList();
         final var secureValueRecoveryV2 = accountManager.getSecureValueRecoveryV2(serviceEnvironmentConfig.svr2Mrenclave());
-        this.pinHelper = new PinHelper(new SecureValueRecoveryV1(keyBackupService),
-                secureValueRecoveryV2,
-                fallbackKeyBackupServices);
+        this.pinHelper = new PinHelper(secureValueRecoveryV2);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 82ffce96..2e2cb75f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -4,7 +4,6 @@ import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
-import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
@@ -23,7 +22,6 @@ import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
-import java.util.Collection;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
@@ -50,7 +48,6 @@ public class SignalDependencies {
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
 
-    private KeyBackupService keyBackupService;
     private SecureValueRecoveryV2 secureValueRecoveryV2;
     private ProfileService profileService;
     private SignalServiceCipher cipher;
@@ -187,31 +184,11 @@ public class SignalDependencies {
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
-    public KeyBackupService getKeyBackupService() {
-        return getOrCreate(() -> keyBackupService,
-                () -> keyBackupService = getAccountManager().getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                        serviceEnvironmentConfig.keyBackupConfig().enclaveName(),
-                        serviceEnvironmentConfig.keyBackupConfig().serviceId(),
-                        serviceEnvironmentConfig.keyBackupConfig().mrenclave(),
-                        10));
-    }
-
     public SecureValueRecoveryV2 getSecureValueRecoveryV2() {
         return getOrCreate(() -> secureValueRecoveryV2,
                 () -> secureValueRecoveryV2 = getAccountManager().getSecureValueRecoveryV2(serviceEnvironmentConfig.svr2Mrenclave()));
     }
 
-    public Collection<KeyBackupService> getFallbackKeyBackupServices() {
-        return serviceEnvironmentConfig.fallbackKeyBackupConfigs()
-                .stream()
-                .map(config -> getAccountManager().getKeyBackupService(ServiceConfig.getIasKeyStore(),
-                        config.enclaveName(),
-                        config.serviceId(),
-                        config.mrenclave(),
-                        10))
-                .toList();
-    }
-
     public ProfileService getProfileService() {
         return getOrCreate(() -> profileService,
                 () -> profileService = new ProfileService(getClientZkProfileOperations(),
diff --git a/lib/src/main/resources/org/asamk/signal/manager/config/ias.store b/lib/src/main/resources/org/asamk/signal/manager/config/ias.store
deleted file mode 100644
index e0b8ec8ccacc48459adb2384402b887682cf45da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1441
zcmZQzU|?ckU=WcLo>6|#P&tUfG}q(0<IWesy<VCO4D5}J49uB{#S9FLDQjO>mH|~V
zFtA4GnHpFEX@7$zR&RqQ=FJP3nHZUvI2kUom&F<_-Y~_0myJ`a&7<u*FC!y2D}zCu
zA-4f18*?ZNn=n&oFpR^&!{qE}C}JQ4l40lJ4o=J~NmOvoNi0e<lroS2iE{A>dghg+
z<|sJl7Zv0eC6;97=NTFp=z-*zdDJ0t!R`?XjwL0j#U)^Qg`iZR(h`N>%=Em>ymSR;
zM*{_MUPCiOLqiioQ)6>u!zc-UBLfplLnC7#GPN|dj2dtkHZd+j4m3tq2IeNleg=ak
z#xABN#zuzuHYs&m%WZZC>Z%(Zxb7IYJ9NRXdH3{ECeD1;B)e1Ks$sb~XSrKeR-Aj=
znM-$HUlEy`rJt-CH1{IU$#(M%<#VLiAI))JxQ@Zo!#&4izU$J3u~jGD99whDb?p}0
z_Vl@5=WtpdUGy?DC!``odiuOl?{G_zeW922zZ{r*UtMvg$=R8#>YIP+UGLwosgkwt
zbfF60=Q+BC>|5MJqUwJOyk_IdSlQa3IL~Y%XHbU4q-#qbt>9pmv~wsmbnr9VESh9K
zb5&D7iNo}eMfYEPU4QjovYh;(^%fix@->!ExOsQ}gM`Vmg~BHsZHQ&A{hBp1SbEyM
z%zMUfm2wU$)CxFlJ-NEx!T-46fq(9qzo%Agyu)`S^Ocn9ga0!{I`Tec&Q^}z(o%cv
zzr!}RXX5OW5B;98StO!<&R^Byr2DTna$8@zSysGo$zGQu!K=R1AN+Lr!snLnUTi<+
zaLngjc6R%pcP~yhN%e(%ieVAE*yGkbE51SK_g&lLzN$%;YY!c`8udS)P01-%nu(c_
zfpKx;NrT2?1_{8_Co9hqX%KD@x*&K#V4HtNNlAf~zJ5tjX>mzvN^xpYS!Qx-v0f%9
z>FOot=jtct1DSax`p!W<`oQF>kCa>?sTG=7ogMX(i*gKPK{oKQh_Q%NI9Hb~tJ`y7
zeVvo}YttI*cE&&(19_0NGK++PSOazid>{q<jEw(TSb#Z`4V=Sdg+Y7{12!PV#K?f0
z+JIRUnA#c{D&ln$j-KH9qE%TYplB(2tLfyXd7Td?XsIqc9xcWxld)RCYh9s4r>9Px
zoDrv>YgGS16DLEx@@1A&Zcd+i;+1Pzlg+EHiw`HBUy<}{$4aBiH#Y=Fu`^u=jW2ns
z@R-@)vq{7AwI{EikW(lyblT5wRAU9Vn{ngc1g)my%t4K-o=#0Vv(?yd#RR)lZbr7o
zujl%<>8+XL=-HuS^=8ti=#Mt{zrQ}C+4od>SCpy6wrsW2N1_7nG1#m%NHttr^YzMm
z{tniQJB4jkgrhbeNs-d;;4qn6Y^)i_SN6{Ps8W$pQs1wJ>vJcq_OlgK`20KSqU71$
z5U+(-mbJxYhwobxUT9FKXS0)?cS*JPpN`B2BEqjYO&#xbRcZ)scQZTsQY7d+&%4M^
zza6~JavyCuJ*PQ@rPznB?pQ+1{qy=?EVo@LoL`{N$78?1|F+Pw(^?l-%gp-t<ICX%
zeRqo%YjbbCuvRtyujs4{Ypp1GS;1dP!TQYCLr%TtU0NI^7uDfY*LhP&;^cLPR?(+l
VXX>1Bm$#Naxay6{qM3DBmjOA4C9ePg

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1d87bc3d..5b0c43ff 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_85")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_86")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")

From 20f8fa2ebd80dd8828db349b530f25e8274ff74e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 20 Oct 2023 13:14:22 +0200
Subject: [PATCH 258/672] Prevent ConcurrentModificationException

Fixes #1351
---
 .../storage/recipients/RecipientStore.java    | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 44c0bafa..87e5f3d2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -435,10 +435,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public void deleteRecipientData(RecipientId recipientId) {
         logger.debug("Deleting recipient data for {}", recipientId);
         synchronized (recipientsLock) {
-            recipientAddressCache.entrySet()
-                    .stream()
-                    .filter(e -> e.getValue().id().equals(recipientId))
-                    .forEach(e -> recipientAddressCache.remove(e.getKey()));
+            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
             try (final var connection = database.getConnection()) {
                 connection.setAutoCommit(false);
                 storeContact(connection, recipientId, null);
@@ -708,10 +705,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                     recipientMergeHandler.mergeRecipients(connection, pair.first(), toBeMergedRecipientId);
                     deleteRecipient(connection, toBeMergedRecipientId);
                     synchronized (recipientsLock) {
-                        recipientAddressCache.entrySet()
-                                .stream()
-                                .filter(e -> e.getValue().id().equals(toBeMergedRecipientId))
-                                .forEach(e -> recipientAddressCache.remove(e.getKey()));
+                        recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(toBeMergedRecipientId));
                     }
                 }
             } catch (SQLException e) {
@@ -807,10 +801,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private void removeRecipientAddress(Connection connection, RecipientId recipientId) throws SQLException {
         synchronized (recipientsLock) {
-            recipientAddressCache.entrySet()
-                    .stream()
-                    .filter(e -> e.getValue().id().equals(recipientId))
-                    .forEach(e -> recipientAddressCache.remove(e.getKey()));
+            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
             final var sql = (
                     """
                     UPDATE %s
@@ -829,10 +820,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             Connection connection, RecipientId recipientId, final RecipientAddress address
     ) throws SQLException {
         synchronized (recipientsLock) {
-            recipientAddressCache.entrySet()
-                    .stream()
-                    .filter(e -> e.getValue().id().equals(recipientId))
-                    .forEach(e -> recipientAddressCache.remove(e.getKey()));
+            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
             final var sql = (
                     """
                     UPDATE %s

From 800ff09a3718c3613f60382f21d4211044914d26 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 22 Oct 2023 18:10:32 +0200
Subject: [PATCH 259/672] Update dependencies

---
 build.gradle.kts    | 2 +-
 settings.gradle.kts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2879633f..9529932a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.27"
+    id("org.graalvm.buildtools.native") version "0.9.28"
 }
 
 version = "0.12.3"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5b0c43ff..a1feb330 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,7 +17,7 @@ dependencyResolutionManagement {
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_86")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.1")
             library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
             library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")
         }

From 7887a5a613ae42cb2b6f09780968565877fab781 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 22 Oct 2023 18:27:57 +0200
Subject: [PATCH 260/672] Prevent unnecessary compile warnings

---
 .../manager/storage/keyValue/KeyValueStore.java   |  1 +
 .../org/asamk/signal/dbus/DbusSignalImpl.java     | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index 90c932af..9b239b72 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -79,6 +79,7 @@ public class KeyValueStore {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private static <T> T readValueFromResultSet(
             final KeyValueEntry<T> key, final ResultSet resultSet
     ) throws SQLException {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 95acd2cb..a5f28c67 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -552,6 +552,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public void setGroupBlocked(final byte[] groupId, final boolean blocked) {
         try {
             m.setGroupsBlocked(List.of(getGroupId(groupId)), blocked);
@@ -565,6 +566,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public List<byte[]> getGroupIds() {
         var groups = m.getGroups();
         return groups.stream().map(g -> g.groupId().serialize()).toList();
@@ -587,6 +589,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public String getGroupName(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null || group.title() == null) {
@@ -597,6 +600,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public List<String> getGroupMembers(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {
@@ -611,11 +615,16 @@ public class DbusSignalImpl implements Signal {
     public byte[] createGroup(
             final String name, final List<String> members, final String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber {
-        return updateGroup(new byte[0], name, members, avatar);
+        return updateGroupInternal(new byte[0], name, members, avatar);
     }
 
     @Override
+    @Deprecated
     public byte[] updateGroup(byte[] groupId, String name, List<String> members, String avatar) {
+        return updateGroupInternal(groupId, name, members, avatar);
+    }
+
+    public byte[] updateGroupInternal(byte[] groupId, String name, List<String> members, String avatar) {
         try {
             groupId = nullIfEmpty(groupId);
             name = nullIfEmpty(name);
@@ -650,6 +659,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public boolean isRegistered() {
         return true;
     }
@@ -770,6 +780,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public void quitGroup(final byte[] groupId) {
         var group = getGroupId(groupId);
         try {
@@ -809,6 +820,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public boolean isGroupBlocked(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {
@@ -819,6 +831,7 @@ public class DbusSignalImpl implements Signal {
     }
 
     @Override
+    @Deprecated
     public boolean isMember(final byte[] groupId) {
         var group = m.getGroup(getGroupId(groupId));
         if (group == null) {

From 101c217ef86aefcc42b5de588812ce8ce9bb0143 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 22 Oct 2023 19:35:57 +0200
Subject: [PATCH 261/672] Update captcha help text

---
 man/signal-cli.1.adoc                                         | 4 ++--
 src/main/java/org/asamk/signal/util/CommandUtil.java          | 3 +--
 .../java/org/asamk/signal/util/SendMessageResultUtils.java    | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 2b545fa2..d72264a8 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -102,7 +102,7 @@ Voice verification only works if an SMS verification has been attempted before.
 The captcha token, required if registration failed with a captcha required error.
 To get the token, go to https://signalcaptchas.org/registration/generate.html
 For the staging environment, use: https://signalcaptchas.org/staging/registration/generate.html
-Check the developer tools for a redirect starting with signalcaptcha:// Everything after signalcaptcha:// is the captcha token.
+After solving the captcha, right-click on the "Open Signal" link and copy the link.
 
 === verify
 
@@ -163,7 +163,7 @@ Voice verification only works if an SMS verification has been attempted before.
 The captcha token, required if registration failed with a captcha required error.
 To get the token, go to https://signalcaptchas.org/registration/generate.html
 For the staging environment, use: https://signalcaptchas.org/staging/registration/generate.html
-Check the developer tools for a redirect starting with signalcaptcha:// Everything after signalcaptcha:// is the captcha token.
+After solving the captcha, right-click on the "Open Signal" link and copy the link.
 
 === finishChangeNumber
 
diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java
index 3fa9aecd..d637f22e 100644
--- a/src/main/java/org/asamk/signal/util/CommandUtil.java
+++ b/src/main/java/org/asamk/signal/util/CommandUtil.java
@@ -105,8 +105,7 @@ public class CommandUtil {
             message = """
                       Captcha required for verification, use --captcha CAPTCHA
                       To get the token, go to https://signalcaptchas.org/registration/generate.html
-                      Check the developer tools (F12) console for a failed redirect to signalcaptcha://
-                      Everything after signalcaptcha:// is the captcha token.""";
+                      After solving the captcha, right-click on the "Open Signal" link and copy the link.""";
         } else {
             message = "Invalid captcha given.";
         }
diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
index ecc669e8..e4386b0e 100644
--- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
+++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
@@ -90,8 +90,7 @@ public class SendMessageResultUtils {
                             failure.getOptions().contains(ProofRequiredException.Option.RECAPTCHA)
                                     ? """
                                       To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
-                                      Check the developer tools (F12) console for a failed redirect to signalcaptcha://
-                                      Everything after signalcaptcha:// is the captcha token.
+                                      After solving the captcha, right-click on the "Open Signal" link and copy the link.
                                       Use the following command to submit the captcha token:
                                       signal-cli submitRateLimitChallenge --challenge CHALLENGE_TOKEN --captcha CAPTCHA_TOKEN"""
                                     : ""

From 7859084be88740b746a3e2fdfe10c203654be4d9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 22 Oct 2023 19:44:41 +0200
Subject: [PATCH 262/672] Fix tests

---
 run_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run_tests.sh b/run_tests.sh
index dbd01df9..ffec8b11 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -190,7 +190,7 @@ run_main -a "$NUMBER_1" receive
 run_main -a "$NUMBER_1" updateGroup -g "$GROUP_ID" -m "$NUMBER_2"
 run_main -a "$NUMBER_1" block -g "$GROUP_ID"
 run_main -a "$NUMBER_1" unblock -g "$GROUP_ID"
-run_main -a "$NUMBER_1" submitRateLimitChallenge --challenge 8xxxxxx8-0xx2-4xx9-9xx2-4xxxxxxxxxx7 --captcha signal-hcaptcha
+run_main -a "$NUMBER_1" submitRateLimitChallenge --challenge 8xxxxxx8-0xx2-4xx9-9xx2-4xxxxxxxxxx7 --captcha signalcaptcha://signal-hcaptcha.5fa.registration.P.h.-K || true
 
 ## Basic send/receive
 for OUTPUT in "plain-text" "json"; do

From 0c24064939dfa9249f80763c41f50dc6869bacb5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 22 Oct 2023 19:44:36 +0200
Subject: [PATCH 263/672] Bump version to 0.12.4

---
 CHANGELOG.md                            | 6 ++++++
 build.gradle.kts                        | 2 +-
 graalvm-config-dir/resource-config.json | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12527f61..837a003d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.12.4] - 2023-10-22
+
+### Fixes
+- Prevent ConcurrentModificationException
+- Update captcha help text
+
 ## [0.12.3] - 2023-10-17
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 9529932a..5879660e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.28"
 }
 
-version = "0.12.3"
+version = "0.12.4"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_17
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 8f11b81b..7332edb8 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -14,6 +14,8 @@
     "pattern":"\\QMETA-INF/services/java.net.spi.URLStreamHandlerProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/java.nio.file.spi.FileTypeDetector\\E"
   }, {
     "pattern":"\\QMETA-INF/services/java.sql.Driver\\E"
   }, {

From cc2ffbb4da781fd22ca175ae5b818058d4c1d206 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 22 Oct 2023 19:44:36 +0200
Subject: [PATCH 264/672] Bump version to 0.12.4

---
 .github/workflows/release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 35c40a9d..6af6daab 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,6 +17,8 @@ env:
 jobs:
 
   ci_wf:
+    permissions:
+      contents: write
     uses: AsamK/signal-cli/.github/workflows/ci.yml@master
     # ${{ github.repository }} not accepted here
 

From 90601b7b6bb4ef880f1377bb05d01def869e9c83 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 22 Oct 2023 21:33:15 +0200
Subject: [PATCH 265/672] Fix man page generation

---
 man/signal-cli-dbus.5.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/signal-cli-dbus.5.adoc b/man/signal-cli-dbus.5.adoc
index cd73b9f0..732efe43 100644
--- a/man/signal-cli-dbus.5.adoc
+++ b/man/signal-cli-dbus.5.adoc
@@ -68,7 +68,7 @@ This can be piped to a QR encoder to create a display that can be captured by a
 
 For example:
 
-[source]
+[source,bash]
 ----
 dbus-send --session --dest=org.asamk.Signal --type=method_call --print-reply /org/asamk/Signal org.asamk.Signal.link string:"My secondary client" | tr '\n' '\0' | sed 's/.*string //g' | sed 's/\"//g' | qrencode -s10 -tANSI256
 ----

From 895740755d345a1df9cb9a1ca498736f6488b3a9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 23 Oct 2023 18:01:49 +0200
Subject: [PATCH 266/672] Remove included by default native-image component

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08390721..5976805e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,6 @@ jobs:
           version: 'latest'
           java-version: '17'
           cache: 'gradle'
-          components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build with Gradle
         run: ./gradlew --no-daemon nativeCompile

From 80c1a6d2af54a6925b88bc0c6dab8dd5a40c25f9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 30 Sep 2023 22:38:24 +0200
Subject: [PATCH 267/672] Switch to Java 21

---
 .github/workflows/ci.yml                |  4 ++--
 .github/workflows/codeql-analysis.yml   |  2 +-
 Containerfile                           |  2 +-
 README.md                               |  2 +-
 build.gradle.kts                        | 10 +++++++---
 graalvm-config-dir/reflect-config.json  |  3 +++
 graalvm-config-dir/resource-config.json |  4 ++++
 lib/build.gradle.kts                    |  8 ++++++--
 run_tests.sh                            |  2 +-
 9 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5976805e..1c6bb3c0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '17', '21' ]
+        java: [ '21' ]
 
     steps:
       - uses: actions/checkout@v4
@@ -48,7 +48,7 @@ jobs:
       - uses: graalvm/setup-graalvm@v1
         with:
           version: 'latest'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Build with Gradle
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9bb10c38..ff13469a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/Containerfile b/Containerfile
index 1a1167ba..361c2667 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,4 +1,4 @@
-FROM docker.io/eclipse-temurin:17-jre
+FROM docker.io/azul/zulu-openjdk:21-jre-headless
 
 LABEL org.opencontainers.image.source=https://github.com/AsamK/signal-cli
 LABEL org.opencontainers.image.description="signal-cli provides an unofficial commandline, dbus and JSON-RPC interface for the Signal messenger."
diff --git a/README.md b/README.md
index a254e267..8d61bc1f 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Windows. There's also a [docker image and some Linux packages](https://github.co
 
 System requirements:
 
-- at least Java Runtime Environment (JRE) 17
+- at least Java Runtime Environment (JRE) 21
 - native library: libsignal-client
 
   The native libs are bundled for x86_64 Linux (with recent enough glibc), Windows and MacOS. For other
diff --git a/build.gradle.kts b/build.gradle.kts
index 5879660e..68eed610 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,12 @@ plugins {
 version = "0.12.4"
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
 application {
@@ -25,7 +29,7 @@ graalvmNative {
             if (System.getenv("GRAALVM_HOME") == null) {
                 toolchainDetection.set(true)
                 javaLauncher.set(javaToolchains.launcherFor {
-                    languageVersion.set(JavaLanguageVersion.of(17))
+                    languageVersion.set(JavaLanguageVersion.of(21))
                 })
             } else {
                 toolchainDetection.set(false)
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 24763591..9f2935ce 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -48,6 +48,9 @@
 {
   "name":"[Lorg.whispersystems.signalservice.internal.push.GroupStaleDevices;"
 },
+{
+  "name":"android.os.Build$VERSION"
+},
 {
   "name":"byte[]",
   "allDeclaredMethods":true,
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 7332edb8..b79033ea 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -28,6 +28,8 @@
     "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition\\E"
   }, {
     "pattern":"\\QMETA-INF/services/kotlin.reflect.jvm.internal.impl.util.ModuleVisibilityHelper\\E"
+  }, {
+    "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.message.ISocketProvider\\E"
   }, {
     "pattern":"\\QMETA-INF/services/org.freedesktop.dbus.spi.transport.ITransportProvider\\E"
   }, {
@@ -198,6 +200,8 @@
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/nfc.nrm\\E"
   }, {
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt67b/uprops.icu\\E"
+  }, {
+    "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/nfc.nrm\\E"
   }, {
     "pattern":"java.base:\\Qjdk/internal/icu/impl/data/icudt72b/uprops.icu\\E"
   }, {
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index dd765cba..38d4c221 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -4,8 +4,12 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
 }
 
 val libsignalClientPath = project.findProperty("libsignal_client_path")?.toString()
diff --git a/run_tests.sh b/run_tests.sh
index ffec8b11..6a7c8358 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -32,7 +32,7 @@ fi
 
 run() {
   # To update graalvm config, set GRAALVM_HOME, e.g:
-  # export GRAALVM_HOME=/usr/lib/jvm/java-17-graalvm
+  # export GRAALVM_HOME=/usr/lib/jvm/java-21-graalvm
   if [ ! -z "$GRAALVM_HOME" ]; then
     export JAVA_HOME=$GRAALVM_HOME
     export SIGNAL_CLI_OPTS="-agentlib:native-image-agent=config-merge-dir=graalvm-config-dir-${SIGNAL_CLI_AGENT_ID}/"

From 8d55dfb66bc0dfbd2b601a27075f2876cde918e3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 19:52:35 +0200
Subject: [PATCH 268/672] Use pattern matching switch cases

---
 .../signal/manager/helper/GroupHelper.java    | 91 ++++++++++---------
 .../signal/manager/helper/PinHelper.java      | 76 ++++++++--------
 .../signal/manager/internal/ManagerImpl.java  | 15 ++-
 src/main/java/org/asamk/signal/Main.java      | 21 ++---
 .../org/asamk/signal/commands/Commands.java   |  4 +-
 .../asamk/signal/commands/DaemonCommand.java  | 10 +-
 .../signal/commands/GetAttachmentCommand.java |  7 +-
 .../signal/commands/GetUserStatusCommand.java | 38 ++++----
 .../signal/commands/JoinGroupCommand.java     | 57 ++++++------
 .../signal/commands/ListAccountsCommand.java  | 15 +--
 .../signal/commands/ListContactsCommand.java  | 83 ++++++++---------
 .../signal/commands/ListDevicesCommand.java   | 30 +++---
 .../signal/commands/ListGroupsCommand.java    | 54 +++++------
 .../commands/ListIdentitiesCommand.java       | 43 ++++-----
 .../commands/ListStickerPacksCommand.java     | 25 ++---
 .../asamk/signal/commands/ReceiveCommand.java |  6 +-
 .../signal/commands/UpdateAccountCommand.java |  7 +-
 .../signal/commands/UpdateGroupCommand.java   | 40 ++++----
 .../commands/UploadStickerPackCommand.java    | 10 +-
 .../asamk/signal/commands/VersionCommand.java |  7 +-
 .../org/asamk/signal/dbus/DbusProperties.java |  2 +-
 .../asamk/signal/jsonrpc/JsonRpcReader.java   | 78 ++++++++--------
 .../SignalJsonRpcDispatcherHandler.java       | 12 +--
 .../org/asamk/signal/output/JsonWriter.java   |  2 +-
 .../org/asamk/signal/output/OutputWriter.java |  4 +-
 .../asamk/signal/output/PlainTextWriter.java  |  2 +-
 .../signal/util/SendMessageResultUtils.java   | 36 ++++----
 27 files changed, 395 insertions(+), 380 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 5991202e..532cd3e7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -224,52 +224,55 @@ public class GroupHelper {
         var group = getGroupForUpdating(groupId);
         final var avatarBytes = readAvatarBytes(avatarFile);
 
-        if (group instanceof GroupInfoV2) {
-            try {
-                return updateGroupV2((GroupInfoV2) group,
-                        name,
-                        description,
-                        members,
-                        removeMembers,
-                        admins,
-                        removeAdmins,
-                        banMembers,
-                        unbanMembers,
-                        resetGroupLink,
-                        groupLinkState,
-                        addMemberPermission,
-                        editDetailsPermission,
-                        avatarBytes,
-                        expirationTimer,
-                        isAnnouncementGroup);
-            } catch (ConflictException e) {
-                // Detected conflicting update, refreshing group and trying again
-                group = getGroup(groupId, true);
-                return updateGroupV2((GroupInfoV2) group,
-                        name,
-                        description,
-                        members,
-                        removeMembers,
-                        admins,
-                        removeAdmins,
-                        banMembers,
-                        unbanMembers,
-                        resetGroupLink,
-                        groupLinkState,
-                        addMemberPermission,
-                        editDetailsPermission,
-                        avatarBytes,
-                        expirationTimer,
-                        isAnnouncementGroup);
+        switch (group) {
+            case GroupInfoV2 gv2 -> {
+                try {
+                    return updateGroupV2(gv2,
+                            name,
+                            description,
+                            members,
+                            removeMembers,
+                            admins,
+                            removeAdmins,
+                            banMembers,
+                            unbanMembers,
+                            resetGroupLink,
+                            groupLinkState,
+                            addMemberPermission,
+                            editDetailsPermission,
+                            avatarBytes,
+                            expirationTimer,
+                            isAnnouncementGroup);
+                } catch (ConflictException e) {
+                    // Detected conflicting update, refreshing group and trying again
+                    group = getGroup(groupId, true);
+                    return updateGroupV2((GroupInfoV2) group,
+                            name,
+                            description,
+                            members,
+                            removeMembers,
+                            admins,
+                            removeAdmins,
+                            banMembers,
+                            unbanMembers,
+                            resetGroupLink,
+                            groupLinkState,
+                            addMemberPermission,
+                            editDetailsPermission,
+                            avatarBytes,
+                            expirationTimer,
+                            isAnnouncementGroup);
+                }
+            }
+
+            case GroupInfoV1 gv1 -> {
+                final var result = updateGroupV1(gv1, name, members, avatarBytes);
+                if (expirationTimer != null) {
+                    setExpirationTimer(gv1, expirationTimer);
+                }
+                return result;
             }
         }
-
-        final var gv1 = (GroupInfoV1) group;
-        final var result = updateGroupV1(gv1, name, members, avatarBytes);
-        if (expirationTimer != null) {
-            setExpirationTimer(gv1, expirationTimer);
-        }
-        return result;
     }
 
     public void updateGroupProfileKey(GroupIdV2 groupId) throws GroupNotFoundException, NotAGroupMemberException, IOException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 3b3a5c6f..de7e4daf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -25,19 +25,19 @@ public class PinHelper {
             String pin, MasterKey masterKey
     ) throws IOException {
         final var backupResponse = secureValueRecoveryV2.setPin(pin, masterKey).execute();
-        if (backupResponse instanceof SecureValueRecovery.BackupResponse.Success) {
-        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.ServerRejected) {
-            logger.warn("Backup svr2 failed: ServerRejected");
-        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.EnclaveNotFound) {
-            logger.warn("Backup svr2 failed: EnclaveNotFound");
-        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.ExposeFailure) {
-            logger.warn("Backup svr2 failed: ExposeFailure");
-        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.ApplicationError error) {
-            throw new IOException(error.getException());
-        } else if (backupResponse instanceof SecureValueRecovery.BackupResponse.NetworkError error) {
-            throw error.getException();
-        } else {
-            throw new AssertionError("Unexpected response");
+        switch (backupResponse) {
+            case SecureValueRecovery.BackupResponse.Success success -> {
+            }
+            case SecureValueRecovery.BackupResponse.ServerRejected serverRejected ->
+                    logger.warn("Backup svr2 failed: ServerRejected");
+            case SecureValueRecovery.BackupResponse.EnclaveNotFound enclaveNotFound ->
+                    logger.warn("Backup svr2 failed: EnclaveNotFound");
+            case SecureValueRecovery.BackupResponse.ExposeFailure exposeFailure ->
+                    logger.warn("Backup svr2 failed: ExposeFailure");
+            case SecureValueRecovery.BackupResponse.ApplicationError error ->
+                    throw new IOException(error.getException());
+            case SecureValueRecovery.BackupResponse.NetworkError error -> throw error.getException();
+            case null, default -> throw new AssertionError("Unexpected response");
         }
     }
 
@@ -47,17 +47,17 @@ public class PinHelper {
 
     public void removeRegistrationLockPin() throws IOException {
         final var deleteResponse = secureValueRecoveryV2.deleteData();
-        if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.Success) {
-        } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.ServerRejected) {
-            logger.warn("Delete svr2 failed: ServerRejected");
-        } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.EnclaveNotFound) {
-            logger.warn("Delete svr2 failed: EnclaveNotFound");
-        } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.ApplicationError error) {
-            throw new IOException(error.getException());
-        } else if (deleteResponse instanceof SecureValueRecovery.DeleteResponse.NetworkError error) {
-            throw error.getException();
-        } else {
-            throw new AssertionError("Unexpected response");
+        switch (deleteResponse) {
+            case SecureValueRecovery.DeleteResponse.Success success -> {
+            }
+            case SecureValueRecovery.DeleteResponse.ServerRejected serverRejected ->
+                    logger.warn("Delete svr2 failed: ServerRejected");
+            case SecureValueRecovery.DeleteResponse.EnclaveNotFound enclaveNotFound ->
+                    logger.warn("Delete svr2 failed: EnclaveNotFound");
+            case SecureValueRecovery.DeleteResponse.ApplicationError error ->
+                    throw new IOException(error.getException());
+            case SecureValueRecovery.DeleteResponse.NetworkError error -> throw error.getException();
+            case null, default -> throw new AssertionError("Unexpected response");
         }
     }
 
@@ -77,19 +77,21 @@ public class PinHelper {
     ) throws IOException, IncorrectPinException {
         final var restoreResponse = secureValueRecovery.restoreDataPreRegistration(authCredentials, pin);
 
-        if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.Success s) {
-            return s;
-        } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.PinMismatch pinMismatch) {
-            throw new IncorrectPinException(pinMismatch.getTriesRemaining());
-        } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.ApplicationError error) {
-            throw new IOException(error.getException());
-        } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.NetworkError error) {
-            throw error.getException();
-        } else if (restoreResponse instanceof SecureValueRecovery.RestoreResponse.Missing) {
-            logger.debug("No SVR data stored for the given credentials.");
-            return null;
-        } else {
-            throw new AssertionError("Unexpected response: " + restoreResponse.getClass().getSimpleName());
+        switch (restoreResponse) {
+            case SecureValueRecovery.RestoreResponse.Success s -> {
+                return s;
+            }
+            case SecureValueRecovery.RestoreResponse.PinMismatch pinMismatch ->
+                    throw new IncorrectPinException(pinMismatch.getTriesRemaining());
+            case SecureValueRecovery.RestoreResponse.ApplicationError error ->
+                    throw new IOException(error.getException());
+            case SecureValueRecovery.RestoreResponse.NetworkError error -> throw error.getException();
+            case SecureValueRecovery.RestoreResponse.Missing missing -> {
+                logger.debug("No SVR data stored for the given credentials.");
+                return null;
+            }
+            case null, default ->
+                    throw new AssertionError("Unexpected response: " + restoreResponse.getClass().getSimpleName());
         }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index a2c90aa4..3feed994 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1252,18 +1252,15 @@ public class ManagerImpl implements Manager {
     public boolean trustIdentityVerified(
             RecipientIdentifier.Single recipient, IdentityVerificationCode verificationCode
     ) throws UnregisteredRecipientException {
-        if (verificationCode instanceof IdentityVerificationCode.Fingerprint fingerprint) {
-            return trustIdentity(recipient,
+        return switch (verificationCode) {
+            case IdentityVerificationCode.Fingerprint fingerprint -> trustIdentity(recipient,
                     r -> context.getIdentityHelper().trustIdentityVerified(r, fingerprint.fingerprint()));
-        } else if (verificationCode instanceof IdentityVerificationCode.SafetyNumber safetyNumber) {
-            return trustIdentity(recipient,
+            case IdentityVerificationCode.SafetyNumber safetyNumber -> trustIdentity(recipient,
                     r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber()));
-        } else if (verificationCode instanceof IdentityVerificationCode.ScannableSafetyNumber safetyNumber) {
-            return trustIdentity(recipient,
+            case IdentityVerificationCode.ScannableSafetyNumber safetyNumber -> trustIdentity(recipient,
                     r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber()));
-        } else {
-            throw new AssertionError("Invalid verification code type");
-        }
+            case null, default -> throw new AssertionError("Invalid verification code type");
+        };
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 0a30d202..00d9d7a9 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -109,18 +109,13 @@ public class Main {
     }
 
     private static int getStatusForError(final CommandException e) {
-        if (e instanceof UserErrorException) {
-            return 1;
-        } else if (e instanceof UnexpectedErrorException) {
-            return 2;
-        } else if (e instanceof IOErrorException) {
-            return 3;
-        } else if (e instanceof UntrustedKeyErrorException) {
-            return 4;
-        } else if (e instanceof RateLimitErrorException) {
-            return 5;
-        } else {
-            return 2;
-        }
+        return switch (e) {
+            case UserErrorException userErrorException -> 1;
+            case UnexpectedErrorException unexpectedErrorException -> 2;
+            case IOErrorException ioErrorException -> 3;
+            case UntrustedKeyErrorException untrustedKeyErrorException -> 4;
+            case RateLimitErrorException rateLimitErrorException -> 5;
+            case null, default -> 2;
+        };
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 719ba132..0f26c994 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -72,8 +72,8 @@ public class Commands {
 
     private static void addCommand(Command command) {
         commands.put(command.getName(), command);
-        if (command instanceof CliCommand) {
-            commandSubparserAttacher.put(command.getName(), ((CliCommand) command)::attachToSubparser);
+        if (command instanceof CliCommand cliCommand) {
+            commandSubparserAttacher.put(command.getName(), cliCommand::attachToSubparser);
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index d32dc69c..5c1fac53 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -249,11 +249,11 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     }
 
     private void addDefaultReceiveHandler(Manager m, OutputWriter outputWriter, final boolean isWeakListener) {
-        final var handler = outputWriter instanceof JsonWriter o
-                ? new JsonReceiveMessageHandler(m, o)
-                : outputWriter instanceof PlainTextWriter o
-                        ? new ReceiveMessageHandler(m, o)
-                        : Manager.ReceiveMessageHandler.EMPTY;
+        final var handler = switch (outputWriter) {
+            case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer);
+            case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer);
+            case null -> Manager.ReceiveMessageHandler.EMPTY;
+        };
         m.addReceiveHandler(handler, isWeakListener);
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
index f2f0450c..160e53bc 100644
--- a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
@@ -42,10 +42,9 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
         try (InputStream attachment = m.retrieveAttachment(id)) {
             final var bytes = attachment.readAllBytes();
             final var base64 = Base64.getEncoder().encodeToString(bytes);
-            if (outputWriter instanceof PlainTextWriter writer) {
-                writer.println(base64);
-            } else if (outputWriter instanceof JsonWriter writer) {
-                writer.write(new JsonAttachmentData(base64));
+            switch (outputWriter) {
+                case PlainTextWriter writer -> writer.println(base64);
+                case JsonWriter writer -> writer.write(new JsonAttachmentData(base64));
             }
         } catch (FileNotFoundException ex) {
             throw new UserErrorException("Could not find attachment with ID: " + id, ex);
diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 30fe7bf2..70a55393 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -55,24 +55,26 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
         }
 
         // Output
-        if (outputWriter instanceof JsonWriter jsonWriter) {
-
-            var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
-                final var number = entry.getValue().number();
-                final var uuid = entry.getValue().uuid();
-                return new JsonUserStatus(entry.getKey(), number, uuid == null ? null : uuid.toString(), uuid != null);
-            }).toList();
-
-            jsonWriter.write(jsonUserStatuses);
-        } else {
-            final var writer = (PlainTextWriter) outputWriter;
-
-            for (var entry : registered.entrySet()) {
-                final var userStatus = entry.getValue();
-                writer.println("{}: {}{}",
-                        entry.getKey(),
-                        userStatus.uuid() != null,
-                        userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
+        switch (outputWriter) {
+            case JsonWriter writer -> {
+                var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
+                    final var number = entry.getValue().number();
+                    final var uuid = entry.getValue().uuid();
+                    return new JsonUserStatus(entry.getKey(),
+                            number,
+                            uuid == null ? null : uuid.toString(),
+                            uuid != null);
+                }).toList();
+                writer.write(jsonUserStatuses);
+            }
+            case PlainTextWriter writer -> {
+                for (var entry : registered.entrySet()) {
+                    final var userStatus = entry.getValue();
+                    writer.println("{}: {}{}",
+                            entry.getKey(),
+                            userStatus.uuid() != null,
+                            userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
+                }
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index 3c3562ae..7a5b2601 100644
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -54,35 +54,38 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
         try {
             final var results = m.joinGroup(linkUrl);
             var newGroupId = results.first();
-            if (outputWriter instanceof JsonWriter writer) {
-                var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.second().results());
-                if (!m.getGroup(newGroupId).isMember()) {
-                    writer.write(Map.of("timestamp",
-                            results.second().timestamp(),
-                            "results",
-                            jsonResults,
-                            "groupId",
-                            newGroupId.toBase64(),
-                            "onlyRequested",
-                            true));
-                } else {
-                    writer.write(Map.of("timestamp",
-                            results.second().timestamp(),
-                            "results",
-                            jsonResults,
-                            "groupId",
-                            newGroupId.toBase64()));
+            switch (outputWriter) {
+                case JsonWriter writer -> {
+                    var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.second().results());
+                    if (!m.getGroup(newGroupId).isMember()) {
+                        writer.write(Map.of("timestamp",
+                                results.second().timestamp(),
+                                "results",
+                                jsonResults,
+                                "groupId",
+                                newGroupId.toBase64(),
+                                "onlyRequested",
+                                true));
+                    } else {
+                        writer.write(Map.of("timestamp",
+                                results.second().timestamp(),
+                                "results",
+                                jsonResults,
+                                "groupId",
+                                newGroupId.toBase64()));
+                    }
                 }
-            } else {
-                final var writer = (PlainTextWriter) outputWriter;
-                if (!m.getGroup(newGroupId).isMember()) {
-                    writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
-                } else {
-                    writer.println("Joined group \"{}\"", newGroupId.toBase64());
+                case PlainTextWriter writer -> {
+                    if (!m.getGroup(newGroupId).isMember()) {
+                        writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
+                    } else {
+                        writer.println("Joined group \"{}\"", newGroupId.toBase64());
+                    }
+                    var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.second()
+                            .results());
+                    SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
+                    writer.println("{}", results.second().timestamp());
                 }
-                var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.second().results());
-                SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
-                writer.println("{}", results.second().timestamp());
             }
         } catch (IOException e) {
             throw new IOErrorException("Failed to send message: "
diff --git a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
index 68b56f29..b19a1686 100644
--- a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
@@ -26,12 +26,15 @@ public class ListAccountsCommand implements JsonRpcMultiLocalCommand {
             final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
     ) throws CommandException {
         final var accountNumbers = c.getAccountNumbers();
-        if (outputWriter instanceof JsonWriter jsonWriter) {
-            final var jsonAccounts = accountNumbers.stream().map(JsonAccount::new).toList();
-            jsonWriter.write(jsonAccounts);
-        } else if (outputWriter instanceof PlainTextWriter plainTextWriter) {
-            for (final var number : accountNumbers) {
-                plainTextWriter.println("Number: {}", number);
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> {
+                final var jsonAccounts = accountNumbers.stream().map(JsonAccount::new).toList();
+                jsonWriter.write(jsonAccounts);
+            }
+            case PlainTextWriter plainTextWriter -> {
+                for (final var number : accountNumbers) {
+                    plainTextWriter.println("Number: {}", number);
+                }
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index 997e31dd..42a33a14 100644
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -51,48 +51,49 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                 recipientIdentifiers,
                 Optional.ofNullable(name));
 
-        if (outputWriter instanceof PlainTextWriter writer) {
-            for (var r : recipients) {
-                final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
-                final var profile = r.getProfile() == null ? Profile.newBuilder().build() : r.getProfile();
-                writer.println(
-                        "Number: {} Name: {} Profile name: {} Username: {} Color: {} Blocked: {} Message expiration: {}",
-                        r.getAddress().getLegacyIdentifier(),
-                        contact.getName(),
-                        profile.getDisplayName(),
-                        r.getAddress().username().orElse(""),
-                        contact.getColor(),
-                        contact.isBlocked(),
-                        contact.getMessageExpirationTime() == 0
-                                ? "disabled"
-                                : contact.getMessageExpirationTime() + "s");
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                for (var r : recipients) {
+                    final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
+                    final var profile = r.getProfile() == null ? Profile.newBuilder().build() : r.getProfile();
+                    writer.println(
+                            "Number: {} Name: {} Profile name: {} Username: {} Color: {} Blocked: {} Message expiration: {}",
+                            r.getAddress().getLegacyIdentifier(),
+                            contact.getName(),
+                            profile.getDisplayName(),
+                            r.getAddress().username().orElse(""),
+                            contact.getColor(),
+                            contact.isBlocked(),
+                            contact.getMessageExpirationTime() == 0
+                                    ? "disabled"
+                                    : contact.getMessageExpirationTime() + "s");
+                }
+            }
+            case JsonWriter writer -> {
+                final var jsonContacts = recipients.stream().map(r -> {
+                    final var address = r.getAddress();
+                    final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
+                    return new JsonContact(address.number().orElse(null),
+                            address.uuid().map(UUID::toString).orElse(null),
+                            address.username().orElse(null),
+                            contact.getName(),
+                            contact.getColor(),
+                            contact.isBlocked(),
+                            contact.getMessageExpirationTime(),
+                            r.getProfile() == null
+                                    ? null
+                                    : new JsonContact.JsonProfile(r.getProfile().getLastUpdateTimestamp(),
+                                            r.getProfile().getGivenName(),
+                                            r.getProfile().getFamilyName(),
+                                            r.getProfile().getAbout(),
+                                            r.getProfile().getAboutEmoji(),
+                                            r.getProfile().getMobileCoinAddress() == null
+                                                    ? null
+                                                    : Base64.getEncoder()
+                                                            .encodeToString(r.getProfile().getMobileCoinAddress())));
+                }).toList();
+                writer.write(jsonContacts);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var jsonContacts = recipients.stream().map(r -> {
-                final var address = r.getAddress();
-                final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
-                return new JsonContact(address.number().orElse(null),
-                        address.uuid().map(UUID::toString).orElse(null),
-                        address.username().orElse(null),
-                        contact.getName(),
-                        contact.getColor(),
-                        contact.isBlocked(),
-                        contact.getMessageExpirationTime(),
-                        r.getProfile() == null
-                                ? null
-                                : new JsonContact.JsonProfile(r.getProfile().getLastUpdateTimestamp(),
-                                        r.getProfile().getGivenName(),
-                                        r.getProfile().getFamilyName(),
-                                        r.getProfile().getAbout(),
-                                        r.getProfile().getAboutEmoji(),
-                                        r.getProfile().getMobileCoinAddress() == null
-                                                ? null
-                                                : Base64.getEncoder()
-                                                        .encodeToString(r.getProfile().getMobileCoinAddress())));
-            }).toList();
-
-            writer.write(jsonContacts);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
index 7920243e..7adc8611 100644
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -42,21 +42,23 @@ public class ListDevicesCommand implements JsonRpcLocalCommand {
             throw new IOErrorException("Failed to get linked devices: " + e.getMessage(), e);
         }
 
-        if (outputWriter instanceof PlainTextWriter writer) {
-            for (var d : devices) {
-                writer.println("- Device {}{}:", d.id(), (d.isThisDevice() ? " (this device)" : ""));
-                writer.indent(w -> {
-                    w.println("Name: {}", d.name());
-                    w.println("Created: {}", DateUtils.formatTimestamp(d.created()));
-                    w.println("Last seen: {}", DateUtils.formatTimestamp(d.lastSeen()));
-                });
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                for (var d : devices) {
+                    writer.println("- Device {}{}:", d.id(), (d.isThisDevice() ? " (this device)" : ""));
+                    writer.indent(w -> {
+                        w.println("Name: {}", d.name());
+                        w.println("Created: {}", DateUtils.formatTimestamp(d.created()));
+                        w.println("Last seen: {}", DateUtils.formatTimestamp(d.lastSeen()));
+                    });
+                }
+            }
+            case JsonWriter writer -> {
+                final var jsonDevices = devices.stream()
+                        .map(d -> new JsonDevice(d.id(), d.name(), d.created(), d.lastSeen()))
+                        .toList();
+                writer.write(jsonDevices);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var jsonDevices = devices.stream()
-                    .map(d -> new JsonDevice(d.id(), d.name(), d.created(), d.lastSeen()))
-                    .toList();
-            writer.write(jsonDevices);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index b22ace6c..eb53516f 100644
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -89,34 +89,34 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
             groups = groups.stream().filter(g -> groupIds.contains(g.groupId())).toList();
         }
 
-        if (outputWriter instanceof JsonWriter jsonWriter) {
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> {
+                var jsonGroups = groups.stream().map(group -> {
+                    final var groupInviteLink = group.groupInviteLinkUrl();
 
-            var jsonGroups = groups.stream().map(group -> {
-                final var groupInviteLink = group.groupInviteLinkUrl();
-
-                return new JsonGroup(group.groupId().toBase64(),
-                        group.title(),
-                        group.description(),
-                        group.isMember(),
-                        group.isBlocked(),
-                        group.messageExpirationTimer(),
-                        resolveJsonMembers(group.members()),
-                        resolveJsonMembers(group.pendingMembers()),
-                        resolveJsonMembers(group.requestingMembers()),
-                        resolveJsonMembers(group.adminMembers()),
-                        resolveJsonMembers(group.bannedMembers()),
-                        group.permissionAddMember().name(),
-                        group.permissionEditDetails().name(),
-                        group.permissionSendMessage().name(),
-                        groupInviteLink == null ? null : groupInviteLink.getUrl());
-            }).toList();
-
-            jsonWriter.write(jsonGroups);
-        } else {
-            final var writer = (PlainTextWriter) outputWriter;
-            boolean detailed = Boolean.TRUE.equals(ns.getBoolean("detailed"));
-            for (var group : groups) {
-                printGroupPlainText(writer, group, detailed);
+                    return new JsonGroup(group.groupId().toBase64(),
+                            group.title(),
+                            group.description(),
+                            group.isMember(),
+                            group.isBlocked(),
+                            group.messageExpirationTimer(),
+                            resolveJsonMembers(group.members()),
+                            resolveJsonMembers(group.pendingMembers()),
+                            resolveJsonMembers(group.requestingMembers()),
+                            resolveJsonMembers(group.adminMembers()),
+                            resolveJsonMembers(group.bannedMembers()),
+                            group.permissionAddMember().name(),
+                            group.permissionEditDetails().name(),
+                            group.permissionSendMessage().name(),
+                            groupInviteLink == null ? null : groupInviteLink.getUrl());
+                }).toList();
+                jsonWriter.write(jsonGroups);
+            }
+            case PlainTextWriter writer -> {
+                boolean detailed = Boolean.TRUE.equals(ns.getBoolean("detailed"));
+                for (var group : groups) {
+                    printGroupPlainText(writer, group, detailed);
+                }
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 45326fbc..53d508d8 100644
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -57,28 +57,29 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
             identities = m.getIdentities(CommandUtil.getSingleRecipientIdentifier(number, m.getSelfNumber()));
         }
 
-        if (outputWriter instanceof PlainTextWriter writer) {
-            for (var id : identities) {
-                printIdentityFingerprint(writer, id);
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                for (var id : identities) {
+                    printIdentityFingerprint(writer, id);
+                }
+            }
+            case JsonWriter writer -> {
+                final var jsonIdentities = identities.stream().map(id -> {
+                    final var address = id.recipient();
+                    var safetyNumber = Util.formatSafetyNumber(id.safetyNumber());
+                    var scannableSafetyNumber = id.scannableSafetyNumber();
+                    return new JsonIdentity(address.number().orElse(null),
+                            address.uuid().map(UUID::toString).orElse(null),
+                            Hex.toString(id.getFingerprint()),
+                            safetyNumber,
+                            scannableSafetyNumber == null
+                                    ? null
+                                    : Base64.getEncoder().encodeToString(scannableSafetyNumber),
+                            id.trustLevel().name(),
+                            id.dateAddedTimestamp());
+                }).toList();
+                writer.write(jsonIdentities);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var jsonIdentities = identities.stream().map(id -> {
-                final var address = id.recipient();
-                var safetyNumber = Util.formatSafetyNumber(id.safetyNumber());
-                var scannableSafetyNumber = id.scannableSafetyNumber();
-                return new JsonIdentity(address.number().orElse(null),
-                        address.uuid().map(UUID::toString).orElse(null),
-                        Hex.toString(id.getFingerprint()),
-                        safetyNumber,
-                        scannableSafetyNumber == null
-                                ? null
-                                : Base64.getEncoder().encodeToString(scannableSafetyNumber),
-                        id.trustLevel().name(),
-                        id.dateAddedTimestamp());
-            }).toList();
-
-            writer.write(jsonIdentities);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java b/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
index 53f3f352..233eb4b5 100644
--- a/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
@@ -30,17 +30,20 @@ public class ListStickerPacksCommand implements JsonRpcLocalCommand {
             final Namespace ns, final Manager c, final OutputWriter outputWriter
     ) throws CommandException {
         final var stickerPacks = c.getStickerPacks();
-        if (outputWriter instanceof JsonWriter jsonWriter) {
-            final var jsonStickerPacks = stickerPacks.stream().map(JsonStickerPack::new).toList();
-            jsonWriter.write(jsonStickerPacks);
-        } else if (outputWriter instanceof PlainTextWriter plainTextWriter) {
-            for (final var sticker : stickerPacks) {
-                plainTextWriter.println("Pack {}: “{}” by “{}” has {} stickers. {}",
-                        Hex.toStringCondensed(sticker.packId().serialize()),
-                        sticker.title(),
-                        sticker.author(),
-                        sticker.stickers().size(),
-                        sticker.url().getUrl());
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> {
+                final var jsonStickerPacks = stickerPacks.stream().map(JsonStickerPack::new).toList();
+                jsonWriter.write(jsonStickerPacks);
+            }
+            case PlainTextWriter plainTextWriter -> {
+                for (final var sticker : stickerPacks) {
+                    plainTextWriter.println("Pack {}: “{}” by “{}” has {} stickers. {}",
+                            Hex.toStringCondensed(sticker.packId().serialize()),
+                            sticker.title(),
+                            sticker.author(),
+                            sticker.stickers().size(),
+                            sticker.url().getUrl());
+                }
             }
         }
     }
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 16421b62..228a0561 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -74,8 +74,10 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
         final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
         m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts));
         try {
-            final var handler = outputWriter instanceof JsonWriter ? new JsonReceiveMessageHandler(m,
-                    (JsonWriter) outputWriter) : new ReceiveMessageHandler(m, (PlainTextWriter) outputWriter);
+            final var handler = switch (outputWriter) {
+                case JsonWriter writer -> new JsonReceiveMessageHandler(m, writer);
+                case PlainTextWriter writer -> new ReceiveMessageHandler(m, writer);
+            };
             final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
             final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
             m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index 9a67d417..d430f49f 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -50,10 +50,9 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
         if (username != null) {
             try {
                 final var newUsername = m.setUsername(username);
-                if (outputWriter instanceof PlainTextWriter w) {
-                    w.println("Your new username: {}", newUsername);
-                } else if (outputWriter instanceof JsonWriter w) {
-                    w.write(new JsonAccountResponse(newUsername));
+                switch (outputWriter) {
+                    case PlainTextWriter w -> w.println("Your new username: {}", newUsername);
+                    case JsonWriter w -> w.write(new JsonAccountResponse(newUsername));
                 }
             } catch (IOException e) {
                 throw new IOErrorException("Failed to set username: " + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 1f7825fb..5fe47417 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -182,27 +182,29 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
     private void outputResult(
             final OutputWriter outputWriter, final SendGroupMessageResults results, final GroupId groupId
     ) {
-        if (outputWriter instanceof PlainTextWriter writer) {
-            if (groupId != null) {
-                writer.println("Created new group: \"{}\"", groupId.toBase64());
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                if (groupId != null) {
+                    writer.println("Created new group: \"{}\"", groupId.toBase64());
+                }
+                if (results != null) {
+                    var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
+                    SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
+                    writer.println("{}", results.timestamp());
+                }
             }
-            if (results != null) {
-                var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
-                SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
-                writer.println("{}", results.timestamp());
+            case JsonWriter writer -> {
+                final var response = new HashMap<>();
+                if (results != null) {
+                    response.put("timestamp", results.timestamp());
+                    var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results());
+                    response.put("results", jsonResults);
+                }
+                if (groupId != null) {
+                    response.put("groupId", groupId.toBase64());
+                }
+                writer.write(response);
             }
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            final var response = new HashMap<>();
-            if (results != null) {
-                response.put("timestamp", results.timestamp());
-                var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results());
-                response.put("results", jsonResults);
-            }
-            if (groupId != null) {
-                response.put("groupId", groupId.toBase64());
-            }
-            writer.write(response);
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index aad9a1e5..89f74129 100644
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -42,11 +42,11 @@ public class UploadStickerPackCommand implements JsonRpcLocalCommand {
 
         try {
             var url = m.uploadStickerPack(path);
-            if (outputWriter instanceof PlainTextWriter writer) {
-                writer.println("{}", url.getUrl());
-            } else {
-                final var writer = (JsonWriter) outputWriter;
-                writer.write(Map.of("url", url.getUrl()));
+            switch (outputWriter) {
+                case PlainTextWriter writer -> writer.println("{}", url.getUrl());
+                case JsonWriter writer -> {
+                    writer.write(Map.of("url", url.getUrl()));
+                }
             }
         } catch (IOException e) {
             throw new IOErrorException("Upload error (maybe image size too large):" + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java
index 52099ff3..01f1a2d7 100644
--- a/src/main/java/org/asamk/signal/commands/VersionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java
@@ -56,10 +56,9 @@ public class VersionCommand implements JsonRpcLocalCommand, JsonRpcMultiLocalCom
         final var projectName = BaseConfig.PROJECT_NAME == null ? "signal-cli" : BaseConfig.PROJECT_NAME;
         final var version = BaseConfig.PROJECT_VERSION == null ? "unknown" : BaseConfig.PROJECT_VERSION;
 
-        if (outputWriter instanceof JsonWriter jsonWriter) {
-            jsonWriter.write(Map.of("version", version));
-        } else if (outputWriter instanceof PlainTextWriter plainTextWriter) {
-            plainTextWriter.println("{} {}", projectName, version);
+        switch (outputWriter) {
+            case JsonWriter jsonWriter -> jsonWriter.write(Map.of("version", version));
+            case PlainTextWriter plainTextWriter -> plainTextWriter.println("{} {}", projectName, version);
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusProperties.java b/src/main/java/org/asamk/signal/dbus/DbusProperties.java
index 256b858d..a77ed164 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusProperties.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusProperties.java
@@ -65,7 +65,7 @@ public abstract class DbusProperties implements Properties {
                 .filter(p -> p.getGetter() != null)
                 .collect(Collectors.toMap(DbusProperty::getName, p -> {
                     final Object o = p.getGetter().get();
-                    return o instanceof Variant ? (Variant<Object>) o : new Variant<>(o);
+                    return o instanceof Variant<?> variant ? variant : new Variant<>(o);
                 }));
     }
 }
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index 25e5c66c..f9ef71a1 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -82,53 +82,55 @@ public class JsonRpcReader {
             final RequestHandler requestHandler,
             final Consumer<JsonRpcResponse> responseHandler
     ) {
-        if (message instanceof final JsonRpcRequest jsonRpcRequest) {
-            logger.debug("Received json rpc request, method: " + jsonRpcRequest.getMethod());
-            final var response = handleRequest(requestHandler, jsonRpcRequest);
-            if (response != null) {
-                jsonRpcSender.sendResponse(response);
+        switch (message) {
+            case JsonRpcRequest jsonRpcRequest -> {
+                logger.debug("Received json rpc request, method: " + jsonRpcRequest.getMethod());
+                final var response = handleRequest(requestHandler, jsonRpcRequest);
+                if (response != null) {
+                    jsonRpcSender.sendResponse(response);
+                }
             }
-        } else if (message instanceof JsonRpcResponse jsonRpcResponse) {
-            responseHandler.accept(jsonRpcResponse);
-        } else {
-            final var messages = ((JsonRpcBatchMessage) message).getMessages();
-            final var responseList = new ArrayList<JsonRpcResponse>(messages.size());
-            final var executor = Executors.newFixedThreadPool(10);
-            try {
-                final var lock = new ReentrantLock();
-                messages.forEach(jsonNode -> {
-                    final JsonRpcRequest request;
-                    try {
-                        request = parseJsonRpcRequest(jsonNode);
-                    } catch (JsonRpcException e) {
-                        final var response = JsonRpcResponse.forError(e.getError(), getId(jsonNode));
-                        lock.lock();
+            case JsonRpcResponse jsonRpcResponse -> responseHandler.accept(jsonRpcResponse);
+            case JsonRpcBatchMessage jsonRpcBatchMessage -> {
+                final var messages = jsonRpcBatchMessage.getMessages();
+                final var responseList = new ArrayList<JsonRpcResponse>(messages.size());
+                final var executor = Executors.newFixedThreadPool(10);
+                try {
+                    final var lock = new ReentrantLock();
+                    messages.forEach(jsonNode -> {
+                        final JsonRpcRequest request;
                         try {
-                            responseList.add(response);
-                        } finally {
-                            lock.unlock();
-                        }
-                        return;
-                    }
-
-                    executor.submit(() -> {
-                        final var response = handleRequest(requestHandler, request);
-                        if (response != null) {
+                            request = parseJsonRpcRequest(jsonNode);
+                        } catch (JsonRpcException e) {
+                            final var response = JsonRpcResponse.forError(e.getError(), getId(jsonNode));
                             lock.lock();
                             try {
                                 responseList.add(response);
                             } finally {
                                 lock.unlock();
                             }
+                            return;
                         }
-                    });
-                });
-            } finally {
-                Util.closeExecutorService(executor);
-            }
 
-            if (!responseList.isEmpty()) {
-                jsonRpcSender.sendBatchResponses(responseList);
+                        executor.submit(() -> {
+                            final var response = handleRequest(requestHandler, request);
+                            if (response != null) {
+                                lock.lock();
+                                try {
+                                    responseList.add(response);
+                                } finally {
+                                    lock.unlock();
+                                }
+                            }
+                        });
+                    });
+                } finally {
+                    Util.closeExecutorService(executor);
+                }
+
+                if (!responseList.isEmpty()) {
+                    jsonRpcSender.sendBatchResponses(responseList);
+                }
             }
         }
     }
@@ -221,7 +223,7 @@ public class JsonRpcReader {
 
     private ValueNode getId(JsonNode jsonNode) {
         final var id = jsonNode.get("id");
-        return id instanceof ValueNode ? (ValueNode) id : null;
+        return id instanceof ValueNode value ? value : null;
     }
 
     private JsonRpcRequest parseJsonRpcRequest(final JsonNode input) throws JsonRpcException {
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 53b876b8..85ed76e6 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -223,13 +223,11 @@ public class SignalJsonRpcDispatcherHandler {
         }
 
         private Integer getSubscriptionId(final JsonNode request) {
-            if (request instanceof ArrayNode req) {
-                return req.get(0).asInt();
-            } else if (request instanceof ObjectNode req) {
-                return req.get("subscription").asInt();
-            } else {
-                return null;
-            }
+            return switch (request) {
+                case ArrayNode req -> req.get(0).asInt();
+                case ObjectNode req -> req.get("subscription").asInt();
+                case null, default -> null;
+            };
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/output/JsonWriter.java b/src/main/java/org/asamk/signal/output/JsonWriter.java
index 034d2f9f..22c323a8 100644
--- a/src/main/java/org/asamk/signal/output/JsonWriter.java
+++ b/src/main/java/org/asamk/signal/output/JsonWriter.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.output;
 
-public interface JsonWriter extends OutputWriter {
+public non-sealed interface JsonWriter extends OutputWriter {
 
     void write(final Object object);
 }
diff --git a/src/main/java/org/asamk/signal/output/OutputWriter.java b/src/main/java/org/asamk/signal/output/OutputWriter.java
index a32e773d..0d84848e 100644
--- a/src/main/java/org/asamk/signal/output/OutputWriter.java
+++ b/src/main/java/org/asamk/signal/output/OutputWriter.java
@@ -1,5 +1,3 @@
 package org.asamk.signal.output;
 
-public interface OutputWriter {
-
-}
+public sealed interface OutputWriter permits JsonWriter, PlainTextWriter {}
diff --git a/src/main/java/org/asamk/signal/output/PlainTextWriter.java b/src/main/java/org/asamk/signal/output/PlainTextWriter.java
index 29ac87af..eb42bed1 100644
--- a/src/main/java/org/asamk/signal/output/PlainTextWriter.java
+++ b/src/main/java/org/asamk/signal/output/PlainTextWriter.java
@@ -2,7 +2,7 @@ package org.asamk.signal.output;
 
 import java.util.function.Consumer;
 
-public interface PlainTextWriter extends OutputWriter {
+public non-sealed interface PlainTextWriter extends OutputWriter {
 
     void println(String format, Object... args);
 
diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
index e4386b0e..108142e3 100644
--- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
+++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
@@ -27,28 +27,32 @@ public class SendMessageResultUtils {
     }
 
     public static void outputResult(final OutputWriter outputWriter, final SendGroupMessageResults sendMessageResults) {
-        if (outputWriter instanceof PlainTextWriter writer) {
-            var errors = getErrorMessagesFromSendMessageResults(sendMessageResults.results());
-            printSendMessageResultErrors(writer, errors);
-            writer.println("{}", sendMessageResults.timestamp());
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            var results = getJsonSendMessageResults(sendMessageResults.results());
-            writer.write(Map.of("timestamp", sendMessageResults.timestamp(), "results", results));
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                var errors = getErrorMessagesFromSendMessageResults(sendMessageResults.results());
+                printSendMessageResultErrors(writer, errors);
+                writer.println("{}", sendMessageResults.timestamp());
+            }
+            case JsonWriter writer -> {
+                var results = getJsonSendMessageResults(sendMessageResults.results());
+                writer.write(Map.of("timestamp", sendMessageResults.timestamp(), "results", results));
+            }
         }
     }
 
     public static void outputResult(
             final OutputWriter outputWriter, final SendMessageResults sendMessageResults
     ) throws CommandException {
-        if (outputWriter instanceof PlainTextWriter writer) {
-            var errors = getErrorMessagesFromSendMessageResults(sendMessageResults.results());
-            printSendMessageResultErrors(writer, errors);
-            writer.println("{}", sendMessageResults.timestamp());
-        } else {
-            final var writer = (JsonWriter) outputWriter;
-            var results = getJsonSendMessageResults(sendMessageResults.results());
-            writer.write(Map.of("timestamp", sendMessageResults.timestamp(), "results", results));
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                var errors = getErrorMessagesFromSendMessageResults(sendMessageResults.results());
+                printSendMessageResultErrors(writer, errors);
+                writer.println("{}", sendMessageResults.timestamp());
+            }
+            case JsonWriter writer -> {
+                var results = getJsonSendMessageResults(sendMessageResults.results());
+                writer.write(Map.of("timestamp", sendMessageResults.timestamp(), "results", results));
+            }
         }
         if (!sendMessageResults.hasSuccess()) {
             if (sendMessageResults.hasOnlyUntrustedIdentity()) {

From ed8ac5b84ccea9dac672021aec74c26d035d17e4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 17 Oct 2023 21:56:10 +0200
Subject: [PATCH 269/672] Use new threads API

---
 .../signal/manager/internal/ManagerImpl.java  |  7 +-
 .../storage/sendLog/MessageSendLogStore.java  |  5 +-
 .../asamk/signal/commands/DaemonCommand.java  | 70 +++++++++----------
 .../signal/dbus/DbusSignalControlImpl.java    |  4 +-
 .../asamk/signal/http/HttpServerHandler.java  |  2 +-
 .../asamk/signal/jsonrpc/JsonRpcReader.java   | 10 +--
 src/main/java/org/asamk/signal/util/Util.java | 17 -----
 7 files changed, 40 insertions(+), 75 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 3feed994..99bede8d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1019,7 +1019,7 @@ public class ManagerImpl implements Manager {
         if (receiveThread != null || isReceivingSynchronous) {
             return;
         }
-        receiveThread = new Thread(() -> {
+        receiveThread = Thread.ofPlatform().name("receive-" + threadNumber.getAndIncrement()).start(() -> {
             logger.debug("Starting receiving messages");
             context.getReceiveHelper().receiveMessagesContinuously(this::passReceivedMessageToHandlers);
             logger.debug("Finished receiving messages");
@@ -1033,9 +1033,6 @@ public class ManagerImpl implements Manager {
                 }
             }
         });
-        receiveThread.setName("receive-" + threadNumber.getAndIncrement());
-
-        receiveThread.start();
     }
 
     private void passReceivedMessageToHandlers(MessageEnvelope envelope, Throwable e) {
@@ -1310,7 +1307,7 @@ public class ManagerImpl implements Manager {
         if (thread != null) {
             stopReceiveThread(thread);
         }
-        executor.shutdown();
+        executor.close();
 
         dependencies.getSignalWebSocket().disconnect();
         disposable.dispose();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index 751f345b..910da3cf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -38,7 +38,7 @@ public class MessageSendLogStore implements AutoCloseable {
     public MessageSendLogStore(final Database database, final boolean disableMessageSendLog) {
         this.database = database;
         this.sendLogDisabled = disableMessageSendLog;
-        this.cleanupThread = new Thread(() -> {
+        this.cleanupThread = Thread.ofPlatform().name("msl-cleanup").daemon().start(() -> {
             try {
                 final var interval = Duration.ofHours(1).toMillis();
                 while (!Thread.interrupted()) {
@@ -55,9 +55,6 @@ public class MessageSendLogStore implements AutoCloseable {
                 logger.debug("Stopping msl cleanup thread");
             }
         });
-        cleanupThread.setName("msl-cleanup");
-        cleanupThread.setDaemon(true);
-        cleanupThread.start();
     }
 
     public static void createSql(Connection connection) throws SQLException {
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 5c1fac53..dcc21d45 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -39,6 +39,7 @@ import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
@@ -257,19 +258,19 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         m.addReceiveHandler(handler, isWeakListener);
     }
 
-    private void runSocketSingleAccount(
+    private Thread runSocketSingleAccount(
             final Manager m, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
     ) {
-        runSocket(serverChannel, channel -> {
+        return runSocket(serverChannel, channel -> {
             final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
             handler.handleConnection(m);
         });
     }
 
-    private void runSocketMultiAccount(
+    private Thread runSocketMultiAccount(
             final MultiAccountManager c, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
     ) {
-        runSocket(serverChannel, channel -> {
+        return runSocket(serverChannel, channel -> {
             final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
             handler.handleConnection(c);
         });
@@ -277,39 +278,37 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
     private static final AtomicInteger threadNumber = new AtomicInteger(0);
 
-    private void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
-        final var thread = new Thread(() -> {
-            while (true) {
-                final var connectionId = threadNumber.getAndIncrement();
-                final SocketChannel channel;
-                final String clientString;
-                try {
-                    channel = serverChannel.accept();
-                    clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
-                    logger.info("Accepted new client connection {}: {}", connectionId, clientString);
-                } catch (IOException e) {
-                    logger.error("Failed to accept new socket connection", e);
-                    synchronized (this) {
-                        notifyAll();
-                    }
-                    break;
-                }
-                final var connectionThread = new Thread(() -> {
-                    try (final var c = channel) {
-                        socketHandler.accept(c);
+    private Thread runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
+        return Thread.ofPlatform().name("daemon-listener").start(() -> {
+            try (final var executor = Executors.newCachedThreadPool()) {
+                while (true) {
+                    final var connectionId = threadNumber.getAndIncrement();
+                    final SocketChannel channel;
+                    final String clientString;
+                    try {
+                        channel = serverChannel.accept();
+                        clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
+                        logger.info("Accepted new client connection {}: {}", connectionId, clientString);
                     } catch (IOException e) {
-                        logger.warn("Failed to close channel", e);
-                    } catch (Throwable e) {
-                        logger.warn("Connection handler failed, closing connection", e);
+                        logger.error("Failed to accept new socket connection", e);
+                        break;
                     }
-                    logger.info("Connection {} closed: {}", connectionId, clientString);
-                });
-                connectionThread.setName("daemon-connection-" + connectionId);
-                connectionThread.start();
+                    executor.submit(() -> {
+                        try (final var c = channel) {
+                            socketHandler.accept(c);
+                        } catch (IOException e) {
+                            logger.warn("Failed to close channel", e);
+                        } catch (Throwable e) {
+                            logger.warn("Connection handler failed, closing connection", e);
+                        }
+                        logger.info("Connection {} closed: {}", connectionId, clientString);
+                    });
+                }
+            }
+            synchronized (this) {
+                notifyAll();
             }
         });
-        thread.setName("daemon-listener");
-        thread.start();
     }
 
     private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(
@@ -411,11 +410,8 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             final DBusConnection conn, final String objectPath, final Manager m, final boolean noReceiveOnStart
     ) {
         final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
-        final var initThread = new Thread(signal::initObjects);
-        initThread.setName("dbus-init");
-        initThread.start();
 
-        return initThread;
+        return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
     }
 
     interface DbusRunner {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index 5c4d807e..7452eaee 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -103,7 +103,7 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
     public String link(final String newDeviceName) throws Error.Failure {
         try {
             final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
-            final var thread = new Thread(() -> {
+            Thread.ofPlatform().name("dbus-link").start(() -> {
                 final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
                 try {
                     provisioningManager.finishDeviceLink(newDeviceName);
@@ -111,8 +111,6 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
                     e.printStackTrace();
                 }
             });
-            thread.setName("dbus-link");
-            thread.start();
             return deviceLinkUri.toString();
         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 39e7f51e..4d13e22c 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -54,7 +54,7 @@ public class HttpServerHandler {
         logger.info("Starting server on " + address.toString());
 
         final var server = HttpServer.create(address, 0);
-        server.setExecutor(Executors.newFixedThreadPool(10));
+        server.setExecutor(Executors.newCachedThreadPool());
 
         server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
         server.createContext("/api/v1/events", this::handleEventsEndpoint);
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index f9ef71a1..d1503d01 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -55,8 +55,7 @@ public class JsonRpcReader {
             return;
         }
 
-        final var executor = Executors.newFixedThreadPool(10);
-        try {
+        try (final var executor = Executors.newCachedThreadPool()) {
             while (!Thread.interrupted()) {
                 final var input = lineSupplier.get();
                 if (input == null) {
@@ -72,8 +71,6 @@ public class JsonRpcReader {
 
                 executor.submit(() -> handleMessage(message, requestHandler, responseHandler));
             }
-        } finally {
-            Util.closeExecutorService(executor);
         }
     }
 
@@ -94,8 +91,7 @@ public class JsonRpcReader {
             case JsonRpcBatchMessage jsonRpcBatchMessage -> {
                 final var messages = jsonRpcBatchMessage.getMessages();
                 final var responseList = new ArrayList<JsonRpcResponse>(messages.size());
-                final var executor = Executors.newFixedThreadPool(10);
-                try {
+                try (final var executor = Executors.newCachedThreadPool()) {
                     final var lock = new ReentrantLock();
                     messages.forEach(jsonNode -> {
                         final JsonRpcRequest request;
@@ -124,8 +120,6 @@ public class JsonRpcReader {
                             }
                         });
                     });
-                } finally {
-                    Util.closeExecutorService(executor);
                 }
 
                 if (!responseList.isEmpty()) {
diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index e193d253..63717ec0 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -16,8 +16,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 public class Util {
@@ -86,19 +84,4 @@ public class Util {
         }
         return map;
     }
-
-    public static void closeExecutorService(ExecutorService executor) {
-        executor.shutdown();
-        try {
-            if (!executor.awaitTermination(5, TimeUnit.MINUTES)) {
-                executor.shutdownNow();
-                if (!executor.awaitTermination(1, TimeUnit.MINUTES)) {
-                    logger.warn("Failed to shutdown executor service");
-                }
-            }
-        } catch (InterruptedException e) {
-            executor.shutdownNow();
-            Thread.currentThread().interrupt();
-        }
-    }
 }

From cdef9c435c103349556825301336dd184578e8da Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 3 Nov 2023 19:59:39 +0100
Subject: [PATCH 270/672] Check if account is already registered before
 attempting verification

---
 .../signal/manager/internal/RegistrationManagerImpl.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 679056df..30355297 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -129,6 +129,10 @@ public class RegistrationManagerImpl implements RegistrationManager {
     public void verifyAccount(
             String verificationCode, String pin
     ) throws IOException, PinLockedException, IncorrectPinException {
+        if (account.isRegistered()) {
+            throw new IOException("Account is already registered");
+        }
+
         if (account.getPniIdentityKeyPair() == null) {
             account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         }

From f1ccfc036130a0bdbac0ad77fb85a10db5a30215 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 3 Nov 2023 20:00:26 +0100
Subject: [PATCH 271/672] Initialize pre key offsets when creating new account

---
 .../org/asamk/signal/manager/storage/SignalAccount.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 2d33555d..1b501331 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -228,6 +228,7 @@ public class SignalAccount implements Closeable {
         signalAccount.pniAccountData.setIdentityKeyPair(pniIdentityKey);
         signalAccount.aciAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
         signalAccount.pniAccountData.setLocalRegistrationId(KeyHelper.generateRegistrationId(false));
+        signalAccount.initAllPreKeyIds();
         signalAccount.settings = settings;
 
         signalAccount.registered = false;
@@ -974,6 +975,13 @@ public class SignalAccount implements Closeable {
         clearAllPreKeys(ServiceIdType.PNI);
     }
 
+    private void initAllPreKeyIds() {
+        resetPreKeyOffsets(ServiceIdType.ACI);
+        resetPreKeyOffsets(ServiceIdType.PNI);
+        resetKyberPreKeyOffsets(ServiceIdType.ACI);
+        resetKyberPreKeyOffsets(ServiceIdType.PNI);
+    }
+
     private void clearAllPreKeys(ServiceIdType serviceIdType) {
         final var accountData = getAccountData(serviceIdType);
         resetPreKeyOffsets(serviceIdType);

From 44c9aded65355b2e431a0ecde94bbf78e996b710 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 3 Nov 2023 20:01:05 +0100
Subject: [PATCH 272/672] Don't check self number in recipients refresh

---
 .../asamk/signal/manager/storage/recipients/RecipientStore.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 87e5f3d2..e87dd6bb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -387,10 +387,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 WHERE r.number IS NOT NULL
                 """
         ).formatted(TABLE_RECIPIENT);
+        final var selfNumber = selfAddressProvider.getSelfAddress().number().orElse(null);
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 return Utils.executeQueryForStream(statement, resultSet -> resultSet.getString("number"))
                         .filter(Objects::nonNull)
+                        .filter(n -> !n.equals(selfNumber))
                         .filter(n -> {
                             try {
                                 Long.parseLong(n);

From 67d8ffcde53f87e9d4b5ce89b5d9041721130edf Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 3 Nov 2023 20:19:41 +0100
Subject: [PATCH 273/672] Initialize database before registering

---
 .../main/java/org/asamk/signal/manager/SignalAccountFiles.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
index ef160621..03c44013 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
@@ -169,6 +169,7 @@ public class SignalAccountFiles {
                     pniIdentityKey,
                     profileKey,
                     settings);
+            account.initDatabase();
 
             return new RegistrationManagerImpl(account,
                     pathConfig,
@@ -183,6 +184,7 @@ public class SignalAccountFiles {
             account.close();
             throw new IOException("Number in account file doesn't match expected number: " + account.getNumber());
         }
+        account.initDatabase();
 
         return new RegistrationManagerImpl(account,
                 pathConfig,

From 91e0d5164b14748a38b5b1db29f0d7f76b0de08f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 3 Nov 2023 20:20:14 +0100
Subject: [PATCH 274/672] Ensure profile key is stored in profileKeyStore

Fixes #1362
---
 graalvm-config-dir/resource-config.json              |  2 ++
 .../asamk/signal/manager/storage/SignalAccount.java  | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index b79033ea..6902124a 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -172,6 +172,8 @@
     "pattern":"\\Qkotlin/coroutines/coroutines.kotlin_builtins\\E"
   }, {
     "pattern":"\\Qkotlin/internal/internal.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qkotlin/jvm/jvm.kotlin_builtins\\E"
   }, {
     "pattern":"\\Qkotlin/kotlin.kotlin_builtins\\E"
   }, {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 1b501331..077ff732 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -654,7 +654,7 @@ public class SignalAccount implements Closeable {
             // Old config file, creating new profile key
             setProfileKey(KeyUtils.createProfileKey());
         }
-        getProfileStore().storeProfileKey(getSelfRecipientId(), getProfileKey());
+        getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
 
         if (previousStorageVersion < 5) {
             final var legacyRecipientsStoreFile = new File(userPath, "recipients-store");
@@ -1185,10 +1185,12 @@ public class SignalAccount implements Closeable {
     }
 
     public RecipientStore getRecipientStore() {
-        return getOrCreate(() -> recipientStore,
-                () -> recipientStore = new RecipientStore(this::mergeRecipients,
-                        this::getSelfRecipientAddress,
-                        getAccountDatabase()));
+        return getOrCreate(() -> recipientStore, () -> {
+            recipientStore = new RecipientStore(this::mergeRecipients,
+                    this::getSelfRecipientAddress,
+                    getAccountDatabase());
+            getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
+        });
     }
 
     public ProfileStore getProfileStore() {

From 506dcfa6c0e04ceb310538e62ff39273796b1948 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 4 Nov 2023 11:32:42 +0100
Subject: [PATCH 275/672] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8d61bc1f..6b87a745 100644
--- a/README.md
+++ b/README.md
@@ -128,8 +128,7 @@ It is possible to build a native binary with [GraalVM](https://www.graalvm.org).
 work in all situations.
 
 1. [Install GraalVM and setup the enviroment](https://www.graalvm.org/docs/getting-started/#install-graalvm)
-2. [Install prerequisites](https://www.graalvm.org/reference-manual/native-image/#prerequisites)
-3. Execute Gradle:
+2. Execute Gradle:
 
        ./gradlew nativeCompile
 

From 8d423adb4d022fded647053b6e6c70eb63a4e306 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 5 Nov 2023 11:59:09 +0100
Subject: [PATCH 276/672] Use safety numbers with ACI by default

---
 .../signal/manager/helper/IdentityHelper.java | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index b9281889..975d5179 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -57,33 +57,28 @@ public class IdentityHelper {
     }
 
     public String computeSafetyNumber(ServiceId serviceId, IdentityKey theirIdentityKey) {
-        final var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, false);
+        final var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey);
         return fingerprint == null ? null : fingerprint.getDisplayableFingerprint().getDisplayText();
     }
 
     public ScannableFingerprint computeSafetyNumberForScanning(ServiceId serviceId, IdentityKey theirIdentityKey) {
-        var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, false);
-        if (fingerprint == null) {
-            fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey, true);
-        }
+        var fingerprint = computeSafetyNumberFingerprint(serviceId, theirIdentityKey);
         return fingerprint == null ? null : fingerprint.getScannableFingerprint();
     }
 
     private Fingerprint computeSafetyNumberFingerprint(
-            final ServiceId serviceId, final IdentityKey theirIdentityKey, boolean useServiceId
+            final ServiceId serviceId, final IdentityKey theirIdentityKey
     ) {
-        final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
-        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
-
-        if (useServiceId) {
-            if (serviceId.isUnknown()) {
-                return null;
-            }
+        if (!serviceId.isUnknown()) {
             return Utils.computeSafetyNumberForUuid(account.getAci(),
                     account.getAciIdentityKeyPair().getPublicKey(),
                     serviceId,
                     theirIdentityKey);
         }
+
+        final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+
         if (address.number().isEmpty()) {
             return null;
         }

From 699b21f066eb3a0c5c21b58ccb79276cc3d296c9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 5 Nov 2023 16:20:33 +0100
Subject: [PATCH 277/672] Handle rate limit error in JSON-RPC mode

---
 src/main/java/org/asamk/signal/Main.java      |  2 +-
 .../commands/exceptions/CommandException.java |  2 +-
 .../jsonrpc/SignalJsonRpcCommandHandler.java  | 35 ++++++++++++-------
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 00d9d7a9..2b805b68 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -115,7 +115,7 @@ public class Main {
             case IOErrorException ioErrorException -> 3;
             case UntrustedKeyErrorException untrustedKeyErrorException -> 4;
             case RateLimitErrorException rateLimitErrorException -> 5;
-            case null, default -> 2;
+            case null -> 2;
         };
     }
 }
diff --git a/src/main/java/org/asamk/signal/commands/exceptions/CommandException.java b/src/main/java/org/asamk/signal/commands/exceptions/CommandException.java
index bae7af43..739aee91 100644
--- a/src/main/java/org/asamk/signal/commands/exceptions/CommandException.java
+++ b/src/main/java/org/asamk/signal/commands/exceptions/CommandException.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.commands.exceptions;
 
-public class CommandException extends Exception {
+public sealed abstract class CommandException extends Exception permits IOErrorException, RateLimitErrorException, UnexpectedErrorException, UntrustedKeyErrorException, UserErrorException {
 
     public CommandException(final String message) {
         super(message);
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 720f22e6..62556725 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -14,6 +14,8 @@ import org.asamk.signal.commands.JsonRpcRegistrationCommand;
 import org.asamk.signal.commands.JsonRpcSingleCommand;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.RateLimitErrorException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
@@ -35,6 +37,7 @@ public class SignalJsonRpcCommandHandler {
     private static final int USER_ERROR = -1;
     private static final int IO_ERROR = -3;
     private static final int UNTRUSTED_KEY_ERROR = -4;
+    private static final int RATELIMIT_ERROR = -5;
 
     private final Manager m;
     private final MultiAccountManager c;
@@ -211,18 +214,26 @@ public class SignalJsonRpcCommandHandler {
             throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INVALID_REQUEST,
                     e.getMessage(),
                     null));
-        } catch (UserErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        } catch (IOErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
-        } catch (UntrustedKeyErrorException e) {
-            throw new JsonRpcException(new JsonRpcResponse.Error(UNTRUSTED_KEY_ERROR,
-                    e.getMessage(),
-                    getErrorDataNode(objectMapper, result)));
+        } catch (CommandException ce) {
+            switch (ce) {
+                case UserErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(USER_ERROR,
+                        e.getMessage(),
+                        getErrorDataNode(objectMapper, result)));
+                case IOErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(IO_ERROR,
+                        e.getMessage(),
+                        getErrorDataNode(objectMapper, result)));
+                case UntrustedKeyErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(
+                        UNTRUSTED_KEY_ERROR,
+                        e.getMessage(),
+                        getErrorDataNode(objectMapper, result)));
+                case RateLimitErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(RATELIMIT_ERROR,
+                        e.getMessage(),
+                        getErrorDataNode(objectMapper, result)));
+                case UnexpectedErrorException e ->
+                        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                                e.getMessage(),
+                                getErrorDataNode(objectMapper, result)));
+            }
         } catch (Throwable e) {
             logger.error("Command execution failed", e);
             throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,

From 7b899d185325c2cca1ab404526ec000156d6d7d6 Mon Sep 17 00:00:00 2001
From: spezialist1 <spezialist@email.ua>
Date: Mon, 6 Nov 2023 12:58:11 +0200
Subject: [PATCH 278/672] Add example syntax for a mixed text style (#1367)

---
 man/signal-cli.1.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index d72264a8..3a28219a 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -288,7 +288,7 @@ e.g.: `-m "Hi X!" --mention "3:1:+123456789"`
 Style parts of the message text (syntax: start:length:STYLE).
 Where STYLE is one of: BOLD, ITALIC, SPOILER, STRIKETHROUGH, MONOSPACE
 
-e.g.: `-m "Something BIG!" --text-style "10:3:BOLD"`
+e.g.: `-m "Something BIG!" --text-style "10:3:BOLD"` or for a mixed text style `-m "Something BIG!" --text-style "0:9:ITALIC" "10:3:BOLD"`
 
 *--quote-timestamp*::
 Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.

From 85b0647a3eae6d542848df3997224923e648f54c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 6 Nov 2023 18:06:45 +0100
Subject: [PATCH 279/672] Extract getReceiveConfig to utils

---
 .../signal/commands/JsonRpcDispatcherCommand.java     | 10 ++--------
 src/main/java/org/asamk/signal/util/CommandUtil.java  | 11 +++++++++++
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 166dfcef..0f1343f9 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -9,7 +9,6 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
-import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.IOUtils;
@@ -20,6 +19,8 @@ import java.io.InputStreamReader;
 import java.util.List;
 import java.util.function.Supplier;
 
+import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
+
 public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
@@ -87,13 +88,6 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
         handler.handleConnection(c);
     }
 
-    private static ReceiveConfig getReceiveConfig(final Namespace ns) {
-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
-        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-        return new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
-    }
-
     private static Supplier<String> getLineSupplier() {
         return IOUtils.getLineSupplier(new InputStreamReader(System.in, IOUtils.getConsoleCharset()));
     }
diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java
index d637f22e..48decc7a 100644
--- a/src/main/java/org/asamk/signal/util/CommandUtil.java
+++ b/src/main/java/org/asamk/signal/util/CommandUtil.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.util;
 
+import net.sourceforge.argparse4j.inf.Namespace;
+
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
@@ -7,6 +9,7 @@ import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupIdFormatException;
 import org.asamk.signal.manager.api.InvalidNumberException;
 import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 
 import java.util.Collection;
@@ -122,4 +125,12 @@ public class CommandUtil {
         }
         return message;
     }
+
+    public static ReceiveConfig getReceiveConfig(final Namespace ns) {
+        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
+        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
+        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+
+        return new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
+    }
 }

From 1e35ac380e81ff16c1d06f6fcebfca6cf6eca27a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 6 Nov 2023 18:25:36 +0100
Subject: [PATCH 280/672] Refactor DaemonCommand

---
 .../asamk/signal/commands/DaemonCommand.java  | 442 +++++++++---------
 1 file changed, 225 insertions(+), 217 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index dcc21d45..df1d51bf 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -18,7 +18,6 @@ import org.asamk.signal.json.JsonReceiveMessageHandler;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
-import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
@@ -32,6 +31,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.net.UnixDomainSocketAddress;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
@@ -43,6 +43,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
+import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
+
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
@@ -105,70 +107,25 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         logger.info("Starting daemon in single-account mode for " + m.getSelfNumber());
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
-        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
+        final var receiveConfig = getReceiveConfig(ns);
 
-        m.setReceiveConfig(new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts));
+        m.setReceiveConfig(receiveConfig);
         addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
 
-        final Channel inheritedChannel;
-        try {
-            inheritedChannel = System.inheritedChannel();
-            if (inheritedChannel instanceof ServerSocketChannel serverChannel) {
-                logger.info("Using inherited socket: " + serverChannel.getLocalAddress());
-                runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-            }
-        } catch (IOException e) {
-            throw new IOErrorException("Failed to use inherited socket", e);
-        }
-        final var socketFile = ns.<File>get("socket");
-        if (socketFile != null) {
-            final var address = UnixDomainSocketAddress.of(socketFile.toPath());
-            final var serverChannel = IOUtils.bindSocket(address);
-            runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-        }
-        final var tcpAddress = ns.getString("tcp");
-        if (tcpAddress != null) {
-            final var address = IOUtils.parseInetSocketAddress(tcpAddress);
-            final var serverChannel = IOUtils.bindSocket(address);
-            runSocketSingleAccount(m, serverChannel, receiveMode == ReceiveMode.MANUAL);
-        }
-        final var httpAddress = ns.getString("http");
-        if (httpAddress != null) {
-            final var address = IOUtils.parseInetSocketAddress(httpAddress);
-            final var handler = new HttpServerHandler(address, m);
-            try {
-                handler.init();
-            } catch (IOException ex) {
-                throw new IOErrorException("Failed to initialize HTTP Server", ex);
-            }
-        }
-        final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
-        if (isDbusSystem) {
-            runDbusSingleAccount(m, true, receiveMode != ReceiveMode.ON_START);
-        }
-        final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
-        if (isDbusSession || (
-                !isDbusSystem
-                        && socketFile == null
-                        && tcpAddress == null
-                        && httpAddress == null
-                        && !(inheritedChannel instanceof ServerSocketChannel)
-        )) {
-            runDbusSingleAccount(m, false, receiveMode != ReceiveMode.ON_START);
-        }
+        try (final var daemonHandler = new SingleAccountDaemonHandler(m, receiveMode)) {
+            setup(ns, daemonHandler);
+
+            m.addClosedListener(() -> {
+                synchronized (this) {
+                    notifyAll();
+                }
+            });
 
-        m.addClosedListener(() -> {
             synchronized (this) {
-                notifyAll();
-            }
-        });
-
-        synchronized (this) {
-            try {
-                wait();
-            } catch (InterruptedException ignored) {
+                try {
+                    wait();
+                } catch (InterruptedException ignored) {
+                }
             }
         }
     }
@@ -180,11 +137,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         logger.info("Starting daemon in multi-account mode");
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
-        final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
-        final var ignoreStories = Boolean.TRUE.equals(ns.getBoolean("ignore-stories"));
-        final var sendReadReceipts = Boolean.TRUE.equals(ns.getBoolean("send-read-receipts"));
-
-        final var receiveConfig = new ReceiveConfig(ignoreAttachments, ignoreStories, sendReadReceipts);
+        final var receiveConfig = getReceiveConfig(ns);
         c.getManagers().forEach(m -> {
             m.setReceiveConfig(receiveConfig);
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
@@ -194,42 +147,55 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             addDefaultReceiveHandler(m, noReceiveStdOut ? null : outputWriter, receiveMode != ReceiveMode.ON_START);
         });
 
+        try (final var daemonHandler = new MultiAccountDaemonHandler(c, receiveMode)) {
+            setup(ns, daemonHandler);
+
+            synchronized (this) {
+                try {
+                    wait();
+                } catch (InterruptedException ignored) {
+                }
+            }
+        }
+    }
+
+    private static void setup(final Namespace ns, final DaemonHandler daemonHandler) throws CommandException {
         final Channel inheritedChannel;
         try {
             inheritedChannel = System.inheritedChannel();
             if (inheritedChannel instanceof ServerSocketChannel serverChannel) {
                 logger.info("Using inherited socket: " + serverChannel.getLocalAddress());
-                runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
+                daemonHandler.runSocket(serverChannel);
             }
         } catch (IOException e) {
             throw new IOErrorException("Failed to use inherited socket", e);
         }
+
         final var socketFile = ns.<File>get("socket");
         if (socketFile != null) {
             final var address = UnixDomainSocketAddress.of(socketFile.toPath());
             final var serverChannel = IOUtils.bindSocket(address);
-            runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
+            daemonHandler.runSocket(serverChannel);
         }
+
         final var tcpAddress = ns.getString("tcp");
         if (tcpAddress != null) {
             final var address = IOUtils.parseInetSocketAddress(tcpAddress);
             final var serverChannel = IOUtils.bindSocket(address);
-            runSocketMultiAccount(c, serverChannel, receiveMode == ReceiveMode.MANUAL);
+            daemonHandler.runSocket(serverChannel);
         }
+
         final var httpAddress = ns.getString("http");
         if (httpAddress != null) {
             final var address = IOUtils.parseInetSocketAddress(httpAddress);
-            final var handler = new HttpServerHandler(address, c);
-            try {
-                handler.init();
-            } catch (IOException ex) {
-                throw new IOErrorException("Failed to initialize HTTP Server", ex);
-            }
+            daemonHandler.runHttp(address);
         }
+
         final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
         if (isDbusSystem) {
-            runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, true);
+            daemonHandler.runDbus(true);
         }
+
         final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
         if (isDbusSession || (
                 !isDbusSystem
@@ -238,14 +204,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                         && httpAddress == null
                         && !(inheritedChannel instanceof ServerSocketChannel)
         )) {
-            runDbusMultiAccount(c, receiveMode != ReceiveMode.ON_START, false);
-        }
-
-        synchronized (this) {
-            try {
-                wait();
-            } catch (InterruptedException ignored) {
-            }
+            daemonHandler.runDbus(false);
         }
     }
 
@@ -258,164 +217,213 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         m.addReceiveHandler(handler, isWeakListener);
     }
 
-    private Thread runSocketSingleAccount(
-            final Manager m, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
-    ) {
-        return runSocket(serverChannel, channel -> {
-            final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
-            handler.handleConnection(m);
-        });
-    }
+    private static abstract class DaemonHandler implements AutoCloseable {
 
-    private Thread runSocketMultiAccount(
-            final MultiAccountManager c, final ServerSocketChannel serverChannel, final boolean noReceiveOnStart
-    ) {
-        return runSocket(serverChannel, channel -> {
-            final var handler = getSignalJsonRpcDispatcherHandler(channel, noReceiveOnStart);
-            handler.handleConnection(c);
-        });
-    }
+        protected final ReceiveMode receiveMode;
+        private static final AtomicInteger threadNumber = new AtomicInteger(0);
 
-    private static final AtomicInteger threadNumber = new AtomicInteger(0);
+        public DaemonHandler(final ReceiveMode receiveMode) {
+            this.receiveMode = receiveMode;
+        }
 
-    private Thread runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
-        return Thread.ofPlatform().name("daemon-listener").start(() -> {
-            try (final var executor = Executors.newCachedThreadPool()) {
-                while (true) {
-                    final var connectionId = threadNumber.getAndIncrement();
-                    final SocketChannel channel;
-                    final String clientString;
-                    try {
-                        channel = serverChannel.accept();
-                        clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
-                        logger.info("Accepted new client connection {}: {}", connectionId, clientString);
-                    } catch (IOException e) {
-                        logger.error("Failed to accept new socket connection", e);
-                        break;
-                    }
-                    executor.submit(() -> {
-                        try (final var c = channel) {
-                            socketHandler.accept(c);
+        public abstract void runSocket(ServerSocketChannel serverChannel) throws CommandException;
+
+        public abstract void runDbus(boolean isDbusSystem) throws CommandException;
+
+        public abstract void runHttp(InetSocketAddress address) throws CommandException;
+
+        protected void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
+            Thread.ofPlatform().name("daemon-listener").start(() -> {
+                try (final var executor = Executors.newCachedThreadPool()) {
+                    while (true) {
+                        final var connectionId = threadNumber.getAndIncrement();
+                        final SocketChannel channel;
+                        final String clientString;
+                        try {
+                            channel = serverChannel.accept();
+                            clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
+                            logger.info("Accepted new client connection {}: {}", connectionId, clientString);
                         } catch (IOException e) {
-                            logger.warn("Failed to close channel", e);
-                        } catch (Throwable e) {
-                            logger.warn("Connection handler failed, closing connection", e);
+                            logger.error("Failed to accept new socket connection", e);
+                            break;
                         }
-                        logger.info("Connection {} closed: {}", connectionId, clientString);
-                    });
-                }
-            }
-            synchronized (this) {
-                notifyAll();
-            }
-        });
-    }
-
-    private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(
-            final SocketChannel c, final boolean noReceiveOnStart
-    ) {
-        final var lineSupplier = IOUtils.getLineSupplier(Channels.newReader(c, StandardCharsets.UTF_8));
-        final var jsonOutputWriter = new JsonWriterImpl(Channels.newWriter(c, StandardCharsets.UTF_8));
-
-        return new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, noReceiveOnStart);
-    }
-
-    private void runDbusSingleAccount(
-            final Manager m, final boolean isDbusSystem, final boolean noReceiveOnStart
-    ) throws CommandException {
-        runDbus(isDbusSystem, (conn, objectPath) -> {
-            try {
-                exportDbusObject(conn, objectPath, m, noReceiveOnStart).join();
-            } catch (InterruptedException ignored) {
-            }
-        });
-    }
-
-    private void runDbusMultiAccount(
-            final MultiAccountManager c, final boolean noReceiveOnStart, final boolean isDbusSystem
-    ) throws CommandException {
-        runDbus(isDbusSystem, (connection, objectPath) -> {
-            final var signalControl = new DbusSignalControlImpl(c, objectPath);
-            connection.exportObject(signalControl);
-
-            c.addOnManagerAddedHandler(m -> {
-                final var thread = exportMultiAccountManager(connection, m, noReceiveOnStart);
-                try {
-                    thread.join();
-                } catch (InterruptedException ignored) {
-                }
-            });
-            c.addOnManagerRemovedHandler(m -> {
-                final var path = DbusConfig.getObjectPath(m.getSelfNumber());
-                try {
-                    final var object = connection.getExportedObject(null, path);
-                    if (object instanceof DbusSignalImpl dbusSignal) {
-                        dbusSignal.close();
+                        executor.submit(() -> {
+                            try (final var c = channel) {
+                                socketHandler.accept(c);
+                            } catch (IOException e) {
+                                logger.warn("Failed to close channel", e);
+                            } catch (Throwable e) {
+                                logger.warn("Connection handler failed, closing connection", e);
+                            }
+                            logger.info("Connection {} closed: {}", connectionId, clientString);
+                        });
                     }
-                } catch (DBusException ignored) {
                 }
             });
+        }
 
-            final var initThreads = c.getManagers()
-                    .stream()
-                    .map(m -> exportMultiAccountManager(connection, m, noReceiveOnStart))
-                    .toList();
+        protected SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(final SocketChannel c) {
+            final var lineSupplier = IOUtils.getLineSupplier(Channels.newReader(c, StandardCharsets.UTF_8));
+            final var jsonOutputWriter = new JsonWriterImpl(Channels.newWriter(c, StandardCharsets.UTF_8));
 
-            for (var t : initThreads) {
+            return new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
+                    lineSupplier,
+                    receiveMode == ReceiveMode.MANUAL);
+        }
+
+        protected Thread exportDbusObject(final DBusConnection conn, final String objectPath, final Manager m) {
+            final var signal = new DbusSignalImpl(m, conn, objectPath, receiveMode != ReceiveMode.ON_START);
+
+            return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
+        }
+
+        protected void runDbus(
+                final boolean isDbusSystem, MultiAccountDaemonHandler.DbusRunner dbusRunner
+        ) throws CommandException {
+            DBusConnection.DBusBusType busType;
+            if (isDbusSystem) {
+                busType = DBusConnection.DBusBusType.SYSTEM;
+            } else {
+                busType = DBusConnection.DBusBusType.SESSION;
+            }
+            DBusConnection conn;
+            try {
+                conn = DBusConnectionBuilder.forType(busType).build();
+                dbusRunner.run(conn, DbusConfig.getObjectPath());
+            } catch (DBusException e) {
+                throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
+            } catch (UnsupportedOperationException e) {
+                throw new UserErrorException("Failed to connect to Dbus: " + e.getMessage(), e);
+            }
+
+            try {
+                conn.requestBusName(DbusConfig.getBusname());
+            } catch (DBusException e) {
+                throw new UnexpectedErrorException(
+                        "Dbus command failed, maybe signal-cli dbus daemon is already running: " + e.getMessage(),
+                        e);
+            }
+
+            logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
+        }
+
+        @Override
+        public void close() {
+            // TODO
+        }
+    }
+
+    private static final class SingleAccountDaemonHandler extends DaemonHandler {
+
+        private final Manager m;
+
+        private SingleAccountDaemonHandler(final Manager m, final ReceiveMode receiveMode) {
+            super(receiveMode);
+            this.m = m;
+        }
+
+        @Override
+        public void runSocket(final ServerSocketChannel serverChannel) {
+            runSocket(serverChannel, channel -> {
+                final var handler = getSignalJsonRpcDispatcherHandler(channel);
+                handler.handleConnection(m);
+            });
+        }
+
+        @Override
+        public void runDbus(final boolean isDbusSystem) throws CommandException {
+            runDbus(isDbusSystem, (conn, objectPath) -> {
                 try {
-                    t.join();
+                    exportDbusObject(conn, objectPath, m).join();
                 } catch (InterruptedException ignored) {
                 }
+            });
+        }
+
+        @Override
+        public void runHttp(InetSocketAddress address) throws CommandException {
+            final var handler = new HttpServerHandler(address, m);
+            try {
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);
             }
-        });
+        }
     }
 
-    private void runDbus(
-            final boolean isDbusSystem, DbusRunner dbusRunner
-    ) throws CommandException {
-        DBusConnection.DBusBusType busType;
-        if (isDbusSystem) {
-            busType = DBusConnection.DBusBusType.SYSTEM;
-        } else {
-            busType = DBusConnection.DBusBusType.SESSION;
-        }
-        DBusConnection conn;
-        try {
-            conn = DBusConnectionBuilder.forType(busType).build();
-            dbusRunner.run(conn, DbusConfig.getObjectPath());
-        } catch (DBusException e) {
-            throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
-        } catch (UnsupportedOperationException e) {
-            throw new UserErrorException("Failed to connect to Dbus: " + e.getMessage(), e);
+    private static final class MultiAccountDaemonHandler extends DaemonHandler {
+
+        private final MultiAccountManager c;
+
+        private MultiAccountDaemonHandler(final MultiAccountManager c, final ReceiveMode receiveMode) {
+            super(receiveMode);
+            this.c = c;
         }
 
-        try {
-            conn.requestBusName(DbusConfig.getBusname());
-        } catch (DBusException e) {
-            throw new UnexpectedErrorException("Dbus command failed, maybe signal-cli dbus daemon is already running: "
-                    + e.getMessage(), e);
+        public void runSocket(final ServerSocketChannel serverChannel) {
+            runSocket(serverChannel, channel -> {
+                final var handler = getSignalJsonRpcDispatcherHandler(channel);
+                handler.handleConnection(c);
+            });
         }
 
-        logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
-    }
+        public void runDbus(final boolean isDbusSystem) throws CommandException {
+            runDbus(isDbusSystem, (connection, objectPath) -> {
+                final var signalControl = new DbusSignalControlImpl(c, objectPath);
+                connection.exportObject(signalControl);
 
-    private Thread exportMultiAccountManager(
-            final DBusConnection conn, final Manager m, final boolean noReceiveOnStart
-    ) {
-        final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
-        return exportDbusObject(conn, objectPath, m, noReceiveOnStart);
-    }
+                c.addOnManagerAddedHandler(m -> {
+                    final var thread = exportMultiAccountManager(connection, m);
+                    try {
+                        thread.join();
+                    } catch (InterruptedException ignored) {
+                    }
+                });
+                c.addOnManagerRemovedHandler(m -> {
+                    final var path = DbusConfig.getObjectPath(m.getSelfNumber());
+                    try {
+                        final var object = connection.getExportedObject(null, path);
+                        if (object instanceof DbusSignalImpl dbusSignal) {
+                            dbusSignal.close();
+                        }
+                    } catch (DBusException ignored) {
+                    }
+                });
 
-    private Thread exportDbusObject(
-            final DBusConnection conn, final String objectPath, final Manager m, final boolean noReceiveOnStart
-    ) {
-        final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
+                final var initThreads = c.getManagers()
+                        .stream()
+                        .map(m -> exportMultiAccountManager(connection, m))
+                        .toList();
 
-        return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
-    }
+                for (var t : initThreads) {
+                    try {
+                        t.join();
+                    } catch (InterruptedException ignored) {
+                    }
+                }
+            });
+        }
 
-    interface DbusRunner {
+        @Override
+        public void runHttp(final InetSocketAddress address) throws CommandException {
+            final var handler = new HttpServerHandler(address, c);
+            try {
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);
+            }
+        }
 
-        void run(DBusConnection connection, String objectPath) throws DBusException;
+        private Thread exportMultiAccountManager(
+                final DBusConnection conn, final Manager m
+        ) {
+            final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
+            return exportDbusObject(conn, objectPath, m);
+        }
+
+        interface DbusRunner {
+
+            void run(DBusConnection connection, String objectPath) throws DBusException;
+        }
     }
 }

From 4fbc97c92a13574a0e5511b0f04e18531d84dbbe Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 6 Nov 2023 20:00:53 +0100
Subject: [PATCH 281/672] Register java exit handlers in graalvm native build

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 68eed610..a20a5899 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,6 +24,7 @@ application {
 graalvmNative {
     binaries {
         this["main"].run {
+            buildArgs.add("--install-exit-handlers")
             resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
             if (System.getenv("GRAALVM_HOME") == null) {

From 4e8f0a41c736d99b3169519b5bf6456aa9ee1086 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 7 Nov 2023 09:11:36 +0100
Subject: [PATCH 282/672] Update dependencies

---
 lib/build.gradle.kts | 3 ++-
 settings.gradle.kts  | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index 38d4c221..c8f22f7c 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -29,7 +29,8 @@ dependencies {
     implementation(libs.sqlite)
     implementation(libs.hikari)
 
-    testImplementation(libs.junit)
+    testImplementation(libs.junit.jupiter)
+    testRuntimeOnly(libs.junit.launcher)
 }
 
 tasks.named<Test>("test") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a1feb330..e30e5aa4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,9 +17,10 @@ dependencyResolutionManagement {
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_86")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.1")
-            library("hikari", "com.zaxxer", "HikariCP").version("5.0.1")
-            library("junit", "org.junit.jupiter", "junit-jupiter").version("5.10.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.2")
+            library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
+            library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
+            library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1")
         }
     }
 }

From e61f587bfc8f5557587d8c6cd54efcaf6631fdce Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 7 Nov 2023 09:28:29 +0100
Subject: [PATCH 283/672] Reduce use of printStackTrace

---
 src/main/java/org/asamk/signal/Main.java      |  4 ++--
 .../asamk/signal/dbus/DbusManagerImpl.java    |  4 ++--
 .../dbus/DbusReceiveMessageHandler.java       |  2 +-
 .../signal/dbus/DbusSignalControlImpl.java    | 24 +++++++++++--------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 2b805b68..1e05206d 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -62,11 +62,11 @@ public class Main {
         } catch (CommandException e) {
             System.err.println(e.getMessage());
             if (verboseLevel > 0 && e.getCause() != null) {
-                e.getCause().printStackTrace();
+                e.getCause().printStackTrace(System.err);
             }
             status = getStatusForError(e);
         } catch (Throwable e) {
-            e.printStackTrace();
+            e.printStackTrace(System.err);
             status = 2;
         }
         System.exit(status);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 49aa0e27..e9fc3f9c 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -948,7 +948,7 @@ public class DbusManagerImpl implements Manager {
             };
             connection.addSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
         signal.subscribeReceive();
     }
@@ -968,7 +968,7 @@ public class DbusManagerImpl implements Manager {
             connection.removeSigHandler(Signal.ReceiptReceivedV2.class, signal, this.dbusRcptHandler);
             connection.removeSigHandler(Signal.SyncMessageReceivedV2.class, signal, this.dbusSyncHandler);
         } catch (DBusException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
index 0ce114cd..29f4a4c9 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusReceiveMessageHandler.java
@@ -30,7 +30,7 @@ public class DbusReceiveMessageHandler implements Manager.ReceiveMessageHandler
         try {
             sendDbusMessages(envelope);
         } catch (DBusException e) {
-            e.printStackTrace();
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index 7452eaee..86ad6c1e 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -14,6 +14,8 @@ import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
 import org.freedesktop.dbus.DBusPath;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.URI;
@@ -24,6 +26,7 @@ import java.util.concurrent.TimeoutException;
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
+    private final static Logger logger = LoggerFactory.getLogger(DbusSignalControlImpl.class);
     private final MultiAccountManager c;
 
     private final String objectPath;
@@ -101,20 +104,21 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public String link(final String newDeviceName) throws Error.Failure {
+        final URI deviceLinkUri;
         try {
-            final URI deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
-            Thread.ofPlatform().name("dbus-link").start(() -> {
-                final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
-                try {
-                    provisioningManager.finishDeviceLink(newDeviceName);
-                } catch (IOException | TimeoutException | UserAlreadyExistsException e) {
-                    e.printStackTrace();
-                }
-            });
-            return deviceLinkUri.toString();
+            deviceLinkUri = c.getNewProvisioningDeviceLinkUri();
         } catch (TimeoutException | IOException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
+        Thread.ofPlatform().name("dbus-link").start(() -> {
+            final ProvisioningManager provisioningManager = c.getProvisioningManagerFor(deviceLinkUri);
+            try {
+                provisioningManager.finishDeviceLink(newDeviceName);
+            } catch (IOException | TimeoutException | UserAlreadyExistsException e) {
+                logger.warn("Failed to finish linking", e);
+            }
+        });
+        return deviceLinkUri.toString();
     }
 
     @Override

From d351f64fb107249bdef21aeab599fe04ef358514 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 8 Nov 2023 11:49:30 +0100
Subject: [PATCH 284/672] Configure log LevelChangePropagator

---
 src/main/java/org/asamk/signal/logging/LogConfigurator.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 7401bf2c..16de72f5 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -6,6 +6,7 @@ import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.PatternLayout;
+import ch.qos.logback.classic.jul.LevelChangePropagator;
 import ch.qos.logback.classic.spi.Configurator;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.ConsoleAppender;
@@ -36,6 +37,9 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
 
     @Override
     public ExecutionStatus configure(LoggerContext lc) {
+        lc.addListener(new LevelChangePropagator() {{
+            setContext(lc);
+        }});
         final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
         final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN;

From e734c125ad21677abf0570390dd9b6f568f5fc83 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 8 Nov 2023 12:40:34 +0100
Subject: [PATCH 285/672] Ignore quotes without author

Fixes #1369
---
 .../java/org/asamk/signal/manager/api/MessageEnvelope.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index f4b63324..27c17650 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -140,7 +140,9 @@ public record MessageEnvelope(
                     dataMessage.isProfileKeyUpdate(),
                     dataMessage.getProfileKey().isPresent(),
                     dataMessage.getReaction().map(r -> Reaction.from(r, recipientResolver, addressResolver)),
-                    dataMessage.getQuote().map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)),
+                    dataMessage.getQuote()
+                            .filter(q -> q.getAuthor() != null && q.getAuthor().isValid())
+                            .map(q -> Quote.from(q, recipientResolver, addressResolver, fileProvider)),
                     dataMessage.getPayment().map(p -> p.getPaymentNotification().isPresent() ? Payment.from(p) : null),
                     dataMessage.getAttachments()
                             .map(a -> a.stream().map(as -> Attachment.from(as, fileProvider)).toList())

From cb5cace8daa20c2dd2e0c107c6f811b026b075a7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 8 Nov 2023 14:05:40 +0100
Subject: [PATCH 286/672] Update libsignal-service

---
 .../java/org/asamk/signal/manager/helper/RecipientHelper.java | 4 +---
 settings.gradle.kts                                           | 2 +-
 src/main/java/org/asamk/signal/BaseConfig.java                | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 4694c099..086ac62c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -6,7 +6,6 @@ import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.signal.core.util.Base64;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
@@ -234,8 +233,7 @@ public class RecipientHelper {
     }
 
     private ACI getRegisteredUserByUsername(String username) throws IOException, BaseUsernameException {
-        return dependencies.getAccountManager()
-                .getAciByUsernameHash(Base64.encodeUrlSafeWithoutPadding(new Username(username).getHash()));
+        return dependencies.getAccountManager().getAciByUsername(new Username(username));
     }
 
     public record RegisteredUser(Optional<ACI> aci, Optional<PNI> pni) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e30e5aa4..e0624b42 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_86")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_87")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.2")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 1509dd83..af3ce1ad 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -5,7 +5,7 @@ public class BaseConfig {
     public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
     public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.36.0";
+    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.39.1";
     final static String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 5a1d2580cb9ae1787f20c37e1d1d9752b6d640d4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 8 Nov 2023 14:06:11 +0100
Subject: [PATCH 287/672] Use a single PushServiceSocket

---
 .../signal/manager/internal/ManagerImpl.java  |  1 +
 .../manager/internal/SignalDependencies.java  | 36 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 99bede8d..cbaaaab3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1310,6 +1310,7 @@ public class ManagerImpl implements Manager {
         executor.close();
 
         dependencies.getSignalWebSocket().disconnect();
+        dependencies.getPushServiceSocket().close();
         disposable.dispose();
 
         if (account != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 2e2cb75f..3b047c88 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -20,6 +20,7 @@ import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
+import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
 import java.util.Optional;
@@ -44,6 +45,7 @@ public class SignalDependencies {
     private GroupsV2Operations groupsV2Operations;
     private ClientZkOperations clientZkOperations;
 
+    private PushServiceSocket pushServiceSocket;
     private SignalWebSocket signalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
@@ -69,6 +71,10 @@ public class SignalDependencies {
     }
 
     public void resetAfterAddressChange() {
+        if (this.pushServiceSocket != null) {
+            this.pushServiceSocket.close();
+            this.pushServiceSocket = null;
+        }
         this.messageSender = null;
         this.cipher = null;
         getSignalWebSocket().forceNewWebSockets();
@@ -89,15 +95,24 @@ public class SignalDependencies {
         return sessionLock;
     }
 
-    public SignalServiceAccountManager getAccountManager() {
-        return getOrCreate(() -> accountManager,
-                () -> accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
+    public PushServiceSocket getPushServiceSocket() {
+        return getOrCreate(() -> pushServiceSocket,
+                () -> pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
                         credentialsProvider,
                         userAgent,
-                        getGroupsV2Operations(),
+                        getClientZkProfileOperations(),
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
+    public SignalServiceAccountManager getAccountManager() {
+        return getOrCreate(() -> accountManager,
+                () -> accountManager = new SignalServiceAccountManager(getPushServiceSocket(),
+                        null,
+                        serviceEnvironmentConfig.signalServiceConfiguration(),
+                        credentialsProvider,
+                        getGroupsV2Operations()));
+    }
+
     public SignalServiceAccountManager createUnauthenticatedAccountManager(String number, String password) {
         return new SignalServiceAccountManager(getServiceEnvironmentConfig().signalServiceConfiguration(),
                 null,
@@ -162,26 +177,19 @@ public class SignalDependencies {
 
     public SignalServiceMessageReceiver getMessageReceiver() {
         return getOrCreate(() -> messageReceiver,
-                () -> messageReceiver = new SignalServiceMessageReceiver(serviceEnvironmentConfig.signalServiceConfiguration(),
-                        credentialsProvider,
-                        userAgent,
-                        getClientZkProfileOperations(),
-                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
+                () -> messageReceiver = new SignalServiceMessageReceiver(pushServiceSocket));
     }
 
     public SignalServiceMessageSender getMessageSender() {
         return getOrCreate(() -> messageSender,
-                () -> messageSender = new SignalServiceMessageSender(serviceEnvironmentConfig.signalServiceConfiguration(),
-                        credentialsProvider,
+                () -> messageSender = new SignalServiceMessageSender(credentialsProvider,
                         dataStore,
                         sessionLock,
-                        userAgent,
                         getSignalWebSocket(),
                         Optional.empty(),
-                        getClientZkProfileOperations(),
                         executor,
                         ServiceConfig.MAX_ENVELOPE_SIZE,
-                        ServiceConfig.AUTOMATIC_NETWORK_RETRY));
+                        pushServiceSocket));
     }
 
     public SecureValueRecoveryV2 getSecureValueRecoveryV2() {

From 19e9f31afdb85a76b7c1cd9a3f3fc54a842ba0a8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 8 Nov 2023 14:06:34 +0100
Subject: [PATCH 288/672] Remove now unnecessary try/catch

---
 .../signal/manager/internal/ProvisioningManagerImpl.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 155756c9..11a6a05e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -76,13 +76,8 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
 
         tempIdentityKey = KeyUtils.generateIdentityKeyPair();
         password = KeyUtils.createPassword();
-        GroupsV2Operations groupsV2Operations;
-        try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
-                    ServiceConfig.GROUP_MAX_SIZE);
-        } catch (Throwable ignored) {
-            groupsV2Operations = null;
-        }
+        GroupsV2Operations groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(
+                serviceEnvironmentConfig.signalServiceConfiguration()), ServiceConfig.GROUP_MAX_SIZE);
         accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                 new DynamicCredentialsProvider(null, null, null, password, SignalServiceAddress.DEFAULT_DEVICE_ID),
                 userAgent,

From 3027ba2cf1727abc6d007b9ed0ecf678dbe62bc6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 Nov 2023 15:55:43 +0100
Subject: [PATCH 289/672] Refactor log config

---
 src/main/java/org/asamk/signal/Main.java | 46 +++++++++++++++---------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 1e05206d..b8973bec 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -45,23 +45,18 @@ public class Main {
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized
+        final var loggingConfig = parseLoggingConfig(args);
+        configureLogging(loggingConfig);
 
-        final var nsLog = parseArgs(args);
-        final var verboseLevel = nsLog == null ? 0 : nsLog.getInt("verbose");
-        final var logFile = nsLog == null ? null : nsLog.<File>get("log-file");
-        final var scrubLog = nsLog != null && nsLog.getBoolean("scrub-log");
-        configureLogging(verboseLevel, logFile, scrubLog);
-
-        var parser = App.buildArgumentParser();
-
-        var ns = parser.parseArgsOrFail(args);
+        final var parser = App.buildArgumentParser();
+        final var ns = parser.parseArgsOrFail(args);
 
         int status = 0;
         try {
             new App(ns).init();
         } catch (CommandException e) {
             System.err.println(e.getMessage());
-            if (verboseLevel > 0 && e.getCause() != null) {
+            if (loggingConfig.verboseLevel > 0 && e.getCause() != null) {
                 e.getCause().printStackTrace(System.err);
             }
             status = getStatusForError(e);
@@ -78,6 +73,21 @@ public class Main {
         Security.addProvider(new BouncyCastleProvider());
     }
 
+    private static LoggingConfig parseLoggingConfig(final String[] args) {
+        final var nsLog = parseArgs(args);
+        if (nsLog == null) {
+            return new LoggingConfig(0, null, false);
+        }
+
+        final var verboseLevel = nsLog.getInt("verbose");
+        final var logFile = nsLog.<File>get("log-file");
+        final var scrubLog = nsLog.getBoolean("scrub-log");
+        return new LoggingConfig(verboseLevel, logFile, scrubLog);
+    }
+
+    /**
+     * This method only parses commandline args relevant for logging configuration.
+     */
     private static Namespace parseArgs(String[] args) {
         var parser = ArgumentParsers.newFor("signal-cli", DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS)
                 .includeArgumentNamesAsKeysInResult(true)
@@ -94,14 +104,16 @@ public class Main {
         }
     }
 
-    private static void configureLogging(final int verboseLevel, final File logFile, final boolean scrubLog) {
-        LogConfigurator.setVerboseLevel(verboseLevel);
-        LogConfigurator.setLogFile(logFile);
-        LogConfigurator.setScrubSensitiveInformation(scrubLog);
+    private static void configureLogging(final LoggingConfig loggingConfig) {
+        LogConfigurator.setVerboseLevel(loggingConfig.verboseLevel);
+        LogConfigurator.setLogFile(loggingConfig.logFile);
+        LogConfigurator.setScrubSensitiveInformation(loggingConfig.scrubLog);
 
-        if (verboseLevel > 0) {
+        if (loggingConfig.verboseLevel > 0) {
             java.util.logging.Logger.getLogger("")
-                    .setLevel(verboseLevel > 2 ? java.util.logging.Level.FINEST : java.util.logging.Level.INFO);
+                    .setLevel(loggingConfig.verboseLevel > 2
+                            ? java.util.logging.Level.FINEST
+                            : java.util.logging.Level.INFO);
             ManagerLogger.initLogger();
         }
         SLF4JBridgeHandler.removeHandlersForRootLogger();
@@ -118,4 +130,6 @@ public class Main {
             case null -> 2;
         };
     }
+
+    private record LoggingConfig(int verboseLevel, File logFile, boolean scrubLog) {}
 }

From 6b04197eaabda1bc2785308faf7ba62b3f45062b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 Nov 2023 16:36:01 +0100
Subject: [PATCH 290/672] Refactor getManagerFromQuery method

---
 .../org/asamk/signal/http/HttpServerHandler.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 4d13e22c..b888464e 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -201,22 +201,22 @@ public class HttpServerHandler {
     }
 
     private List<Manager> getManagerFromQuery(final Map<String, String> query) {
-        List<Manager> managers;
         if (m != null) {
-            managers = List.of(m);
-        } else {
+            return List.of(m);
+        }
+        if (c != null) {
             final var account = query.get("account");
             if (account == null || account.isEmpty()) {
-                managers = c.getManagers();
+                return c.getManagers();
             } else {
                 final var manager = c.getManager(account);
                 if (manager == null) {
                     return null;
                 }
-                managers = List.of(manager);
+                return List.of(manager);
             }
         }
-        return managers;
+        return List.of();
     }
 
     private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(

From cbbfc4ea6ead16711f1360105414c211456d7138 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 Nov 2023 18:50:20 +0100
Subject: [PATCH 291/672] Rename exportManager method

---
 .../java/org/asamk/signal/commands/DaemonCommand.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index df1d51bf..aee1330d 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -373,7 +373,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 connection.exportObject(signalControl);
 
                 c.addOnManagerAddedHandler(m -> {
-                    final var thread = exportMultiAccountManager(connection, m);
+                    final var thread = exportManager(connection, m);
                     try {
                         thread.join();
                     } catch (InterruptedException ignored) {
@@ -390,10 +390,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                     }
                 });
 
-                final var initThreads = c.getManagers()
-                        .stream()
-                        .map(m -> exportMultiAccountManager(connection, m))
-                        .toList();
+                final var initThreads = c.getManagers().stream().map(m -> exportManager(connection, m)).toList();
 
                 for (var t : initThreads) {
                     try {
@@ -414,7 +411,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             }
         }
 
-        private Thread exportMultiAccountManager(
+        private Thread exportManager(
                 final DBusConnection conn, final Manager m
         ) {
             final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());

From f252597002c3c95e8ed68338c53a41d519b24dcd Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 Nov 2023 16:01:08 +0100
Subject: [PATCH 292/672] Add infrastructure for better shutdown handling

---
 src/main/java/org/asamk/signal/Main.java     |  1 +
 src/main/java/org/asamk/signal/Shutdown.java | 66 ++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 src/main/java/org/asamk/signal/Shutdown.java

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index b8973bec..9219a1d6 100644
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -64,6 +64,7 @@ public class Main {
             e.printStackTrace(System.err);
             status = 2;
         }
+        Shutdown.shutdownComplete();
         System.exit(status);
     }
 
diff --git a/src/main/java/org/asamk/signal/Shutdown.java b/src/main/java/org/asamk/signal/Shutdown.java
new file mode 100644
index 00000000..a59497c9
--- /dev/null
+++ b/src/main/java/org/asamk/signal/Shutdown.java
@@ -0,0 +1,66 @@
+package org.asamk.signal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import sun.misc.Signal;
+
+public class Shutdown {
+
+    private static final Logger logger = LoggerFactory.getLogger(Shutdown.class);
+    private static final CompletableFuture<Void> shutdown = new CompletableFuture<>();
+    private static final CompletableFuture<Void> shutdownComplete = new CompletableFuture<>();
+    private static boolean initialized = false;
+
+    public static void installHandler() {
+        if (initialized) {
+            return;
+        }
+        initialized = true;
+        Signal.handle(new Signal("INT"), Shutdown::handleSignal);
+        Signal.handle(new Signal("TERM"), Shutdown::handleSignal);
+        Runtime.getRuntime().addShutdownHook(Thread.ofPlatform().unstarted(() -> {
+            logger.debug("JVM is shutting down");
+            if (!shutdown.isDone()) {
+                triggerShutdown();
+            }
+
+            try {
+                logger.debug("Waiting for app to shut down");
+                shutdownComplete.get();
+                logger.debug("Exiting");
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }));
+    }
+
+    public static void triggerShutdown() {
+        logger.debug("Triggering shutdown.");
+        shutdown.complete(null);
+    }
+
+    public static void waitForShutdown() throws InterruptedException {
+        try {
+            shutdown.get();
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void registerShutdownListener(Runnable action) {
+        shutdown.thenRun(action);
+    }
+
+    static void shutdownComplete() {
+        shutdownComplete.complete(null);
+    }
+
+    private static void handleSignal(Signal signal) {
+        logger.info("Received {} signal, shutting down ...", signal);
+        triggerShutdown();
+    }
+}

From b7fedff5110c55625f2391a5aab607a2248bf104 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 Nov 2023 16:08:39 +0100
Subject: [PATCH 293/672] Use improved shutdown for jsonRpc command

---
 .../signal/commands/JsonRpcDispatcherCommand.java  | 14 +++++++++++++-
 src/main/java/org/asamk/signal/util/IOUtils.java   |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 0f1343f9..89457bad 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -5,6 +5,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputType;
+import org.asamk.signal.Shutdown;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
 import org.asamk.signal.manager.Manager;
@@ -15,7 +16,10 @@ import org.asamk.signal.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
 import java.io.InputStreamReader;
+import java.nio.channels.Channels;
 import java.util.List;
 import java.util.function.Supplier;
 
@@ -57,6 +61,7 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
+        Shutdown.installHandler();
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var receiveConfig = getReceiveConfig(ns);
         m.setReceiveConfig(receiveConfig);
@@ -67,6 +72,8 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
         final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
                 lineSupplier,
                 receiveMode == ReceiveMode.MANUAL);
+        final var thread = Thread.currentThread();
+        Shutdown.registerShutdownListener(thread::interrupt);
         handler.handleConnection(m);
     }
 
@@ -74,6 +81,7 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
     public void handleCommand(
             final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
     ) throws CommandException {
+        Shutdown.installHandler();
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var receiveConfig = getReceiveConfig(ns);
         c.getManagers().forEach(m -> m.setReceiveConfig(receiveConfig));
@@ -85,10 +93,14 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
         final var handler = new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
                 lineSupplier,
                 receiveMode == ReceiveMode.MANUAL);
+        final var thread = Thread.currentThread();
+        Shutdown.registerShutdownListener(thread::interrupt);
         handler.handleConnection(c);
     }
 
     private static Supplier<String> getLineSupplier() {
-        return IOUtils.getLineSupplier(new InputStreamReader(System.in, IOUtils.getConsoleCharset()));
+        // Use FileChannel for stdin, because System.in is uninterruptible
+        final var stdInCh = Channels.newInputStream((new FileInputStream(FileDescriptor.in)).getChannel());
+        return IOUtils.getLineSupplier(new InputStreamReader(stdInCh, IOUtils.getConsoleCharset()));
     }
 }
diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java
index 9e0d6c3e..d40b4a6c 100644
--- a/src/main/java/org/asamk/signal/util/IOUtils.java
+++ b/src/main/java/org/asamk/signal/util/IOUtils.java
@@ -15,6 +15,7 @@ import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.StandardProtocolFamily;
 import java.net.UnixDomainSocketAddress;
+import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.Charset;
@@ -93,6 +94,9 @@ public class IOUtils {
         return () -> {
             try {
                 return bufferedReader.readLine();
+            } catch (ClosedChannelException ignored) {
+                logger.trace("Line supplier has been interrupted.");
+                return null;
             } catch (IOException e) {
                 logger.error("Error occurred while reading line", e);
                 return null;

From 1058e33f1208e1ca284d3fd4760380d68093741f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 Nov 2023 18:50:07 +0100
Subject: [PATCH 294/672] Use improved shutdown for daemon command

---
 .../asamk/signal/commands/DaemonCommand.java  | 52 ++++++++++++++-----
 .../org/asamk/signal/dbus/DbusSignalImpl.java |  3 +-
 .../asamk/signal/http/HttpServerHandler.java  | 27 ++++++++--
 3 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index aee1330d..209b071c 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -7,6 +7,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;
+import org.asamk.signal.Shutdown;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
@@ -35,9 +36,11 @@ import java.net.InetSocketAddress;
 import java.net.UnixDomainSocketAddress;
 import java.nio.channels.Channel;
 import java.nio.channels.Channels;
+import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -104,6 +107,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
+        Shutdown.installHandler();
         logger.info("Starting daemon in single-account mode for " + m.getSelfNumber());
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
@@ -115,17 +119,11 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         try (final var daemonHandler = new SingleAccountDaemonHandler(m, receiveMode)) {
             setup(ns, daemonHandler);
 
-            m.addClosedListener(() -> {
-                synchronized (this) {
-                    notifyAll();
-                }
-            });
+            m.addClosedListener(Shutdown::triggerShutdown);
 
-            synchronized (this) {
-                try {
-                    wait();
-                } catch (InterruptedException ignored) {
-                }
+            try {
+                Shutdown.waitForShutdown();
+            } catch (InterruptedException ignored) {
             }
         }
     }
@@ -134,6 +132,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     public void handleCommand(
             final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
     ) throws CommandException {
+        Shutdown.installHandler();
         logger.info("Starting daemon in multi-account mode");
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
@@ -152,7 +151,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
             synchronized (this) {
                 try {
-                    wait();
+                    Shutdown.waitForShutdown();
                 } catch (InterruptedException ignored) {
                 }
             }
@@ -220,6 +219,8 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     private static abstract class DaemonHandler implements AutoCloseable {
 
         protected final ReceiveMode receiveMode;
+        protected final List<AutoCloseable> closeables = new ArrayList<>();
+
         private static final AtomicInteger threadNumber = new AtomicInteger(0);
 
         public DaemonHandler(final ReceiveMode receiveMode) {
@@ -233,7 +234,8 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         public abstract void runHttp(InetSocketAddress address) throws CommandException;
 
         protected void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
-            Thread.ofPlatform().name("daemon-listener").start(() -> {
+            final List<AutoCloseable> channels = new ArrayList<>();
+            final var thread = Thread.ofPlatform().name("daemon-listener").start(() -> {
                 try (final var executor = Executors.newCachedThreadPool()) {
                     while (true) {
                         final var connectionId = threadNumber.getAndIncrement();
@@ -243,10 +245,14 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                             channel = serverChannel.accept();
                             clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
                             logger.info("Accepted new client connection {}: {}", connectionId, clientString);
+                        } catch (ClosedChannelException ignored) {
+                            logger.trace("Listening socket has been closed");
+                            break;
                         } catch (IOException e) {
                             logger.error("Failed to accept new socket connection", e);
                             break;
                         }
+                        channels.add(channel);
                         executor.submit(() -> {
                             try (final var c = channel) {
                                 socketHandler.accept(c);
@@ -256,10 +262,18 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                                 logger.warn("Connection handler failed, closing connection", e);
                             }
                             logger.info("Connection {} closed: {}", connectionId, clientString);
+                            channels.remove(channel);
                         });
                     }
                 }
             });
+            closeables.add(() -> {
+                serverChannel.close();
+                for (final var c : new ArrayList<>(channels)) {
+                    c.close();
+                }
+                thread.join();
+            });
         }
 
         protected SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(final SocketChannel c) {
@@ -273,6 +287,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
         protected Thread exportDbusObject(final DBusConnection conn, final String objectPath, final Manager m) {
             final var signal = new DbusSignalImpl(m, conn, objectPath, receiveMode != ReceiveMode.ON_START);
+            closeables.add(signal);
 
             return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
         }
@@ -303,13 +318,21 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                         "Dbus command failed, maybe signal-cli dbus daemon is already running: " + e.getMessage(),
                         e);
             }
+            closeables.add(conn);
 
             logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
         }
 
         @Override
         public void close() {
-            // TODO
+            for (final var closeable : new ArrayList<>(closeables)) {
+                try {
+                    closeable.close();
+                } catch (Exception e) {
+                    logger.warn("Failed to close daemon handler", e);
+                }
+            }
+            closeables.clear();
         }
     }
 
@@ -348,6 +371,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             } catch (IOException ex) {
                 throw new IOErrorException("Failed to initialize HTTP Server", ex);
             }
+            this.closeables.add(handler);
         }
     }
 
@@ -385,6 +409,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                         final var object = connection.getExportedObject(null, path);
                         if (object instanceof DbusSignalImpl dbusSignal) {
                             dbusSignal.close();
+                            closeables.remove(dbusSignal);
                         }
                     } catch (DBusException ignored) {
                     }
@@ -409,6 +434,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             } catch (IOException ex) {
                 throw new IOErrorException("Failed to initialize HTTP Server", ex);
             }
+            this.closeables.add(handler);
         }
 
         private Thread exportManager(
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index a5f28c67..e6ec70d9 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -62,7 +62,7 @@ import java.util.stream.Collectors;
 
 import static org.asamk.signal.dbus.DbusUtils.makeValidObjectPathElement;
 
-public class DbusSignalImpl implements Signal {
+public class DbusSignalImpl implements Signal, AutoCloseable {
 
     private final Manager m;
     private final DBusConnection connection;
@@ -108,6 +108,7 @@ public class DbusSignalImpl implements Signal {
         updateIdentities();
     }
 
+    @Override
     public void close() {
         if (dbusMessageHandler != null) {
             m.removeReceiveHandler(dbusMessageHandler);
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index b888464e..6cd3b0ef 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class HttpServerHandler {
+public class HttpServerHandler implements AutoCloseable {
 
     private final static Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);
 
@@ -35,6 +35,8 @@ public class HttpServerHandler {
     private final SignalJsonRpcCommandHandler commandHandler;
     private final MultiAccountManager c;
     private final Manager m;
+    private HttpServer server;
+    private final AtomicBoolean shutdown = new AtomicBoolean(false);
 
     public HttpServerHandler(final InetSocketAddress address, final Manager m) {
         this.address = address;
@@ -51,9 +53,12 @@ public class HttpServerHandler {
     }
 
     public void init() throws IOException {
+        if (server != null) {
+            throw new AssertionError("HttpServerHandler already initialized");
+        }
         logger.info("Starting server on " + address.toString());
 
-        final var server = HttpServer.create(address, 0);
+        server = HttpServer.create(address, 0);
         server.setExecutor(Executors.newCachedThreadPool());
 
         server.createContext("/api/v1/rpc", this::handleRpcEndpoint);
@@ -153,7 +158,7 @@ public class HttpServerHandler {
             final var handlers = subscribeReceiveHandlers(managers, sender, () -> {
                 shouldStop.set(true);
                 synchronized (this) {
-                    this.notify();
+                    this.notifyAll();
                 }
             });
 
@@ -162,7 +167,7 @@ public class HttpServerHandler {
                     synchronized (this) {
                         wait(15_000);
                     }
-                    if (shouldStop.get()) {
+                    if (shouldStop.get() || shutdown.get()) {
                         break;
                     }
 
@@ -241,6 +246,20 @@ public class HttpServerHandler {
         m.removeReceiveHandler(handler);
     }
 
+    @Override
+    public void close() {
+        if (server != null) {
+            shutdown.set(true);
+            synchronized (this) {
+                this.notifyAll();
+            }
+            // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed
+            server.stop(2);
+            server = null;
+            shutdown.set(false);
+        }
+    }
+
     private interface Callable {
 
         void call();

From 5d33f71d4d337e45c6051274b404424562503938 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 Nov 2023 19:22:58 +0100
Subject: [PATCH 295/672] Use improved shutdown for receive command

---
 .../org/asamk/signal/manager/Manager.java     |  2 ++
 .../signal/manager/internal/ManagerImpl.java  | 14 ++++++++++++++
 .../asamk/signal/commands/ReceiveCommand.java |  3 +++
 .../asamk/signal/dbus/DbusManagerImpl.java    | 19 ++++++++++++++++++-
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 41e08fb6..da69a8da 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -255,6 +255,8 @@ public interface Manager extends Closeable {
             Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
     ) throws IOException, AlreadyReceivingException;
 
+    void stopReceiveMessages();
+
     void setReceiveConfig(ReceiveConfig receiveConfig);
 
     boolean isContactBlocked(RecipientIdentifier.Single recipient);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index cbaaaab3..af001f40 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1091,6 +1091,20 @@ public class ManagerImpl implements Manager {
         receiveMessages(timeout.orElse(Duration.ofMinutes(1)), timeout.isPresent(), maxMessages.orElse(null), handler);
     }
 
+    @Override
+    public void stopReceiveMessages() {
+        Thread thread = null;
+        synchronized (messageHandlers) {
+            if (isReceivingSynchronous) {
+                thread = receiveThread;
+                receiveThread = null;
+            }
+        }
+        if (thread != null) {
+            stopReceiveThread(thread);
+        }
+    }
+
     private void receiveMessages(
             Duration timeout, boolean returnOnTimeout, Integer maxMessages, ReceiveMessageHandler handler
     ) throws IOException, AlreadyReceivingException {
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 228a0561..4a6f746a 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -8,6 +8,7 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;
+import org.asamk.signal.Shutdown;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
@@ -67,6 +68,7 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
+        Shutdown.installHandler();
         final var timeout = ns.getDouble("timeout");
         final var maxMessagesRaw = ns.getInt("max-messages");
         final var ignoreAttachments = Boolean.TRUE.equals(ns.getBoolean("ignore-attachments"));
@@ -80,6 +82,7 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
             };
             final var duration = timeout < 0 ? null : Duration.ofMillis((long) (timeout * 1000));
             final var maxMessages = maxMessagesRaw < 0 ? null : maxMessagesRaw;
+            Shutdown.registerShutdownListener(m::stopReceiveMessages);
             m.receiveMessages(Optional.ofNullable(duration), Optional.ofNullable(maxMessages), handler);
         } catch (IOException e) {
             throw new IOErrorException("Error while receiving messages: " + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index e9fc3f9c..cd6c6715 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -3,6 +3,7 @@ package org.asamk.signal.dbus;
 import org.asamk.Signal;
 import org.asamk.signal.DbusConfig;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
@@ -548,10 +549,17 @@ public class DbusManagerImpl implements Manager {
         }
     }
 
+    private Thread receiveThread;
+
     @Override
     public void receiveMessages(
             Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
-    ) throws IOException {
+    ) throws IOException, AlreadyReceivingException {
+        if (receiveThread != null) {
+            throw new AlreadyReceivingException("Already receiving message.");
+        }
+        receiveThread = Thread.currentThread();
+
         final var remainingMessages = new AtomicInteger(maxMessages.orElse(-1));
         final var lastMessage = new AtomicLong(System.currentTimeMillis());
         final var thread = Thread.currentThread();
@@ -577,6 +585,7 @@ public class DbusManagerImpl implements Manager {
                     }
                     Thread.sleep(sleepTimeRemaining);
                 } catch (InterruptedException ignored) {
+                    break;
                 }
             }
         } else {
@@ -589,6 +598,14 @@ public class DbusManagerImpl implements Manager {
         }
 
         removeReceiveHandler(receiveHandler);
+        receiveThread = null;
+    }
+
+    @Override
+    public void stopReceiveMessages() {
+        if (receiveThread != null) {
+            receiveThread.interrupt();
+        }
     }
 
     @Override

From b20978e08e0210d179ec14e4ceeb8f01dad27642 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 Nov 2023 23:26:38 +0100
Subject: [PATCH 296/672] Remove now unnecessary SuccessExitStatus from systemd
 units

---
 data/signal-cli-socket.service | 2 --
 data/signal-cli.service        | 2 --
 data/signal-cli@.service       | 2 --
 3 files changed, 6 deletions(-)

diff --git a/data/signal-cli-socket.service b/data/signal-cli-socket.service
index 670f9c99..11d56ce3 100644
--- a/data/signal-cli-socket.service
+++ b/data/signal-cli-socket.service
@@ -32,8 +32,6 @@ RestrictAddressFamilies=AF_INET AF_INET6
 RestrictNamespaces=true
 RestrictRealtime=true
 RestrictSUIDSGID=true
-# JVM always exits with 143 in reaction to SIGTERM signal
-SuccessExitStatus=143
 StandardInput=socket
 StandardOutput=journal
 StandardError=journal
diff --git a/data/signal-cli.service b/data/signal-cli.service
index d334107a..1e4a5a5c 100644
--- a/data/signal-cli.service
+++ b/data/signal-cli.service
@@ -11,8 +11,6 @@ Environment="SIGNAL_CLI_OPTS=-Xms2m"
 ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon --system
 User=signal-cli
 BusName=org.asamk.Signal
-# JVM always exits with 143 in reaction to SIGTERM signal
-SuccessExitStatus=143
 
 [Install]
 Alias=dbus-org.asamk.Signal.service
diff --git a/data/signal-cli@.service b/data/signal-cli@.service
index 4368a5e2..d96352e8 100644
--- a/data/signal-cli@.service
+++ b/data/signal-cli@.service
@@ -11,8 +11,6 @@ Environment="SIGNAL_CLI_OPTS=-Xms2m"
 ExecStart=%dir%/bin/signal-cli -a %I --config /var/lib/signal-cli daemon --system
 User=signal-cli
 BusName=org.asamk.Signal
-# JVM always exits with 143 in reaction to SIGTERM signal
-SuccessExitStatus=143
 
 [Install]
 Alias=dbus-org.asamk.Signal.service

From c0aa338d7c8e40874dbc453b3fc3916701762029 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 10 Nov 2023 14:03:13 +0100
Subject: [PATCH 297/672] Reorder static final modifier

---
 .../manager/api/GroupInviteLinkUrl.java       |  4 +--
 .../signal/manager/api/StickerPackUrl.java    |  2 +-
 .../signal/manager/config/LiveConfig.java     | 28 +++++++++----------
 .../signal/manager/config/ServiceConfig.java  | 18 ++++++------
 .../signal/manager/config/StagingConfig.java  | 28 +++++++++----------
 .../signal/manager/helper/AccountHelper.java  |  2 +-
 .../manager/helper/AttachmentHelper.java      |  2 +-
 .../signal/manager/helper/GroupHelper.java    |  2 +-
 .../signal/manager/helper/GroupV2Helper.java  |  2 +-
 .../signal/manager/helper/IdentityHelper.java |  2 +-
 .../helper/IncomingMessageHandler.java        |  2 +-
 .../signal/manager/helper/PinHelper.java      |  2 +-
 .../signal/manager/helper/PreKeyHelper.java   |  2 +-
 .../signal/manager/helper/ProfileHelper.java  |  2 +-
 .../signal/manager/helper/ReceiveHelper.java  |  4 +--
 .../manager/helper/RecipientHelper.java       |  2 +-
 .../signal/manager/helper/SendHelper.java     |  2 +-
 .../signal/manager/helper/StickerHelper.java  |  2 +-
 .../signal/manager/helper/StorageHelper.java  |  2 +-
 .../signal/manager/helper/SyncHelper.java     |  2 +-
 .../helper/UnidentifiedAccessHelper.java      |  4 +--
 .../manager/internal/LibSignalLogger.java     |  2 +-
 .../signal/manager/internal/ManagerImpl.java  |  2 +-
 .../internal/MultiAccountManagerImpl.java     |  2 +-
 .../internal/ProvisioningManagerImpl.java     |  2 +-
 .../internal/RegistrationManagerImpl.java     |  2 +-
 .../SignalWebSocketHealthMonitor.java         |  4 +--
 .../manager/jobs/RetrieveStickerPackJob.java  |  2 +-
 .../manager/storage/AccountDatabase.java      |  2 +-
 .../signal/manager/storage/SignalAccount.java |  2 +-
 .../storage/accounts/AccountsStore.java       |  2 +-
 .../manager/storage/groups/GroupStore.java    |  2 +-
 .../storage/groups/LegacyGroupStore.java      |  2 +-
 .../storage/identities/IdentityKeyStore.java  |  2 +-
 .../identities/LegacyIdentityKeyStore.java    |  2 +-
 .../storage/keyValue/KeyValueStore.java       |  2 +-
 .../storage/messageCache/CachedMessage.java   |  2 +-
 .../storage/messageCache/MessageCache.java    |  2 +-
 .../storage/prekeys/KyberPreKeyStore.java     |  2 +-
 .../storage/prekeys/LegacyPreKeyStore.java    |  2 +-
 .../prekeys/LegacySignedPreKeyStore.java      |  2 +-
 .../manager/storage/prekeys/PreKeyStore.java  |  2 +-
 .../storage/prekeys/SignedPreKeyStore.java    |  2 +-
 .../protocol/LegacyJsonIdentityKeyStore.java  |  2 +-
 .../recipients/LegacyRecipientStore2.java     |  2 +-
 .../recipients/MergeRecipientHelper.java      |  2 +-
 .../storage/recipients/RecipientStore.java    |  2 +-
 .../LegacySenderKeyRecordStore.java           |  4 +--
 .../LegacySenderKeySharedStore.java           |  2 +-
 .../senderKeys/SenderKeyRecordStore.java      |  4 +--
 .../senderKeys/SenderKeySharedStore.java      |  4 +--
 .../storage/sessions/LegacySessionStore.java  |  2 +-
 .../storage/sessions/SessionStore.java        |  2 +-
 .../storage/stickers/StickerStore.java        |  2 +-
 .../manager/util/MessageCacheUtils.java       |  4 +--
 .../manager/util/NumberVerificationUtils.java |  2 +-
 .../signal/manager/util/PaymentUtils.java     |  2 +-
 .../signal/manager/util/ProfileUtils.java     |  2 +-
 .../org/asamk/signal/manager/util/Utils.java  |  2 +-
 src/main/java/org/asamk/signal/App.java       |  2 +-
 .../java/org/asamk/signal/BaseConfig.java     | 10 +++----
 .../signal/commands/AddDeviceCommand.java     |  2 +-
 .../commands/AddStickerPackCommand.java       |  2 +-
 .../asamk/signal/commands/BlockCommand.java   |  2 +-
 .../asamk/signal/commands/DaemonCommand.java  |  2 +-
 .../signal/commands/FinishLinkCommand.java    |  2 +-
 .../signal/commands/GetUserStatusCommand.java |  2 +-
 .../commands/JsonRpcDispatcherCommand.java    |  2 +-
 .../asamk/signal/commands/LinkCommand.java    |  2 +-
 .../signal/commands/ListDevicesCommand.java   |  2 +-
 .../signal/commands/ListGroupsCommand.java    |  2 +-
 .../commands/ListIdentitiesCommand.java       |  2 +-
 .../signal/commands/QuitGroupCommand.java     |  2 +-
 .../asamk/signal/commands/ReceiveCommand.java |  2 +-
 .../asamk/signal/commands/SendCommand.java    |  2 +-
 .../signal/commands/StartLinkCommand.java     |  2 +-
 .../asamk/signal/commands/UnblockCommand.java |  2 +-
 .../signal/commands/UpdateGroupCommand.java   |  2 +-
 .../commands/UploadStickerPackCommand.java    |  2 +-
 .../asamk/signal/commands/VerifyCommand.java  |  2 +-
 .../signal/dbus/DbusSignalControlImpl.java    |  2 +-
 .../org/asamk/signal/dbus/DbusSignalImpl.java |  2 +-
 .../asamk/signal/http/HttpServerHandler.java  |  2 +-
 .../json/JsonReceiveMessageHandler.java       |  2 +-
 .../asamk/signal/jsonrpc/JsonRpcReader.java   |  2 +-
 .../jsonrpc/SignalJsonRpcCommandHandler.java  |  2 +-
 .../SignalJsonRpcDispatcherHandler.java       |  2 +-
 .../signal/output/PlainTextWriterImpl.java    |  2 +-
 src/main/java/org/asamk/signal/util/Hex.java  |  2 +-
 .../java/org/asamk/signal/util/IOUtils.java   |  2 +-
 src/main/java/org/asamk/signal/util/Util.java |  2 +-
 91 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
index 0c00b309..a5a23e56 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/GroupInviteLinkUrl.java
@@ -112,7 +112,7 @@ public final class GroupInviteLinkUrl {
         return password;
     }
 
-    public final static class InvalidGroupLinkException extends Exception {
+    public static final class InvalidGroupLinkException extends Exception {
 
         public InvalidGroupLinkException(String message) {
             super(message);
@@ -123,7 +123,7 @@ public final class GroupInviteLinkUrl {
         }
     }
 
-    public final static class UnknownGroupLinkVersionException extends Exception {
+    public static final class UnknownGroupLinkVersionException extends Exception {
 
         public UnknownGroupLinkVersionException(String message) {
             super(message);
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
index 7113b4b8..ea4e3f3e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackUrl.java
@@ -59,7 +59,7 @@ public record StickerPackUrl(StickerPackId packId, byte[] packKey) {
         }
     }
 
-    public final static class InvalidStickerPackLinkException extends Exception {
+    public static final class InvalidStickerPackLinkException extends Exception {
 
         public InvalidStickerPackLinkException(String message) {
             super(message);
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 2756f292..300371bd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -22,25 +22,25 @@ import okhttp3.Interceptor;
 
 class LiveConfig {
 
-    private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
+    private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
-    private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private final static String SVR2_MRENCLAVE = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";
+    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
+    private static final String SVR2_MRENCLAVE = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";
 
-    private final static String URL = "https://chat.signal.org";
-    private final static String CDN_URL = "https://cdn.signal.org";
-    private final static String CDN2_URL = "https://cdn2.signal.org";
-    private final static String STORAGE_URL = "https://storage.signal.org";
-    private final static String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
-    private final static String SIGNAL_SVR2_URL = "https://svr2.signal.org";
-    private final static TrustStore TRUST_STORE = new WhisperTrustStore();
+    private static final String URL = "https://chat.signal.org";
+    private static final String CDN_URL = "https://cdn.signal.org";
+    private static final String CDN2_URL = "https://cdn2.signal.org";
+    private static final String STORAGE_URL = "https://storage.signal.org";
+    private static final String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
+    private static final String SIGNAL_SVR2_URL = "https://svr2.signal.org";
+    private static final TrustStore TRUST_STORE = new WhisperTrustStore();
 
-    private final static Optional<Dns> dns = Optional.empty();
-    private final static Optional<SignalProxy> proxy = Optional.empty();
+    private static final Optional<Dns> dns = Optional.empty();
+    private static final Optional<SignalProxy> proxy = Optional.empty();
 
-    private final static byte[] zkGroupServerPublicParams = Base64.getDecoder()
+    private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
             .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P");
-    private final static byte[] genericServerPublicParams = Base64.getDecoder()
+    private static final byte[] genericServerPublicParams = Base64.getDecoder()
             .decode("AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN");
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 5cafbdc2..02e4f8b5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -11,19 +11,19 @@ import okhttp3.Interceptor;
 
 public class ServiceConfig {
 
-    public final static int PREKEY_MINIMUM_COUNT = 10;
-    public final static int PREKEY_BATCH_SIZE = 100;
-    public final static int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;
+    public static final int PREKEY_MINIMUM_COUNT = 10;
+    public static final int PREKEY_BATCH_SIZE = 100;
+    public static final int PREKEY_MAXIMUM_ID = Medium.MAX_VALUE;
     public static final long PREKEY_ARCHIVE_AGE = TimeUnit.DAYS.toMillis(30);
     public static final long PREKEY_STALE_AGE = TimeUnit.DAYS.toMillis(90);
     public static final long SIGNED_PREKEY_ROTATE_AGE = TimeUnit.DAYS.toMillis(2);
 
-    public final static int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
-    public final static long MAX_ENVELOPE_SIZE = 0;
-    public final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
-    public final static boolean AUTOMATIC_NETWORK_RETRY = true;
-    public final static int GROUP_MAX_SIZE = 1001;
-    public final static int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
+    public static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
+    public static final long MAX_ENVELOPE_SIZE = 0;
+    public static final long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
+    public static final boolean AUTOMATIC_NETWORK_RETRY = true;
+    public static final int GROUP_MAX_SIZE = 1001;
+    public static final int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var giftBadges = !isPrimaryDevice;
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index af196303..f90ae48b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -22,25 +22,25 @@ import okhttp3.Interceptor;
 
 class StagingConfig {
 
-    private final static byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
+    private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
-    private final static String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private final static String SVR2_MRENCLAVE = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";
+    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
+    private static final String SVR2_MRENCLAVE = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";
 
-    private final static String URL = "https://chat.staging.signal.org";
-    private final static String CDN_URL = "https://cdn-staging.signal.org";
-    private final static String CDN2_URL = "https://cdn2-staging.signal.org";
-    private final static String STORAGE_URL = "https://storage-staging.signal.org";
-    private final static String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
-    private final static String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
-    private final static TrustStore TRUST_STORE = new WhisperTrustStore();
+    private static final String URL = "https://chat.staging.signal.org";
+    private static final String CDN_URL = "https://cdn-staging.signal.org";
+    private static final String CDN2_URL = "https://cdn2-staging.signal.org";
+    private static final String STORAGE_URL = "https://storage-staging.signal.org";
+    private static final String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
+    private static final String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
+    private static final TrustStore TRUST_STORE = new WhisperTrustStore();
 
-    private final static Optional<Dns> dns = Optional.empty();
-    private final static Optional<SignalProxy> proxy = Optional.empty();
+    private static final Optional<Dns> dns = Optional.empty();
+    private static final Optional<SignalProxy> proxy = Optional.empty();
 
-    private final static byte[] zkGroupServerPublicParams = Base64.getDecoder()
+    private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
             .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj");
-    private final static byte[] genericServerPublicParams = Base64.getDecoder()
+    private static final byte[] genericServerPublicParams = Base64.getDecoder()
             .decode("AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N");
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 4e4eb165..d56b2379 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -54,7 +54,7 @@ import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
 public class AccountHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(AccountHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(AccountHelper.class);
 
     private final Context context;
     private final SignalAccount account;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 7c2d9089..75f0fd4a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 public class AttachmentHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(AttachmentHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(AttachmentHelper.class);
 
     private final SignalDependencies dependencies;
     private final AttachmentStore attachmentStore;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 532cd3e7..af666ab6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -62,7 +62,7 @@ import java.util.Set;
 
 public class GroupHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(GroupHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 96ecf2c0..83f49926 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -59,7 +59,7 @@ import okio.ByteString;
 
 class GroupV2Helper {
 
-    private final static Logger logger = LoggerFactory.getLogger(GroupV2Helper.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupV2Helper.class);
 
     private final SignalDependencies dependencies;
     private final Context context;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index 975d5179..cc71e15c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -19,7 +19,7 @@ import java.util.function.BiFunction;
 
 public class IdentityHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(IdentityHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(IdentityHelper.class);
 
     private final SignalAccount account;
     private final Context context;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 3f0abc48..66a13767 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -75,7 +75,7 @@ import java.util.stream.Collectors;
 
 public final class IncomingMessageHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(IncomingMessageHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(IncomingMessageHandler.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index de7e4daf..824b278b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 
 public class PinHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(PinHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(PinHelper.class);
 
     private final SecureValueRecoveryV2 secureValueRecoveryV2;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index c08da92c..5b1ae051 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -24,7 +24,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.SIGNED_PREKEY_ROTATE
 
 public class PreKeyHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(PreKeyHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(PreKeyHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 1631ad9d..d0f442ce 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -47,7 +47,7 @@ import io.reactivex.rxjava3.core.Single;
 
 public final class ProfileHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(ProfileHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProfileHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 0c003682..d48f125a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -31,8 +31,8 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ReceiveHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(ReceiveHelper.class);
-    private final static int MAX_BACKOFF_COUNTER = 9;
+    private static final Logger logger = LoggerFactory.getLogger(ReceiveHelper.class);
+    private static final int MAX_BACKOFF_COUNTER = 9;
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 086ac62c..2ab17768 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -29,7 +29,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.MAXIMUM_ONE_OFF_REQU
 
 public class RecipientHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(RecipientHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(RecipientHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 49758486..7a0841e7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -56,7 +56,7 @@ import okio.ByteString;
 
 public class SendHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(SendHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(SendHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
index daa5aeb6..4a0d25fe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
@@ -17,7 +17,7 @@ import java.util.HashSet;
 
 public class StickerHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(StickerHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(StickerHelper.class);
 
     private final Context context;
     private final SignalAccount account;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index e9a8d681..600bd832 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 
 public class StorageHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(StorageHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(StorageHelper.class);
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 1be5a268..049cbff0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -47,7 +47,7 @@ import java.util.stream.Stream;
 
 public class SyncHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(SyncHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(SyncHelper.class);
 
     private final Context context;
     private final SignalAccount account;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index bc02e319..7c73c80f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit;
 
 public class UnidentifiedAccessHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class);
-    private final static long CERTIFICATE_EXPIRATION_BUFFER = TimeUnit.DAYS.toMillis(1);
+    private static final Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class);
+    private static final long CERTIFICATE_EXPIRATION_BUFFER = TimeUnit.DAYS.toMillis(1);
     private static final byte[] UNRESTRICTED_KEY = new byte[16];
 
     private final SignalAccount account;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java b/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
index 66a480e9..541ad099 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/LibSignalLogger.java
@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory;
 
 public class LibSignalLogger implements SignalProtocolLogger {
 
-    private final static Logger logger = LoggerFactory.getLogger("LibSignal");
+    private static final Logger logger = LoggerFactory.getLogger("LibSignal");
 
     public static void initLogger() {
         SignalProtocolLoggerProvider.setProvider(new LibSignalLogger());
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index af001f40..af2c6558 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -126,7 +126,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable;
 
 public class ManagerImpl implements Manager {
 
-    private final static Logger logger = LoggerFactory.getLogger(ManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(ManagerImpl.class);
 
     private SignalAccount account;
     private final SignalDependencies dependencies;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
index 4dc1ede2..478e761b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/MultiAccountManagerImpl.java
@@ -22,7 +22,7 @@ import java.util.function.Consumer;
 
 public class MultiAccountManagerImpl implements MultiAccountManager {
 
-    private final static Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(MultiAccountManagerImpl.class);
 
     private final Set<Consumer<Manager>> onManagerAddedHandlers = new HashSet<>();
     private final Set<Consumer<Manager>> onManagerRemovedHandlers = new HashSet<>();
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 11a6a05e..2a7ef9e4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -49,7 +49,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
 
 public class ProvisioningManagerImpl implements ProvisioningManager {
 
-    private final static Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);
 
     private final PathConfig pathConfig;
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 30355297..13412d25 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -53,7 +53,7 @@ import java.util.function.Consumer;
 
 public class RegistrationManagerImpl implements RegistrationManager {
 
-    private final static Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
 
     private SignalAccount account;
     private final PathConfig pathConfig;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index 0986d62e..02bdd49e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -23,7 +23,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
  */
 final class SignalWebSocketHealthMonitor implements HealthMonitor {
 
-    private final static Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
 
     private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
     private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3;
@@ -157,7 +157,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
         }
     }
 
-    private final static class HttpErrorTracker {
+    private static final class HttpErrorTracker {
 
         private final long[] timestamps;
         private final long errorTimeRange;
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
index 9d90a546..585e3161 100644
--- a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
@@ -11,7 +11,7 @@ import java.io.IOException;
 
 public class RetrieveStickerPackJob implements Job {
 
-    private final static Logger logger = LoggerFactory.getLogger(RetrieveStickerPackJob.class);
+    private static final Logger logger = LoggerFactory.getLogger(RetrieveStickerPackJob.class);
 
     private final StickerPackId packId;
     private final byte[] packKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index e09cd4c2..94dff8fc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -31,7 +31,7 @@ import java.util.UUID;
 
 public class AccountDatabase extends Database {
 
-    private final static Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
+    private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
     private static final long DATABASE_VERSION = 18;
 
     private AccountDatabase(final HikariDataSource dataSource) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 077ff732..dee71275 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -109,7 +109,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
 
 public class SignalAccount implements Closeable {
 
-    private final static Logger logger = LoggerFactory.getLogger(SignalAccount.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalAccount.class);
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
     private static final int CURRENT_STORAGE_VERSION = 8;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
index 55c5adf0..02379941 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
@@ -33,7 +33,7 @@ public class AccountsStore {
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
     private static final int CURRENT_STORAGE_VERSION = 2;
-    private final static Logger logger = LoggerFactory.getLogger(AccountsStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(AccountsStore.class);
     private final ObjectMapper objectMapper = Utils.createStorageObjectMapper();
 
     private final File dataPath;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 71fa0f9d..a281622d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
 
 public class GroupStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(GroupStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(GroupStore.class);
     private static final String TABLE_GROUP_V2 = "group_v2";
     private static final String TABLE_GROUP_V1 = "group_v1";
     private static final String TABLE_GROUP_V1_MEMBER = "group_v1_member";
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index b53b14c0..a87759b3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 
 public class LegacyGroupStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacyGroupStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyGroupStore.class);
 
     public static void migrate(
             final Storage storage,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index 3195df17..bcb40669 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -23,7 +23,7 @@ import io.reactivex.rxjava3.subjects.PublishSubject;
 
 public class IdentityKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(IdentityKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(IdentityKeyStore.class);
     private static final String TABLE_IDENTITY = "identity";
     private final Database database;
     private final TrustNewIdentity trustNewIdentity;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
index 27cb6f84..a7f6a4aa 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
 
 public class LegacyIdentityKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacyIdentityKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyIdentityKeyStore.class);
     private static final ObjectMapper objectMapper = org.asamk.signal.manager.storage.Utils.createStorageObjectMapper();
 
     public static void migrate(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index 9b239b72..95980d4d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -14,7 +14,7 @@ import java.sql.Types;
 public class KeyValueStore {
 
     private static final String TABLE_KEY_VALUE = "key_value";
-    private final static Logger logger = LoggerFactory.getLogger(KeyValueStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(KeyValueStore.class);
 
     private final Database database;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
index e053b91f..4b2cea9b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/CachedMessage.java
@@ -11,7 +11,7 @@ import java.nio.file.Files;
 
 public final class CachedMessage {
 
-    private final static Logger logger = LoggerFactory.getLogger(CachedMessage.class);
+    private static final Logger logger = LoggerFactory.getLogger(CachedMessage.class);
 
     private final File file;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index 30452fbb..51882a44 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -17,7 +17,7 @@ import java.util.stream.Stream;
 
 public class MessageCache {
 
-    private final static Logger logger = LoggerFactory.getLogger(MessageCache.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageCache.class);
 
     private final File messageCachePath;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
index 4067e2fe..7b05dff9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/KyberPreKeyStore.java
@@ -20,7 +20,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_ARCHIVE_AGE;
 public class KyberPreKeyStore implements SignalServiceKyberPreKeyStore {
 
     private static final String TABLE_KYBER_PRE_KEY = "kyber_pre_key";
-    private final static Logger logger = LoggerFactory.getLogger(KyberPreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(KyberPreKeyStore.class);
 
     private final Database database;
     private final int accountIdType;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java
index f1151b23..c2c236df 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacyPreKeyStore.java
@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
 
 public class LegacyPreKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacyPreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyPreKeyStore.class);
     static final Pattern preKeyFileNamePattern = Pattern.compile("(\\d+)");
 
     public static void migrate(File preKeysPath, PreKeyStore preKeyStore) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java
index 8e34776c..a7133223 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/LegacySignedPreKeyStore.java
@@ -14,7 +14,7 @@ import java.util.regex.Pattern;
 
 public class LegacySignedPreKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacySignedPreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacySignedPreKeyStore.class);
     static final Pattern signedPreKeyFileNamePattern = Pattern.compile("(\\d+)");
 
     public static void migrate(File signedPreKeysPath, SignedPreKeyStore signedPreKeyStore) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
index c3ac9632..d2d55710 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
@@ -20,7 +20,7 @@ import java.util.Collection;
 public class PreKeyStore implements SignalServicePreKeyStore {
 
     private static final String TABLE_PRE_KEY = "pre_key";
-    private final static Logger logger = LoggerFactory.getLogger(PreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(PreKeyStore.class);
 
     private final Database database;
     private final int accountIdType;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
index 7c726f16..0de10b13 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
@@ -23,7 +23,7 @@ import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_ARCHIVE_AGE;
 public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.SignedPreKeyStore {
 
     private static final String TABLE_SIGNED_PRE_KEY = "signed_pre_key";
-    private final static Logger logger = LoggerFactory.getLogger(SignedPreKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignedPreKeyStore.class);
 
     private final Database database;
     private final int accountIdType;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
index 1e95eaff..0d12a303 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 public class LegacyJsonIdentityKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacyJsonIdentityKeyStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyJsonIdentityKeyStore.class);
 
     private final List<LegacyIdentityInfo> identities;
     private final IdentityKeyPair identityKeyPair;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index f1b77180..2f714c6f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 public class LegacyRecipientStore2 {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacyRecipientStore2.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacyRecipientStore2.class);
 
     public static void migrate(File file, RecipientStore recipientStore) {
         final var objectMapper = Utils.createStorageObjectMapper();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index 0afde555..5cf3c675 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 
 public class MergeRecipientHelper {
 
-    private final static Logger logger = LoggerFactory.getLogger(MergeRecipientHelper.class);
+    private static final Logger logger = LoggerFactory.getLogger(MergeRecipientHelper.class);
 
     static Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
             Store store, RecipientAddress address
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index e87dd6bb..551b5c91 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 
 public class RecipientStore implements RecipientIdCreator, RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(RecipientStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(RecipientStore.class);
     private static final String TABLE_RECIPIENT = "recipient";
     private static final String SQL_IS_CONTACT = "r.given_name IS NOT NULL OR r.family_name IS NOT NULL OR r.expiration_time > 0 OR r.profile_sharing = TRUE OR r.color IS NOT NULL OR r.blocked = TRUE OR r.archived = TRUE";
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
index 64928624..2a96043d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeyRecordStore.java
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 
 public class LegacySenderKeyRecordStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacySenderKeyRecordStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacySenderKeyRecordStore.class);
 
     public static void migrate(
             final File senderKeysPath,
@@ -70,7 +70,7 @@ public class LegacySenderKeyRecordStore {
         }
     }
 
-    final static Pattern senderKeyFileNamePattern = Pattern.compile("(\\d+)_(\\d+)_([\\da-z\\-]+)");
+    static final Pattern senderKeyFileNamePattern = Pattern.compile("(\\d+)_(\\d+)_([\\da-z\\-]+)");
 
     private static List<Key> parseFileNames(final File[] files, final RecipientResolver resolver) {
         return Arrays.stream(files)
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
index bbd05dea..cda652b2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/LegacySenderKeySharedStore.java
@@ -19,7 +19,7 @@ import java.util.Set;
 
 public class LegacySenderKeySharedStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacySenderKeySharedStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacySenderKeySharedStore.class);
 
     public static void migrate(
             final File file,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
index e321e9ea..39e1df97 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
@@ -20,8 +20,8 @@ import java.util.UUID;
 
 public class SenderKeyRecordStore implements SenderKeyStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(SenderKeyRecordStore.class);
-    private final static String TABLE_SENDER_KEY = "sender_key";
+    private static final Logger logger = LoggerFactory.getLogger(SenderKeyRecordStore.class);
+    private static final String TABLE_SENDER_KEY = "sender_key";
 
     private final Database database;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
index 0b17d479..284ba08f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
@@ -19,8 +19,8 @@ import java.util.stream.Collectors;
 
 public class SenderKeySharedStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(SenderKeySharedStore.class);
-    private final static String TABLE_SENDER_KEY_SHARED = "sender_key_shared";
+    private static final Logger logger = LoggerFactory.getLogger(SenderKeySharedStore.class);
+    private static final String TABLE_SENDER_KEY_SHARED = "sender_key_shared";
 
     private final Database database;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
index 517271da..98491514 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/LegacySessionStore.java
@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 
 public class LegacySessionStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(LegacySessionStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(LegacySessionStore.class);
 
     public static void migrate(
             final File sessionsPath,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index b8c0a322..97f428ba 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
 public class SessionStore implements SignalServiceSessionStore {
 
     private static final String TABLE_SESSION = "session";
-    private final static Logger logger = LoggerFactory.getLogger(SessionStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(SessionStore.class);
 
     private final Map<Key, SessionRecord> cachedSessions = new HashMap<>();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
index aacd18bd..32223424 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java
@@ -14,7 +14,7 @@ import java.util.List;
 
 public class StickerStore {
 
-    private final static Logger logger = LoggerFactory.getLogger(StickerStore.class);
+    private static final Logger logger = LoggerFactory.getLogger(StickerStore.class);
     private static final String TABLE_STICKER = "sticker";
 
     private final Database database;
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
index b3c9457b..316c349e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/MessageCacheUtils.java
@@ -18,9 +18,9 @@ import java.util.Optional;
 
 public class MessageCacheUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(MessageCacheUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(MessageCacheUtils.class);
 
-    final static int CURRENT_VERSION = 9;
+    static final int CURRENT_VERSION = 9;
 
     public static SignalServiceEnvelope loadEnvelope(File file) throws IOException {
         try (var f = new FileInputStream(file)) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 62474e66..a5c91f5b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -26,7 +26,7 @@ import java.util.function.Consumer;
 
 public class NumberVerificationUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(NumberVerificationUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(NumberVerificationUtils.class);
 
     public static String handleVerificationSession(
             SignalServiceAccountManager accountManager,
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
index ca55008c..fe338e73 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
@@ -12,7 +12,7 @@ import okio.ByteString;
 
 public class PaymentUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(PaymentUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(PaymentUtils.class);
 
     private PaymentUtils() {
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 40fc8f7b..85c9fdd6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -19,7 +19,7 @@ import java.util.HashSet;
 
 public class ProfileUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(ProfileUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(ProfileUtils.class);
 
     public static Profile decryptProfile(
             final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 6e9c701e..e6d8e4d3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -32,7 +32,7 @@ import java.util.stream.StreamSupport;
 
 public class Utils {
 
-    private final static Logger logger = LoggerFactory.getLogger(Utils.class);
+    private static final Logger logger = LoggerFactory.getLogger(Utils.class);
 
     public static Pair<StreamDetails, Optional<String>> createStreamDetailsFromDataURI(final String dataURI) {
         final DataURI uri = DataURI.of(dataURI);
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index f0ebbfae..83c0ef56 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -47,7 +47,7 @@ import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_S
 
 public class App {
 
-    private final static Logger logger = LoggerFactory.getLogger(App.class);
+    private static final Logger logger = LoggerFactory.getLogger(App.class);
 
     private final Namespace ns;
 
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index af3ce1ad..648f19d0 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -2,14 +2,14 @@ package org.asamk.signal;
 
 public class BaseConfig {
 
-    public final static String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
-    public final static String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
+    public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
+    public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    final static String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.39.1";
-    final static String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
+    static final String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.39.1";
+    static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;
-    final static String USER_AGENT = USER_AGENT_SIGNAL_ANDROID + " " + USER_AGENT_SIGNAL_CLI;
+    static final String USER_AGENT = USER_AGENT_SIGNAL_ANDROID + " " + USER_AGENT_SIGNAL_CLI;
 
     private BaseConfig() {
     }
diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index 47cf8748..2813f4af 100644
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -20,7 +20,7 @@ import java.net.URISyntaxException;
 
 public class AddDeviceCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
index a5af48d8..89c82200 100644
--- a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
@@ -18,7 +18,7 @@ import java.net.URISyntaxException;
 
 public class AddStickerPackCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(AddStickerPackCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(AddStickerPackCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 2a8c4f50..1518c53a 100644
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -19,7 +19,7 @@ import java.io.IOException;
 
 public class BlockCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(BlockCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(BlockCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 209b071c..a0683c34 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -50,7 +50,7 @@ import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
 
 public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(DaemonCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
index 2d1422aa..a0fa0ab7 100644
--- a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeoutException;
 
 public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.FinishLinkParams> {
 
-    private final static Logger logger = LoggerFactory.getLogger(FinishLinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(FinishLinkCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 70a55393..7cf78ec8 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -22,7 +22,7 @@ import java.util.Map;
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(GetUserStatusCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 89457bad..0eb99351 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -27,7 +27,7 @@ import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
 
 public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonRpcDispatcherCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index f49e0c24..ed0cc0ed 100644
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -18,7 +18,7 @@ import java.util.concurrent.TimeoutException;
 
 public class LinkCommand implements ProvisioningCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(LinkCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
index 7adc8611..c4ae6e72 100644
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -19,7 +19,7 @@ import java.util.List;
 
 public class ListDevicesCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListDevicesCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index eb53516f..debe4ad0 100644
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 
 public class ListGroupsCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListGroupsCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListGroupsCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 53d508d8..3c4e7a19 100644
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -22,7 +22,7 @@ import java.util.UUID;
 
 public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ListIdentitiesCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index ca745b32..f1b8ef5b 100644
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -23,7 +23,7 @@ import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class QuitGroupCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 4a6f746a..ba126f7e 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -30,7 +30,7 @@ import java.util.Optional;
 
 public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<ReceiveCommand.ReceiveParams> {
 
-    private final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 51f1fa1e..7d9fe788 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -35,7 +35,7 @@ import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
 
 public class SendCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(SendCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
index 70e36f40..ac269e95 100644
--- a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
@@ -14,7 +14,7 @@ import java.util.concurrent.TimeoutException;
 
 public class StartLinkCommand implements JsonRpcMultiCommand<Void> {
 
-    private final static Logger logger = LoggerFactory.getLogger(StartLinkCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(StartLinkCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index a7a8b6d7..1299d0db 100644
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -19,7 +19,7 @@ import java.io.IOException;
 
 public class UnblockCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(UnblockCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UnblockCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 5fe47417..f29f0732 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
 
 public class UpdateGroupCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index 89f74129..b4c09b41 100644
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -20,7 +20,7 @@ import java.util.Map;
 
 public class UploadStickerPackCommand implements JsonRpcLocalCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
index 4ac26955..54d05a4d 100644
--- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
@@ -21,7 +21,7 @@ import java.util.List;
 
 public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCommand<VerifyCommand.VerifyParams> {
 
-    private final static Logger logger = LoggerFactory.getLogger(VerifyCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(VerifyCommand.class);
 
     @Override
     public String getName() {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index 86ad6c1e..f21dd40d 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException;
 
 public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
-    private final static Logger logger = LoggerFactory.getLogger(DbusSignalControlImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalControlImpl.class);
     private final MultiAccountManager c;
 
     private final String objectPath;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index e6ec70d9..2921533e 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -76,7 +76,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     private DbusReceiveMessageHandler dbusMessageHandler;
     private int subscriberCount;
 
-    private final static Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
 
     public DbusSignalImpl(
             final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 6cd3b0ef..6f8b1826 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public class HttpServerHandler implements AutoCloseable {
 
-    private final static Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(HttpServerHandler.class);
 
     private final ObjectMapper objectMapper = Util.createJsonObjectMapper();
 
diff --git a/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java b/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
index da29ed6c..ca0dba2b 100644
--- a/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiveMessageHandler.java
@@ -10,7 +10,7 @@ import java.util.HashMap;
 
 public class JsonReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(JsonReceiveMessageHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonReceiveMessageHandler.class);
 
     private final Manager m;
     private final JsonWriter jsonWriter;
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index d1503d01..84805e10 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -23,7 +23,7 @@ import java.util.stream.StreamSupport;
 
 public class JsonRpcReader {
 
-    private final static Logger logger = LoggerFactory.getLogger(JsonRpcReader.class);
+    private static final Logger logger = LoggerFactory.getLogger(JsonRpcReader.class);
 
     private final JsonRpcSender jsonRpcSender;
     private final ObjectMapper objectMapper;
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 62556725..3d470820 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -32,7 +32,7 @@ import java.util.function.Function;
 
 public class SignalJsonRpcCommandHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
 
     private static final int USER_ERROR = -1;
     private static final int IO_ERROR = -3;
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 85ed76e6..00abb635 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -32,7 +32,7 @@ import java.util.function.Supplier;
 
 public class SignalJsonRpcDispatcherHandler {
 
-    private final static Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
+    private static final Logger logger = LoggerFactory.getLogger(SignalJsonRpcDispatcherHandler.class);
 
     private final ObjectMapper objectMapper;
     private final JsonRpcSender jsonRpcSender;
diff --git a/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java b/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
index abf850a9..bfbb3f21 100644
--- a/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
+++ b/src/main/java/org/asamk/signal/output/PlainTextWriterImpl.java
@@ -38,7 +38,7 @@ public final class PlainTextWriterImpl implements PlainTextWriter {
 
     private static final class IndentedPlainTextWriter implements PlainTextWriter {
 
-        private final static int INDENTATION = 2;
+        private static final int INDENTATION = 2;
 
         private final String spaces = " ".repeat(INDENTATION);
         private final PlainTextWriter plainTextWriter;
diff --git a/src/main/java/org/asamk/signal/util/Hex.java b/src/main/java/org/asamk/signal/util/Hex.java
index f7a870ca..d87f8ec9 100644
--- a/src/main/java/org/asamk/signal/util/Hex.java
+++ b/src/main/java/org/asamk/signal/util/Hex.java
@@ -2,7 +2,7 @@ package org.asamk.signal.util;
 
 public class Hex {
 
-    private final static char[] HEX_DIGITS = {
+    private static final char[] HEX_DIGITS = {
             '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
     };
 
diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java
index d40b4a6c..aea49e09 100644
--- a/src/main/java/org/asamk/signal/util/IOUtils.java
+++ b/src/main/java/org/asamk/signal/util/IOUtils.java
@@ -35,7 +35,7 @@ import static java.nio.file.attribute.PosixFilePermission.OWNER_WRITE;
 
 public class IOUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(IOUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(IOUtils.class);
 
     private IOUtils() {
     }
diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 63717ec0..4685249c 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
 
 public class Util {
 
-    private final static Logger logger = LoggerFactory.getLogger(Util.class);
+    private static final Logger logger = LoggerFactory.getLogger(Util.class);
 
     private Util() {
     }

From 7e9940be4ac1d3b7e19bcbd1e92b8db436415195 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 10 Nov 2023 15:18:06 +0100
Subject: [PATCH 298/672] Refactor DaemonCommand

---
 .../asamk/signal/commands/DaemonCommand.java  | 216 +++---------------
 .../org/asamk/signal/dbus/DbusHandler.java    | 131 +++++++++++
 .../asamk/signal/http/HttpServerHandler.java  |  33 +--
 .../asamk/signal/jsonrpc/SocketHandler.java   | 118 ++++++++++
 .../java/org/asamk/signal/util/IOUtils.java   |   2 +-
 5 files changed, 301 insertions(+), 199 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/dbus/DbusHandler.java
 create mode 100644 src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index a0683c34..561ee8c3 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -4,29 +4,21 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.DbusConfig;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.Shutdown;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
-import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
-import org.asamk.signal.commands.exceptions.UserErrorException;
-import org.asamk.signal.dbus.DbusSignalControlImpl;
-import org.asamk.signal.dbus.DbusSignalImpl;
+import org.asamk.signal.dbus.DbusHandler;
 import org.asamk.signal.http.HttpServerHandler;
 import org.asamk.signal.json.JsonReceiveMessageHandler;
-import org.asamk.signal.jsonrpc.SignalJsonRpcDispatcherHandler;
+import org.asamk.signal.jsonrpc.SocketHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.output.JsonWriter;
-import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.IOUtils;
-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
-import org.freedesktop.dbus.exceptions.DBusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,16 +27,9 @@ import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.UnixDomainSocketAddress;
 import java.nio.channels.Channel;
-import java.nio.channels.Channels;
-import java.nio.channels.ClosedChannelException;
 import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
 
 import static org.asamk.signal.util.CommandUtil.getReceiveConfig;
 
@@ -60,7 +45,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         final var defaultSocketPath = new File(new File(IOUtils.getRuntimeDir(), "signal-cli"), "socket");
-        subparser.help("Run in daemon mode and provide an experimental dbus or JSON-RPC interface.");
+        subparser.help("Run in daemon mode and provide a JSON-RPC or an experimental dbus interface.");
         subparser.addArgument("--dbus")
                 .action(Arguments.storeTrue())
                 .help("Expose a DBus interface on the user bus (the default, if no other options are given).");
@@ -161,10 +146,12 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     private static void setup(final Namespace ns, final DaemonHandler daemonHandler) throws CommandException {
         final Channel inheritedChannel;
         try {
-            inheritedChannel = System.inheritedChannel();
-            if (inheritedChannel instanceof ServerSocketChannel serverChannel) {
+            if (System.inheritedChannel() instanceof ServerSocketChannel serverChannel) {
+                inheritedChannel = serverChannel;
                 logger.info("Using inherited socket: " + serverChannel.getLocalAddress());
                 daemonHandler.runSocket(serverChannel);
+            } else {
+                inheritedChannel = null;
             }
         } catch (IOException e) {
             throw new IOErrorException("Failed to use inherited socket", e);
@@ -201,7 +188,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                         && socketFile == null
                         && tcpAddress == null
                         && httpAddress == null
-                        && !(inheritedChannel instanceof ServerSocketChannel)
+                        && inheritedChannel == null
         )) {
             daemonHandler.runDbus(false);
         }
@@ -221,9 +208,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         protected final ReceiveMode receiveMode;
         protected final List<AutoCloseable> closeables = new ArrayList<>();
 
-        private static final AtomicInteger threadNumber = new AtomicInteger(0);
-
-        public DaemonHandler(final ReceiveMode receiveMode) {
+        protected DaemonHandler(final ReceiveMode receiveMode) {
             this.receiveMode = receiveMode;
         }
 
@@ -233,106 +218,37 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
         public abstract void runHttp(InetSocketAddress address) throws CommandException;
 
-        protected void runSocket(final ServerSocketChannel serverChannel, Consumer<SocketChannel> socketHandler) {
-            final List<AutoCloseable> channels = new ArrayList<>();
-            final var thread = Thread.ofPlatform().name("daemon-listener").start(() -> {
-                try (final var executor = Executors.newCachedThreadPool()) {
-                    while (true) {
-                        final var connectionId = threadNumber.getAndIncrement();
-                        final SocketChannel channel;
-                        final String clientString;
-                        try {
-                            channel = serverChannel.accept();
-                            clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
-                            logger.info("Accepted new client connection {}: {}", connectionId, clientString);
-                        } catch (ClosedChannelException ignored) {
-                            logger.trace("Listening socket has been closed");
-                            break;
-                        } catch (IOException e) {
-                            logger.error("Failed to accept new socket connection", e);
-                            break;
-                        }
-                        channels.add(channel);
-                        executor.submit(() -> {
-                            try (final var c = channel) {
-                                socketHandler.accept(c);
-                            } catch (IOException e) {
-                                logger.warn("Failed to close channel", e);
-                            } catch (Throwable e) {
-                                logger.warn("Connection handler failed, closing connection", e);
-                            }
-                            logger.info("Connection {} closed: {}", connectionId, clientString);
-                            channels.remove(channel);
-                        });
-                    }
-                }
-            });
-            closeables.add(() -> {
-                serverChannel.close();
-                for (final var c : new ArrayList<>(channels)) {
-                    c.close();
-                }
-                thread.join();
-            });
+        protected final void runSocket(final SocketHandler socketHandler) {
+            socketHandler.init();
+            this.closeables.add(socketHandler);
         }
 
-        protected SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(final SocketChannel c) {
-            final var lineSupplier = IOUtils.getLineSupplier(Channels.newReader(c, StandardCharsets.UTF_8));
-            final var jsonOutputWriter = new JsonWriterImpl(Channels.newWriter(c, StandardCharsets.UTF_8));
-
-            return new SignalJsonRpcDispatcherHandler(jsonOutputWriter,
-                    lineSupplier,
-                    receiveMode == ReceiveMode.MANUAL);
-        }
-
-        protected Thread exportDbusObject(final DBusConnection conn, final String objectPath, final Manager m) {
-            final var signal = new DbusSignalImpl(m, conn, objectPath, receiveMode != ReceiveMode.ON_START);
-            closeables.add(signal);
-
-            return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
-        }
-
-        protected void runDbus(
-                final boolean isDbusSystem, MultiAccountDaemonHandler.DbusRunner dbusRunner
+        protected final void runDbus(
+                DbusHandler dbusHandler
         ) throws CommandException {
-            DBusConnection.DBusBusType busType;
-            if (isDbusSystem) {
-                busType = DBusConnection.DBusBusType.SYSTEM;
-            } else {
-                busType = DBusConnection.DBusBusType.SESSION;
-            }
-            DBusConnection conn;
-            try {
-                conn = DBusConnectionBuilder.forType(busType).build();
-                dbusRunner.run(conn, DbusConfig.getObjectPath());
-            } catch (DBusException e) {
-                throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
-            } catch (UnsupportedOperationException e) {
-                throw new UserErrorException("Failed to connect to Dbus: " + e.getMessage(), e);
-            }
+            dbusHandler.init();
+            this.closeables.add(dbusHandler);
+        }
 
+        protected final void runHttp(final HttpServerHandler handler) throws CommandException {
             try {
-                conn.requestBusName(DbusConfig.getBusname());
-            } catch (DBusException e) {
-                throw new UnexpectedErrorException(
-                        "Dbus command failed, maybe signal-cli dbus daemon is already running: " + e.getMessage(),
-                        e);
+                handler.init();
+            } catch (IOException ex) {
+                throw new IOErrorException("Failed to initialize HTTP Server", ex);
             }
-            closeables.add(conn);
-
-            logger.info("DBus daemon running on {} bus: {}", busType, DbusConfig.getBusname());
+            this.closeables.add(handler);
         }
 
         @Override
         public void close() {
-            for (final var closeable : new ArrayList<>(closeables)) {
+            for (final var closeable : new ArrayList<>(this.closeables)) {
                 try {
                     closeable.close();
                 } catch (Exception e) {
                     logger.warn("Failed to close daemon handler", e);
                 }
             }
-            closeables.clear();
+            this.closeables.clear();
         }
     }
 
@@ -340,38 +256,24 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
         private final Manager m;
 
-        private SingleAccountDaemonHandler(final Manager m, final ReceiveMode receiveMode) {
+        public SingleAccountDaemonHandler(final Manager m, final ReceiveMode receiveMode) {
             super(receiveMode);
             this.m = m;
         }
 
         @Override
         public void runSocket(final ServerSocketChannel serverChannel) {
-            runSocket(serverChannel, channel -> {
-                final var handler = getSignalJsonRpcDispatcherHandler(channel);
-                handler.handleConnection(m);
-            });
+            runSocket(new SocketHandler(serverChannel, m, receiveMode == ReceiveMode.MANUAL));
         }
 
         @Override
         public void runDbus(final boolean isDbusSystem) throws CommandException {
-            runDbus(isDbusSystem, (conn, objectPath) -> {
-                try {
-                    exportDbusObject(conn, objectPath, m).join();
-                } catch (InterruptedException ignored) {
-                }
-            });
+            runDbus(new DbusHandler(isDbusSystem, m, receiveMode != ReceiveMode.ON_START));
         }
 
         @Override
         public void runHttp(InetSocketAddress address) throws CommandException {
-            final var handler = new HttpServerHandler(address, m);
-            try {
-                handler.init();
-            } catch (IOException ex) {
-                throw new IOErrorException("Failed to initialize HTTP Server", ex);
-            }
-            this.closeables.add(handler);
+            runHttp(new HttpServerHandler(address, m));
         }
     }
 
@@ -379,74 +281,24 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
         private final MultiAccountManager c;
 
-        private MultiAccountDaemonHandler(final MultiAccountManager c, final ReceiveMode receiveMode) {
+        public MultiAccountDaemonHandler(final MultiAccountManager c, final ReceiveMode receiveMode) {
             super(receiveMode);
             this.c = c;
         }
 
+        @Override
         public void runSocket(final ServerSocketChannel serverChannel) {
-            runSocket(serverChannel, channel -> {
-                final var handler = getSignalJsonRpcDispatcherHandler(channel);
-                handler.handleConnection(c);
-            });
+            runSocket(new SocketHandler(serverChannel, c, receiveMode == ReceiveMode.MANUAL));
         }
 
+        @Override
         public void runDbus(final boolean isDbusSystem) throws CommandException {
-            runDbus(isDbusSystem, (connection, objectPath) -> {
-                final var signalControl = new DbusSignalControlImpl(c, objectPath);
-                connection.exportObject(signalControl);
-
-                c.addOnManagerAddedHandler(m -> {
-                    final var thread = exportManager(connection, m);
-                    try {
-                        thread.join();
-                    } catch (InterruptedException ignored) {
-                    }
-                });
-                c.addOnManagerRemovedHandler(m -> {
-                    final var path = DbusConfig.getObjectPath(m.getSelfNumber());
-                    try {
-                        final var object = connection.getExportedObject(null, path);
-                        if (object instanceof DbusSignalImpl dbusSignal) {
-                            dbusSignal.close();
-                            closeables.remove(dbusSignal);
-                        }
-                    } catch (DBusException ignored) {
-                    }
-                });
-
-                final var initThreads = c.getManagers().stream().map(m -> exportManager(connection, m)).toList();
-
-                for (var t : initThreads) {
-                    try {
-                        t.join();
-                    } catch (InterruptedException ignored) {
-                    }
-                }
-            });
+            runDbus(new DbusHandler(isDbusSystem, c, receiveMode != ReceiveMode.ON_START));
         }
 
         @Override
         public void runHttp(final InetSocketAddress address) throws CommandException {
-            final var handler = new HttpServerHandler(address, c);
-            try {
-                handler.init();
-            } catch (IOException ex) {
-                throw new IOErrorException("Failed to initialize HTTP Server", ex);
-            }
-            this.closeables.add(handler);
-        }
-
-        private Thread exportManager(
-                final DBusConnection conn, final Manager m
-        ) {
-            final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
-            return exportDbusObject(conn, objectPath, m);
-        }
-
-        interface DbusRunner {
-
-            void run(DBusConnection connection, String objectPath) throws DBusException;
+            runHttp(new HttpServerHandler(address, c));
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusHandler.java b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
new file mode 100644
index 00000000..8b1dd61e
--- /dev/null
+++ b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
@@ -0,0 +1,131 @@
+package org.asamk.signal.dbus;
+
+import org.asamk.signal.DbusConfig;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DbusHandler implements AutoCloseable {
+
+    private static final Logger logger = LoggerFactory.getLogger(DbusHandler.class);
+
+    private final boolean isDbusSystem;
+    private DBusConnection dBusConnection;
+
+    private final List<AutoCloseable> closeables = new ArrayList<>();
+    private final DbusRunner dbusRunner;
+    private final boolean noReceiveOnStart;
+
+    public DbusHandler(final boolean isDbusSystem, final Manager m, final boolean noReceiveOnStart) {
+        this.isDbusSystem = isDbusSystem;
+        this.dbusRunner = (connection) -> {
+            try {
+                exportDbusObject(connection, DbusConfig.getObjectPath(), m).join();
+            } catch (InterruptedException ignored) {
+            }
+        };
+        this.noReceiveOnStart = noReceiveOnStart;
+    }
+
+    public DbusHandler(final boolean isDbusSystem, final MultiAccountManager c, final boolean noReceiveOnStart) {
+        this.isDbusSystem = isDbusSystem;
+        this.dbusRunner = (connection) -> {
+            final var signalControl = new DbusSignalControlImpl(c, DbusConfig.getObjectPath());
+            connection.exportObject(signalControl);
+
+            c.addOnManagerAddedHandler(m -> {
+                final var thread = exportManager(connection, m);
+                try {
+                    thread.join();
+                } catch (InterruptedException ignored) {
+                }
+            });
+            c.addOnManagerRemovedHandler(m -> {
+                final var path = DbusConfig.getObjectPath(m.getSelfNumber());
+                try {
+                    final var object = connection.getExportedObject(null, path);
+                    if (object instanceof DbusSignalImpl dbusSignal) {
+                        dbusSignal.close();
+                        closeables.remove(dbusSignal);
+                    }
+                } catch (DBusException ignored) {
+                }
+            });
+
+            final var initThreads = c.getManagers().stream().map(m -> exportManager(connection, m)).toList();
+
+            for (var t : initThreads) {
+                try {
+                    t.join();
+                } catch (InterruptedException ignored) {
+                }
+            }
+        };
+        this.noReceiveOnStart = noReceiveOnStart;
+    }
+
+    public void init() throws CommandException {
+        if (dBusConnection != null) {
+            throw new AssertionError("DbusHandler already initialized");
+        }
+        final var busType = isDbusSystem ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
+        logger.debug("Starting DBus server on {} bus: {}", busType, DbusConfig.getBusname());
+        try {
+            dBusConnection = DBusConnectionBuilder.forType(busType).build();
+            dbusRunner.run(dBusConnection);
+        } catch (DBusException e) {
+            throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
+        } catch (UnsupportedOperationException e) {
+            throw new UserErrorException("Failed to connect to Dbus: " + e.getMessage(), e);
+        }
+
+        try {
+            dBusConnection.requestBusName(DbusConfig.getBusname());
+        } catch (DBusException e) {
+            throw new UnexpectedErrorException("Dbus command failed, maybe signal-cli dbus daemon is already running: "
+                    + e.getMessage(), e);
+        }
+
+        logger.info("Started DBus server on {} bus: {}", busType, DbusConfig.getBusname());
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (dBusConnection == null) {
+            return;
+        }
+        dBusConnection.close();
+        for (final var c : new ArrayList<>(closeables)) {
+            c.close();
+        }
+        closeables.clear();
+        dBusConnection = null;
+    }
+
+    private Thread exportDbusObject(final DBusConnection conn, final String objectPath, final Manager m) {
+        final var signal = new DbusSignalImpl(m, conn, objectPath, noReceiveOnStart);
+        closeables.add(signal);
+
+        return Thread.ofPlatform().name("dbus-init-" + m.getSelfNumber()).start(signal::initObjects);
+    }
+
+    private Thread exportManager(final DBusConnection conn, final Manager m) {
+        final var objectPath = DbusConfig.getObjectPath(m.getSelfNumber());
+        return exportDbusObject(conn, objectPath, m);
+    }
+
+    private interface DbusRunner {
+
+        void run(DBusConnection connection) throws DBusException;
+    }
+}
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index 6f8b1826..c9c8fa16 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -56,7 +56,7 @@ public class HttpServerHandler implements AutoCloseable {
         if (server != null) {
             throw new AssertionError("HttpServerHandler already initialized");
         }
-        logger.info("Starting server on " + address.toString());
+        logger.debug("Starting HTTP server on {}", address);
 
         server = HttpServer.create(address, 0);
         server.setExecutor(Executors.newCachedThreadPool());
@@ -66,6 +66,21 @@ public class HttpServerHandler implements AutoCloseable {
         server.createContext("/api/v1/check", this::handleCheckEndpoint);
 
         server.start();
+        logger.info("Started HTTP server on {}", address);
+    }
+
+    @Override
+    public void close() {
+        if (server != null) {
+            shutdown.set(true);
+            synchronized (this) {
+                this.notifyAll();
+            }
+            // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed
+            server.stop(2);
+            server = null;
+            shutdown.set(false);
+        }
     }
 
     private void sendResponse(int status, Object response, HttpExchange httpExchange) throws IOException {
@@ -221,7 +236,7 @@ public class HttpServerHandler implements AutoCloseable {
                 return List.of(manager);
             }
         }
-        return List.of();
+        throw new AssertionError("Unreachable state");
     }
 
     private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(
@@ -246,20 +261,6 @@ public class HttpServerHandler implements AutoCloseable {
         m.removeReceiveHandler(handler);
     }
 
-    @Override
-    public void close() {
-        if (server != null) {
-            shutdown.set(true);
-            synchronized (this) {
-                this.notifyAll();
-            }
-            // Increase this delay when https://bugs.openjdk.org/browse/JDK-8304065 is fixed
-            server.stop(2);
-            server = null;
-            shutdown.set(false);
-        }
-    }
-
     private interface Callable {
 
         void call();
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java
new file mode 100644
index 00000000..dc620bc8
--- /dev/null
+++ b/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java
@@ -0,0 +1,118 @@
+package org.asamk.signal.jsonrpc;
+
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.MultiAccountManager;
+import org.asamk.signal.output.JsonWriterImpl;
+import org.asamk.signal.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.nio.channels.Channels;
+import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+public class SocketHandler implements AutoCloseable {
+
+    private static final Logger logger = LoggerFactory.getLogger(SocketHandler.class);
+    private static final AtomicInteger threadNumber = new AtomicInteger(0);
+
+    private final ServerSocketChannel serverChannel;
+
+    private Thread listenerThread;
+    private final List<AutoCloseable> channels = new ArrayList<>();
+    private final Consumer<SocketChannel> socketHandler;
+    private final boolean noReceiveOnStart;
+
+    public SocketHandler(final ServerSocketChannel serverChannel, final Manager m, final boolean noReceiveOnStart) {
+        this.serverChannel = serverChannel;
+        this.socketHandler = channel -> getSignalJsonRpcDispatcherHandler(channel).handleConnection(m);
+        this.noReceiveOnStart = noReceiveOnStart;
+    }
+
+    public SocketHandler(
+            final ServerSocketChannel serverChannel, final MultiAccountManager c, final boolean noReceiveOnStart
+    ) {
+        this.serverChannel = serverChannel;
+        this.socketHandler = channel -> getSignalJsonRpcDispatcherHandler(channel).handleConnection(c);
+        this.noReceiveOnStart = noReceiveOnStart;
+    }
+
+    public void init() {
+        if (listenerThread != null) {
+            throw new AssertionError("SocketHandler already initialized");
+        }
+        SocketAddress socketAddress;
+        try {
+            socketAddress = serverChannel.getLocalAddress();
+        } catch (IOException e) {
+            logger.debug("Failed to get socket address: {}", e.getMessage());
+            socketAddress = null;
+        }
+        final var address = socketAddress == null ? "<Unknown socket address>" : socketAddress;
+        logger.debug("Starting JSON-RPC server on {}", address);
+
+        listenerThread = Thread.ofPlatform().name("daemon-listener").start(() -> {
+            try (final var executor = Executors.newCachedThreadPool()) {
+                logger.info("Started JSON-RPC server on {}", address);
+                while (true) {
+                    final var connectionId = threadNumber.getAndIncrement();
+                    final SocketChannel channel;
+                    final String clientString;
+                    try {
+                        channel = serverChannel.accept();
+                        clientString = channel.getRemoteAddress() + " " + IOUtils.getUnixDomainPrincipal(channel);
+                        logger.info("Accepted new client connection {}: {}", connectionId, clientString);
+                    } catch (ClosedChannelException ignored) {
+                        logger.trace("Listening socket has been closed");
+                        break;
+                    } catch (IOException e) {
+                        logger.error("Failed to accept new socket connection", e);
+                        break;
+                    }
+                    channels.add(channel);
+                    executor.submit(() -> {
+                        try (final var c = channel) {
+                            socketHandler.accept(c);
+                        } catch (IOException e) {
+                            logger.warn("Failed to close channel", e);
+                        } catch (Throwable e) {
+                            logger.warn("Connection handler failed, closing connection", e);
+                        }
+                        logger.info("Connection {} closed: {}", connectionId, clientString);
+                        channels.remove(channel);
+                    });
+                }
+            }
+        });
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (listenerThread == null) {
+            return;
+        }
+        serverChannel.close();
+        for (final var c : new ArrayList<>(channels)) {
+            c.close();
+        }
+        listenerThread.join();
+        channels.clear();
+        listenerThread = null;
+    }
+
+    private SignalJsonRpcDispatcherHandler getSignalJsonRpcDispatcherHandler(final SocketChannel c) {
+        final var lineSupplier = IOUtils.getLineSupplier(Channels.newReader(c, StandardCharsets.UTF_8));
+        final var jsonOutputWriter = new JsonWriterImpl(Channels.newWriter(c, StandardCharsets.UTF_8));
+
+        return new SignalJsonRpcDispatcherHandler(jsonOutputWriter, lineSupplier, noReceiveOnStart);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/util/IOUtils.java b/src/main/java/org/asamk/signal/util/IOUtils.java
index aea49e09..7f93417f 100644
--- a/src/main/java/org/asamk/signal/util/IOUtils.java
+++ b/src/main/java/org/asamk/signal/util/IOUtils.java
@@ -142,7 +142,7 @@ public class IOUtils {
                     ? ServerSocketChannel.open(StandardProtocolFamily.UNIX)
                     : ServerSocketChannel.open();
             serverChannel.bind(address);
-            logger.info("Listening on socket: " + address);
+            logger.debug("Listening on socket: " + address);
             postBind(address);
         } catch (IOException e) {
             throw new IOErrorException("Failed to bind socket " + address + ": " + e.getMessage(), e);

From 9741c93ce969a961cb90571b2d7046084a293db3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 10 Nov 2023 15:44:42 +0100
Subject: [PATCH 299/672] Move all dbus interaction to dbus package

---
 src/main/java/org/asamk/signal/App.java       | 25 +------------------
 .../signal/commands/JoinGroupCommand.java     |  5 ----
 .../asamk/signal/dbus/DbusCommandHandler.java | 22 ++++++++++++++++
 .../asamk/signal/dbus/DbusManagerImpl.java    | 10 ++++++--
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index 83c0ef56..d9ffa622 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -16,7 +16,6 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
-import org.asamk.signal.dbus.DbusCommandHandler;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.Settings;
@@ -29,11 +28,6 @@ import org.asamk.signal.output.JsonWriterImpl;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriterImpl;
 import org.asamk.signal.util.IOUtils;
-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
-import org.freedesktop.dbus.errors.ServiceUnknown;
-import org.freedesktop.dbus.exceptions.DBusException;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,6 +38,7 @@ import java.io.OutputStreamWriter;
 import java.util.Set;
 
 import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS;
+import static org.asamk.signal.dbus.DbusCommandHandler.initDbusClient;
 
 public class App {
 
@@ -331,24 +326,6 @@ public class App {
         }
     }
 
-    private void initDbusClient(
-            final Command command, final String account, final boolean systemBus, final CommandHandler commandHandler
-    ) throws CommandException {
-        try {
-            final var busType = systemBus ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
-            try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) {
-                DbusCommandHandler.handleCommand(command, account, dBusConn, commandHandler);
-            }
-        } catch (ServiceUnknown e) {
-            throw new UserErrorException("signal-cli DBus daemon not running on "
-                    + (systemBus ? "system" : "session")
-                    + " bus: "
-                    + e.getMessage(), e);
-        } catch (DBusExecutionException | DBusException | IOException e) {
-            throw new UnexpectedErrorException("Dbus client failed: " + e.getMessage(), e);
-        }
-    }
-
     /**
      * @return the default data directory to be used by signal-cli.
      */
diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index 7a5b2601..f9e9f513 100644
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -5,7 +5,6 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
-import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
@@ -15,7 +14,6 @@ import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.SendMessageResultUtils;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
 import java.io.IOException;
 import java.util.Map;
@@ -93,9 +91,6 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
                     + " ("
                     + e.getClass().getSimpleName()
                     + ")", e);
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
-                    .getSimpleName() + ")", e);
         } catch (InactiveGroupLinkException e) {
             throw new UserErrorException("Group link is not valid: " + e.getMessage());
         } catch (PendingAdminApprovalException e) {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
index 6e7a6ee1..f8a65e7e 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
@@ -13,12 +13,34 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
+import org.freedesktop.dbus.errors.ServiceUnknown;
 import org.freedesktop.dbus.errors.UnknownMethod;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 
+import java.io.IOException;
+
 public class DbusCommandHandler {
 
+    public static void initDbusClient(
+            final Command command, final String account, final boolean systemBus, final CommandHandler commandHandler
+    ) throws CommandException {
+        try {
+            final var busType = systemBus ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
+            try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) {
+                handleCommand(command, account, dBusConn, commandHandler);
+            }
+        } catch (ServiceUnknown e) {
+            throw new UserErrorException("signal-cli DBus daemon not running on "
+                    + (systemBus ? "system" : "session")
+                    + " bus: "
+                    + e.getMessage(), e);
+        } catch (DBusExecutionException | DBusException | IOException e) {
+            throw new UnexpectedErrorException("Dbus client failed: " + e.getMessage(), e);
+        }
+    }
+
     public static void handleCommand(
             final Command command,
             final String account,
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index cd6c6715..ea09dba4 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -50,6 +50,7 @@ import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.dbus.interfaces.DBusInterface;
 import org.freedesktop.dbus.interfaces.DBusSigHandler;
 import org.freedesktop.dbus.types.Variant;
@@ -342,8 +343,13 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> joinGroup(final GroupInviteLinkUrl inviteLinkUrl) throws IOException, InactiveGroupLinkException {
-        final var newGroupId = signal.joinGroup(inviteLinkUrl.getUrl());
-        return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
+        try {
+            final var newGroupId = signal.joinGroup(inviteLinkUrl.getUrl());
+            return new Pair<>(GroupId.unknownVersion(newGroupId), new SendGroupMessageResults(0, List.of()));
+        } catch (DBusExecutionException e) {
+            throw new IOException("Failed to join group: " + e.getMessage() + " (" + e.getClass().getSimpleName() + ")",
+                    e);
+        }
     }
 
     @Override

From 9f4a2b3e26a18fbf0e3d6c80af4b34644047cd7a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 11 Nov 2023 11:09:24 +0100
Subject: [PATCH 300/672] Convert Contact to record

---
 .../org/asamk/signal/manager/api/Contact.java | 119 +++---------------
 .../signal/manager/helper/ContactHelper.java  |   2 +-
 .../signal/manager/helper/SendHelper.java     |   4 +-
 .../signal/manager/helper/StorageHelper.java  |   4 +-
 .../signal/manager/helper/SyncHelper.java     |   4 +-
 .../storage/recipients/RecipientStore.java    |   8 +-
 .../signal/commands/ListContactsCommand.java  |  10 +-
 7 files changed, 35 insertions(+), 116 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
index 27c2d4da..e6dd5f93 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -2,50 +2,24 @@ package org.asamk.signal.manager.api;
 
 import org.whispersystems.signalservice.internal.util.Util;
 
-import java.util.Objects;
-
-public class Contact {
-
-    private final String givenName;
-
-    private final String familyName;
-
-    private final String color;
-
-    private final int messageExpirationTime;
-
-    private final boolean blocked;
-
-    private final boolean archived;
-
-    private final boolean profileSharingEnabled;
-
-    public Contact(
-            final String givenName,
-            final String familyName,
-            final String color,
-            final int messageExpirationTime,
-            final boolean blocked,
-            final boolean archived,
-            final boolean profileSharingEnabled
-    ) {
-        this.givenName = givenName;
-        this.familyName = familyName;
-        this.color = color;
-        this.messageExpirationTime = messageExpirationTime;
-        this.blocked = blocked;
-        this.archived = archived;
-        this.profileSharingEnabled = profileSharingEnabled;
-    }
+public record Contact(
+        String givenName,
+        String familyName,
+        String color,
+        int messageExpirationTime,
+        boolean isBlocked,
+        boolean isArchived,
+        boolean isProfileSharingEnabled
+) {
 
     private Contact(final Builder builder) {
-        givenName = builder.givenName;
-        familyName = builder.familyName;
-        color = builder.color;
-        messageExpirationTime = builder.messageExpirationTime;
-        blocked = builder.blocked;
-        archived = builder.archived;
-        profileSharingEnabled = builder.profileSharingEnabled;
+        this(builder.givenName,
+                builder.familyName,
+                builder.color,
+                builder.messageExpirationTime,
+                builder.blocked,
+                builder.archived,
+                builder.profileSharingEnabled);
     }
 
     public static Builder newBuilder() {
@@ -54,10 +28,10 @@ public class Contact {
 
     public static Builder newBuilder(final Contact copy) {
         Builder builder = new Builder();
-        builder.givenName = copy.getGivenName();
-        builder.familyName = copy.getFamilyName();
-        builder.color = copy.getColor();
-        builder.messageExpirationTime = copy.getMessageExpirationTime();
+        builder.givenName = copy.givenName();
+        builder.familyName = copy.familyName();
+        builder.color = copy.color();
+        builder.messageExpirationTime = copy.messageExpirationTime();
         builder.blocked = copy.isBlocked();
         builder.archived = copy.isArchived();
         builder.profileSharingEnabled = copy.isProfileSharingEnabled();
@@ -79,59 +53,6 @@ public class Contact {
         return givenName + " " + familyName;
     }
 
-    public String getGivenName() {
-        return givenName;
-    }
-
-    public String getFamilyName() {
-        return familyName;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public int getMessageExpirationTime() {
-        return messageExpirationTime;
-    }
-
-    public boolean isBlocked() {
-        return blocked;
-    }
-
-    public boolean isArchived() {
-        return archived;
-    }
-
-    public boolean isProfileSharingEnabled() {
-        return profileSharingEnabled;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        final Contact contact = (Contact) o;
-        return messageExpirationTime == contact.messageExpirationTime
-                && blocked == contact.blocked
-                && archived == contact.archived
-                && profileSharingEnabled == contact.profileSharingEnabled
-                && Objects.equals(givenName, contact.givenName)
-                && Objects.equals(familyName, contact.familyName)
-                && Objects.equals(color, contact.color);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(givenName,
-                familyName,
-                color,
-                messageExpirationTime,
-                blocked,
-                archived,
-                profileSharingEnabled);
-    }
-
     public static final class Builder {
 
         private String givenName;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index 80df9447..4e96bacc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -31,7 +31,7 @@ public class ContactHelper {
 
     public void setExpirationTimer(RecipientId recipientId, int messageExpirationTimer) {
         var contact = account.getContactStore().getContact(recipientId);
-        if (contact != null && contact.getMessageExpirationTime() == messageExpirationTimer) {
+        if (contact != null && contact.messageExpirationTime() == messageExpirationTimer) {
             return;
         }
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 7a0841e7..23607815 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -84,7 +84,7 @@ public class SendHelper {
             account.getContactStore().storeContact(recipientId, contact);
         }
 
-        final var expirationTime = contact.getMessageExpirationTime();
+        final var expirationTime = contact.messageExpirationTime();
         messageBuilder.withExpiration(expirationTime);
 
         if (!contact.isBlocked()) {
@@ -177,7 +177,7 @@ public class SendHelper {
     ) {
         final var recipientId = account.getSelfRecipientId();
         final var contact = account.getContactStore().getContact(recipientId);
-        final var expirationTime = contact != null ? contact.getMessageExpirationTime() : 0;
+        final var expirationTime = contact != null ? contact.messageExpirationTime() : 0;
         messageBuilder.withExpiration(expirationTime);
 
         var message = messageBuilder.build();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 600bd832..35821c5b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -116,8 +116,8 @@ public class StorageHelper {
         final var blocked = contact != null && contact.isBlocked();
         final var profileShared = contact != null && contact.isProfileSharingEnabled();
         final var archived = contact != null && contact.isArchived();
-        final var contactGivenName = contact == null ? null : contact.getGivenName();
-        final var contactFamilyName = contact == null ? null : contact.getFamilyName();
+        final var contactGivenName = contact == null ? null : contact.givenName();
+        final var contactFamilyName = contact == null ? null : contact.familyName();
         if (blocked != contactRecord.isBlocked()
                 || profileShared != contactRecord.isProfileSharingEnabled()
                 || archived != contactRecord.isArchived()
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 049cbff0..0badc544 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -148,11 +148,11 @@ public class SyncHelper {
                     out.write(new DeviceContact(address,
                             Optional.ofNullable(contact.getName()),
                             createContactAvatarAttachment(new RecipientAddress(address)),
-                            Optional.ofNullable(contact.getColor()),
+                            Optional.ofNullable(contact.color()),
                             Optional.ofNullable(verifiedMessage),
                             Optional.ofNullable(profileKey),
                             contact.isBlocked(),
-                            Optional.of(contact.getMessageExpirationTime()),
+                            Optional.of(contact.messageExpirationTime()),
                             Optional.empty(),
                             contact.isArchived()));
                 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 551b5c91..c446e468 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -589,11 +589,11 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setString(1, contact == null ? null : contact.getGivenName());
-            statement.setString(2, contact == null ? null : contact.getFamilyName());
-            statement.setInt(3, contact == null ? 0 : contact.getMessageExpirationTime());
+            statement.setString(1, contact == null ? null : contact.givenName());
+            statement.setString(2, contact == null ? null : contact.familyName());
+            statement.setInt(3, contact == null ? 0 : contact.messageExpirationTime());
             statement.setBoolean(4, contact != null && contact.isProfileSharingEnabled());
-            statement.setString(5, contact == null ? null : contact.getColor());
+            statement.setString(5, contact == null ? null : contact.color());
             statement.setBoolean(6, contact != null && contact.isBlocked());
             statement.setBoolean(7, contact != null && contact.isArchived());
             statement.setLong(8, recipientId.id());
diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index 42a33a14..698e6f2b 100644
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -62,11 +62,9 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                             contact.getName(),
                             profile.getDisplayName(),
                             r.getAddress().username().orElse(""),
-                            contact.getColor(),
+                            contact.color(),
                             contact.isBlocked(),
-                            contact.getMessageExpirationTime() == 0
-                                    ? "disabled"
-                                    : contact.getMessageExpirationTime() + "s");
+                            contact.messageExpirationTime() == 0 ? "disabled" : contact.messageExpirationTime() + "s");
                 }
             }
             case JsonWriter writer -> {
@@ -77,9 +75,9 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                             address.uuid().map(UUID::toString).orElse(null),
                             address.username().orElse(null),
                             contact.getName(),
-                            contact.getColor(),
+                            contact.color(),
                             contact.isBlocked(),
-                            contact.getMessageExpirationTime(),
+                            contact.messageExpirationTime(),
                             r.getProfile() == null
                                     ? null
                                     : new JsonContact.JsonProfile(r.getProfile().getLastUpdateTimestamp(),

From 7b0744ec758b1ccbe3c9ce5a1e6dea5d7e2313da Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 11 Nov 2023 11:35:23 +0100
Subject: [PATCH 301/672] Add --hide parameter to removeContact command

---
 .../org/asamk/signal/manager/Manager.java     |  2 +
 .../org/asamk/signal/manager/api/Contact.java | 45 ++++++++++++-------
 .../signal/manager/helper/ContactHelper.java  | 11 ++++-
 .../signal/manager/helper/SendHelper.java     |  4 +-
 .../signal/manager/helper/StorageHelper.java  |  9 ++--
 .../signal/manager/helper/SyncHelper.java     |  4 +-
 .../signal/manager/internal/ManagerImpl.java  |  9 ++++
 .../manager/storage/AccountDatabase.java      | 10 ++++-
 .../signal/manager/storage/SignalAccount.java |  1 +
 .../recipients/LegacyRecipientStore2.java     |  3 +-
 .../storage/recipients/RecipientStore.java    | 13 +++---
 man/signal-cli.1.adoc                         |  3 ++
 .../signal/commands/RemoveContactCommand.java | 11 ++++-
 .../asamk/signal/dbus/DbusManagerImpl.java    |  6 ++-
 14 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index da69a8da..6153000b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -193,6 +193,8 @@ public interface Manager extends Closeable {
 
     SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException;
 
+    void hideRecipient(RecipientIdentifier.Single recipient);
+
     void deleteRecipient(RecipientIdentifier.Single recipient);
 
     void deleteContact(RecipientIdentifier.Single recipient);
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
index e6dd5f93..f84c667b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -9,7 +9,8 @@ public record Contact(
         int messageExpirationTime,
         boolean isBlocked,
         boolean isArchived,
-        boolean isProfileSharingEnabled
+        boolean isProfileSharingEnabled,
+        boolean isHidden
 ) {
 
     private Contact(final Builder builder) {
@@ -17,9 +18,10 @@ public record Contact(
                 builder.familyName,
                 builder.color,
                 builder.messageExpirationTime,
-                builder.blocked,
-                builder.archived,
-                builder.profileSharingEnabled);
+                builder.isBlocked,
+                builder.isArchived,
+                builder.isProfileSharingEnabled,
+                builder.isHidden);
     }
 
     public static Builder newBuilder() {
@@ -32,9 +34,10 @@ public record Contact(
         builder.familyName = copy.familyName();
         builder.color = copy.color();
         builder.messageExpirationTime = copy.messageExpirationTime();
-        builder.blocked = copy.isBlocked();
-        builder.archived = copy.isArchived();
-        builder.profileSharingEnabled = copy.isProfileSharingEnabled();
+        builder.isBlocked = copy.isBlocked();
+        builder.isArchived = copy.isArchived();
+        builder.isProfileSharingEnabled = copy.isProfileSharingEnabled();
+        builder.isHidden = copy.isHidden();
         return builder;
     }
 
@@ -59,13 +62,18 @@ public record Contact(
         private String familyName;
         private String color;
         private int messageExpirationTime;
-        private boolean blocked;
-        private boolean archived;
-        private boolean profileSharingEnabled;
+        private boolean isBlocked;
+        private boolean isArchived;
+        private boolean isProfileSharingEnabled;
+        private boolean isHidden;
 
         private Builder() {
         }
 
+        public static Builder newBuilder() {
+            return new Builder();
+        }
+
         public Builder withGivenName(final String val) {
             givenName = val;
             return this;
@@ -86,18 +94,23 @@ public record Contact(
             return this;
         }
 
-        public Builder withBlocked(final boolean val) {
-            blocked = val;
+        public Builder withIsBlocked(final boolean val) {
+            isBlocked = val;
             return this;
         }
 
-        public Builder withArchived(final boolean val) {
-            archived = val;
+        public Builder withIsArchived(final boolean val) {
+            isArchived = val;
             return this;
         }
 
-        public Builder withProfileSharingEnabled(final boolean val) {
-            profileSharingEnabled = val;
+        public Builder withIsProfileSharingEnabled(final boolean val) {
+            isProfileSharingEnabled = val;
+            return this;
+        }
+
+        public Builder withIsHidden(final boolean val) {
+            isHidden = val;
             return this;
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index 4e96bacc..609c2bcf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -20,6 +20,7 @@ public class ContactHelper {
     public void setContactName(final RecipientId recipientId, final String givenName, final String familyName) {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        builder.withIsHidden(false);
         if (givenName != null) {
             builder.withGivenName(givenName);
         }
@@ -43,8 +44,14 @@ public class ContactHelper {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
         if (blocked) {
-            builder.withProfileSharingEnabled(false);
+            builder.withIsProfileSharingEnabled(false);
         }
-        account.getContactStore().storeContact(recipientId, builder.withBlocked(blocked).build());
+        account.getContactStore().storeContact(recipientId, builder.withIsBlocked(blocked).build());
+    }
+
+    public void setContactHidden(RecipientId recipientId, boolean hidden) {
+        var contact = account.getContactStore().getContact(recipientId);
+        final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        account.getContactStore().storeContact(recipientId, builder.withIsHidden(hidden).build());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 23607815..5ffb9646 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -78,9 +78,9 @@ public class SendHelper {
             Optional<Long> editTargetTimestamp
     ) {
         var contact = account.getContactStore().getContact(recipientId);
-        if (contact == null || !contact.isProfileSharingEnabled()) {
+        if (contact == null || !contact.isProfileSharingEnabled() || contact.isHidden()) {
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            contact = contactBuilder.withProfileSharingEnabled(true).build();
+            contact = contactBuilder.withIsProfileSharingEnabled(true).withIsHidden(false).build();
             account.getContactStore().storeContact(recipientId, contact);
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 35821c5b..f2518568 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -116,11 +116,13 @@ public class StorageHelper {
         final var blocked = contact != null && contact.isBlocked();
         final var profileShared = contact != null && contact.isProfileSharingEnabled();
         final var archived = contact != null && contact.isArchived();
+        final var hidden = contact != null && contact.isHidden();
         final var contactGivenName = contact == null ? null : contact.givenName();
         final var contactFamilyName = contact == null ? null : contact.familyName();
         if (blocked != contactRecord.isBlocked()
                 || profileShared != contactRecord.isProfileSharingEnabled()
                 || archived != contactRecord.isArchived()
+                || hidden != contactRecord.isHidden()
                 || (
                 contactRecord.getSystemGivenName().isPresent() && !contactRecord.getSystemGivenName()
                         .get()
@@ -133,9 +135,10 @@ public class StorageHelper {
         )) {
             logger.debug("Storing new or updated contact {}", recipientId);
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            final var newContact = contactBuilder.withBlocked(contactRecord.isBlocked())
-                    .withProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
-                    .withArchived(contactRecord.isArchived());
+            final var newContact = contactBuilder.withIsBlocked(contactRecord.isBlocked())
+                    .withIsProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
+                    .withIsArchived(contactRecord.isArchived())
+                    .withIsHidden(contactRecord.isHidden());
             if (contactRecord.getSystemGivenName().isPresent() || contactRecord.getSystemFamilyName().isPresent()) {
                 newContact.withGivenName(contactRecord.getSystemGivenName().orElse(null))
                         .withFamilyName(contactRecord.getSystemFamilyName().orElse(null));
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 0badc544..f6392ea9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -339,8 +339,8 @@ public class SyncHelper {
             if (c.getExpirationTimer().isPresent()) {
                 builder.withMessageExpirationTime(c.getExpirationTimer().get());
             }
-            builder.withBlocked(c.isBlocked());
-            builder.withArchived(c.isArchived());
+            builder.withIsBlocked(c.isBlocked());
+            builder.withIsArchived(c.isArchived());
             account.getContactStore().storeContact(recipientId, builder.build());
 
             if (c.getAvatar().isPresent()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index af2c6558..cc67229a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -840,6 +840,15 @@ public class ManagerImpl implements Manager {
         }
     }
 
+    @Override
+    public void hideRecipient(final RecipientIdentifier.Single recipient) {
+        final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
+        if (recipientIdOptional.isPresent()) {
+            context.getContactHelper().setContactHidden(recipientIdOptional.get(), true);
+            account.removeRecipient(recipientIdOptional.get());
+        }
+    }
+
     @Override
     public void deleteRecipient(final RecipientIdentifier.Single recipient) {
         final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 94dff8fc..43a146a7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -32,7 +32,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 18;
+    private static final long DATABASE_VERSION = 19;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -531,5 +531,13 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 19) {
+            logger.debug("Updating database: Adding contact hidden column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD COLUMN hidden INTEGER NOT NULL DEFAULT FALSE;
+                                        """);
+            }
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index dee71275..4b2e6403 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -826,6 +826,7 @@ public class SignalAccount implements Closeable {
                                 contact.messageExpirationTime,
                                 contact.blocked,
                                 contact.archived,
+                                false,
                                 false));
 
                 // Store profile keys only in profile store
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index 2f714c6f..55231cb7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -44,7 +44,8 @@ public class LegacyRecipientStore2 {
                             r.contact.messageExpirationTime,
                             r.contact.blocked,
                             r.contact.archived,
-                            r.contact.profileSharingEnabled);
+                            r.contact.profileSharingEnabled,
+                            false);
                 }
 
                 ProfileKey profileKey = null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index c446e468..bc7475b7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -70,6 +70,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       blocked INTEGER NOT NULL DEFAULT FALSE,
                                       archived INTEGER NOT NULL DEFAULT FALSE,
                                       profile_sharing INTEGER NOT NULL DEFAULT FALSE,
+                                      hidden INTEGER NOT NULL DEFAULT FALSE,
 
                                       profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                       profile_given_name TEXT,
@@ -318,9 +319,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public List<Pair<RecipientId, Contact>> getContacts() {
         final var sql = (
                 """
-                SELECT r._id, r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived
+                SELECT r._id, r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden
                 FROM %s r
-                WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL) AND %s
+                WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL) AND %s AND r.hidden = FALSE
                 """
         ).formatted(TABLE_RECIPIENT, SQL_IS_CONTACT);
         try (final var connection = database.getConnection()) {
@@ -342,6 +343,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sqlWhere = new ArrayList<String>();
         if (onlyContacts) {
             sqlWhere.add("(" + SQL_IS_CONTACT + ")");
+            sqlWhere.add("r.hidden = FALSE");
         }
         if (blocked.isPresent()) {
             sqlWhere.add("r.blocked = ?");
@@ -357,7 +359,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 SELECT r._id,
                        r.number, r.uuid, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived,
+                       r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities
                 FROM %s r
                 WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL) AND %s
@@ -962,7 +964,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     private Contact getContact(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
-                SELECT r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived
+                SELECT r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden
                 FROM %s r
                 WHERE r._id = ? AND (%s)
                 """
@@ -1053,7 +1055,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 resultSet.getInt("expiration_time"),
                 resultSet.getBoolean("blocked"),
                 resultSet.getBoolean("archived"),
-                resultSet.getBoolean("profile_sharing"));
+                resultSet.getBoolean("profile_sharing"),
+                resultSet.getBoolean("hidden"));
     }
 
     private Profile getProfileFromResultSet(ResultSet resultSet) throws SQLException {
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 3a28219a..4814d28a 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -613,6 +613,9 @@ Remove the info of a given contact
 NUMBER::
 Specify the contact phone number.
 
+*--hide*::
+Hide the contact in the contact list, but keep the data.
+
 *--forget*::
 Delete all data associated with this contact, including identity keys and sessions.
 
diff --git a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
index c4a3d7d8..aca52778 100644
--- a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
@@ -20,7 +20,11 @@ public class RemoveContactCommand implements JsonRpcLocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Remove the details of a given contact");
         subparser.addArgument("recipient").help("Contact number");
-        subparser.addArgument("--forget")
+        final var mut = subparser.addMutuallyExclusiveGroup();
+        mut.addArgument("--hide")
+                .action(Arguments.storeTrue())
+                .help("Hide the contact in the contact list, but keep the data.");
+        mut.addArgument("--forget")
                 .action(Arguments.storeTrue())
                 .help("Delete all data associated with this contact, including identity keys and sessions.");
     }
@@ -32,8 +36,11 @@ public class RemoveContactCommand implements JsonRpcLocalCommand {
         var recipientString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
 
+        var hide = Boolean.TRUE == ns.getBoolean("hide");
         var forget = Boolean.TRUE == ns.getBoolean("forget");
-        if (forget) {
+        if (hide) {
+            m.hideRecipient(recipient);
+        } else if (forget) {
             m.deleteRecipient(recipient);
         } else {
             m.deleteContact(recipient);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index ea09dba4..a3f18393 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -452,6 +452,10 @@ public class DbusManagerImpl implements Manager {
         return new SendMessageResults(0, Map.of());
     }
 
+    public void hideRecipient(final RecipientIdentifier.Single recipient) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void deleteRecipient(final RecipientIdentifier.Single recipient) {
         signal.deleteRecipient(recipient.getIdentifier());
@@ -653,7 +657,7 @@ public class DbusManagerImpl implements Manager {
             }
             return Recipient.newBuilder()
                     .withAddress(new RecipientAddress(null, n))
-                    .withContact(new Contact(contactName, null, null, 0, contactBlocked, false, false))
+                    .withContact(new Contact(contactName, null, null, 0, contactBlocked, false, false, false))
                     .build();
         }).filter(Objects::nonNull).toList();
     }

From f8ea631b039d0cdd20716a96ba527fb40945bbda Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 11 Nov 2023 13:17:36 +0100
Subject: [PATCH 302/672] Refactor trusted recipient resolver

---
 .../signal/manager/storage/recipients/RecipientStore.java  | 7 ++++---
 .../storage/recipients/RecipientTrustedResolver.java       | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index bc7475b7..668366fe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -275,13 +275,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return resolveRecipientTrusted(address, true);
     }
 
+    @Override
     public RecipientId resolveRecipientTrusted(RecipientAddress address) {
         return resolveRecipientTrusted(address, false);
     }
 
     @Override
     public RecipientId resolveRecipientTrusted(SignalServiceAddress address) {
-        return resolveRecipientTrusted(new RecipientAddress(address), false);
+        return resolveRecipientTrusted(new RecipientAddress(address));
     }
 
     @Override
@@ -289,12 +290,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Optional<ACI> aci, final Optional<PNI> pni, final Optional<String> number
     ) {
         final var serviceId = aci.map(a -> (ServiceId) a).or(() -> pni);
-        return resolveRecipientTrusted(new RecipientAddress(serviceId, pni, number, Optional.empty()), false);
+        return resolveRecipientTrusted(new RecipientAddress(serviceId, pni, number, Optional.empty()));
     }
 
     @Override
     public RecipientId resolveRecipientTrusted(final ACI aci, final String username) {
-        return resolveRecipientTrusted(new RecipientAddress(aci, null, null, username), false);
+        return resolveRecipientTrusted(new RecipientAddress(aci, null, null, username));
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
index 21708551..598ef791 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
@@ -11,6 +11,8 @@ public interface RecipientTrustedResolver {
 
     RecipientId resolveSelfRecipientTrusted(RecipientAddress address);
 
+    RecipientId resolveRecipientTrusted(RecipientAddress address);
+
     RecipientId resolveRecipientTrusted(SignalServiceAddress address);
 
     RecipientId resolveRecipientTrusted(Optional<ACI> aci, Optional<PNI> pni, Optional<String> number);
@@ -30,6 +32,11 @@ public interface RecipientTrustedResolver {
             return recipientTrustedResolverSupplier.get().resolveSelfRecipientTrusted(address);
         }
 
+        @Override
+        public RecipientId resolveRecipientTrusted(final RecipientAddress address) {
+            return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(address);
+        }
+
         @Override
         public RecipientId resolveRecipientTrusted(final SignalServiceAddress address) {
             return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(address);

From eaa6b7cf5795b6240bfcbf3e56927ac10cde6839 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 11 Nov 2023 18:12:18 +0100
Subject: [PATCH 303/672] Check whoAmI after regular CDSI sync

---
 .../main/java/org/asamk/signal/manager/internal/ManagerImpl.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index cc67229a..e6f1a143 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -227,6 +227,7 @@ public class ManagerImpl implements Manager {
                         e.getClass().getSimpleName());
                 logger.debug("Full CDSI refresh failed", e);
             }
+            context.getAccountHelper().checkWhoAmiI();
         }
     }
 

From ed11bf6368f59a454c3b18ccd97460c5f642b5aa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 12 Nov 2023 11:51:38 +0100
Subject: [PATCH 304/672] Make JobExecutor execute jobs asynchronously

---
 .../signal/manager/api/StickerPackId.java     |  6 ++++++
 .../asamk/signal/manager/helper/Context.java  |  7 ++++++-
 .../signal/manager/internal/JobExecutor.java  | 19 +++++++++++++++++--
 .../signal/manager/internal/ManagerImpl.java  |  1 +
 .../manager/jobs/RetrieveStickerPackJob.java  |  1 +
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
index 38ea4950..ccb18708 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager.api;
 
 import java.util.Arrays;
+import java.util.Base64;
 
 public class StickerPackId {
 
@@ -32,4 +33,9 @@ public class StickerPackId {
     public int hashCode() {
         return Arrays.hashCode(id);
     }
+
+    @Override
+    public String toString() {
+        return "StickerPackId{" + Base64.getUrlEncoder().encodeToString(id) + '}';
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index e5824a5a..ba2e5fb0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -9,7 +9,7 @@ import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
 
 import java.util.function.Supplier;
 
-public class Context {
+public class Context implements AutoCloseable {
 
     private final Object LOCK = new Object();
 
@@ -170,6 +170,11 @@ public class Context {
         }
     }
 
+    @Override
+    public void close() {
+        jobExecutor.close();
+    }
+
     private interface Callable {
 
         void call();
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
index 8a3e815f..bbd36800 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
@@ -2,16 +2,31 @@ package org.asamk.signal.manager.internal;
 
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.jobs.Job;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class JobExecutor {
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
+public class JobExecutor implements AutoCloseable {
+
+    private static final Logger logger = LoggerFactory.getLogger(JobExecutor.class);
     private final Context context;
+    private final ExecutorService executorService;
 
     public JobExecutor(final Context context) {
         this.context = context;
+        this.executorService = Executors.newCachedThreadPool();
     }
 
     public void enqueueJob(Job job) {
-        job.run(context);
+        logger.debug("Enqueuing {} job", job.getClass().getSimpleName());
+
+        executorService.execute(() -> job.run(context));
+    }
+
+    @Override
+    public void close() {
+        executorService.close();
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index e6f1a143..d4d0b10a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1332,6 +1332,7 @@ public class ManagerImpl implements Manager {
             stopReceiveThread(thread);
         }
         executor.close();
+        context.close();
 
         dependencies.getSignalWebSocket().disconnect();
         dependencies.getPushServiceSocket().close();
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
index 585e3161..1eeed9dc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java
@@ -23,6 +23,7 @@ public class RetrieveStickerPackJob implements Job {
 
     @Override
     public void run(Context context) {
+        logger.trace("Downloading sticker pack {}", packId);
         try {
             context.getStickerHelper().retrieveStickerPack(packId, packKey);
         } catch (IOException e) {

From d844e0f3961ce34c080424f2625d33fb34d80966 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 12 Nov 2023 11:59:48 +0100
Subject: [PATCH 305/672] Add download profile avatar job

---
 .../signal/manager/helper/StorageHelper.java  |  3 ++-
 .../jobs/DownloadProfileAvatarJob.java        | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileAvatarJob.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index f2518568..393953d9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.signal.libsignal.protocol.IdentityKey;
@@ -276,7 +277,7 @@ public class StorageHelper {
             if (profileKey != null) {
                 account.setProfileKey(profileKey);
                 final var avatarPath = accountRecord.getAvatarUrlPath().orElse(null);
-                context.getProfileHelper().downloadProfileAvatar(account.getSelfRecipientId(), avatarPath, profileKey);
+                context.getJobExecutor().enqueueJob(new DownloadProfileAvatarJob(avatarPath));
             }
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileAvatarJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileAvatarJob.java
new file mode 100644
index 00000000..f46bac0c
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileAvatarJob.java
@@ -0,0 +1,23 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DownloadProfileAvatarJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(DownloadProfileAvatarJob.class);
+    private final String avatarPath;
+
+    public DownloadProfileAvatarJob(final String avatarPath) {
+        this.avatarPath = avatarPath;
+    }
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Downloading profile avatar {}", avatarPath);
+        final var account = context.getAccount();
+        context.getProfileHelper()
+                .downloadProfileAvatar(account.getSelfRecipientId(), avatarPath, account.getProfileKey());
+    }
+}

From 5cac7feabed779eaea48f95ab82939f26854c1e9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 12 Nov 2023 12:12:02 +0100
Subject: [PATCH 306/672] Add who am I job

---
 .../signal/manager/helper/StorageHelper.java  |  3 ++-
 .../signal/manager/jobs/CheckWhoAmIJob.java   | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/jobs/CheckWhoAmIJob.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 393953d9..fa1eef11 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.CheckWhoAmIJob;
 import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
@@ -251,7 +252,7 @@ public class StorageHelper {
         }
 
         if (!accountRecord.getE164().equals(account.getNumber())) {
-            context.getAccountHelper().checkWhoAmiI();
+            context.getJobExecutor().enqueueJob(new CheckWhoAmIJob());
         }
 
         account.getConfigurationStore().setReadReceipts(accountRecord.isReadReceiptsEnabled());
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/CheckWhoAmIJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/CheckWhoAmIJob.java
new file mode 100644
index 00000000..165bf70e
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/CheckWhoAmIJob.java
@@ -0,0 +1,22 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class CheckWhoAmIJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(CheckWhoAmIJob.class);
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Checking whoAmI");
+        try {
+            context.getAccountHelper().checkWhoAmiI();
+        } catch (IOException e) {
+            logger.warn("Failed to check whoAmI", e);
+        }
+    }
+}

From 26cef99cdf1b5fb9093588ff20930eac80043955 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 12 Nov 2023 13:13:58 +0100
Subject: [PATCH 307/672] Don't store self profile key in recipient store

---
 .../signal/manager/storage/SignalAccount.java | 16 ++++------
 .../storage/profiles/ProfileStore.java        |  2 --
 .../storage/recipients/RecipientStore.java    | 30 ++++++++++++-------
 .../recipients/SelfProfileKeyProvider.java    |  8 +++++
 4 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfProfileKeyProvider.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 4b2e6403..cd6720d3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -282,7 +282,6 @@ public class SignalAccount implements Closeable {
         getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
         this.password = password;
         this.profileKey = profileKey;
-        getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
         this.encryptedDeviceName = encryptedDeviceName;
         this.aciAccountData.setIdentityKeyPair(aciIdentity);
         this.pniAccountData.setIdentityKeyPair(pniIdentity);
@@ -654,14 +653,11 @@ public class SignalAccount implements Closeable {
             // Old config file, creating new profile key
             setProfileKey(KeyUtils.createProfileKey());
         }
-        getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
 
         if (previousStorageVersion < 5) {
             final var legacyRecipientsStoreFile = new File(userPath, "recipients-store");
             if (legacyRecipientsStoreFile.exists()) {
                 LegacyRecipientStore2.migrate(legacyRecipientsStoreFile, getRecipientStore());
-                // Ensure our profile key is stored in profile store
-                getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
             }
         }
         if (previousStorageVersion < 6) {
@@ -1186,12 +1182,11 @@ public class SignalAccount implements Closeable {
     }
 
     public RecipientStore getRecipientStore() {
-        return getOrCreate(() -> recipientStore, () -> {
-            recipientStore = new RecipientStore(this::mergeRecipients,
-                    this::getSelfRecipientAddress,
-                    getAccountDatabase());
-            getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
-        });
+        return getOrCreate(() -> recipientStore,
+                () -> recipientStore = new RecipientStore(this::mergeRecipients,
+                        this::getSelfRecipientAddress,
+                        this::getProfileKey,
+                        getAccountDatabase()));
     }
 
     public ProfileStore getProfileStore() {
@@ -1548,7 +1543,6 @@ public class SignalAccount implements Closeable {
         }
         this.profileKey = profileKey;
         save();
-        getProfileStore().storeSelfProfileKey(getSelfRecipientId(), getProfileKey());
     }
 
     public byte[] getSelfUnidentifiedAccessKey() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
index 8128435d..5d3a95a8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
@@ -15,8 +15,6 @@ public interface ProfileStore {
 
     void storeProfile(RecipientId recipientId, Profile profile);
 
-    void storeSelfProfileKey(RecipientId recipientId, ProfileKey profileKey);
-
     void storeProfileKey(RecipientId recipientId, ProfileKey profileKey);
 
     void storeExpiringProfileKeyCredential(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 668366fe..c27499ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -42,6 +42,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private final RecipientMergeHandler recipientMergeHandler;
     private final SelfAddressProvider selfAddressProvider;
+    private final SelfProfileKeyProvider selfProfileKeyProvider;
     private final Database database;
 
     private final Object recipientsLock = new Object();
@@ -89,10 +90,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public RecipientStore(
             final RecipientMergeHandler recipientMergeHandler,
             final SelfAddressProvider selfAddressProvider,
+            final SelfProfileKeyProvider selfProfileKeyProvider,
             final Database database
     ) {
         this.recipientMergeHandler = recipientMergeHandler;
         this.selfAddressProvider = selfAddressProvider;
+        this.selfProfileKeyProvider = selfProfileKeyProvider;
         this.database = database;
     }
 
@@ -366,6 +369,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL) AND %s
                 """
         ).formatted(TABLE_RECIPIENT, sqlWhere.isEmpty() ? "TRUE" : String.join(" AND ", sqlWhere));
+        final var selfServiceId = selfAddressProvider.getSelfAddress().serviceId();
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 if (blocked.isPresent()) {
@@ -374,7 +378,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 try (var result = Utils.executeQueryForStream(statement, this::getRecipientFromResultSet)) {
                     return result.filter(r -> name.isEmpty() || (
                             r.getContact() != null && name.get().equals(r.getContact().getName())
-                    ) || (r.getProfile() != null && name.get().equals(r.getProfile().getDisplayName()))).toList();
+                    ) || (r.getProfile() != null && name.get().equals(r.getProfile().getDisplayName()))).map(r -> {
+                        if (r.getAddress().serviceId().equals(selfServiceId)) {
+                            return Recipient.newBuilder(r)
+                                    .withProfileKey(selfProfileKeyProvider.getSelfProfileKey())
+                                    .build();
+                        }
+                        return r;
+                    }).toList();
                 }
             }
         } catch (SQLException e) {
@@ -419,10 +430,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 WHERE r.uuid IS NOT NULL AND r.profile_key IS NOT NULL
                 """
         ).formatted(TABLE_RECIPIENT);
+        final var selfServiceId = selfAddressProvider.getSelfAddress().serviceId().orElse(null);
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 return Utils.executeQueryForStream(statement, resultSet -> {
                     final var serviceId = ServiceId.parseOrThrow(resultSet.getBytes("uuid"));
+                    if (serviceId.equals(selfServiceId)) {
+                        return new Pair<>(serviceId, selfProfileKeyProvider.getSelfProfileKey());
+                    }
                     final var profileKey = getProfileKeyFromResultSet(resultSet);
                     return new Pair<>(serviceId, profileKey);
                 }).filter(Objects::nonNull).collect(Collectors.toMap(Pair::first, Pair::second));
@@ -466,6 +481,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     @Override
     public ProfileKey getProfileKey(final RecipientId recipientId) {
+        final var selfRecipientId = resolveRecipient(selfAddressProvider.getSelfAddress());
+        if (recipientId.equals(selfRecipientId)) {
+            return selfProfileKeyProvider.getSelfProfileKey();
+        }
         try (final var connection = database.getConnection()) {
             return getProfileKey(connection, recipientId);
         } catch (SQLException e) {
@@ -491,15 +510,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    @Override
-    public void storeSelfProfileKey(final RecipientId recipientId, final ProfileKey profileKey) {
-        try (final var connection = database.getConnection()) {
-            storeProfileKey(connection, recipientId, profileKey, false);
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed update recipient store", e);
-        }
-    }
-
     @Override
     public void storeProfileKey(RecipientId recipientId, final ProfileKey profileKey) {
         try (final var connection = database.getConnection()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfProfileKeyProvider.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfProfileKeyProvider.java
new file mode 100644
index 00000000..c3f7f000
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/SelfProfileKeyProvider.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.storage.recipients;
+
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+
+public interface SelfProfileKeyProvider {
+
+    ProfileKey getSelfProfileKey();
+}

From fbcc1cfb50b38b78f5e3fb986defaaa72f96f840 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 12 Nov 2023 14:19:10 +0100
Subject: [PATCH 308/672] Refactor KeyValueStore

---
 .../storage/keyValue/KeyValueStore.java       | 50 +++++++++++--------
 1 file changed, 30 insertions(+), 20 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index 95980d4d..9addcc7d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -36,6 +36,22 @@ public class KeyValueStore {
     }
 
     public <T> T getEntry(KeyValueEntry<T> key) {
+        try (final var connection = database.getConnection()) {
+            return getEntry(connection, key);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from pre_key store", e);
+        }
+    }
+
+    public <T> void storeEntry(KeyValueEntry<T> key, T value) {
+        try (final var connection = database.getConnection()) {
+            storeEntry(connection, key, value);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update key_value store", e);
+        }
+    }
+
+    private <T> T getEntry(final Connection connection, final KeyValueEntry<T> key) throws SQLException {
         final var sql = (
                 """
                 SELECT key, value
@@ -43,24 +59,22 @@ public class KeyValueStore {
                 WHERE p.key = ?
                 """
         ).formatted(TABLE_KEY_VALUE);
-        try (final var connection = database.getConnection()) {
-            try (final var statement = connection.prepareStatement(sql)) {
-                statement.setString(1, key.key());
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, key.key());
 
-                final var result = Utils.executeQueryForOptional(statement,
-                        resultSet -> readValueFromResultSet(key, resultSet)).orElse(null);
+            final var result = Utils.executeQueryForOptional(statement,
+                    resultSet -> readValueFromResultSet(key, resultSet)).orElse(null);
 
-                if (result == null) {
-                    return key.defaultValue();
-                }
-                return result;
+            if (result == null) {
+                return key.defaultValue();
             }
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed read from pre_key store", e);
+            return result;
         }
     }
 
-    public <T> void storeEntry(KeyValueEntry<T> key, T value) {
+    private <T> void storeEntry(
+            final Connection connection, final KeyValueEntry<T> key, final T value
+    ) throws SQLException {
         final var sql = (
                 """
                 INSERT INTO %s (key, value)
@@ -68,14 +82,10 @@ public class KeyValueStore {
                 ON CONFLICT (key) DO UPDATE SET value=excluded.value
                 """
         ).formatted(TABLE_KEY_VALUE);
-        try (final var connection = database.getConnection()) {
-            try (final var statement = connection.prepareStatement(sql)) {
-                statement.setString(1, key.key());
-                setParameterValue(statement, 2, key.clazz(), value);
-                statement.executeUpdate();
-            }
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed update key_value store", e);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, key.key());
+            setParameterValue(statement, 2, key.clazz(), value);
+            statement.executeUpdate();
         }
     }
 

From f06eeb01b971ad242cb209627744d7d8e1b03f47 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 12 Nov 2023 15:21:25 +0100
Subject: [PATCH 309/672] Refactor getGroup method

---
 .../manager/storage/groups/GroupStore.java       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index a281622d..27d97fe5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -150,23 +150,29 @@ public class GroupStore {
 
     public GroupInfo getGroup(GroupId groupId) {
         try (final var connection = database.getConnection()) {
-            if (groupId instanceof GroupIdV1 groupIdV1) {
+            return getGroup(connection, groupId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from group store", e);
+        }
+    }
+
+    public GroupInfo getGroup(final Connection connection, final GroupId groupId) throws SQLException {
+        switch (groupId) {
+            case GroupIdV1 groupIdV1 -> {
                 final var group = getGroup(connection, groupIdV1);
                 if (group != null) {
                     return group;
                 }
                 return getGroupV2ByV1Id(connection, groupIdV1);
-            } else if (groupId instanceof GroupIdV2 groupIdV2) {
+            }
+            case GroupIdV2 groupIdV2 -> {
                 final var group = getGroup(connection, groupIdV2);
                 if (group != null) {
                     return group;
                 }
                 return getGroupV1ByV2Id(connection, groupIdV2);
             }
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed read from group store", e);
         }
-        throw new AssertionError("Invalid group id type");
     }
 
     public GroupInfoV1 getOrCreateGroupV1(GroupIdV1 groupId) {

From 0d60c4d464fb26bb4c6fc3fd3008bcd4fcd9e5c9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 12 Nov 2023 17:53:13 +0100
Subject: [PATCH 310/672] Refactor group v2 migration

---
 .../signal/manager/helper/GroupHelper.java    |  19 +---
 .../manager/storage/groups/GroupStore.java    | 106 +++++++++++++-----
 2 files changed, 81 insertions(+), 44 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index af666ab6..a7a5dfb7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -107,23 +107,8 @@ public class GroupHelper {
     ) {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
 
-        var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
-        var groupInfo = getGroup(groupId);
-        final GroupInfoV2 groupInfoV2;
-        if (groupInfo instanceof GroupInfoV1) {
-            // Received a v2 group message for a v1 group, we need to locally migrate the group
-            account.getGroupStore().deleteGroup(((GroupInfoV1) groupInfo).getGroupId());
-            groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey, account.getRecipientResolver());
-            groupInfoV2.setBlocked(groupInfo.isBlocked());
-            account.getGroupStore().updateGroup(groupInfoV2);
-            logger.info("Locally migrated group {} to group v2, id: {}",
-                    groupInfo.getGroupId().toBase64(),
-                    groupInfoV2.getGroupId().toBase64());
-        } else if (groupInfo instanceof GroupInfoV2) {
-            groupInfoV2 = (GroupInfoV2) groupInfo;
-        } else {
-            groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey, account.getRecipientResolver());
-        }
+        final var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
+        final var groupInfoV2 = account.getGroupStore().getGroupOrPartialMigrate(groupMasterKey, groupId);
 
         if (groupInfoV2.getGroup() == null || groupInfoV2.getGroup().revision < revision) {
             DecryptedGroup group = null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 27d97fe5..33bb2532 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -11,6 +11,7 @@ import org.asamk.signal.manager.storage.recipients.RecipientIdCreator;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,25 +88,29 @@ public class GroupStore {
     public void updateGroup(GroupInfo group) {
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
-            final Long internalId;
-            final var sql = (
-                    """
-                    SELECT g._id
-                    FROM %s g
-                    WHERE g.group_id = ?
-                    """
-            ).formatted(group instanceof GroupInfoV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2);
-            try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBytes(1, group.getGroupId().serialize());
-                internalId = Utils.executeQueryForOptional(statement, res -> res.getLong("_id")).orElse(null);
-            }
-            insertOrReplaceGroup(connection, internalId, group);
+            updateGroup(connection, group);
             connection.commit();
         } catch (SQLException e) {
             throw new RuntimeException("Failed update recipient store", e);
         }
     }
 
+    public void updateGroup(final Connection connection, final GroupInfo group) throws SQLException {
+        final Long internalId;
+        final var sql = (
+                """
+                SELECT g._id
+                FROM %s g
+                WHERE g.group_id = ?
+                """
+        ).formatted(group instanceof GroupInfoV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, group.getGroupId().serialize());
+            internalId = Utils.executeQueryForOptional(statement, res -> res.getLong("_id")).orElse(null);
+        }
+        insertOrReplaceGroup(connection, internalId, group);
+    }
+
     public void deleteGroup(GroupId groupId) {
         if (groupId instanceof GroupIdV1 groupIdV1) {
             deleteGroup(groupIdV1);
@@ -115,30 +120,34 @@ public class GroupStore {
     }
 
     public void deleteGroup(GroupIdV1 groupIdV1) {
+        try (final var connection = database.getConnection()) {
+            deleteGroup(connection, groupIdV1);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update group store", e);
+        }
+    }
+
+    private void deleteGroup(final Connection connection, final GroupIdV1 groupIdV1) throws SQLException {
         final var sql = (
                 """
                 DELETE FROM %s
                 WHERE group_id = ?
                 """
         ).formatted(TABLE_GROUP_V1);
-        try (final var connection = database.getConnection()) {
-            try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBytes(1, groupIdV1.serialize());
-                statement.executeUpdate();
-            }
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed update group store", e);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV1.serialize());
+            statement.executeUpdate();
         }
     }
 
     public void deleteGroup(GroupIdV2 groupIdV2) {
-        final var sql = (
-                """
-                DELETE FROM %s
-                WHERE group_id = ?
-                """
-        ).formatted(TABLE_GROUP_V2);
         try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    DELETE FROM %s
+                    WHERE group_id = ?
+                    """
+            ).formatted(TABLE_GROUP_V2);
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setBytes(1, groupIdV2.serialize());
                 statement.executeUpdate();
@@ -193,6 +202,49 @@ public class GroupStore {
         }
     }
 
+    public GroupInfoV2 getGroupOrPartialMigrate(
+            Connection connection, final GroupMasterKey groupMasterKey
+    ) throws SQLException {
+        final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+        final var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
+
+        return getGroupOrPartialMigrate(connection, groupMasterKey, groupId);
+    }
+
+    public GroupInfoV2 getGroupOrPartialMigrate(
+            final GroupMasterKey groupMasterKey, final GroupIdV2 groupId
+    ) {
+        try (final var connection = database.getConnection()) {
+            return getGroupOrPartialMigrate(connection, groupMasterKey, groupId);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from group store", e);
+        }
+    }
+
+    private GroupInfoV2 getGroupOrPartialMigrate(
+            Connection connection, final GroupMasterKey groupMasterKey, final GroupIdV2 groupId
+    ) throws SQLException {
+        switch (getGroup(groupId)) {
+            case GroupInfoV1 groupInfoV1 -> {
+                // Received a v2 group message for a v1 group, we need to locally migrate the group
+                deleteGroup(connection, groupInfoV1.getGroupId());
+                final var groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey, recipientResolver);
+                groupInfoV2.setBlocked(groupInfoV1.isBlocked());
+                updateGroup(connection, groupInfoV2);
+                logger.debug("Locally migrated group {} to group v2, id: {}",
+                        groupInfoV1.getGroupId().toBase64(),
+                        groupInfoV2.getGroupId().toBase64());
+                return groupInfoV2;
+            }
+            case GroupInfoV2 groupInfoV2 -> {
+                return groupInfoV2;
+            }
+            case null -> {
+                return new GroupInfoV2(groupId, groupMasterKey, recipientResolver);
+            }
+        }
+    }
+
     public List<GroupInfo> getGroups() {
         return Stream.concat(getGroupsV2().stream(), getGroupsV1().stream()).toList();
     }
@@ -212,7 +264,7 @@ public class GroupStore {
             statement.setLong(2, toBeMergedRecipientId.id());
             final var updatedRows = statement.executeUpdate();
             if (updatedRows > 0) {
-                logger.info("Updated {} group members when merging recipients", updatedRows);
+                logger.debug("Updated {} group members when merging recipients", updatedRows);
             }
         }
     }

From 77f284661b990abc8557f98972084d0c5a8739f5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 12 Nov 2023 18:50:56 +0100
Subject: [PATCH 311/672] Fix storing of username

---
 .../recipients/MergeRecipientHelper.java      |  6 ++---
 .../storage/recipients/RecipientStore.java    |  7 +++---
 .../recipients/MergeRecipientHelperTest.java  | 25 +++++++++++++++----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index 5cf3c675..dd18f401 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -17,12 +17,12 @@ public class MergeRecipientHelper {
     static Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
             Store store, RecipientAddress address
     ) throws SQLException {
-        // address has serviceId and number, optionally also pni
+        // address has at least one of serviceId/pni and optionally number/username
 
         final var recipients = store.findAllByAddress(address);
 
         if (recipients.isEmpty()) {
-            logger.debug("Got new recipient, serviceId, PNI and number are unknown");
+            logger.debug("Got new recipient, serviceId, PNI, number, username are unknown");
             return new Pair<>(store.addNewRecipient(address), List.of());
         }
 
@@ -47,7 +47,7 @@ public class MergeRecipientHelper {
             }
 
             logger.debug(
-                    "Got recipient {} existing with number/pni, but different serviceId, so stripping its number and adding new recipient",
+                    "Got recipient {} existing with number/pni/username, but different serviceId, so stripping its number and adding new recipient",
                     recipient.id());
             store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(address));
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index c27499ab..63b6780f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -793,8 +793,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     ) throws SQLException {
         final var sql = (
                 """
-                INSERT INTO %s (number, uuid, pni)
-                VALUES (?, ?, ?)
+                INSERT INTO %s (number, uuid, pni, username)
+                VALUES (?, ?, ?, ?)
                 RETURNING _id
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -803,6 +803,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setBytes(2,
                     address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setString(4, address.username().orElse(null));
             final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
             if (generatedKey.isPresent()) {
                 final var recipientId = new RecipientId(generatedKey.get(), this);
@@ -820,7 +821,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final var sql = (
                     """
                     UPDATE %s
-                    SET number = NULL, uuid = NULL, pni = NULL
+                    SET number = NULL, uuid = NULL, pni = NULL, username = NULL
                     WHERE _id = ?
                     """
             ).formatted(TABLE_RECIPIENT);
diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
index 770054f3..eae8958f 100644
--- a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
@@ -23,19 +23,24 @@ class MergeRecipientHelperTest {
     static final PNI PNI_B = PNI.from(UUID.randomUUID());
     static final String NUMBER_A = "+AAA";
     static final String NUMBER_B = "+BBB";
+    static final String USERNAME_A = "USER.1";
+    static final String USERNAME_B = "USER.2";
 
-    static final PartialAddresses ADDR_A = new PartialAddresses(SERVICE_ID_A, PNI_A, NUMBER_A);
-    static final PartialAddresses ADDR_B = new PartialAddresses(SERVICE_ID_B, PNI_B, NUMBER_B);
+    static final PartialAddresses ADDR_A = new PartialAddresses(SERVICE_ID_A, PNI_A, NUMBER_A, USERNAME_A);
+    static final PartialAddresses ADDR_B = new PartialAddresses(SERVICE_ID_B, PNI_B, NUMBER_B, USERNAME_B);
 
     static final T[] testInstancesNone = new T[]{
             new T(Set.of(), ADDR_A.FULL, Set.of(rec(1000000, ADDR_A.FULL))),
             new T(Set.of(), ADDR_A.ACI_NUM, Set.of(rec(1000000, ADDR_A.ACI_NUM))),
             new T(Set.of(), ADDR_A.ACI_PNI, Set.of(rec(1000000, ADDR_A.ACI_PNI))),
             new T(Set.of(), ADDR_A.PNI_NUM, Set.of(rec(1000000, ADDR_A.PNI_NUM))),
+            new T(Set.of(), ADDR_A.ACI_USERNAME, Set.of(rec(1000000, ADDR_A.ACI_USERNAME))),
+            new T(Set.of(), ADDR_A.FULL_USERNAME, Set.of(rec(1000000, ADDR_A.FULL_USERNAME))),
     };
 
     static final T[] testInstancesSingle = new T[]{
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.FULL_USERNAME)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL_USERNAME))),
             new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
@@ -72,6 +77,10 @@ class MergeRecipientHelperTest {
             new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.ACI_PNI, Set.of(rec(1, ADDR_A.ACI_PNI))),
 
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_B.FULL, Set.of(rec(1, ADDR_A.FULL), rec(1000000, ADDR_B.FULL))),
+
+            new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.ACI_USERNAME, Set.of(rec(1, ADDR_A.FULL_USERNAME))),
+            new T(Set.of(rec(1, ADDR_A.ACI)), ADDR_A.ACI_USERNAME, Set.of(rec(1, ADDR_A.ACI_USERNAME))),
+            new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_USERNAME, Set.of(rec(1, ADDR_A.ACI_NUM_USERNAME))),
     };
 
     static final T[] testInstancesTwo = new T[]{
@@ -225,22 +234,28 @@ class MergeRecipientHelperTest {
 
     private record PartialAddresses(
             RecipientAddress FULL,
+            RecipientAddress FULL_USERNAME,
             RecipientAddress ACI,
             RecipientAddress PNI,
             RecipientAddress NUM,
             RecipientAddress ACI_NUM,
+            RecipientAddress ACI_NUM_USERNAME,
             RecipientAddress PNI_NUM,
-            RecipientAddress ACI_PNI
+            RecipientAddress ACI_PNI,
+            RecipientAddress ACI_USERNAME
     ) {
 
-        PartialAddresses(ServiceId serviceId, PNI pni, String number) {
+        PartialAddresses(ServiceId serviceId, PNI pni, String number, String username) {
             this(new RecipientAddress(serviceId, pni, number),
+                    new RecipientAddress(serviceId, pni, number, username),
                     new RecipientAddress(serviceId, null, null),
                     new RecipientAddress(null, pni, null),
                     new RecipientAddress(null, null, number),
                     new RecipientAddress(serviceId, null, number),
+                    new RecipientAddress(serviceId, null, number, username),
                     new RecipientAddress(null, pni, number),
-                    new RecipientAddress(serviceId, pni, null));
+                    new RecipientAddress(serviceId, pni, null),
+                    new RecipientAddress(serviceId, null, null, username));
         }
     }
 }

From 37c65ca6b4d86c918740de323be797bd8246ffc9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 16 Nov 2023 20:18:15 +0100
Subject: [PATCH 312/672] Implement username links

---
 graalvm-config-dir/jni-config.json            |  4 +
 graalvm-config-dir/reflect-config.json        | 16 +++-
 .../org/asamk/signal/manager/Manager.java     |  7 +-
 .../signal/manager/api/UsernameLinkUrl.java   | 82 +++++++++++++++++++
 .../signal/manager/helper/AccountHelper.java  | 57 ++++++++++---
 .../manager/helper/RecipientHelper.java       | 20 ++++-
 .../signal/manager/internal/ManagerImpl.java  | 15 +++-
 .../signal/manager/storage/SignalAccount.java | 10 +++
 .../signal/commands/UpdateAccountCommand.java | 14 +++-
 .../asamk/signal/dbus/DbusManagerImpl.java    | 13 ++-
 10 files changed, 214 insertions(+), 24 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/UsernameLinkUrl.java

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index a7e63038..5b47a7b6 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -173,6 +173,10 @@
   "name":"org.signal.libsignal.usernames.CannotBeEmptyException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"org.signal.libsignal.usernames.MissingSeparatorException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.signal.libsignal.usernames.NicknameTooLongException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 9f2935ce..7bfa2e71 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -768,7 +768,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"username","parameterTypes":[] }]
+  "methods":[{"name":"username","parameterTypes":[] }, {"name":"usernameLink","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.VerifyCommand$VerifyParams",
@@ -2594,6 +2594,20 @@
   "name":"org.whispersystems.signalservice.internal.push.SenderCertificate$ByteArrayDesieralizer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.SetUsernameLinkRequestBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }, {"name":"getUsernameLinkEncryptedValue","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.SetUsernameLinkResponseBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.util.UUID"] }, {"name":"<init>","parameterTypes":["java.util.UUID","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.StaleDevices",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 6153000b..ac88e2bc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -41,6 +41,7 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
@@ -100,11 +101,15 @@ public interface Manager extends Closeable {
      */
     void updateProfile(UpdateProfile updateProfile) throws IOException;
 
+    String getUsername();
+
+    UsernameLinkUrl getUsernameLink();
+
     /**
      * Set a username for the account.
      * If the username is null, it will be deleted.
      */
-    String setUsername(String username) throws IOException, InvalidUsernameException;
+    void setUsername(String username) throws IOException, InvalidUsernameException;
 
     /**
      * Set a username for the account.
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UsernameLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/UsernameLinkUrl.java
new file mode 100644
index 00000000..f8fff6eb
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UsernameLinkUrl.java
@@ -0,0 +1,82 @@
+package org.asamk.signal.manager.api;
+
+import org.signal.core.util.Base64;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+public final class UsernameLinkUrl {
+
+    private static final Pattern URL_REGEX = Pattern.compile("(https://)?signal.me/?#eu/([a-zA-Z0-9+\\-_/]+)");
+
+    private static final String BASE_URL = "https://signal.me/#eu/";
+
+    private final String url;
+    private final UsernameLinkComponents usernameLinkComponents;
+
+    public static UsernameLinkUrl fromUri(String url) throws InvalidUsernameLinkException {
+        final var matcher = URL_REGEX.matcher(url);
+        if (!matcher.matches()) {
+            throw new InvalidUsernameLinkException("Invalid username link");
+        }
+        final var path = matcher.group(2);
+        final byte[] allBytes;
+        try {
+            allBytes = Base64.decode(path);
+        } catch (IOException e) {
+            throw new InvalidUsernameLinkException("Invalid base64 encoding");
+        }
+
+        if (allBytes.length != 48) {
+            throw new InvalidUsernameLinkException("Invalid username link");
+        }
+
+        final var entropy = Arrays.copyOfRange(allBytes, 0, 32);
+        final var serverId = Arrays.copyOfRange(allBytes, 32, allBytes.length);
+        final var serverIdUuid = UuidUtil.parseOrNull(serverId);
+        if (serverIdUuid == null) {
+            throw new InvalidUsernameLinkException("Invalid serverId");
+        }
+
+        return new UsernameLinkUrl(new UsernameLinkComponents(entropy, serverIdUuid));
+    }
+
+    public UsernameLinkUrl(UsernameLinkComponents usernameLinkComponents) {
+        this.usernameLinkComponents = usernameLinkComponents;
+        this.url = createUrl(usernameLinkComponents);
+    }
+
+    private static String createUrl(UsernameLinkComponents usernameLinkComponents) {
+        final var entropy = usernameLinkComponents.getEntropy();
+        final var serverId = UuidUtil.toByteArray(usernameLinkComponents.getServerId());
+
+        final var combined = new byte[entropy.length + serverId.length];
+        System.arraycopy(entropy, 0, combined, 0, entropy.length);
+        System.arraycopy(serverId, 0, combined, entropy.length, serverId.length);
+
+        final var base64 = Base64.encodeUrlSafeWithoutPadding(combined);
+        return BASE_URL + base64;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public UsernameLinkComponents getComponents() {
+        return usernameLinkComponents;
+    }
+
+    public static final class InvalidUsernameLinkException extends Exception {
+
+        public InvalidUsernameLinkException(String message) {
+            super(message);
+        }
+
+        public InvalidUsernameLinkException(Throwable cause) {
+            super(cause);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index d56b2379..32642f28 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -33,6 +33,9 @@ import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameIsNotReservedException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameMalformedException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameTakenException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
@@ -98,6 +101,13 @@ public class AccountHelper {
                     && account.getRegistrationLockPin() != null) {
                 migrateRegistrationPin();
             }
+            if (account.getUsername() != null && account.getUsernameLink() == null) {
+                try {
+                    tryToSetUsernameLink(new Username(account.getUsername()));
+                } catch (BaseUsernameException e) {
+                    logger.debug("Invalid local username");
+                }
+            }
         } catch (DeprecatedVersionException e) {
             logger.debug("Signal-Server returned deprecated version exception", e);
             throw e;
@@ -305,13 +315,13 @@ public class AccountHelper {
     public static final int USERNAME_MIN_LENGTH = 3;
     public static final int USERNAME_MAX_LENGTH = 32;
 
-    public String reserveUsername(String nickname) throws IOException, BaseUsernameException {
+    public void reserveUsername(String nickname) throws IOException, BaseUsernameException {
         final var currentUsername = account.getUsername();
         if (currentUsername != null) {
             final var currentNickname = currentUsername.substring(0, currentUsername.indexOf('.'));
             if (currentNickname.equals(nickname)) {
                 refreshCurrentUsername();
-                return currentUsername;
+                return;
             }
         }
 
@@ -329,14 +339,13 @@ public class AccountHelper {
         }
 
         logger.debug("[reserveUsername] Successfully reserved username.");
-        final var username = candidates.get(hashIndex).getUsername();
+        final var username = candidates.get(hashIndex);
 
-        dependencies.getAccountManager().confirmUsername(username, response);
-        account.setUsername(username);
+        dependencies.getAccountManager().confirmUsername(username.getUsername(), response);
+        account.setUsername(username.getUsername());
         account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
         logger.debug("[confirmUsername] Successfully confirmed username.");
-
-        return username;
+        tryToSetUsernameLink(username);
     }
 
     public void refreshCurrentUsername() throws IOException, BaseUsernameException {
@@ -348,7 +357,8 @@ public class AccountHelper {
         final var whoAmIResponse = dependencies.getAccountManager().getWhoAmI();
         final var serverUsernameHash = whoAmIResponse.getUsernameHash();
         final var hasServerUsername = !isEmpty(serverUsernameHash);
-        final var localUsernameHash = Base64.encodeUrlSafeWithoutPadding(new Username(localUsername).getHash());
+        final var username = new Username(localUsername);
+        final var localUsernameHash = Base64.encodeUrlSafeWithoutPadding(username.getHash());
 
         if (!hasServerUsername) {
             logger.debug("No remote username is set.");
@@ -360,17 +370,40 @@ public class AccountHelper {
 
         if (!hasServerUsername || !Objects.equals(localUsernameHash, serverUsernameHash)) {
             logger.debug("Attempting to resynchronize username.");
-            tryReserveConfirmUsername(localUsername, localUsernameHash);
+            try {
+                tryReserveConfirmUsername(username);
+            } catch (UsernameMalformedException | UsernameTakenException | UsernameIsNotReservedException e) {
+                logger.debug("[confirmUsername] Failed to reserve confirm username: {} ({})",
+                        e.getMessage(),
+                        e.getClass().getSimpleName());
+                account.setUsername(null);
+                account.setUsernameLink(null);
+                throw e;
+            }
         } else {
             logger.debug("Username already set, not refreshing.");
         }
     }
 
-    private void tryReserveConfirmUsername(final String username, String localUsernameHash) throws IOException {
-        final var response = dependencies.getAccountManager().reserveUsername(List.of(localUsernameHash));
+    private void tryReserveConfirmUsername(final Username username) throws IOException {
+        final var response = dependencies.getAccountManager()
+                .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash())));
         logger.debug("[reserveUsername] Successfully reserved existing username.");
-        dependencies.getAccountManager().confirmUsername(username, response);
+        dependencies.getAccountManager().confirmUsername(username.getUsername(), response);
         logger.debug("[confirmUsername] Successfully confirmed existing username.");
+        tryToSetUsernameLink(username);
+    }
+
+    private void tryToSetUsernameLink(Username username) {
+        for (var i = 1; i < 4; i++) {
+            try {
+                final var linkComponents = dependencies.getAccountManager().createUsernameLink(username);
+                account.setUsernameLink(linkComponents);
+                break;
+            } catch (IOException e) {
+                logger.debug("[tryToSetUsernameLink] Failed with IOException on attempt {}/3", i, e);
+            }
+        }
     }
 
     public void deleteUsername() throws IOException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 2ab17768..6bddde84 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
@@ -93,10 +94,23 @@ public class RecipientHelper {
                 }
             });
         } else if (recipient instanceof RecipientIdentifier.Username usernameRecipient) {
-            final var username = usernameRecipient.username();
-            return account.getRecipientStore().resolveRecipientByUsername(username, () -> {
+            var username = usernameRecipient.username();
+            try {
+                UsernameLinkUrl usernameLinkUrl = UsernameLinkUrl.fromUri(username);
+                final var components = usernameLinkUrl.getComponents();
+                final var encryptedUsername = dependencies.getAccountManager()
+                        .getEncryptedUsernameFromLinkServerId(components.getServerId());
+                final var link = new Username.UsernameLink(components.getEntropy(), encryptedUsername);
+
+                username = Username.fromLink(link).getUsername();
+            } catch (UsernameLinkUrl.InvalidUsernameLinkException e) {
+            } catch (IOException | BaseUsernameException e) {
+                throw new RuntimeException(e);
+            }
+            final String finalUsername = username;
+            return account.getRecipientStore().resolveRecipientByUsername(finalUsername, () -> {
                 try {
-                    return getRegisteredUserByUsername(username);
+                    return getRegisteredUserByUsername(finalUsername);
                 } catch (Exception e) {
                     return null;
                 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index d4d0b10a..cfa54cde 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -61,6 +61,7 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
@@ -332,9 +333,19 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public String setUsername(final String username) throws IOException, InvalidUsernameException {
+    public String getUsername() {
+        return account.getUsername();
+    }
+
+    @Override
+    public UsernameLinkUrl getUsernameLink() {
+        return new UsernameLinkUrl(account.getUsernameLink());
+    }
+
+    @Override
+    public void setUsername(final String username) throws IOException, InvalidUsernameException {
         try {
-            return context.getAccountHelper().reserveUsername(username);
+            context.getAccountHelper().reserveUsername(username);
         } catch (BaseUsernameException e) {
             throw new InvalidUsernameException(e.getMessage() + " (" + e.getClass().getSimpleName() + ")", e);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index cd6720d3..5a6738d1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -76,6 +76,7 @@ import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.StorageKey;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
@@ -129,6 +130,7 @@ public class SignalAccount implements Closeable {
     private ServiceEnvironment serviceEnvironment;
     private String number;
     private String username;
+    private UsernameLinkComponents usernameLink;
     private String encryptedDeviceName;
     private int deviceId = 0;
     private String password;
@@ -1278,6 +1280,14 @@ public class SignalAccount implements Closeable {
         save();
     }
 
+    public UsernameLinkComponents getUsernameLink() {
+        return usernameLink;
+    }
+
+    public void setUsernameLink(final UsernameLinkComponents usernameLink) {
+        this.usernameLink = usernameLink;
+    }
+
     public ServiceEnvironment getServiceEnvironment() {
         return serviceEnvironment;
     }
diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index d430f49f..c729a39a 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -49,10 +49,15 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
         var username = ns.getString("username");
         if (username != null) {
             try {
-                final var newUsername = m.setUsername(username);
+                m.setUsername(username);
+                final var newUsername = m.getUsername();
+                final var newUsernameLink = m.getUsernameLink();
                 switch (outputWriter) {
-                    case PlainTextWriter w -> w.println("Your new username: {}", newUsername);
-                    case JsonWriter w -> w.write(new JsonAccountResponse(newUsername));
+                    case PlainTextWriter w -> w.println("Your new username: {} ({})",
+                            newUsername,
+                            newUsernameLink == null ? "-" : newUsernameLink.getUrl());
+                    case JsonWriter w -> w.write(new JsonAccountResponse(newUsername,
+                            newUsernameLink == null ? null : newUsernameLink.getUrl()));
                 }
             } catch (IOException e) {
                 throw new IOErrorException("Failed to set username: " + e.getMessage(), e);
@@ -72,6 +77,7 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
     }
 
     private record JsonAccountResponse(
-            @JsonInclude(JsonInclude.Include.NON_NULL) String username
+            @JsonInclude(JsonInclude.Include.NON_NULL) String username,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String usernameLink
     ) {}
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index a3f18393..985e2674 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -46,6 +46,7 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -164,7 +165,17 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public String setUsername(final String username) throws IOException, InvalidUsernameException {
+    public String getUsername() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public UsernameLinkUrl getUsernameLink() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void setUsername(final String username) throws IOException, InvalidUsernameException {
         throw new UnsupportedOperationException();
     }
 

From 3602ef9be940e287bfe6ed32972ce13fea9deaa4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 16 Nov 2023 20:36:46 +0100
Subject: [PATCH 313/672] Add -u flag to send to username

---
 .../signal/commands/RemoteDeleteCommand.java    |  5 ++++-
 .../org/asamk/signal/commands/SendCommand.java  |  6 +++++-
 .../signal/commands/SendReactionCommand.java    |  5 ++++-
 .../java/org/asamk/signal/util/CommandUtil.java | 17 ++++++++++++++++-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
index 294fd7c5..1b26396d 100644
--- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
@@ -34,6 +34,7 @@ public class RemoteDeleteCommand implements JsonRpcLocalCommand {
                 .help("Specify the timestamp of the message to delete.");
         subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
+        subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
         subparser.addArgument("--note-to-self").action(Arguments.storeTrue());
     }
 
@@ -43,12 +44,14 @@ public class RemoteDeleteCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
+        final var usernameStrings = ns.<String>getList("username");
         final var groupIdStrings = ns.<String>getList("group-id");
 
         final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
                 isNoteToSelf,
                 recipientStrings,
-                groupIdStrings);
+                groupIdStrings,
+                usernameStrings);
 
         final long targetTimestamp = ns.getLong("target-timestamp");
 
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 7d9fe788..1d0b46e4 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -47,6 +47,7 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.help("Send a message to another user or group.");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
         subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
+        subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
         subparser.addArgument("--note-to-self")
                 .help("Send the message to self without notification.")
                 .action(Arguments.storeTrue());
@@ -56,6 +57,7 @@ public class SendCommand implements JsonRpcLocalCommand {
         mut.addArgument("--message-from-stdin")
                 .action(Arguments.storeTrue())
                 .help("Read the message from standard input.");
+
         subparser.addArgument("-a", "--attachment")
                 .nargs("*")
                 .help("Add an attachment. "
@@ -106,11 +108,13 @@ public class SendCommand implements JsonRpcLocalCommand {
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
+        final var usernameStrings = ns.<String>getList("username");
 
         final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
                 isNoteToSelf,
                 recipientStrings,
-                groupIdStrings);
+                groupIdStrings,
+                usernameStrings);
 
         final var isEndSession = Boolean.TRUE.equals(ns.getBoolean("end-session"));
         if (isEndSession) {
diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index 0eafc2fd..56fa81f2 100644
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -31,6 +31,7 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
         subparser.help("Send reaction to a previously received or sent message.");
         subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
+        subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
         subparser.addArgument("--note-to-self")
                 .help("Send the reaction to self without notification.")
                 .action(Arguments.storeTrue());
@@ -57,11 +58,13 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
+        final var usernameStrings = ns.<String>getList("username");
 
         final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
                 isNoteToSelf,
                 recipientStrings,
-                groupIdStrings);
+                groupIdStrings,
+                usernameStrings);
 
         final var emoji = ns.getString("emoji");
         final var isRemove = Boolean.TRUE.equals(ns.getBoolean("remove"));
diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java
index 48decc7a..039ac2a7 100644
--- a/src/main/java/org/asamk/signal/util/CommandUtil.java
+++ b/src/main/java/org/asamk/signal/util/CommandUtil.java
@@ -26,7 +26,8 @@ public class CommandUtil {
             final Manager m,
             final boolean isNoteToSelf,
             final List<String> recipientStrings,
-            final List<String> groupIdStrings
+            final List<String> groupIdStrings,
+            final List<String> usernameStrings
     ) throws UserErrorException {
         final var recipientIdentifiers = new HashSet<RecipientIdentifier>();
         if (isNoteToSelf) {
@@ -39,6 +40,9 @@ public class CommandUtil {
         if (groupIdStrings != null) {
             recipientIdentifiers.addAll(CommandUtil.getGroupIdentifiers(groupIdStrings));
         }
+        if (usernameStrings != null) {
+            recipientIdentifiers.addAll(CommandUtil.getUsernameIdentifiers(usernameStrings));
+        }
 
         if (recipientIdentifiers.isEmpty()) {
             throw new UserErrorException("No recipients given");
@@ -102,6 +106,17 @@ public class CommandUtil {
         }
     }
 
+    public static Set<RecipientIdentifier.Username> getUsernameIdentifiers(Collection<String> usernameIdStrings) {
+        if (usernameIdStrings == null) {
+            return Set.of();
+        }
+        final var usernameIds = new HashSet<RecipientIdentifier.Username>();
+        for (final var usernameIdString : usernameIdStrings) {
+            usernameIds.add(new RecipientIdentifier.Username(usernameIdString));
+        }
+        return usernameIds;
+    }
+
     public static String getCaptchaRequiredMessage(final CaptchaRequiredException e, final boolean captchaProvided) {
         String message;
         if (!captchaProvided) {

From fddf982832418effc2b0e37a871effb2282cc99a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 17:09:05 +0100
Subject: [PATCH 314/672] Fix receiving contact address

Fixes #1385
---
 .../asamk/signal/manager/api/MessageEnvelope.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 27c17650..938bdad8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -482,13 +482,13 @@ public record MessageEnvelope(
                 static Address from(org.whispersystems.signalservice.api.messages.shared.SharedContact.PostalAddress address) {
                     return new Address(Address.Type.from(address.getType()),
                             address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel(),
-                            address.getLabel());
+                            address.getStreet(),
+                            address.getPobox(),
+                            address.getNeighborhood(),
+                            address.getCity(),
+                            address.getRegion(),
+                            address.getPostcode(),
+                            address.getCountry());
                 }
 
                 public enum Type {

From 81d2e315e3ceebddf33fd5e0c62f04cf7851aa29 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 17:17:26 +0100
Subject: [PATCH 315/672] Prevent groupV2Operations from being null

---
 .../manager/internal/RegistrationManagerImpl.java    | 12 ++++--------
 .../signal/manager/internal/SignalDependencies.java  |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 13412d25..d66ab214 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -60,6 +60,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
     private final String userAgent;
     private final Consumer<Manager> newManagerListener;
+    private final GroupsV2Operations groupsV2Operations;
 
     private final SignalServiceAccountManager accountManager;
     private final PinHelper pinHelper;
@@ -80,13 +81,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
         this.userAgent = userAgent;
         this.newManagerListener = newManagerListener;
 
-        GroupsV2Operations groupsV2Operations;
-        try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
-                    ServiceConfig.GROUP_MAX_SIZE);
-        } catch (Throwable ignored) {
-            groupsV2Operations = null;
-        }
+        groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
+                ServiceConfig.GROUP_MAX_SIZE);
         this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                 new DynamicCredentialsProvider(
                         // Using empty UUID, because registering doesn't work otherwise
@@ -210,7 +206,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
             final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
                     account.getCredentialsProvider(),
                     userAgent,
-                    null,
+                    groupsV2Operations,
                     ServiceConfig.AUTOMATIC_NETWORK_RETRY);
             accountManager.setAccountAttributes(account.getAccountAttributes(null));
             account.setRegistered(true);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 3b047c88..8b5f3e26 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -142,7 +142,7 @@ public class SignalDependencies {
 
     private ClientZkProfileOperations getClientZkProfileOperations() {
         final var clientZkOperations = getClientZkOperations();
-        return clientZkOperations == null ? null : clientZkOperations.getProfileOperations();
+        return clientZkOperations.getProfileOperations();
     }
 
     public SignalWebSocket getSignalWebSocket() {

From fcaecef961491115e8353a83a3821734cb5eea91 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 19:59:06 +0100
Subject: [PATCH 316/672] Improve source serviceId handling

---
 .../signal/manager/api/MessageEnvelope.java   |  6 ++--
 .../helper/IncomingMessageHandler.java        | 36 +++++++++----------
 .../signal/manager/helper/ReceiveHelper.java  | 11 +++---
 .../manager/helper/RecipientHelper.java       |  4 ---
 .../signal/manager/helper/SendHelper.java     |  9 ++---
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 938bdad8..dc157fe6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -32,6 +32,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptM
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ViewOnceOpenMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ViewedMessage;
+import org.whispersystems.signalservice.api.push.ServiceId;
 
 import java.io.File;
 import java.io.IOException;
@@ -904,8 +905,9 @@ public record MessageEnvelope(
             final AttachmentFileProvider fileProvider,
             Exception exception
     ) {
-        final var source = !envelope.isUnidentifiedSender() && envelope.hasSourceServiceId()
-                ? recipientResolver.resolveRecipient(envelope.getSourceAddress())
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
+        final var source = !envelope.isUnidentifiedSender() && serviceId != null
+                ? recipientResolver.resolveRecipient(serviceId)
                 : envelope.isUnidentifiedSender() && content != null
                         ? recipientResolver.resolveRecipient(content.getSender())
                         : exception instanceof ProtocolException e
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 66a13767..cf9c43a2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -131,15 +131,10 @@ public final class IncomingMessageHandler {
         final var actions = new ArrayList<HandleAction>();
         SignalServiceContent content = null;
         Exception exception = null;
-        try {
-            if (envelope.hasSourceServiceId()) {
+        envelope.getSourceServiceId().map(ServiceId::parseOrNull)
                 // Store uuid if we don't have it already
                 // uuid in envelope is sent by server
-                account.getRecipientTrustedResolver().resolveRecipientTrusted(envelope.getSourceAddress());
-            }
-        } catch (Exception e) {
-            exception = e;
-        }
+                .ifPresent(serviceId -> account.getRecipientResolver().resolveRecipient(serviceId));
         if (!envelope.isReceipt()) {
             try {
                 final var cipherResult = dependencies.getCipher()
@@ -488,7 +483,7 @@ public final class IncomingMessageHandler {
                         sender,
                         destination == null
                                 ? null
-                                : new DeviceAddress(context.getRecipientHelper().resolveRecipient(destination),
+                                : new DeviceAddress(account.getRecipientResolver().resolveRecipient(destination),
                                         destination.getServiceId(),
                                         0),
                         ignoreAttachments));
@@ -530,7 +525,7 @@ public final class IncomingMessageHandler {
             final var blockedListMessage = syncMessage.getBlockedList().get();
             for (var address : blockedListMessage.getAddresses()) {
                 context.getContactHelper()
-                        .setContactBlocked(context.getRecipientHelper().resolveRecipient(address), true);
+                        .setContactBlocked(account.getRecipientResolver().resolveRecipient(address), true);
             }
             for (var groupId : blockedListMessage.getGroupIds()
                     .stream()
@@ -654,7 +649,7 @@ public final class IncomingMessageHandler {
         if (source == null) {
             return false;
         }
-        final var recipientId = context.getRecipientHelper().resolveRecipient(source);
+        final var recipientId = account.getRecipientResolver().resolveRecipient(source);
         if (context.getContactHelper().isContactBlocked(recipientId)) {
             return true;
         }
@@ -694,7 +689,7 @@ public final class IncomingMessageHandler {
 
         final var message = content.getDataMessage().orElse(null);
 
-        final var recipientId = context.getRecipientHelper().resolveRecipient(source);
+        final var recipientId = account.getRecipientResolver().resolveRecipient(source);
         if (!group.isMember(recipientId) && !(
                 group.isPendingMember(recipientId) && message != null && message.isGroupV2Update()
         )) {
@@ -745,10 +740,11 @@ public final class IncomingMessageHandler {
                             }
 
                             if (groupInfo.getMembers().isPresent()) {
+                                final var recipientResolver = account.getRecipientResolver();
                                 groupV1.addMembers(groupInfo.getMembers()
                                         .get()
                                         .stream()
-                                        .map(context.getRecipientHelper()::resolveRecipient)
+                                        .map(recipientResolver::resolveRecipient)
                                         .collect(Collectors.toSet()));
                             }
 
@@ -921,8 +917,9 @@ public final class IncomingMessageHandler {
     }
 
     private SignalServiceAddress getSenderAddress(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceServiceId()) {
-            return envelope.getSourceAddress();
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
+        if (!envelope.isUnidentifiedSender() && serviceId != null) {
+            return new SignalServiceAddress(serviceId);
         } else if (content != null) {
             return content.getSender();
         } else {
@@ -931,12 +928,13 @@ public final class IncomingMessageHandler {
     }
 
     private DeviceAddress getSender(SignalServiceEnvelope envelope, SignalServiceContent content) {
-        if (!envelope.isUnidentifiedSender() && envelope.hasSourceServiceId()) {
-            return new DeviceAddress(context.getRecipientHelper().resolveRecipient(envelope.getSourceAddress()),
-                    envelope.getSourceAddress().getServiceId(),
+        final var serviceId = envelope.getSourceServiceId().map(ServiceId::parseOrNull).orElse(null);
+        if (!envelope.isUnidentifiedSender() && serviceId != null) {
+            return new DeviceAddress(account.getRecipientResolver().resolveRecipient(serviceId),
+                    serviceId,
                     envelope.getSourceDevice());
         } else {
-            return new DeviceAddress(context.getRecipientHelper().resolveRecipient(content.getSender()),
+            return new DeviceAddress(account.getRecipientResolver().resolveRecipient(content.getSender()),
                     content.getSender().getServiceId(),
                     content.getSenderDevice());
         }
@@ -951,7 +949,7 @@ public final class IncomingMessageHandler {
             return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
         }
         final var address = addressOptional.get();
-        return new DeviceAddress(context.getRecipientHelper().resolveRecipient(address),
+        return new DeviceAddress(account.getRecipientResolver().resolveRecipient(address),
                 address.getServiceId(),
                 account.getDeviceId());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index d48f125a..713ca5d7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -12,6 +12,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalWebSocket;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
 import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
@@ -147,8 +148,10 @@ public class ReceiveHelper {
                     for (final var it : batch) {
                         SignalServiceEnvelope envelope1 = new SignalServiceEnvelope(it.getEnvelope(),
                                 it.getServerDeliveredTimestamp());
-                        final var recipientId = envelope1.hasSourceServiceId() ? account.getRecipientResolver()
-                                .resolveRecipient(envelope1.getSourceAddress()) : null;
+                        final var recipientId = envelope1.getSourceServiceId()
+                                .map(ServiceId::parseOrNull)
+                                .map(s -> account.getRecipientResolver().resolveRecipient(s))
+                                .orElse(null);
                         logger.trace("Storing new message from {}", recipientId);
                         // store message on disk, before acknowledging receipt to the server
                         cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
@@ -230,7 +233,7 @@ public class ReceiveHelper {
                     if (exception instanceof UntrustedIdentityException) {
                         logger.debug("Keeping message with untrusted identity in message cache");
                         final var address = ((UntrustedIdentityException) exception).getSender();
-                        if (!envelope.hasSourceServiceId() && address.uuid().isPresent()) {
+                        if (envelope.getSourceServiceId().isEmpty() && address.uuid().isPresent()) {
                             final var recipientId = account.getRecipientResolver()
                                     .resolveRecipient(ACI.from(address.uuid().get()));
                             try {
@@ -282,7 +285,7 @@ public class ReceiveHelper {
                 cachedMessage.delete();
                 return null;
             }
-            if (!envelope.hasSourceServiceId()) {
+            if (envelope.getSourceServiceId().isEmpty()) {
                 final var identifier = ((UntrustedIdentityException) exception).getSender();
                 final var recipientId = account.getRecipientResolver()
                         .resolveRecipient(new RecipientAddress(identifier));
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 6bddde84..4a0bc9c4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -68,10 +68,6 @@ public class RecipientHelper {
                 .toSignalServiceAddress();
     }
 
-    public RecipientId resolveRecipient(final SignalServiceAddress address) {
-        return account.getRecipientResolver().resolveRecipient(address);
-    }
-
     public Set<RecipientId> resolveRecipients(Collection<RecipientIdentifier.Single> recipients) throws UnregisteredRecipientException {
         final var recipientIds = new HashSet<RecipientId>(recipients.size());
         for (var number : recipients) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 5ffb9646..80eb4c06 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -475,9 +475,10 @@ public class SendHelper {
                 senderKeyTargets = Set.of();
             } else {
                 results.stream().filter(SendMessageResult::isSuccess).forEach(allResults::add);
+                final var recipientResolver = account.getRecipientResolver();
                 final var failedTargets = results.stream()
                         .filter(r -> !r.isSuccess())
-                        .map(r -> context.getRecipientHelper().resolveRecipient(r.getAddress()))
+                        .map(r -> recipientResolver.resolveRecipient(r.getAddress()))
                         .toList();
                 if (!failedTargets.isEmpty()) {
                     senderKeyTargets = new HashSet<>(senderKeyTargets);
@@ -724,7 +725,7 @@ public class SendHelper {
 
     private void handleSendMessageResult(final SendMessageResult r) {
         if (r.isSuccess() && !r.getSuccess().isUnidentified()) {
-            final var recipientId = context.getRecipientHelper().resolveRecipient(r.getAddress());
+            final var recipientId = account.getRecipientResolver().resolveRecipient(r.getAddress());
             final var profile = account.getProfileStore().getProfile(recipientId);
             if (profile != null && (
                     profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.ENABLED
@@ -738,7 +739,7 @@ public class SendHelper {
             }
         }
         if (r.isUnregisteredFailure()) {
-            final var recipientId = context.getRecipientHelper().resolveRecipient(r.getAddress());
+            final var recipientId = account.getRecipientResolver().resolveRecipient(r.getAddress());
             final var profile = account.getProfileStore().getProfile(recipientId);
             if (profile != null && (
                     profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.ENABLED
@@ -752,7 +753,7 @@ public class SendHelper {
             }
         }
         if (r.getIdentityFailure() != null) {
-            final var recipientId = context.getRecipientHelper().resolveRecipient(r.getAddress());
+            final var recipientId = account.getRecipientResolver().resolveRecipient(r.getAddress());
             context.getIdentityHelper()
                     .handleIdentityFailure(recipientId, r.getAddress().getServiceId(), r.getIdentityFailure());
         }

From ce4afbe4c269d74e4cc3da93744e0dc980e536d7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 20:33:00 +0100
Subject: [PATCH 317/672] Update libsignal-service-java

Fixes #1384
---
 graalvm-config-dir/reflect-config.json | 12 +++++++++++-
 settings.gradle.kts                    |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 7bfa2e71..82f9c9c3 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -201,7 +201,7 @@
 },
 {
   "name":"java.lang.Class",
-  "methods":[{"name":"getRecordComponents","parameterTypes":[] }]
+  "methods":[{"name":"getPermittedSubclasses","parameterTypes":[] }, {"name":"getRecordComponents","parameterTypes":[] }, {"name":"isRecord","parameterTypes":[] }, {"name":"isSealed","parameterTypes":[] }]
 },
 {
   "name":"java.lang.Comparable",
@@ -268,6 +268,16 @@
   "queryAllPublicMethods":true,
   "methods":[{"name":"addSuppressed","parameterTypes":["java.lang.Throwable"] }, {"name":"getSuppressed","parameterTypes":[] }]
 },
+{
+  "name":"java.lang.annotation.Retention",
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"value","parameterTypes":[] }]
+},
+{
+  "name":"java.lang.annotation.Target",
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"value","parameterTypes":[] }]
+},
 {
   "name":"java.lang.constant.Constable",
   "queryAllDeclaredMethods":true
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e0624b42..f8963282 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_87")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_88")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.2")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")

From b88f8c205eebb9fece2349533dc1fb73b92af1db Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 20:43:09 +0100
Subject: [PATCH 318/672] Update dependencies

---
 settings.gradle.kts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index f8963282..bc63bd9f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,8 +6,8 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("libs") {
-            library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.76")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.15.3")
+            library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.77")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.16.0")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.1")
             version("slf4j", "2.0.9")
@@ -17,7 +17,7 @@ dependencyResolutionManagement {
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_88")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.43.2.2")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
             library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1")

From 6d5b8b6a7bdb5401072ba3724b2748ffa77e1629 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 20:51:29 +0100
Subject: [PATCH 319/672] Bump version to 0.12.5

---
 CHANGELOG.md     | 10 +++++++++-
 build.gradle.kts |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 837a003d..1c70f9d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## [Unreleased]
+## [0.12.5] - 2023-10-22
+
+### Fixes
+- Fix issue with joining groups by group link for new accounts
+- Fix receiving address of shared contact
+- Fix receiving sync edit messages in groups
+
+### Changed
+- Create safety numbers based on ACI instead of phone number
 
 ## [0.12.4] - 2023-10-22
 
diff --git a/build.gradle.kts b/build.gradle.kts
index a20a5899..47de4d0c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.28"
 }
 
-version = "0.12.4"
+version = "0.12.5"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 2c1d7a803f1f98ea4b0d7b505ea80d1964e56d07 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 21:10:44 +0100
Subject: [PATCH 320/672] Set snapshot version

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c70f9d3..a62159b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.12.5] - 2023-10-22
 
 ### Fixes
diff --git a/build.gradle.kts b/build.gradle.kts
index 47de4d0c..b0919040 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.28"
 }
 
-version = "0.12.5"
+version = "0.12.6-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 5904bfa92b8688c5e5cd983bcc9375ad1b91aa21 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 Nov 2023 21:14:16 +0100
Subject: [PATCH 321/672] Update CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a62159b2..0795b846 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## [Unreleased]
 
-## [0.12.5] - 2023-10-22
+## [0.12.5] - 2023-11-21
 
 ### Fixes
 - Fix issue with joining groups by group link for new accounts

From 66077f317be3a3e9c5b99e44e468a6e0a67e393b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 28 Nov 2023 19:12:53 +0100
Subject: [PATCH 322/672] Add missing capabilities for linking account

Fixes #1386
---
 .../java/org/asamk/signal/manager/config/ServiceConfig.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 02e4f8b5..18ff2ce8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -27,7 +27,9 @@ public class ServiceConfig {
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var giftBadges = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(false, true, true, true, true, giftBadges, false, false);
+        final var pni = !isPrimaryDevice;
+        final var paymentActivation = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(false, true, true, true, true, giftBadges, pni, paymentActivation);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(

From 089ec226663b253feeb3025f35fde8987c900f8a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 6 Dec 2023 18:08:35 +0100
Subject: [PATCH 323/672] Fix overlapping sqlite sessions in migration

Fixes #1394
---
 .../manager/storage/recipients/RecipientStore.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 63b6780f..96a8f224 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -481,10 +481,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     @Override
     public ProfileKey getProfileKey(final RecipientId recipientId) {
-        final var selfRecipientId = resolveRecipient(selfAddressProvider.getSelfAddress());
-        if (recipientId.equals(selfRecipientId)) {
-            return selfProfileKeyProvider.getSelfProfileKey();
-        }
         try (final var connection = database.getConnection()) {
             return getProfileKey(connection, recipientId);
         } catch (SQLException e) {
@@ -665,9 +661,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             Connection connection, RecipientId recipientId, final ProfileKey profileKey, boolean resetProfile
     ) throws SQLException {
         if (profileKey != null) {
-            final var recipientProfileKey = getProfileKey(recipientId);
+            final var recipientProfileKey = getProfileKey(connection, recipientId);
             if (profileKey.equals(recipientProfileKey)) {
-                final var recipientProfile = getProfile(recipientId);
+                final var recipientProfile = getProfile(connection, recipientId);
                 if (recipientProfile == null || (
                         recipientProfile.getUnidentifiedAccessMode() != Profile.UnidentifiedAccessMode.UNKNOWN
                                 && recipientProfile.getUnidentifiedAccessMode()
@@ -988,6 +984,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private ProfileKey getProfileKey(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var selfRecipientId = resolveRecipientLocked(connection, selfAddressProvider.getSelfAddress());
+        if (recipientId.equals(selfRecipientId)) {
+            return selfProfileKeyProvider.getSelfProfileKey();
+        }
         final var sql = (
                 """
                 SELECT r.profile_key

From 35fb1d60af927d5fca5d676ea7dc171d238a9ee3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 6 Dec 2023 18:11:27 +0100
Subject: [PATCH 324/672] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 63721 -> 43462 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
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

literal 63721
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3fa8f862..1af9e093 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From d3eef6c820e057a4a0abd0a64c6d652a33485e19 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 6 Dec 2023 18:12:17 +0100
Subject: [PATCH 325/672] Update dependencies

---
 settings.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index bc63bd9f..eebadcae 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,11 +13,11 @@ dependencyResolutionManagement {
             version("slf4j", "2.0.9")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.4.11")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_88")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.0.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
             library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1")

From 2535cd9c2caebd0e751acd5888ad975a82231f45 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 10 Dec 2023 18:57:05 +0100
Subject: [PATCH 326/672] Update libsignal-service-java

---
 .../org/asamk/signal/manager/helper/AccountHelper.java    | 1 +
 .../manager/storage/protocol/SignalProtocolStore.java     | 3 ++-
 .../signal/manager/storage/sessions/SessionStore.java     | 8 +++-----
 .../org/asamk/signal/manager/util/AttachmentUtils.java    | 1 +
 settings.gradle.kts                                       | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 32642f28..d49ab67a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -432,6 +432,7 @@ public class AccountHelper {
                             account.getAciIdentityKeyPair(),
                             account.getPniIdentityKeyPair(),
                             account.getProfileKey(),
+                            account.getOrCreatePinMasterKey(),
                             verificationCode);
         } catch (InvalidKeyException e) {
             throw new InvalidDeviceLinkException("Invalid device link", e);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index ea1a5c6f..f334a2be 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -21,6 +21,7 @@ import org.whispersystems.signalservice.api.push.DistributionId;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Supplier;
@@ -140,7 +141,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     }
 
     @Override
-    public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(final List<String> addressNames) {
+    public Map<SignalProtocolAddress, SessionRecord> getAllAddressesWithActiveSessions(final List<String> addressNames) {
         return sessionStore.getAllAddressesWithActiveSessions(addressNames);
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index 97f428ba..3f3ba4d6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 public class SessionStore implements SignalServiceSessionStore {
@@ -198,7 +197,7 @@ public class SessionStore implements SignalServiceSessionStore {
     }
 
     @Override
-    public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(final List<String> addressNames) {
+    public Map<SignalProtocolAddress, SessionRecord> getAllAddressesWithActiveSessions(final List<String> addressNames) {
         final var serviceIdsCommaSeparated = addressNames.stream()
                 .map(address -> "'" + address.replaceAll("'", "''") + "'")
                 .collect(Collectors.joining(","));
@@ -215,9 +214,8 @@ public class SessionStore implements SignalServiceSessionStore {
                 return Utils.executeQueryForStream(statement,
                                 res -> new Pair<>(getKeyFromResultSet(res), getSessionRecordFromResultSet(res)))
                         .filter(pair -> isActive(pair.second()))
-                        .map(Pair::first)
-                        .map(key -> new SignalProtocolAddress(key.address(), key.deviceId()))
-                        .collect(Collectors.toSet());
+                        .collect(Collectors.toMap(pair -> new SignalProtocolAddress(pair.first().address(),
+                                pair.first().deviceId()), Pair::second));
             }
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from session store", e);
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index a535d82b..5126b691 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -49,6 +49,7 @@ public class AttachmentUtils {
                 false,
                 false,
                 false,
+                false,
                 preview,
                 0,
                 0,
diff --git a/settings.gradle.kts b/settings.gradle.kts
index eebadcae..2a83b72a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_88")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_89")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")

From 4dcdffda0ae90941c7ee7a653ba4a7607e146889 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 10 Dec 2023 19:30:36 +0100
Subject: [PATCH 327/672] Use a new SVR2 enclave.

---
 .../signal/manager/config/LiveConfig.java     | 17 ++--
 .../signal/manager/config/ServiceConfig.java  | 12 +--
 .../config/ServiceEnvironmentConfig.java      |  4 +-
 .../signal/manager/config/StagingConfig.java  | 17 ++--
 .../signal/manager/helper/PinHelper.java      | 92 ++++++++++++-------
 .../internal/RegistrationManagerImpl.java     |  6 +-
 .../manager/internal/SignalDependencies.java  | 12 ++-
 7 files changed, 99 insertions(+), 61 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 300371bd..a0806e31 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -20,12 +20,15 @@ import java.util.Optional;
 import okhttp3.Dns;
 import okhttp3.Interceptor;
 
+import static org.asamk.signal.manager.api.ServiceEnvironment.LIVE;
+
 class LiveConfig {
 
     private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";
+    private static final String SVR2_MRENCLAVE = "a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97";
+    private static final String SVR2_MRENCLAVE_DEPRECATED = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";
 
     private static final String URL = "https://chat.signal.org";
     private static final String CDN_URL = "https://cdn.signal.org";
@@ -69,12 +72,12 @@ class LiveConfig {
         }
     }
 
-    static String getCdsiMrenclave() {
-        return CDSI_MRENCLAVE;
-    }
-
-    static String getSvr2Mrenclave() {
-        return SVR2_MRENCLAVE;
+    static ServiceEnvironmentConfig getServiceEnvironmentConfig(List<Interceptor> interceptors) {
+        return new ServiceEnvironmentConfig(LIVE,
+                createDefaultServiceConfiguration(interceptors),
+                getUnidentifiedSenderTrustRoot(),
+                CDSI_MRENCLAVE,
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_DEPRECATED));
     }
 
     private LiveConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 18ff2ce8..cd103f80 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -43,16 +43,8 @@ public class ServiceConfig {
         final var interceptors = List.of(userAgentInterceptor);
 
         return switch (serviceEnvironment) {
-            case LIVE -> new ServiceEnvironmentConfig(serviceEnvironment,
-                    LiveConfig.createDefaultServiceConfiguration(interceptors),
-                    LiveConfig.getUnidentifiedSenderTrustRoot(),
-                    LiveConfig.getCdsiMrenclave(),
-                    LiveConfig.getSvr2Mrenclave());
-            case STAGING -> new ServiceEnvironmentConfig(serviceEnvironment,
-                    StagingConfig.createDefaultServiceConfiguration(interceptors),
-                    StagingConfig.getUnidentifiedSenderTrustRoot(),
-                    StagingConfig.getCdsiMrenclave(),
-                    StagingConfig.getSvr2Mrenclave());
+            case LIVE -> LiveConfig.getServiceEnvironmentConfig(interceptors);
+            case STAGING -> StagingConfig.getServiceEnvironmentConfig(interceptors);
         };
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index 9664dcae..f4622064 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -4,10 +4,12 @@ import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
+import java.util.List;
+
 public record ServiceEnvironmentConfig(
         ServiceEnvironment type,
         SignalServiceConfiguration signalServiceConfiguration,
         ECPublicKey unidentifiedSenderTrustRoot,
         String cdsiMrenclave,
-        String svr2Mrenclave
+        List<String> svr2Mrenclaves
 ) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index f90ae48b..4409b005 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -20,12 +20,15 @@ import java.util.Optional;
 import okhttp3.Dns;
 import okhttp3.Interceptor;
 
+import static org.asamk.signal.manager.api.ServiceEnvironment.STAGING;
+
 class StagingConfig {
 
     private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";
+    private static final String SVR2_MRENCLAVE = "acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482";
+    private static final String SVR2_MRENCLAVE_DEPRECATED = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";
 
     private static final String URL = "https://chat.staging.signal.org";
     private static final String CDN_URL = "https://cdn-staging.signal.org";
@@ -69,12 +72,12 @@ class StagingConfig {
         }
     }
 
-    static String getCdsiMrenclave() {
-        return CDSI_MRENCLAVE;
-    }
-
-    static String getSvr2Mrenclave() {
-        return SVR2_MRENCLAVE;
+    static ServiceEnvironmentConfig getServiceEnvironmentConfig(List<Interceptor> interceptors) {
+        return new ServiceEnvironmentConfig(STAGING,
+                createDefaultServiceConfiguration(interceptors),
+                getUnidentifiedSenderTrustRoot(),
+                CDSI_MRENCLAVE,
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_DEPRECATED));
     }
 
     private StagingConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 824b278b..0bcfe09e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -5,39 +5,49 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
-import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2;
 import org.whispersystems.signalservice.internal.push.AuthCredentials;
 import org.whispersystems.signalservice.internal.push.LockedException;
 
 import java.io.IOException;
+import java.util.List;
 
 public class PinHelper {
 
     private static final Logger logger = LoggerFactory.getLogger(PinHelper.class);
 
-    private final SecureValueRecoveryV2 secureValueRecoveryV2;
+    private final List<SecureValueRecovery> secureValueRecoveries;
 
-    public PinHelper(final SecureValueRecoveryV2 secureValueRecoveryV2) {
-        this.secureValueRecoveryV2 = secureValueRecoveryV2;
+    public PinHelper(final List<SecureValueRecovery> secureValueRecoveries) {
+        this.secureValueRecoveries = secureValueRecoveries;
     }
 
     public void setRegistrationLockPin(
             String pin, MasterKey masterKey
     ) throws IOException {
-        final var backupResponse = secureValueRecoveryV2.setPin(pin, masterKey).execute();
-        switch (backupResponse) {
-            case SecureValueRecovery.BackupResponse.Success success -> {
+        IOException exception = null;
+        for (final var secureValueRecovery : secureValueRecoveries) {
+            try {
+                final var backupResponse = secureValueRecovery.setPin(pin, masterKey).execute();
+                switch (backupResponse) {
+                    case SecureValueRecovery.BackupResponse.Success success -> {
+                    }
+                    case SecureValueRecovery.BackupResponse.ServerRejected serverRejected ->
+                            logger.warn("Backup svr2 failed: ServerRejected");
+                    case SecureValueRecovery.BackupResponse.EnclaveNotFound enclaveNotFound ->
+                            logger.warn("Backup svr2 failed: EnclaveNotFound");
+                    case SecureValueRecovery.BackupResponse.ExposeFailure exposeFailure ->
+                            logger.warn("Backup svr2 failed: ExposeFailure");
+                    case SecureValueRecovery.BackupResponse.ApplicationError error ->
+                            throw new IOException(error.getException());
+                    case SecureValueRecovery.BackupResponse.NetworkError error -> throw error.getException();
+                    case null, default -> throw new AssertionError("Unexpected response");
+                }
+            } catch (IOException e) {
+                exception = e;
             }
-            case SecureValueRecovery.BackupResponse.ServerRejected serverRejected ->
-                    logger.warn("Backup svr2 failed: ServerRejected");
-            case SecureValueRecovery.BackupResponse.EnclaveNotFound enclaveNotFound ->
-                    logger.warn("Backup svr2 failed: EnclaveNotFound");
-            case SecureValueRecovery.BackupResponse.ExposeFailure exposeFailure ->
-                    logger.warn("Backup svr2 failed: ExposeFailure");
-            case SecureValueRecovery.BackupResponse.ApplicationError error ->
-                    throw new IOException(error.getException());
-            case SecureValueRecovery.BackupResponse.NetworkError error -> throw error.getException();
-            case null, default -> throw new AssertionError("Unexpected response");
+        }
+        if (exception != null) {
+            throw exception;
         }
     }
 
@@ -46,27 +56,47 @@ public class PinHelper {
     }
 
     public void removeRegistrationLockPin() throws IOException {
-        final var deleteResponse = secureValueRecoveryV2.deleteData();
-        switch (deleteResponse) {
-            case SecureValueRecovery.DeleteResponse.Success success -> {
+        IOException exception = null;
+        for (final var secureValueRecovery : secureValueRecoveries) {
+            try {
+                final var deleteResponse = secureValueRecovery.deleteData();
+                switch (deleteResponse) {
+                    case SecureValueRecovery.DeleteResponse.Success success -> {
+                    }
+                    case SecureValueRecovery.DeleteResponse.ServerRejected serverRejected ->
+                            logger.warn("Delete svr2 failed: ServerRejected");
+                    case SecureValueRecovery.DeleteResponse.EnclaveNotFound enclaveNotFound ->
+                            logger.warn("Delete svr2 failed: EnclaveNotFound");
+                    case SecureValueRecovery.DeleteResponse.ApplicationError error ->
+                            throw new IOException(error.getException());
+                    case SecureValueRecovery.DeleteResponse.NetworkError error -> throw error.getException();
+                    case null, default -> throw new AssertionError("Unexpected response");
+                }
+            } catch (IOException e) {
+                exception = e;
             }
-            case SecureValueRecovery.DeleteResponse.ServerRejected serverRejected ->
-                    logger.warn("Delete svr2 failed: ServerRejected");
-            case SecureValueRecovery.DeleteResponse.EnclaveNotFound enclaveNotFound ->
-                    logger.warn("Delete svr2 failed: EnclaveNotFound");
-            case SecureValueRecovery.DeleteResponse.ApplicationError error ->
-                    throw new IOException(error.getException());
-            case SecureValueRecovery.DeleteResponse.NetworkError error -> throw error.getException();
-            case null, default -> throw new AssertionError("Unexpected response");
+        }
+        if (exception != null) {
+            throw exception;
         }
     }
 
     public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
-            String pin, LockedException e
+            String pin, LockedException lockedException
     ) throws IOException, IncorrectPinException {
-        var svr2Credentials = e.getSvr2Credentials();
+        var svr2Credentials = lockedException.getSvr2Credentials();
         if (svr2Credentials != null) {
-            return getRegistrationLockData(secureValueRecoveryV2, svr2Credentials, pin);
+            IOException exception = null;
+            for (final var secureValueRecovery : secureValueRecoveries) {
+                try {
+                    return getRegistrationLockData(secureValueRecovery, svr2Credentials, pin);
+                } catch (IOException e) {
+                    exception = e;
+                }
+            }
+            if (exception != null) {
+                throw exception;
+            }
         }
 
         return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index d66ab214..ec200966 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -45,6 +45,7 @@ import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
@@ -90,7 +91,10 @@ public class RegistrationManagerImpl implements RegistrationManager {
                 userAgent,
                 groupsV2Operations,
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
-        final var secureValueRecoveryV2 = accountManager.getSecureValueRecoveryV2(serviceEnvironmentConfig.svr2Mrenclave());
+        final var secureValueRecoveryV2 = serviceEnvironmentConfig.svr2Mrenclaves()
+                .stream()
+                .map(mr -> (SecureValueRecovery) accountManager.getSecureValueRecoveryV2(mr))
+                .toList();
         this.pinHelper = new PinHelper(secureValueRecoveryV2);
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 8b5f3e26..9fb7aff4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -16,13 +16,14 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.ProfileService;
-import org.whispersystems.signalservice.api.svr.SecureValueRecoveryV2;
+import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
@@ -50,7 +51,7 @@ public class SignalDependencies {
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
 
-    private SecureValueRecoveryV2 secureValueRecoveryV2;
+    private List<SecureValueRecovery> secureValueRecoveryV2;
     private ProfileService profileService;
     private SignalServiceCipher cipher;
 
@@ -192,9 +193,12 @@ public class SignalDependencies {
                         pushServiceSocket));
     }
 
-    public SecureValueRecoveryV2 getSecureValueRecoveryV2() {
+    public List<SecureValueRecovery> getSecureValueRecoveryV2() {
         return getOrCreate(() -> secureValueRecoveryV2,
-                () -> secureValueRecoveryV2 = getAccountManager().getSecureValueRecoveryV2(serviceEnvironmentConfig.svr2Mrenclave()));
+                () -> secureValueRecoveryV2 = serviceEnvironmentConfig.svr2Mrenclaves()
+                        .stream()
+                        .map(mr -> (SecureValueRecovery) getAccountManager().getSecureValueRecoveryV2(mr))
+                        .toList());
     }
 
     public ProfileService getProfileService() {

From 70e0f7027eff8babcb9089333b3e96f600d194cb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 11 Dec 2023 18:28:38 +0100
Subject: [PATCH 328/672] Bump version to 0.12.6

---
 CHANGELOG.md     | 6 ++++++
 build.gradle.kts | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0795b846..08a82bcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [0.12.6] - 2023-12-11
+
+### Fixes
+- Fix linking to an existing account
+- Fix migration from old account data
+
 ## [0.12.5] - 2023-11-21
 
 ### Fixes
diff --git a/build.gradle.kts b/build.gradle.kts
index b0919040..d0903949 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.28"
 }
 
-version = "0.12.6-SNAPSHOT"
+version = "0.12.7-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 2729772adbf56efa15906d15f49321725ad88547 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 11 Dec 2023 19:11:26 +0100
Subject: [PATCH 329/672] Fix release pipeline

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6af6daab..335f1eec 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,7 +6,7 @@ on:
       - v*
 
 permissions:
-  contents: read # to fetch code (actions/checkout)
+  contents: write # to fetch code (actions/checkout) and create release
 
 env:
   IMAGE_NAME: signal-cli

From fc6a4b78eb797643e6b45ca76bed552b9ecc190f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 14 Dec 2023 18:07:13 +0100
Subject: [PATCH 330/672] Update libsignal-service-java

Uses new device link endpoint

Fixes #1399
---
 graalvm-config-dir/reflect-config.json        | 10 ++++++++-
 .../internal/ProvisioningManagerImpl.java     | 20 +++++++++---------
 .../internal/RegistrationManagerImpl.java     | 21 ++++---------------
 .../signal/manager/storage/SignalAccount.java | 11 +++++++---
 .../asamk/signal/manager/util/KeyUtils.java   | 16 ++++++++++++++
 settings.gradle.kts                           |  2 +-
 6 files changed, 48 insertions(+), 32 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 82f9c9c3..f907f84e 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -250,6 +250,7 @@
 {
   "name":"java.lang.Record",
   "allDeclaredFields":true,
+  "allDeclaredClasses":true,
   "queryAllDeclaredMethods":true
 },
 {
@@ -300,7 +301,7 @@
 },
 {
   "name":"java.lang.reflect.RecordComponent",
-  "methods":[{"name":"getName","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
+  "methods":[{"name":"getAccessor","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getType","parameterTypes":[] }]
 },
 {
   "name":"java.net.NetPermission"
@@ -2439,6 +2440,13 @@
   "name":"org.whispersystems.signalservice.internal.push.KyberPreKeyEntity$KEMPublicKeySerializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.LinkDeviceRequest",
+  "allDeclaredFields":true,
+  "allDeclaredClasses":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"accountAttributes","parameterTypes":[] }, {"name":"aciPqLastResortPreKey","parameterTypes":[] }, {"name":"aciSignedPreKey","parameterTypes":[] }, {"name":"pniPqLastResortPreKey","parameterTypes":[] }, {"name":"pniSignedPreKey","parameterTypes":[] }, {"name":"verificationCode","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.MismatchedDevices",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 2a7ef9e4..1dbe7e9b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -36,7 +36,6 @@ import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
-import org.whispersystems.signalservice.internal.push.ConfirmCodeMessage;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
 import java.io.IOException;
@@ -45,7 +44,7 @@ import java.nio.channels.OverlappingFileLockException;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import static org.asamk.signal.manager.config.ServiceConfig.getCapabilities;
+import static org.asamk.signal.manager.util.KeyUtils.generatePreKeysForType;
 
 public class ProvisioningManagerImpl implements ProvisioningManager {
 
@@ -140,20 +139,21 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
                     encryptedDeviceName,
                     ret.getAciIdentity(),
                     ret.getPniIdentity(),
-                    profileKey);
+                    profileKey,
+                    ret.getMasterKey());
 
             account.getConfigurationStore().setReadReceipts(ret.isReadReceipts());
 
+            final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
+            final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
+
             logger.debug("Finishing new device registration");
             var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
-                    new ConfirmCodeMessage(false,
-                            true,
-                            account.getAccountData(ServiceIdType.ACI).getLocalRegistrationId(),
-                            account.getAccountData(ServiceIdType.PNI).getLocalRegistrationId(),
-                            encryptedDeviceName,
-                            getCapabilities(false)));
+                    account.getAccountAttributes(null),
+                    aciPreKeys,
+                    pniPreKeys);
 
-            account.finishLinking(deviceId);
+            account.finishLinking(deviceId, aciPreKeys, pniPreKeys);
 
             ManagerImpl m = null;
             try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index ec200966..6a2f3633 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -52,6 +52,8 @@ import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider
 import java.io.IOException;
 import java.util.function.Consumer;
 
+import static org.asamk.signal.manager.util.KeyUtils.generatePreKeysForType;
+
 public class RegistrationManagerImpl implements RegistrationManager {
 
     private static final Logger logger = LoggerFactory.getLogger(RegistrationManagerImpl.class);
@@ -137,8 +139,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
             account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         }
 
-        final var aciPreKeys = generatePreKeysForType(ServiceIdType.ACI);
-        final var pniPreKeys = generatePreKeysForType(ServiceIdType.PNI);
+        final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
+        final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
         final var result = NumberVerificationUtils.verifyNumber(account.getSessionId(account.getNumber()),
                 verificationCode,
                 pin,
@@ -252,21 +254,6 @@ public class RegistrationManagerImpl implements RegistrationManager {
                 true));
     }
 
-    private PreKeyCollection generatePreKeysForType(ServiceIdType serviceIdType) {
-        final var accountData = account.getAccountData(serviceIdType);
-        final var keyPair = accountData.getIdentityKeyPair();
-        final var preKeyMetadata = accountData.getPreKeyMetadata();
-
-        final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId();
-        final var signedPreKey = KeyUtils.generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair.getPrivateKey());
-
-        final var privateKey = keyPair.getPrivateKey();
-        final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId();
-        final var lastResortKyberPreKey = KeyUtils.generateKyberPreKeyRecord(kyberPreKeyIdOffset, privateKey);
-
-        return new PreKeyCollection(keyPair.getPublicKey(), signedPreKey, lastResortKyberPreKey);
-    }
-
     @Override
     public void close() {
         if (account != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 5a6738d1..b95b86e5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -275,7 +275,8 @@ public class SignalAccount implements Closeable {
             final String encryptedDeviceName,
             final IdentityKeyPair aciIdentity,
             final IdentityKeyPair pniIdentity,
-            final ProfileKey profileKey
+            final ProfileKey profileKey,
+            final MasterKey masterKey
     ) {
         this.deviceId = 0;
         this.number = number;
@@ -290,7 +291,7 @@ public class SignalAccount implements Closeable {
         this.registered = false;
         this.isMultiDevice = true;
         getKeyValueStore().storeEntry(lastReceiveTimestamp, 0L);
-        this.pinMasterKey = null;
+        this.pinMasterKey = masterKey;
         getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
         this.storageKey = null;
@@ -304,9 +305,13 @@ public class SignalAccount implements Closeable {
         save();
     }
 
-    public void finishLinking(final int deviceId) {
+    public void finishLinking(
+            final int deviceId, final PreKeyCollection aciPreKeys, final PreKeyCollection pniPreKeys
+    ) {
         this.registered = true;
         this.deviceId = deviceId;
+        setPreKeys(ServiceIdType.ACI, aciPreKeys);
+        setPreKeys(ServiceIdType.PNI, pniPreKeys);
         save();
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 758831fc..486e3655 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -1,5 +1,6 @@
 package org.asamk.signal.manager.util;
 
+import org.asamk.signal.manager.storage.SignalAccount;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
@@ -12,6 +13,7 @@ import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 
 import java.security.SecureRandom;
@@ -125,4 +127,18 @@ public class KeyUtils {
     public static int getRandomInt(int bound) {
         return secureRandom.nextInt(bound);
     }
+
+    public static PreKeyCollection generatePreKeysForType(final SignalAccount.AccountData<?> accountData) {
+        final var keyPair = accountData.getIdentityKeyPair();
+        final var preKeyMetadata = accountData.getPreKeyMetadata();
+
+        final var nextSignedPreKeyId = preKeyMetadata.getNextSignedPreKeyId();
+        final var signedPreKey = generateSignedPreKeyRecord(nextSignedPreKeyId, keyPair.getPrivateKey());
+
+        final var privateKey = keyPair.getPrivateKey();
+        final var kyberPreKeyIdOffset = preKeyMetadata.getNextKyberPreKeyId();
+        final var lastResortKyberPreKey = generateKyberPreKeyRecord(kyberPreKeyIdOffset, privateKey);
+
+        return new PreKeyCollection(keyPair.getPublicKey(), signedPreKey, lastResortKyberPreKey);
+    }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2a83b72a..b4e33068 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_89")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_90")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")

From caa4fa0180a84cca10a1b363d25147d03ccb0387 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 15 Dec 2023 17:32:30 +0100
Subject: [PATCH 331/672] Fix inspection issues

---
 .../java/org/asamk/signal/manager/helper/SendHelper.java    | 2 +-
 .../java/org/asamk/signal/manager/helper/StorageHelper.java | 2 +-
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java | 2 +-
 src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java | 2 +-
 src/main/java/org/asamk/signal/dbus/DbusProperties.java     | 1 -
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java     | 2 +-
 src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java  | 6 ++----
 src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java  | 2 +-
 src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java | 2 +-
 .../asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java   | 2 +-
 .../signal/jsonrpc/SignalJsonRpcDispatcherHandler.java      | 2 +-
 src/main/java/org/asamk/signal/util/Util.java               | 2 +-
 12 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 80eb4c06..2af6337f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -220,7 +220,7 @@ public class SendHelper {
                 (messageSender, address, unidentifiedAccess) -> messageSender.sendTyping(List.of(address),
                         List.of(unidentifiedAccess),
                         message,
-                        null).get(0));
+                        null).getFirst());
         handleSendMessageResult(result);
         return result;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index fa1eef11..1eed964d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -302,7 +302,7 @@ public class StorageHelper {
             logger.warn("Failed to read storage records, ignoring.");
             return null;
         }
-        return !records.isEmpty() ? records.get(0) : null;
+        return !records.isEmpty() ? records.getFirst() : null;
     }
 
     private List<SignalStorageRecord> getSignalStorageRecords(final Collection<StorageId> storageIds) throws IOException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index cfa54cde..e87550b1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1291,7 +1291,7 @@ public class ManagerImpl implements Manager {
                     r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber()));
             case IdentityVerificationCode.ScannableSafetyNumber safetyNumber -> trustIdentity(recipient,
                     r -> context.getIdentityHelper().trustIdentityVerifiedSafetyNumber(r, safetyNumber.safetyNumber()));
-            case null, default -> throw new AssertionError("Invalid verification code type");
+            case null -> throw new AssertionError("Invalid verification code type");
         };
     }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
index f8a65e7e..4f320ad8 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
@@ -94,7 +94,7 @@ public class DbusCommandHandler {
                         "Multiple users found, you need to specify an account (phone number) with -a");
             }
 
-            return accounts.get(0).getPath();
+            return accounts.getFirst().getPath();
         } catch (UnknownMethod e) {
             // dbus daemon not running in multi-account mode
             return null;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusProperties.java b/src/main/java/org/asamk/signal/dbus/DbusProperties.java
index a77ed164..419a034b 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusProperties.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusProperties.java
@@ -52,7 +52,6 @@ public abstract class DbusProperties implements Properties {
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public Map<String, Variant<?>> GetAll(final String interface_name) {
         final var handler = getHandlerOptional(interface_name);
         if (handler.isEmpty()) {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 2921533e..6e394eb4 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -668,7 +668,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     @Override
     public boolean isRegistered(String number) {
         var result = isRegistered(List.of(number));
-        return result.get(0);
+        return result.getFirst();
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
index 8d1fcbf7..e0acdcf1 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcMessage.java
@@ -2,8 +2,6 @@ package org.asamk.signal.jsonrpc;
 
 /**
  * Represents a JSON-RPC (batch) request or (batch) response.
- * https://www.jsonrpc.org/specification
+ * <a href="https://www.jsonrpc.org/specification">https://www.jsonrpc.org/specification</a>
  */
-public sealed abstract class JsonRpcMessage permits JsonRpcBatchMessage, JsonRpcRequest, JsonRpcResponse {
-
-}
+public sealed abstract class JsonRpcMessage permits JsonRpcBatchMessage, JsonRpcRequest, JsonRpcResponse {}
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
index 8e7535ec..e90d740c 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ValueNode;
 
 /**
  * Represents a JSON-RPC request.
- * https://www.jsonrpc.org/specification#request_object
+ * <a href="https://www.jsonrpc.org/specification#request_object">https://www.jsonrpc.org/specification#request_object</a>
  */
 public final class JsonRpcRequest extends JsonRpcMessage {
 
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java
index 406212d8..9cc2e965 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcResponse.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.node.ValueNode;
 
 /**
  * Represents a JSON-RPC response.
- * https://www.jsonrpc.org/specification#response_object
+ * <a href="https://www.jsonrpc.org/specification#response_object">https://www.jsonrpc.org/specification#response_object</a>
  */
 public final class JsonRpcResponse extends JsonRpcMessage {
 
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 3d470820..3609163c 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -94,7 +94,7 @@ public class SignalJsonRpcCommandHandler {
             if (manager == null) {
                 final var managers = c.getManagers();
                 if (managers.size() == 1) {
-                    manager = managers.get(0);
+                    manager = managers.getFirst();
                 }
             }
             if (manager != null) {
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index 00abb635..c8b4bc15 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -126,7 +126,7 @@ public class SignalJsonRpcDispatcherHandler {
     private void unsubscribeReceive(final Manager m) {
         final var subscriptionId = receiveHandlers.entrySet()
                 .stream()
-                .filter(e -> e.getValue().size() == 1 && e.getValue().get(0).first().equals(m))
+                .filter(e -> e.getValue().size() == 1 && e.getValue().getFirst().first().equals(m))
                 .map(Map.Entry::getKey)
                 .findFirst();
         subscriptionId.ifPresent(this::unsubscribeReceive);
diff --git a/src/main/java/org/asamk/signal/util/Util.java b/src/main/java/org/asamk/signal/util/Util.java
index 4685249c..94996ee3 100644
--- a/src/main/java/org/asamk/signal/util/Util.java
+++ b/src/main/java/org/asamk/signal/util/Util.java
@@ -42,7 +42,7 @@ public class Util {
         if (strings.isEmpty()) {
             return "";
         }
-        return strings.get(0) + strings.stream()
+        return strings.getFirst() + strings.stream()
                 .skip(1)
                 .filter(s -> !s.isEmpty())
                 .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1).toLowerCase(Locale.ROOT))

From 59cbbde8350158f70e1a611cd3b45f1f1cddbf5a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 15 Dec 2023 19:05:13 +0100
Subject: [PATCH 332/672] Update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08a82bcb..445bb4fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 ## [Unreleased]
 
+**Attention**: Now requires Java 21
+
+### Added
+- New --hidden parameter for removeContact command
+
+### Improved
+- Better shutdown handling after Ctrl+C and SIGTERM
+
 ## [0.12.6] - 2023-12-11
 
 ### Fixes

From 328ba0202fbdd8c3d106835a0b2ef906c93bfeb5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 15 Dec 2023 19:08:56 +0100
Subject: [PATCH 333/672] Bump version to 0.12.7

---
 CHANGELOG.md     | 5 +++++
 build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 445bb4fd..b6100a9b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,11 @@
 ### Improved
 - Better shutdown handling after Ctrl+C and SIGTERM
 
+## [0.12.7] - 2023-12-15
+
+### Fixes
+- Fix linking to an existing account
+
 ## [0.12.6] - 2023-12-11
 
 ### Fixes
diff --git a/build.gradle.kts b/build.gradle.kts
index d0903949..df3ce9d2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.9.28"
 }
 
-version = "0.12.7-SNAPSHOT"
+version = "0.12.8-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 5e7899675e6fa7f0b99ffa35fcff3a70bde4f7ab Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 15 Dec 2023 19:53:35 +0100
Subject: [PATCH 334/672] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6100a9b..25aa6e45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 
 ## [0.12.7] - 2023-12-15
 
+**Attention**: Now requires native libsignal-client version 0.36.1
+
 ### Fixes
 - Fix linking to an existing account
 

From 375bdb79485ec90beb9a154112821a4657740b7a Mon Sep 17 00:00:00 2001
From: morph027 <stefan.heitmueller@gmx.com>
Date: Tue, 19 Dec 2023 18:48:54 +0100
Subject: [PATCH 335/672] add file.encoding=UTF-8 to native builds, refs #1105
 (#1404)

Signed-off-by: morph027 <stefan.heitmueller@gmx.com>
---
 build.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index df3ce9d2..b0a37747 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,6 +25,8 @@ graalvmNative {
     binaries {
         this["main"].run {
             buildArgs.add("--install-exit-handlers")
+            buildArgs.add("-Dfile.encoding=UTF-8")
+            buildArgs.add("-J-Dfile.encoding=UTF-8")
             resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
             if (System.getenv("GRAALVM_HOME") == null) {

From c6e9e19858ef9c89135cbee70e7f5ec45c76e248 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 4 Jan 2024 18:00:19 +0100
Subject: [PATCH 336/672] Update libsignal-service-java

---
 .../java/org/asamk/signal/manager/config/LiveConfig.java  | 8 ++++++--
 .../org/asamk/signal/manager/config/StagingConfig.java    | 8 ++++++--
 .../org/asamk/signal/manager/helper/PreKeyHelper.java     | 1 -
 .../org/asamk/signal/manager/helper/ProfileHelper.java    | 5 ++++-
 settings.gradle.kts                                       | 2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index a0806e31..3c477299 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -42,10 +42,13 @@ class LiveConfig {
     private static final Optional<SignalProxy> proxy = Optional.empty();
 
     private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
-            .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P");
+            .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0I=");
     private static final byte[] genericServerPublicParams = Base64.getDecoder()
             .decode("AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN");
 
+    private static final byte[] backupServerPublicParams = Base64.getDecoder()
+            .decode("AJwNSU55fsFCbgaxGRD11wO1juAs8Yr5GF8FPlGzzvdJJIKH5/4CC7ZJSOe3yL2vturVaRU2Cx0n751Vt8wkj1bozK3CBV1UokxV09GWf+hdVImLGjXGYLLhnI1J2TWEe7iWHyb553EEnRb5oxr9n3lUbNAJuRmFM7hrr0Al0F0wrDD4S8lo2mGaXe0MJCOM166F8oYRQqpFeEHfiLnxA1O8ZLh7vMdv4g9jI5phpRBTsJ5IjiJrWeP0zdIGHEssUeprDZ9OUJ14m0v61eYJMKsf59Bn+mAT2a7YfB+Don9O");
+
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
     ) {
@@ -61,7 +64,8 @@ class LiveConfig {
                 dns,
                 proxy,
                 zkGroupServerPublicParams,
-                genericServerPublicParams);
+                genericServerPublicParams,
+                backupServerPublicParams);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 4409b005..83bb7be6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -42,10 +42,13 @@ class StagingConfig {
     private static final Optional<SignalProxy> proxy = Optional.empty();
 
     private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
-            .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj");
+            .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCM=");
     private static final byte[] genericServerPublicParams = Base64.getDecoder()
             .decode("AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N");
 
+    private static final byte[] backupServerPublicParams = Base64.getDecoder()
+            .decode("AHYrGb9IfugAAJiPKp+mdXUx+OL9zBolPYHYQz6GI1gWjpEu5me3zVNSvmYY4zWboZHif+HG1sDHSuvwFd0QszSwuSF4X4kRP3fJREdTZ5MCR0n55zUppTwfHRW2S4sdQ0JGz7YDQIJCufYSKh0pGNEHL6hv79Agrdnr4momr3oXdnkpVBIp3HWAQ6IbXQVSG18X36GaicI1vdT0UFmTwU2KTneluC2eyL9c5ff8PcmiS+YcLzh0OKYQXB5ZfQ06d6DiINvDQLy75zcfUOniLAj0lGJiHxGczin/RXisKSR8");
+
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
     ) {
@@ -61,7 +64,8 @@ class StagingConfig {
                 dns,
                 proxy,
                 zkGroupServerPublicParams,
-                genericServerPublicParams);
+                genericServerPublicParams,
+                backupServerPublicParams);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 5b1ae051..e8ef3fd6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -107,7 +107,6 @@ public class PreKeyHelper {
                 || lastResortKyberPreKeyRecord != null
                 || kyberPreKeyRecords != null) {
             final var preKeyUpload = new PreKeyUpload(serviceIdType,
-                    identityKeyPair.getPublicKey(),
                     signedPreKeyRecord,
                     preKeyRecords,
                     lastResortKyberPreKeyRecord,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index d0f442ce..d427d0d0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.internal.SignalDependencies;
@@ -202,7 +203,9 @@ public final class ProfileHelper {
                                 newProfile.getAboutEmoji() == null ? "" : newProfile.getAboutEmoji(),
                                 paymentsAddress,
                                 avatarUploadParams,
-                                List.of(/* TODO implement support for badges */));
+                                List.of(/* TODO implement support for badges */),
+                                account.getConfigurationStore().getPhoneNumberSharingMode()
+                                        == PhoneNumberSharingMode.EVERYBODY);
                 if (!avatarUploadParams.keepTheSame) {
                     builder.withAvatarUrlPath(avatarPath.orElse(null));
                 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b4e33068..2010e50f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_90")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_91")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")

From c07ba14fc6936e638d7fa6eb5c758bdaa7219747 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 4 Jan 2024 18:09:36 +0100
Subject: [PATCH 337/672] Update dependencies

---
 settings.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2010e50f..c6d4cdb4 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,10 +7,10 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.77")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.16.0")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.16.1")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.1")
-            version("slf4j", "2.0.9")
+            version("slf4j", "2.0.10")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")

From 3290a5bf4d642beaef6584a700aab8f2da3af6e0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 12 Jan 2024 18:07:14 +0100
Subject: [PATCH 338/672] Add --notify-self parmeter

Fixes #1087
---
 CHANGELOG.md                                  |  4 +-
 .../org/asamk/signal/manager/Manager.java     |  2 +-
 .../signal/manager/helper/GroupHelper.java    |  2 +-
 .../signal/manager/helper/SendHelper.java     | 14 +++++--
 .../signal/manager/internal/ManagerImpl.java  | 39 ++++++++++++-------
 .../asamk/signal/commands/SendCommand.java    |  6 ++-
 .../asamk/signal/dbus/DbusManagerImpl.java    |  2 +-
 .../org/asamk/signal/dbus/DbusSignalImpl.java | 39 ++++++++++---------
 8 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25aa6e45..40bb6d37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,12 @@
 
 ## [Unreleased]
 
-**Attention**: Now requires Java 21
+**Attention**: Now requires Java 21 and libsignal-client version 0.37
 
 ### Added
 - New --hidden parameter for removeContact command
+- New --notify-self parameter for send command, for sending a non-sync message when self is part of the recipients or groups.
+  With this parameter sending to the self number (+XXXX) now behaves the same as the --note-to-self parameter.
 
 ### Improved
 - Better shutdown handling after Ctrl+C and SIGTERM
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index ac88e2bc..4104a8fb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -172,7 +172,7 @@ public interface Manager extends Closeable {
     );
 
     SendMessageResults sendMessage(
-            Message message, Set<RecipientIdentifier> recipients
+            Message message, Set<RecipientIdentifier> recipients, boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
 
     SendMessageResults sendEditMessage(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index a7a5dfb7..40558a89 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -551,7 +551,7 @@ public class GroupHelper {
 
     private void sendExpirationTimerUpdate(GroupIdV1 groupId) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
-        context.getSendHelper().sendAsGroupMessage(messageBuilder, groupId, Optional.empty());
+        context.getSendHelper().sendAsGroupMessage(messageBuilder, groupId, false, Optional.empty());
     }
 
     private SendGroupMessageResults updateGroupV2(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 2af6337f..38e8de17 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -101,10 +101,13 @@ public class SendHelper {
      * The message is extended with the current expiration timer for the group and the group context.
      */
     public List<SendMessageResult> sendAsGroupMessage(
-            SignalServiceDataMessage.Builder messageBuilder, GroupId groupId, Optional<Long> editTargetTimestamp
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final GroupId groupId,
+            final boolean includeSelf,
+            final Optional<Long> editTargetTimestamp
     ) throws IOException, GroupNotFoundException, NotAGroupMemberException, GroupSendingNotAllowedException {
         final var g = getGroupForSending(groupId);
-        return sendAsGroupMessage(messageBuilder, g, editTargetTimestamp);
+        return sendAsGroupMessage(messageBuilder, g, includeSelf, editTargetTimestamp);
     }
 
     /**
@@ -297,13 +300,16 @@ public class SendHelper {
     }
 
     private List<SendMessageResult> sendAsGroupMessage(
-            final SignalServiceDataMessage.Builder messageBuilder, final GroupInfo g, Optional<Long> editTargetTimestamp
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final GroupInfo g,
+            final boolean includeSelf,
+            final Optional<Long> editTargetTimestamp
     ) throws IOException, GroupSendingNotAllowedException {
         GroupUtils.setGroupContext(messageBuilder, g);
         messageBuilder.withExpiration(g.getMessageExpirationTimer());
 
         final var message = messageBuilder.build();
-        final var recipients = g.getMembersWithout(account.getSelfRecipientId());
+        final var recipients = includeSelf ? g.getMembers() : g.getMembersWithout(account.getSelfRecipientId());
 
         if (g.isAnnouncementGroup() && !g.isAdmin(account.getSelfRecipientId())) {
             if (message.getBody().isPresent()
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index e87550b1..bc801a28 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -71,6 +71,7 @@ import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.identities.IdentityInfo;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack;
 import org.asamk.signal.manager.storage.stickerPacks.StickerPackStore;
@@ -528,21 +529,31 @@ public class ManagerImpl implements Manager {
     }
 
     private SendMessageResults sendMessage(
-            SignalServiceDataMessage.Builder messageBuilder, Set<RecipientIdentifier> recipients
+            SignalServiceDataMessage.Builder messageBuilder, Set<RecipientIdentifier> recipients, boolean notifySelf
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
-        return sendMessage(messageBuilder, recipients, Optional.empty());
+        return sendMessage(messageBuilder, recipients, notifySelf, Optional.empty());
     }
 
     private SendMessageResults sendMessage(
             SignalServiceDataMessage.Builder messageBuilder,
             Set<RecipientIdentifier> recipients,
+            boolean notifySelf,
             Optional<Long> editTargetTimestamp
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
         long timestamp = System.currentTimeMillis();
         messageBuilder.withTimestamp(timestamp);
         for (final var recipient : recipients) {
-            if (recipient instanceof RecipientIdentifier.Single single) {
+            if (recipient instanceof RecipientIdentifier.NoteToSelf || (
+                    recipient instanceof RecipientIdentifier.Single single
+                            && new RecipientAddress(single.toPartialRecipientAddress()).matches(account.getSelfRecipientAddress())
+            )) {
+                final var result = notifySelf
+                        ? context.getSendHelper()
+                        .sendMessage(messageBuilder, account.getSelfRecipientId(), editTargetTimestamp)
+                        : context.getSendHelper().sendSelfMessage(messageBuilder, editTargetTimestamp);
+                results.put(recipient, List.of(toSendMessageResult(result)));
+            } else if (recipient instanceof RecipientIdentifier.Single single) {
                 try {
                     final var recipientId = context.getRecipientHelper().resolveRecipient(single);
                     final var result = context.getSendHelper()
@@ -552,12 +563,9 @@ public class ManagerImpl implements Manager {
                     results.put(recipient,
                             List.of(SendMessageResult.unregisteredFailure(single.toPartialRecipientAddress())));
                 }
-            } else if (recipient instanceof RecipientIdentifier.NoteToSelf) {
-                final var result = context.getSendHelper().sendSelfMessage(messageBuilder, editTargetTimestamp);
-                results.put(recipient, List.of(toSendMessageResult(result)));
             } else if (recipient instanceof RecipientIdentifier.Group group) {
                 final var result = context.getSendHelper()
-                        .sendAsGroupMessage(messageBuilder, group.groupId(), editTargetTimestamp);
+                        .sendAsGroupMessage(messageBuilder, group.groupId(), notifySelf, editTargetTimestamp);
                 results.put(recipient, result.stream().map(this::toSendMessageResult).toList());
             }
         }
@@ -642,7 +650,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendMessage(
-            Message message, Set<RecipientIdentifier> recipients
+            Message message, Set<RecipientIdentifier> recipients, boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
         final var selfProfile = context.getProfileHelper().getSelfProfile();
         if (selfProfile == null || selfProfile.getDisplayName().isEmpty()) {
@@ -651,7 +659,7 @@ public class ManagerImpl implements Manager {
         }
         final var messageBuilder = SignalServiceDataMessage.newBuilder();
         applyMessage(messageBuilder, message);
-        return sendMessage(messageBuilder, recipients);
+        return sendMessage(messageBuilder, recipients, notifySelf);
     }
 
     @Override
@@ -660,7 +668,7 @@ public class ManagerImpl implements Manager {
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
         final var messageBuilder = SignalServiceDataMessage.newBuilder();
         applyMessage(messageBuilder, message);
-        return sendMessage(messageBuilder, recipients, Optional.of(editTargetTimestamp));
+        return sendMessage(messageBuilder, recipients, false, Optional.of(editTargetTimestamp));
     }
 
     private void applyMessage(
@@ -785,7 +793,7 @@ public class ManagerImpl implements Manager {
                 account.getMessageSendLogStore().deleteEntryForGroup(targetSentTimestamp, r.groupId());
             }
         }
-        return sendMessage(messageBuilder, recipients);
+        return sendMessage(messageBuilder, recipients, false);
     }
 
     @Override
@@ -807,7 +815,7 @@ public class ManagerImpl implements Manager {
             messageBuilder.withStoryContext(new SignalServiceDataMessage.StoryContext(authorServiceId,
                     targetSentTimestamp));
         }
-        return sendMessage(messageBuilder, recipients);
+        return sendMessage(messageBuilder, recipients, false);
     }
 
     @Override
@@ -818,7 +826,7 @@ public class ManagerImpl implements Manager {
         final var payment = new SignalServiceDataMessage.Payment(paymentNotification, null);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withPayment(payment);
         try {
-            return sendMessage(messageBuilder, Set.of(recipient));
+            return sendMessage(messageBuilder, Set.of(recipient), false);
         } catch (NotAGroupMemberException | GroupNotFoundException | GroupSendingNotAllowedException e) {
             throw new AssertionError(e);
         }
@@ -830,7 +838,8 @@ public class ManagerImpl implements Manager {
 
         try {
             return sendMessage(messageBuilder,
-                    recipients.stream().map(RecipientIdentifier.class::cast).collect(Collectors.toSet()));
+                    recipients.stream().map(RecipientIdentifier.class::cast).collect(Collectors.toSet()),
+                    false);
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new AssertionError(e);
         } finally {
@@ -952,7 +961,7 @@ public class ManagerImpl implements Manager {
         context.getContactHelper().setExpirationTimer(recipientId, messageExpirationTimer);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().asExpirationUpdate();
         try {
-            sendMessage(messageBuilder, Set.of(recipient));
+            sendMessage(messageBuilder, Set.of(recipient), false);
         } catch (NotAGroupMemberException | GroupNotFoundException | GroupSendingNotAllowedException e) {
             throw new AssertionError(e);
         }
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 1d0b46e4..0c38cf7d 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -51,6 +51,9 @@ public class SendCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--note-to-self")
                 .help("Send the message to self without notification.")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--notify-self")
+                .help("If self is part of recipients/groups send a normal message, not a sync message.")
+                .action(Arguments.storeTrue());
 
         var mut = subparser.addMutuallyExclusiveGroup();
         mut.addArgument("-m", "--message").help("Specify the message to be sent.");
@@ -105,6 +108,7 @@ public class SendCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
+        final var notifySelf = Boolean.TRUE.equals(ns.getBoolean("notify-self"));
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
@@ -236,7 +240,7 @@ public class SendCommand implements JsonRpcLocalCommand {
                     textStyles);
             var results = editTimestamp != null
                     ? m.sendEditMessage(message, recipientIdentifiers, editTimestamp)
-                    : m.sendMessage(message, recipientIdentifiers);
+                    : m.sendMessage(message, recipientIdentifiers, notifySelf);
             outputResult(outputWriter, results);
         } catch (AttachmentInvalidException | IOException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 985e2674..e149e58c 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -397,7 +397,7 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendMessage(
-            final Message message, final Set<RecipientIdentifier> recipients
+            final Message message, final Set<RecipientIdentifier> recipients, final boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessage(message.messageText(), message.attachments(), numbers),
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 6e394eb4..5ad14537 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -225,19 +225,20 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     }
 
     @Override
-    public long sendMessage(final String message, final List<String> attachments, final List<String> recipients) {
+    public long sendMessage(final String messageText, final List<String> attachments, final List<String> recipients) {
         try {
-            final var results = m.sendMessage(new Message(message,
-                            attachments,
-                            List.of(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            List.of(),
-                            Optional.empty(),
-                            List.of()),
-                    getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
-                            .map(RecipientIdentifier.class::cast)
-                            .collect(Collectors.toSet()));
+            final var message = new Message(messageText,
+                    attachments,
+                    List.of(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    List.of(),
+                    Optional.empty(),
+                    List.of());
+            final var recipientIdentifiers = getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
+                    .map(RecipientIdentifier.class::cast)
+                    .collect(Collectors.toSet());
+            final var results = m.sendMessage(message, recipientIdentifiers, false);
 
             checkSendMessageResults(results);
             return results.timestamp();
@@ -384,17 +385,18 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
 
     @Override
     public long sendNoteToSelfMessage(
-            final String message, final List<String> attachments
+            final String messageText, final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
-            final var results = m.sendMessage(new Message(message,
+            final var message = new Message(messageText,
                     attachments,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
                     List.of(),
                     Optional.empty(),
-                    List.of()), Set.of(RecipientIdentifier.NoteToSelf.INSTANCE));
+                    List.of());
+            final var results = m.sendMessage(message, Set.of(RecipientIdentifier.NoteToSelf.INSTANCE), false);
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (AttachmentInvalidException e) {
@@ -429,16 +431,17 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     }
 
     @Override
-    public long sendGroupMessage(final String message, final List<String> attachments, final byte[] groupId) {
+    public long sendGroupMessage(final String messageText, final List<String> attachments, final byte[] groupId) {
         try {
-            var results = m.sendMessage(new Message(message,
+            final var message = new Message(messageText,
                     attachments,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
                     List.of(),
                     Optional.empty(),
-                    List.of()), Set.of(getGroupRecipientIdentifier(groupId)));
+                    List.of());
+            var results = m.sendMessage(message, Set.of(getGroupRecipientIdentifier(groupId)), false);
             checkSendMessageResults(results);
             return results.timestamp();
         } catch (IOException | InvalidStickerException e) {

From 30e8e36635733b3e8c75a44e95785ba33cf55e61 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 13 Jan 2024 16:00:55 +0100
Subject: [PATCH 339/672] Add --unrestricted-unidentified-sender to
 updateAccount command

---
 CHANGELOG.md                                        |  1 +
 .../main/java/org/asamk/signal/manager/Manager.java |  2 +-
 .../asamk/signal/manager/helper/ProfileHelper.java  |  7 +++++++
 .../asamk/signal/manager/internal/ManagerImpl.java  |  5 ++++-
 .../asamk/signal/manager/storage/SignalAccount.java | 11 +++++++++--
 man/signal-cli.1.adoc                               |  3 +++
 .../asamk/signal/commands/UpdateAccountCommand.java | 13 +++++++++----
 .../java/org/asamk/signal/dbus/DbusManagerImpl.java |  4 +++-
 .../java/org/asamk/signal/dbus/DbusSignalImpl.java  |  2 +-
 9 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40bb6d37..4abfc108 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - New --hidden parameter for removeContact command
 - New --notify-self parameter for send command, for sending a non-sync message when self is part of the recipients or groups.
   With this parameter sending to the self number (+XXXX) now behaves the same as the --note-to-self parameter.
+- New --unrestricted-unidentified-sender parameter for updateAccount command
 
 ### Improved
 - Better shutdown handling after Ctrl+C and SIGTERM
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 4104a8fb..6fe1a67f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -89,7 +89,7 @@ public interface Manager extends Closeable {
      */
     Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException;
 
-    void updateAccountAttributes(String deviceName) throws IOException;
+    void updateAccountAttributes(String deviceName, Boolean unrestrictedUnidentifiedSender) throws IOException;
 
     Configuration getConfiguration();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index d427d0d0..ec3ae020 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -328,6 +328,13 @@ public final class ProfileHelper {
 
             final var profile = account.getProfileStore().getProfile(recipientId);
 
+            if (recipientId.equals(account.getSelfRecipientId())) {
+                final var isUnrestricted = encryptedProfile.isUnrestrictedUnidentifiedAccess();
+                if (account.isUnrestrictedUnidentifiedAccess() != isUnrestricted) {
+                    account.setUnrestrictedUnidentifiedAccess(isUnrestricted);
+                }
+            }
+
             Profile newProfile = null;
             if (profileKey.isPresent()) {
                 logger.trace("Decrypting profile");
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index bc801a28..29f3d2ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -277,10 +277,13 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void updateAccountAttributes(String deviceName) throws IOException {
+    public void updateAccountAttributes(String deviceName, Boolean unrestrictedUnidentifiedSender) throws IOException {
         if (deviceName != null) {
             context.getAccountHelper().setDeviceName(deviceName);
         }
+        if (unrestrictedUnidentifiedSender != null) {
+            account.setUnrestrictedUnidentifiedAccess(unrestrictedUnidentifiedSender);
+        }
         context.getAccountHelper().updateAccountAttributes();
         context.getAccountHelper().checkWhoAmiI();
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index b95b86e5..6860e239 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -154,6 +154,10 @@ public class SignalAccount implements Closeable {
     private final KeyValueEntry<Long> storageManifestVersion = new KeyValueEntry<>("storage-manifest-version",
             long.class,
             -1L);
+    private final KeyValueEntry<Boolean> unrestrictedUnidentifiedAccess = new KeyValueEntry<>(
+            "unrestricted-unidentified-access",
+            Boolean.class,
+            false);
     private boolean isMultiDevice = false;
     private boolean registered = false;
 
@@ -1594,8 +1598,11 @@ public class SignalAccount implements Closeable {
     }
 
     public boolean isUnrestrictedUnidentifiedAccess() {
-        final var profile = getProfileStore().getProfile(getSelfRecipientId());
-        return profile != null && profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNRESTRICTED;
+        return Boolean.TRUE.equals(getKeyValueStore().getEntry(unrestrictedUnidentifiedAccess));
+    }
+
+    public void setUnrestrictedUnidentifiedAccess(boolean value) {
+        getKeyValueStore().storeEntry(unrestrictedUnidentifiedAccess, value);
     }
 
     public boolean isDiscoverableByPhoneNumber() {
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 4814d28a..bd855ab4 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -147,6 +147,9 @@ Can fix problems with receiving messages.
 *-n* NAME, *--device-name* NAME::
 Set a new device name for the primary or linked device
 
+*--unrestricted-unidentified-sender* {true,false}::
+Enable if anyone should be able to send you unidentified sender messages.
+
 === startChangeNumber
 
 Change an account to a new phone number with SMS or voice verification.
diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index c729a39a..95c0f4a4 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -28,6 +28,10 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Update the account attributes on the signal server.");
         subparser.addArgument("-n", "--device-name").help("Specify a name to describe this device.");
+        subparser.addArgument("--unrestricted-unidentified-sender")
+                .type(Boolean.class)
+                .help("Enable if anyone should be able to send you unidentified sender messages.");
+
         var mut = subparser.addMutuallyExclusiveGroup();
         mut.addArgument("-u", "--username").help("Specify a username that can then be used to contact this account.");
         mut.addArgument("--delete-username")
@@ -39,14 +43,15 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        var deviceName = ns.getString("device-name");
+        final var deviceName = ns.getString("device-name");
+        final var unrestrictedUnidentifiedSender = ns.getBoolean("unrestricted-unidentified-sender");
         try {
-            m.updateAccountAttributes(deviceName);
+            m.updateAccountAttributes(deviceName, unrestrictedUnidentifiedSender);
         } catch (IOException e) {
             throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e);
         }
 
-        var username = ns.getString("username");
+        final var username = ns.getString("username");
         if (username != null) {
             try {
                 m.setUsername(username);
@@ -66,7 +71,7 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
             }
         }
 
-        var deleteUsername = Boolean.TRUE.equals(ns.getBoolean("delete-username"));
+        final var deleteUsername = Boolean.TRUE.equals(ns.getBoolean("delete-username"));
         if (deleteUsername) {
             try {
                 m.deleteUsername();
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index e149e58c..e6a18307 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -121,7 +121,9 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public void updateAccountAttributes(final String deviceName) throws IOException {
+    public void updateAccountAttributes(
+            final String deviceName, final Boolean unrestrictedUnidentifiedSender
+    ) throws IOException {
         if (deviceName != null) {
             final var devicePath = signal.getThisDevice();
             getRemoteObject(devicePath, Signal.Device.class).Set("org.asamk.Signal.Device", "Name", deviceName);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 5ad14537..80132f09 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1187,7 +1187,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
                 throw new Error.Failure("Only the name of this device can be changed");
             }
             try {
-                m.updateAccountAttributes(name);
+                m.updateAccountAttributes(name, null);
                 // update device list
                 updateDevices();
             } catch (IOException e) {

From be9efb9a25ab99bf28371dbbf91e9223cd2eaf92 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 14 Jan 2024 11:42:48 +0100
Subject: [PATCH 340/672] Update libsignal-service-java

---
 .../signal/manager/api/MessageEnvelope.java   | 17 ++++-------
 .../signal/manager/helper/AccountHelper.java  | 30 +++++++++++++------
 settings.gradle.kts                           |  3 +-
 .../asamk/signal/ReceiveMessageHandler.java   |  6 ++--
 .../asamk/signal/json/JsonCallMessage.java    | 17 ++++-------
 5 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index dc157fe6..c964281f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -716,7 +716,6 @@ public record MessageEnvelope(
             Optional<Busy> busy,
             List<IceUpdate> iceUpdate,
             Optional<Opaque> opaque,
-            boolean isMultiRing,
             boolean isUrgent
     ) {
 
@@ -732,17 +731,13 @@ public record MessageEnvelope(
                             .map(m -> m.stream().map(IceUpdate::from).toList())
                             .orElse(List.of()),
                     callMessage.getOpaqueMessage().map(Opaque::from),
-                    callMessage.isMultiRing(),
                     callMessage.isUrgent());
         }
 
-        public record Offer(long id, String sdp, Type type, byte[] opaque) {
+        public record Offer(long id, Type type, byte[] opaque) {
 
             static Offer from(OfferMessage offerMessage) {
-                return new Offer(offerMessage.getId(),
-                        offerMessage.getSdp(),
-                        Type.from(offerMessage.getType()),
-                        offerMessage.getOpaque());
+                return new Offer(offerMessage.getId(), Type.from(offerMessage.getType()), offerMessage.getOpaque());
             }
 
             public enum Type {
@@ -758,10 +753,10 @@ public record MessageEnvelope(
             }
         }
 
-        public record Answer(long id, String sdp, byte[] opaque) {
+        public record Answer(long id, byte[] opaque) {
 
             static Answer from(AnswerMessage answerMessage) {
-                return new Answer(answerMessage.getId(), answerMessage.getSdp(), answerMessage.getOpaque());
+                return new Answer(answerMessage.getId(), answerMessage.getOpaque());
             }
         }
 
@@ -799,10 +794,10 @@ public record MessageEnvelope(
             }
         }
 
-        public record IceUpdate(long id, String sdp, byte[] opaque) {
+        public record IceUpdate(long id, byte[] opaque) {
 
             static IceUpdate from(IceUpdateMessage iceUpdateMessage) {
-                return new IceUpdate(iceUpdateMessage.getId(), iceUpdateMessage.getSdp(), iceUpdateMessage.getOpaque());
+                return new IceUpdate(iceUpdateMessage.getId(), iceUpdateMessage.getOpaque());
             }
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index d49ab67a..c83dde25 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -320,7 +320,11 @@ public class AccountHelper {
         if (currentUsername != null) {
             final var currentNickname = currentUsername.substring(0, currentUsername.indexOf('.'));
             if (currentNickname.equals(nickname)) {
-                refreshCurrentUsername();
+                try {
+                    refreshCurrentUsername();
+                } catch (IOException | BaseUsernameException e) {
+                    logger.warn("[reserveUsername] Failed to refresh current username, trying to claim new username");
+                }
                 return;
             }
         }
@@ -341,11 +345,11 @@ public class AccountHelper {
         logger.debug("[reserveUsername] Successfully reserved username.");
         final var username = candidates.get(hashIndex);
 
-        dependencies.getAccountManager().confirmUsername(username.getUsername(), response);
+        final var linkComponents = dependencies.getAccountManager().confirmUsernameAndCreateNewLink(username);
         account.setUsername(username.getUsername());
+        account.setUsernameLink(linkComponents);
         account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
         logger.debug("[confirmUsername] Successfully confirmed username.");
-        tryToSetUsernameLink(username);
     }
 
     public void refreshCurrentUsername() throws IOException, BaseUsernameException {
@@ -386,12 +390,20 @@ public class AccountHelper {
     }
 
     private void tryReserveConfirmUsername(final Username username) throws IOException {
-        final var response = dependencies.getAccountManager()
-                .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash())));
-        logger.debug("[reserveUsername] Successfully reserved existing username.");
-        dependencies.getAccountManager().confirmUsername(username.getUsername(), response);
-        logger.debug("[confirmUsername] Successfully confirmed existing username.");
-        tryToSetUsernameLink(username);
+        final var usernameLink = account.getUsernameLink();
+
+        if (usernameLink == null) {
+            dependencies.getAccountManager()
+                    .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash())));
+            logger.debug("[reserveUsername] Successfully reserved existing username.");
+            final var linkComponents = dependencies.getAccountManager().confirmUsernameAndCreateNewLink(username);
+            account.setUsernameLink(linkComponents);
+            logger.debug("[confirmUsername] Successfully confirmed existing username.");
+        } else {
+            final var linkComponents = dependencies.getAccountManager().reclaimUsernameAndLink(username, usernameLink);
+            account.setUsernameLink(linkComponents);
+            logger.debug("[confirmUsername] Successfully reclaimed existing username and link.");
+        }
     }
 
     private void tryToSetUsernameLink(Username username) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c6d4cdb4..831c1188 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,8 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
-
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_91")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_92")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index ef7a8359..f6eb660e 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -273,7 +273,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
         if (callMessage.answer().isPresent()) {
             var answerMessage = callMessage.answer().get();
-            writer.println("Answer message: {}, sdp: {})", answerMessage.id(), answerMessage.sdp());
+            writer.println("Answer message: {}, opaque length: {})", answerMessage.id(), answerMessage.opaque().length);
         }
         if (callMessage.busy().isPresent()) {
             var busyMessage = callMessage.busy().get();
@@ -287,12 +287,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             writer.println("Ice update messages:");
             var iceUpdateMessages = callMessage.iceUpdate();
             for (var iceUpdateMessage : iceUpdateMessages) {
-                writer.println("- {}, sdp: {}", iceUpdateMessage.id(), iceUpdateMessage.sdp());
+                writer.println("- {}, opaque length: {}", iceUpdateMessage.id(), iceUpdateMessage.opaque().length);
             }
         }
         if (callMessage.offer().isPresent()) {
             var offerMessage = callMessage.offer().get();
-            writer.println("Offer message: {}, sdp: {}", offerMessage.id(), offerMessage.sdp());
+            writer.println("Offer message: {}, opaque length: {}", offerMessage.id(), offerMessage.opaque().length);
         }
         if (callMessage.opaque().isPresent()) {
             final var opaqueMessage = callMessage.opaque().get();
diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
index 3438cf39..1b1bc2ba 100644
--- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
@@ -23,20 +23,17 @@ record JsonCallMessage(
                 callMessage.iceUpdate().stream().map(IceUpdate::from).toList());
     }
 
-    record Offer(long id, String sdp, String type, String opaque) {
+    record Offer(long id, String type, String opaque) {
 
         public static Offer from(final MessageEnvelope.Call.Offer offer) {
-            return new Offer(offer.id(),
-                    offer.sdp(),
-                    offer.type().name(),
-                    Base64.getEncoder().encodeToString(offer.opaque()));
+            return new Offer(offer.id(), offer.type().name(), Base64.getEncoder().encodeToString(offer.opaque()));
         }
     }
 
-    public record Answer(long id, String sdp, String opaque) {
+    public record Answer(long id, String opaque) {
 
         public static Answer from(final MessageEnvelope.Call.Answer answer) {
-            return new Answer(answer.id(), answer.sdp(), Base64.getEncoder().encodeToString(answer.opaque()));
+            return new Answer(answer.id(), Base64.getEncoder().encodeToString(answer.opaque()));
         }
     }
 
@@ -54,12 +51,10 @@ record JsonCallMessage(
         }
     }
 
-    public record IceUpdate(long id, String sdp, String opaque) {
+    public record IceUpdate(long id, String opaque) {
 
         public static IceUpdate from(final MessageEnvelope.Call.IceUpdate iceUpdate) {
-            return new IceUpdate(iceUpdate.id(),
-                    iceUpdate.sdp(),
-                    Base64.getEncoder().encodeToString(iceUpdate.opaque()));
+            return new IceUpdate(iceUpdate.id(), Base64.getEncoder().encodeToString(iceUpdate.opaque()));
         }
     }
 }

From ac2343b142b462d1fdeb4dfc6fef95931d40f7ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Jan 2024 09:18:20 +0100
Subject: [PATCH 341/672] Bump h2 from 0.3.21 to 0.3.24 in /client (#1418)

Bumps [h2](https://github.com/hyperium/h2) from 0.3.21 to 0.3.24.
- [Release notes](https://github.com/hyperium/h2/releases)
- [Changelog](https://github.com/hyperium/h2/blob/v0.3.24/CHANGELOG.md)
- [Commits](https://github.com/hyperium/h2/compare/v0.3.21...v0.3.24)

---
updated-dependencies:
- dependency-name: h2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 client/Cargo.lock | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index db4cebf1..f44499d8 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -338,9 +338,9 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
 dependencies = [
  "bytes",
  "fnv",
@@ -348,19 +348,13 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap 1.9.3",
+ "indexmap",
  "slab",
  "tokio",
  "tokio-util",
  "tracing",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.0"
@@ -463,16 +457,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.0.0"
@@ -480,7 +464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1084,7 +1068,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap",
  "toml_datetime",
  "winnow",
 ]

From ca1a852b44f9e7413ab2b8b41e65d54074ad5924 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 22 Jan 2024 18:40:39 +0100
Subject: [PATCH 342/672] Handle mentions when receiving from dbus

---
 graalvm-config-dir/reflect-config.json        |  8 +++++---
 .../asamk/signal/dbus/DbusManagerImpl.java    | 19 ++++++++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index f907f84e..157b94d1 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -568,7 +568,7 @@
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
   "allDeclaredClasses":true,
-  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }]
+  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getGroup","parameterTypes":["byte[]"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.Signal$Configuration",
@@ -663,7 +663,8 @@
 {
   "name":"org.asamk.SignalControl",
   "allDeclaredMethods":true,
-  "allDeclaredClasses":true
+  "allDeclaredClasses":true,
+  "methods":[{"name":"listAccounts","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.SignalControl$Error$Failure",
@@ -1815,7 +1816,8 @@
 {
   "name":"org.freedesktop.dbus.interfaces.Properties",
   "allDeclaredMethods":true,
-  "allDeclaredClasses":true
+  "allDeclaredClasses":true,
+  "methods":[{"name":"GetAll","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index e6a18307..9ba19348 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -849,7 +849,7 @@ public class DbusManagerImpl implements Manager {
                                 Optional.empty(),
                                 Optional.empty(),
                                 List.of(),
-                                List.of(),
+                                getMentions(extras),
                                 List.of(),
                                 List.of())),
                         Optional.empty(),
@@ -893,7 +893,7 @@ public class DbusManagerImpl implements Manager {
                                         Optional.empty(),
                                         Optional.empty(),
                                         List.of(),
-                                        List.of(),
+                                        getMentions(extras),
                                         List.of(),
                                         List.of()))),
                         Optional.empty(),
@@ -970,7 +970,7 @@ public class DbusManagerImpl implements Manager {
                                         Optional.empty(),
                                         Optional.empty(),
                                         List.of(),
-                                        List.of(),
+                                        getMentions(extras),
                                         List.of(),
                                         List.of())),
                                 Optional.empty(),
@@ -1039,6 +1039,19 @@ public class DbusManagerImpl implements Manager {
         }).toList();
     }
 
+    private List<MessageEnvelope.Data.Mention> getMentions(final Map<String, Variant<?>> extras) {
+        if (!extras.containsKey("mentions")) {
+            return List.of();
+        }
+
+        final List<DBusMap<String, Variant<?>>> mentions = getValue(extras, "mentions");
+        return mentions.stream()
+                .map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(null, getValue(a, "recipient")),
+                        getValue(a, "start"),
+                        getValue(a, "length")))
+                .toList();
+    }
+
     @Override
     public InputStream retrieveAttachment(final String id) throws IOException {
         throw new UnsupportedOperationException();

From 2974b466aa9df03f7b6c9aeffff321c31c4af683 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 22 Jan 2024 18:40:46 +0100
Subject: [PATCH 343/672] Update sqlite

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 831c1188..015265d8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_92")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.44.1.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
             library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1")

From 78c87e501ea1982f90e466c4fbdf85188bee7313 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 25 Jan 2024 21:00:16 +0100
Subject: [PATCH 344/672] Improve log level

---
 src/main/java/org/asamk/signal/logging/LogConfigurator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 16de72f5..825495df 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -42,7 +42,7 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         }});
         final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
-        final var defaultLevel = verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN;
+        final var defaultLevel = verboseLevel > 2 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN;
         rootLogger.setLevel(defaultLevel);
 
         final var consoleLayout = verboseLevel == 0 || logFile != null

From 7d3db03d4a1e40797e37e11421860e608400223b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 25 Jan 2024 21:03:25 +0100
Subject: [PATCH 345/672] Update dbusjava

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 015265d8..5877097f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,7 +9,7 @@ dependencyResolutionManagement {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.77")
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.16.1")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
-            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("4.3.1")
+            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
             version("slf4j", "2.0.10")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")

From f696097301055577076b53f24ff8e60bab1ce3d7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 25 Jan 2024 21:47:40 +0100
Subject: [PATCH 346/672] Improve JobExecutor

---
 .../signal/manager/internal/JobExecutor.java  | 59 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
index bbd36800..ee4c2222 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
@@ -5,6 +5,8 @@ import org.asamk.signal.manager.jobs.Job;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayDeque;
+import java.util.Queue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -13,6 +15,8 @@ public class JobExecutor implements AutoCloseable {
     private static final Logger logger = LoggerFactory.getLogger(JobExecutor.class);
     private final Context context;
     private final ExecutorService executorService;
+    private Job running;
+    private final Queue<Job> queue = new ArrayDeque<>();
 
     public JobExecutor(final Context context) {
         this.context = context;
@@ -20,13 +24,64 @@ public class JobExecutor implements AutoCloseable {
     }
 
     public void enqueueJob(Job job) {
-        logger.debug("Enqueuing {} job", job.getClass().getSimpleName());
+        if (executorService.isShutdown()) {
+            logger.debug("Not enqueuing {} job, shutting down", job.getClass().getSimpleName());
+            return;
+        }
 
-        executorService.execute(() -> job.run(context));
+        synchronized (queue) {
+            logger.trace("Enqueuing {} job", job.getClass().getSimpleName());
+            queue.add(job);
+        }
+
+        runNextJob();
+    }
+
+    private void runNextJob() {
+        Job job;
+        synchronized (queue) {
+            if (running != null) {
+                return;
+            }
+            job = queue.poll();
+            running = job;
+        }
+
+        if (job == null) {
+            synchronized (this) {
+                this.notifyAll();
+            }
+            return;
+        }
+        logger.debug("Running {} job", job.getClass().getSimpleName());
+        executorService.execute(() -> {
+            try {
+                job.run(context);
+            } catch (Throwable e) {
+                logger.warn("Job {} failed", job.getClass().getSimpleName(), e);
+            } finally {
+                synchronized (queue) {
+                    running = null;
+                }
+                runNextJob();
+            }
+        });
     }
 
     @Override
     public void close() {
+        synchronized (queue) {
+            if (queue.isEmpty()) {
+                executorService.close();
+                return;
+            }
+        }
+        synchronized (this) {
+            try {
+                this.wait();
+            } catch (InterruptedException ignored) {
+            }
+        }
         executorService.close();
     }
 }

From 6c65de8ddf8ba2d1af7f5294fa1af7f575ca1fb4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 26 Jan 2024 19:30:23 +0100
Subject: [PATCH 347/672] Update libsignal-service

---
 graalvm-config-dir/reflect-config.json | 2 +-
 settings.gradle.kts                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 157b94d1..ea6babe4 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -568,7 +568,7 @@
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
   "allDeclaredClasses":true,
-  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getGroup","parameterTypes":["byte[]"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }]
+  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getGroup","parameterTypes":["byte[]"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.util.List"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.Signal$Configuration",
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 5877097f..d34fe85c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_92")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_93")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")

From 6a5dcd00b2bc60a0f756c95659a65876cdaeb3c8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 27 Jun 2022 15:39:22 +0200
Subject: [PATCH 348/672] Implement remote storage sync

Closes #604
---
 .../actions/RetrieveStorageDataAction.java    |  20 -
 .../actions/SyncStorageDataAction.java        |  21 +
 .../asamk/signal/manager/api/TrustLevel.java  |   9 -
 .../signal/manager/config/ServiceConfig.java  |   2 +-
 .../signal/manager/helper/AccountHelper.java  |   4 +-
 .../asamk/signal/manager/helper/Context.java  |   2 +-
 .../signal/manager/helper/GroupHelper.java    |  16 +-
 .../helper/IncomingMessageHandler.java        |  12 +-
 .../signal/manager/helper/ProfileHelper.java  |   4 +-
 .../signal/manager/helper/StorageHelper.java  | 715 ++++++++++++------
 .../signal/manager/helper/SyncHelper.java     |   7 +-
 .../signal/manager/internal/JobExecutor.java  |  10 +-
 .../signal/manager/internal/ManagerImpl.java  |  71 +-
 .../internal/RegistrationManagerImpl.java     |   2 +-
 .../manager/jobs/DownloadProfileJob.java      |  24 +
 .../signal/manager/jobs/SyncStorageJob.java   |  22 +
 .../manager/storage/AccountDatabase.java      |  21 +-
 .../signal/manager/storage/SignalAccount.java |  46 +-
 .../storage/UnknownStorageIdStore.java        | 104 +++
 .../configuration/ConfigurationStore.java     |  89 ++-
 .../manager/storage/groups/GroupInfoV1.java   |   9 +-
 .../manager/storage/groups/GroupInfoV2.java   |   7 +
 .../manager/storage/groups/GroupStore.java    | 280 ++++++-
 .../storage/groups/LegacyGroupStore.java      |   4 +-
 .../storage/identities/IdentityKeyStore.java  |  95 ++-
 .../storage/keyValue/KeyValueStore.java       |  13 +-
 .../recipients/LegacyRecipientStore2.java     |   8 +-
 .../manager/storage/recipients/Recipient.java |  26 +-
 .../storage/recipients/RecipientAddress.java  |   4 +
 .../storage/recipients/RecipientStore.java    | 328 +++++++-
 .../syncStorage/AccountRecordProcessor.java   | 225 ++++++
 .../syncStorage/ContactRecordProcessor.java   | 336 ++++++++
 .../DefaultStorageRecordProcessor.java        |  96 +++
 .../syncStorage/GroupV1RecordProcessor.java   | 137 ++++
 .../syncStorage/GroupV2RecordProcessor.java   | 115 +++
 .../syncStorage/StorageRecordProcessor.java   |  14 +
 .../syncStorage/StorageRecordUpdate.java      |  14 +
 .../syncStorage/StorageSyncModels.java        | 145 ++++
 .../syncStorage/StorageSyncValidations.java   | 238 ++++++
 .../syncStorage/WriteOperationResult.java     |  30 +
 .../asamk/signal/manager/util/KeyUtils.java   |   4 +
 41 files changed, 2891 insertions(+), 438 deletions(-)
 delete mode 100644 lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/actions/SyncStorageDataAction.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileJob.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java
deleted file mode 100644
index 8b296006..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/actions/RetrieveStorageDataAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.asamk.signal.manager.actions;
-
-import org.asamk.signal.manager.helper.Context;
-
-public class RetrieveStorageDataAction implements HandleAction {
-
-    private static final RetrieveStorageDataAction INSTANCE = new RetrieveStorageDataAction();
-
-    private RetrieveStorageDataAction() {
-    }
-
-    public static RetrieveStorageDataAction create() {
-        return INSTANCE;
-    }
-
-    @Override
-    public void execute(Context context) throws Throwable {
-        context.getStorageHelper().readDataFromStorage();
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SyncStorageDataAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SyncStorageDataAction.java
new file mode 100644
index 00000000..7101b3d1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SyncStorageDataAction.java
@@ -0,0 +1,21 @@
+package org.asamk.signal.manager.actions;
+
+import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
+
+public class SyncStorageDataAction implements HandleAction {
+
+    private static final SyncStorageDataAction INSTANCE = new SyncStorageDataAction();
+
+    private SyncStorageDataAction() {
+    }
+
+    public static SyncStorageDataAction create() {
+        return INSTANCE;
+    }
+
+    @Override
+    public void execute(Context context) throws Throwable {
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java b/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
index cbfa0bd5..ac93e34a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/TrustLevel.java
@@ -1,7 +1,6 @@
 package org.asamk.signal.manager.api;
 
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
-import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
 
 public enum TrustLevel {
     UNTRUSTED,
@@ -17,14 +16,6 @@ public enum TrustLevel {
         return TrustLevel.cachedValues[i];
     }
 
-    public static TrustLevel fromIdentityState(ContactRecord.IdentityState identityState) {
-        return switch (identityState) {
-            case DEFAULT -> TRUSTED_UNVERIFIED;
-            case UNVERIFIED -> UNTRUSTED;
-            case VERIFIED -> TRUSTED_VERIFIED;
-        };
-    }
-
     public static TrustLevel fromVerifiedState(VerifiedMessage.VerifiedState verifiedState) {
         return switch (verifiedState) {
             case DEFAULT -> TRUSTED_UNVERIFIED;
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index cd103f80..d46b6988 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -29,7 +29,7 @@ public class ServiceConfig {
         final var giftBadges = !isPrimaryDevice;
         final var pni = !isPrimaryDevice;
         final var paymentActivation = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(false, true, true, true, true, giftBadges, pni, paymentActivation);
+        return new AccountAttributes.Capabilities(true, true, true, true, true, giftBadges, pni, paymentActivation);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index c83dde25..2563494d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -8,6 +8,7 @@ import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
@@ -137,11 +138,11 @@ public class AccountHelper {
             account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         }
         account.getRecipientTrustedResolver().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
-        // TODO check and update remote storage
         context.getUnidentifiedAccessHelper().rotateSenderCertificates();
         dependencies.resetAfterAddressChange();
         context.getGroupV2Helper().clearAuthCredentialCache();
         context.getAccountFileUpdater().updateAccountIdentifiers(account.getNumber(), account.getAci());
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     public void setPni(
@@ -450,6 +451,7 @@ public class AccountHelper {
             throw new InvalidDeviceLinkException("Invalid device link", e);
         }
         account.setMultiDevice(true);
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     public void removeLinkedDevices(int deviceId) throws IOException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index ba2e5fb0..848a57c1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -80,7 +80,7 @@ public class Context implements AutoCloseable {
         return attachmentStore;
     }
 
-    JobExecutor getJobExecutor() {
+    public JobExecutor getJobExecutor() {
         return jobExecutor;
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 40558a89..dec9185a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -19,6 +19,7 @@ import org.asamk.signal.manager.api.SendMessageResult;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
@@ -143,6 +144,7 @@ public class GroupHelper {
             }
             groupInfoV2.setGroup(group);
             account.getGroupStore().updateGroup(groupInfoV2);
+            context.getJobExecutor().enqueueJob(new SyncStorageJob());
         }
 
         return groupInfoV2;
@@ -185,6 +187,7 @@ public class GroupHelper {
         final var result = sendGroupMessage(messageBuilder,
                 gv2.getMembersIncludingPendingWithout(selfRecipientId),
                 gv2.getDistributionId());
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
         return new Pair<>(gv2.getGroupId(), result);
     }
 
@@ -209,10 +212,11 @@ public class GroupHelper {
         var group = getGroupForUpdating(groupId);
         final var avatarBytes = readAvatarBytes(avatarFile);
 
+        SendGroupMessageResults results;
         switch (group) {
             case GroupInfoV2 gv2 -> {
                 try {
-                    return updateGroupV2(gv2,
+                    results = updateGroupV2(gv2,
                             name,
                             description,
                             members,
@@ -231,7 +235,7 @@ public class GroupHelper {
                 } catch (ConflictException e) {
                     // Detected conflicting update, refreshing group and trying again
                     group = getGroup(groupId, true);
-                    return updateGroupV2((GroupInfoV2) group,
+                    results = updateGroupV2((GroupInfoV2) group,
                             name,
                             description,
                             members,
@@ -251,13 +255,14 @@ public class GroupHelper {
             }
 
             case GroupInfoV1 gv1 -> {
-                final var result = updateGroupV1(gv1, name, members, avatarBytes);
+                results = updateGroupV1(gv1, name, members, avatarBytes);
                 if (expirationTimer != null) {
                     setExpirationTimer(gv1, expirationTimer);
                 }
-                return result;
             }
         }
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
+        return results;
     }
 
     public void updateGroupProfileKey(GroupIdV2 groupId) throws GroupNotFoundException, NotAGroupMemberException, IOException {
@@ -304,6 +309,7 @@ public class GroupHelper {
 
         final var result = sendUpdateGroupV2Message(group, group.getGroup(), groupChange);
 
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
         return new Pair<>(group.getGroupId(), result);
     }
 
@@ -327,6 +333,7 @@ public class GroupHelper {
     public void deleteGroup(GroupId groupId) throws IOException {
         account.getGroupStore().deleteGroup(groupId);
         context.getAvatarStore().deleteGroupAvatar(groupId);
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     public void setGroupBlocked(final GroupId groupId, final boolean blocked) throws GroupNotFoundException {
@@ -337,6 +344,7 @@ public class GroupHelper {
 
         group.setBlocked(blocked);
         account.getGroupStore().updateGroup(group);
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     public SendGroupMessageResults sendGroupInfoRequest(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index cf9c43a2..0f062828 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -6,7 +6,6 @@ import org.asamk.signal.manager.actions.RefreshPreKeysAction;
 import org.asamk.signal.manager.actions.RenewSessionAction;
 import org.asamk.signal.manager.actions.ResendMessageAction;
 import org.asamk.signal.manager.actions.RetrieveProfileAction;
-import org.asamk.signal.manager.actions.RetrieveStorageDataAction;
 import org.asamk.signal.manager.actions.SendGroupInfoAction;
 import org.asamk.signal.manager.actions.SendGroupInfoRequestAction;
 import org.asamk.signal.manager.actions.SendProfileKeyAction;
@@ -17,6 +16,7 @@ import org.asamk.signal.manager.actions.SendSyncConfigurationAction;
 import org.asamk.signal.manager.actions.SendSyncContactsAction;
 import org.asamk.signal.manager.actions.SendSyncGroupsAction;
 import org.asamk.signal.manager.actions.SendSyncKeysAction;
+import org.asamk.signal.manager.actions.SyncStorageDataAction;
 import org.asamk.signal.manager.actions.UpdateAccountAttributesAction;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupNotFoundException;
@@ -511,6 +511,7 @@ public final class IncomingMessageHandler {
             if (rm.isConfigurationRequest()) {
                 actions.add(SendSyncConfigurationAction.create());
             }
+            actions.add(SyncStorageDataAction.create());
         }
         if (syncMessage.getGroups().isPresent()) {
             try {
@@ -578,7 +579,7 @@ public final class IncomingMessageHandler {
         if (syncMessage.getFetchType().isPresent()) {
             switch (syncMessage.getFetchType().get()) {
                 case LOCAL_PROFILE -> actions.add(new RetrieveProfileAction(account.getSelfRecipientId()));
-                case STORAGE_MANIFEST -> actions.add(RetrieveStorageDataAction.create());
+                case STORAGE_MANIFEST -> actions.add(SyncStorageDataAction.create());
             }
         }
         if (syncMessage.getKeys().isPresent()) {
@@ -586,7 +587,12 @@ public final class IncomingMessageHandler {
             if (keysMessage.getStorageService().isPresent()) {
                 final var storageKey = keysMessage.getStorageService().get();
                 account.setStorageKey(storageKey);
-                actions.add(RetrieveStorageDataAction.create());
+                actions.add(SyncStorageDataAction.create());
+            }
+            if (keysMessage.getMaster().isPresent()) {
+                final var masterKey = keysMessage.getMaster().get();
+                account.setMasterKey(masterKey);
+                actions.add(SyncStorageDataAction.create());
             }
         }
         if (syncMessage.getConfiguration().isPresent()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index ec3ae020..dbde28a7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
@@ -67,7 +68,8 @@ public final class ProfileHelper {
         account.setProfileKey(profileKey);
         context.getAccountHelper().updateAccountAttributes();
         setProfile(true, true, null, null, null, null, null, null);
-        // TODO update profile key in storage
+        account.getRecipientStore().rotateSelfStorageId();
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
 
         final var recipientIds = account.getRecipientStore().getRecipientIdsWithEnabledProfileSharing();
         for (final var recipientId : recipientIds) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 1eed964d..8c8ac6fc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -1,39 +1,47 @@
 package org.asamk.signal.manager.helper;
 
-import org.asamk.signal.manager.api.Contact;
-import org.asamk.signal.manager.api.GroupId;
-import org.asamk.signal.manager.api.PhoneNumberSharingMode;
-import org.asamk.signal.manager.api.Profile;
-import org.asamk.signal.manager.api.TrustLevel;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.api.GroupIdV2;
 import org.asamk.signal.manager.internal.SignalDependencies;
-import org.asamk.signal.manager.jobs.CheckWhoAmIJob;
-import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob;
 import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.signal.libsignal.protocol.IdentityKey;
+import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.asamk.signal.manager.syncStorage.AccountRecordProcessor;
+import org.asamk.signal.manager.syncStorage.ContactRecordProcessor;
+import org.asamk.signal.manager.syncStorage.GroupV1RecordProcessor;
+import org.asamk.signal.manager.syncStorage.GroupV2RecordProcessor;
+import org.asamk.signal.manager.syncStorage.StorageSyncModels;
+import org.asamk.signal.manager.syncStorage.StorageSyncValidations;
+import org.asamk.signal.manager.syncStorage.WriteOperationResult;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.core.util.SetUtil;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.api.storage.StorageKey;
 import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
 
 import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class StorageHelper {
 
     private static final Logger logger = LoggerFactory.getLogger(StorageHelper.class);
+    private static final List<Integer> KNOWN_TYPES = List.of(ManifestRecord.Identifier.Type.CONTACT.getValue(),
+            ManifestRecord.Identifier.Type.GROUPV1.getValue(),
+            ManifestRecord.Identifier.Type.GROUPV2.getValue(),
+            ManifestRecord.Identifier.Type.ACCOUNT.getValue());
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
@@ -45,275 +53,496 @@ public class StorageHelper {
         this.context = context;
     }
 
-    public void readDataFromStorage() throws IOException {
+    public void syncDataWithStorage() throws IOException {
         final var storageKey = account.getOrCreateStorageKey();
         if (storageKey == null) {
-            logger.debug("Storage key unknown, requesting from primary device.");
-            context.getSyncHelper().requestSyncKeys();
+            if (!account.isPrimaryDevice()) {
+                logger.debug("Storage key unknown, requesting from primary device.");
+                context.getSyncHelper().requestSyncKeys();
+            }
             return;
         }
 
-        logger.debug("Reading data from remote storage");
-        Optional<SignalStorageManifest> manifest;
+        logger.trace("Reading manifest from remote storage");
+        final var localManifestVersion = account.getStorageManifestVersion();
+        final var localManifest = account.getStorageManifest().orElse(SignalStorageManifest.EMPTY);
+        SignalStorageManifest remoteManifest;
         try {
-            manifest = dependencies.getAccountManager()
-                    .getStorageManifestIfDifferentVersion(storageKey, account.getStorageManifestVersion());
+            remoteManifest = dependencies.getAccountManager()
+                    .getStorageManifestIfDifferentVersion(storageKey, localManifestVersion)
+                    .orElse(localManifest);
         } catch (InvalidKeyException e) {
-            logger.warn("Manifest couldn't be decrypted, ignoring.");
-            return;
-        }
-
-        if (manifest.isEmpty()) {
-            logger.debug("Manifest is up to date, does not exist or couldn't be decrypted, ignoring.");
-            return;
-        }
-
-        logger.trace("Remote storage manifest has {} records", manifest.get().getStorageIds().size());
-        final var storageIds = manifest.get()
-                .getStorageIds()
-                .stream()
-                .filter(id -> !id.isUnknown())
-                .collect(Collectors.toSet());
-
-        Optional<SignalStorageManifest> localManifest = account.getStorageManifest();
-        localManifest.ifPresent(m -> m.getStorageIds().forEach(storageIds::remove));
-
-        logger.trace("Reading {} new records", manifest.get().getStorageIds().size());
-        for (final var record : getSignalStorageRecords(storageIds)) {
-            logger.debug("Reading record of type {}", record.getType());
-            if (record.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue()) {
-                readAccountRecord(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV2.getValue()) {
-                readGroupV2Record(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.GROUPV1.getValue()) {
-                readGroupV1Record(record);
-            } else if (record.getType() == ManifestRecord.Identifier.Type.CONTACT.getValue()) {
-                readContactRecord(record);
-            }
-        }
-        account.setStorageManifestVersion(manifest.get().getVersion());
-        account.setStorageManifest(manifest.get());
-        logger.debug("Done reading data from remote storage");
-    }
-
-    private void readContactRecord(final SignalStorageRecord record) {
-        if (record == null || record.getContact().isEmpty()) {
-            return;
-        }
-
-        final var contactRecord = record.getContact().get();
-        final var aci = contactRecord.getAci().orElse(null);
-        final var pni = contactRecord.getPni().orElse(null);
-        if (contactRecord.getNumber().isEmpty() && aci == null && pni == null) {
-            return;
-        }
-        final var address = new RecipientAddress(aci, pni, contactRecord.getNumber().orElse(null));
-        var recipientId = account.getRecipientResolver().resolveRecipient(address);
-        if (aci != null && contactRecord.getUsername().isPresent()) {
-            recipientId = account.getRecipientTrustedResolver()
-                    .resolveRecipientTrusted(aci, contactRecord.getUsername().get());
-        }
-
-        final var contact = account.getContactStore().getContact(recipientId);
-        final var blocked = contact != null && contact.isBlocked();
-        final var profileShared = contact != null && contact.isProfileSharingEnabled();
-        final var archived = contact != null && contact.isArchived();
-        final var hidden = contact != null && contact.isHidden();
-        final var contactGivenName = contact == null ? null : contact.givenName();
-        final var contactFamilyName = contact == null ? null : contact.familyName();
-        if (blocked != contactRecord.isBlocked()
-                || profileShared != contactRecord.isProfileSharingEnabled()
-                || archived != contactRecord.isArchived()
-                || hidden != contactRecord.isHidden()
-                || (
-                contactRecord.getSystemGivenName().isPresent() && !contactRecord.getSystemGivenName()
-                        .get()
-                        .equals(contactGivenName)
-        )
-                || (
-                contactRecord.getSystemFamilyName().isPresent() && !contactRecord.getSystemFamilyName()
-                        .get()
-                        .equals(contactFamilyName)
-        )) {
-            logger.debug("Storing new or updated contact {}", recipientId);
-            final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            final var newContact = contactBuilder.withIsBlocked(contactRecord.isBlocked())
-                    .withIsProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
-                    .withIsArchived(contactRecord.isArchived())
-                    .withIsHidden(contactRecord.isHidden());
-            if (contactRecord.getSystemGivenName().isPresent() || contactRecord.getSystemFamilyName().isPresent()) {
-                newContact.withGivenName(contactRecord.getSystemGivenName().orElse(null))
-                        .withFamilyName(contactRecord.getSystemFamilyName().orElse(null));
-            }
-            account.getContactStore().storeContact(recipientId, newContact.build());
-        }
-
-        final var profile = account.getProfileStore().getProfile(recipientId);
-        final var profileGivenName = profile == null ? null : profile.getGivenName();
-        final var profileFamilyName = profile == null ? null : profile.getFamilyName();
-        if ((
-                contactRecord.getProfileGivenName().isPresent() && !contactRecord.getProfileGivenName()
-                        .get()
-                        .equals(profileGivenName)
-        ) || (
-                contactRecord.getProfileFamilyName().isPresent() && !contactRecord.getProfileFamilyName()
-                        .get()
-                        .equals(profileFamilyName)
-        )) {
-            final var profileBuilder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
-            final var newProfile = profileBuilder.withGivenName(contactRecord.getProfileGivenName().orElse(null))
-                    .withFamilyName(contactRecord.getProfileFamilyName().orElse(null))
-                    .build();
-            account.getProfileStore().storeProfile(recipientId, newProfile);
-        }
-        if (contactRecord.getProfileKey().isPresent()) {
-            try {
-                logger.trace("Storing profile key {}", recipientId);
-                final var profileKey = new ProfileKey(contactRecord.getProfileKey().get());
-                account.getProfileStore().storeProfileKey(recipientId, profileKey);
-            } catch (InvalidInputException e) {
-                logger.warn("Received invalid contact profile key from storage");
-            }
-        }
-        if (contactRecord.getIdentityKey().isPresent() && aci != null) {
-            try {
-                logger.trace("Storing identity key {}", recipientId);
-                final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get());
-                account.getIdentityKeyStore().saveIdentity(aci, identityKey);
-
-                final var trustLevel = TrustLevel.fromIdentityState(contactRecord.getIdentityState());
-                if (trustLevel != null) {
-                    account.getIdentityKeyStore().setIdentityTrustLevel(aci, identityKey, trustLevel);
+            logger.warn("Manifest couldn't be decrypted.");
+            if (account.isPrimaryDevice()) {
+                try {
+                    forcePushToStorage(storageKey);
+                } catch (RetryLaterException rle) {
+                    // TODO retry later
+                    return;
                 }
-            } catch (InvalidKeyException e) {
-                logger.warn("Received invalid contact identity key from storage");
             }
-        }
-    }
-
-    private void readGroupV1Record(final SignalStorageRecord record) {
-        if (record == null || record.getGroupV1().isEmpty()) {
             return;
         }
 
-        final var groupV1Record = record.getGroupV1().get();
-        final var groupIdV1 = GroupId.v1(groupV1Record.getGroupId());
+        logger.trace("Manifest versions: local {}, remote {}", localManifestVersion, remoteManifest.getVersion());
 
-        var group = account.getGroupStore().getGroup(groupIdV1);
-        if (group == null) {
-            try {
-                context.getGroupHelper().sendGroupInfoRequest(groupIdV1, account.getSelfRecipientId());
-            } catch (Throwable e) {
-                logger.warn("Failed to send group request", e);
-            }
-            group = account.getGroupStore().getOrCreateGroupV1(groupIdV1);
+        var needsForcePush = false;
+        if (remoteManifest.getVersion() > localManifestVersion) {
+            logger.trace("Remote version was newer, reading records.");
+            needsForcePush = readDataFromStorage(storageKey, localManifest, remoteManifest);
+        } else if (remoteManifest.getVersion() < localManifest.getVersion()) {
+            logger.debug("Remote storage manifest version was older. User might have switched accounts.");
         }
-        if (group != null && group.isBlocked() != groupV1Record.isBlocked()) {
-            group.setBlocked(groupV1Record.isBlocked());
-            account.getGroupStore().updateGroup(group);
-        }
-    }
+        logger.trace("Done reading data from remote storage");
 
-    private void readGroupV2Record(final SignalStorageRecord record) {
-        if (record == null || record.getGroupV2().isEmpty()) {
-            return;
+        if (localManifest != remoteManifest) {
+            storeManifestLocally(remoteManifest);
         }
 
-        final var groupV2Record = record.getGroupV2().get();
-        if (groupV2Record.isArchived()) {
-            return;
-        }
+        readRecordsWithPreviouslyUnknownTypes(storageKey);
 
-        final GroupMasterKey groupMasterKey;
+        logger.trace("Adding missing storageIds to local data");
+        account.getRecipientStore().setMissingStorageIds();
+        account.getGroupStore().setMissingStorageIds();
+
+        var needsMultiDeviceSync = false;
         try {
-            groupMasterKey = new GroupMasterKey(groupV2Record.getMasterKeyBytes());
-        } catch (InvalidInputException e) {
-            logger.warn("Received invalid group master key from storage");
+            needsMultiDeviceSync = writeToStorage(storageKey, remoteManifest, needsForcePush);
+        } catch (RetryLaterException e) {
+            // TODO retry later
             return;
         }
 
-        final var group = context.getGroupHelper().getOrMigrateGroup(groupMasterKey, 0, null);
-        if (group.isBlocked() != groupV2Record.isBlocked()) {
-            group.setBlocked(groupV2Record.isBlocked());
-            account.getGroupStore().updateGroup(group);
-        }
-    }
-
-    private void readAccountRecord(final SignalStorageRecord record) throws IOException {
-        if (record == null) {
-            logger.warn("Could not find account record, even though we had an ID, ignoring.");
-            return;
-        }
-
-        SignalAccountRecord accountRecord = record.getAccount().orElse(null);
-        if (accountRecord == null) {
-            logger.warn("The storage record didn't actually have an account, ignoring.");
-            return;
-        }
-
-        if (!accountRecord.getE164().equals(account.getNumber())) {
-            context.getJobExecutor().enqueueJob(new CheckWhoAmIJob());
-        }
-
-        account.getConfigurationStore().setReadReceipts(accountRecord.isReadReceiptsEnabled());
-        account.getConfigurationStore().setTypingIndicators(accountRecord.isTypingIndicatorsEnabled());
-        account.getConfigurationStore()
-                .setUnidentifiedDeliveryIndicators(accountRecord.isSealedSenderIndicatorsEnabled());
-        account.getConfigurationStore().setLinkPreviews(accountRecord.isLinkPreviewsEnabled());
-        account.getConfigurationStore().setPhoneNumberSharingMode(switch (accountRecord.getPhoneNumberSharingMode()) {
-            case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
-            case NOBODY, UNKNOWN -> PhoneNumberSharingMode.NOBODY;
-        });
-        account.getConfigurationStore().setPhoneNumberUnlisted(accountRecord.isPhoneNumberUnlisted());
-        account.setUsername(accountRecord.getUsername());
-
-        if (accountRecord.getProfileKey().isPresent()) {
-            ProfileKey profileKey;
+        if (needsForcePush) {
+            logger.debug("Doing a force push.");
             try {
-                profileKey = new ProfileKey(accountRecord.getProfileKey().get());
-            } catch (InvalidInputException e) {
-                logger.warn("Received invalid profile key from storage");
-                profileKey = null;
-            }
-            if (profileKey != null) {
-                account.setProfileKey(profileKey);
-                final var avatarPath = accountRecord.getAvatarUrlPath().orElse(null);
-                context.getJobExecutor().enqueueJob(new DownloadProfileAvatarJob(avatarPath));
+                forcePushToStorage(storageKey);
+                needsMultiDeviceSync = true;
+            } catch (RetryLaterException e) {
+                // TODO retry later
+                return;
             }
         }
 
-        context.getProfileHelper()
-                .setProfile(false,
-                        false,
-                        accountRecord.getGivenName().orElse(null),
-                        accountRecord.getFamilyName().orElse(null),
-                        null,
-                        null,
-                        null,
-                        null);
+        if (needsMultiDeviceSync) {
+            context.getSyncHelper().sendSyncFetchStorageMessage();
+        }
+
+        logger.debug("Done syncing data with remote storage");
     }
 
-    private SignalStorageRecord getSignalStorageRecord(final StorageId accountId) throws IOException {
-        List<SignalStorageRecord> records;
+    private boolean readDataFromStorage(
+            final StorageKey storageKey,
+            final SignalStorageManifest localManifest,
+            final SignalStorageManifest remoteManifest
+    ) throws IOException {
+        var needsForcePush = false;
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+
+            var idDifference = findIdDifference(remoteManifest.getStorageIds(), localManifest.getStorageIds());
+
+            if (idDifference.hasTypeMismatches() && account.isPrimaryDevice()) {
+                logger.debug("Found type mismatches in the ID sets! Scheduling a force push after this sync completes.");
+                needsForcePush = true;
+            }
+
+            logger.debug("Pre-Merge ID Difference :: " + idDifference);
+
+            if (!idDifference.isEmpty()) {
+                final var remoteOnlyRecords = getSignalStorageRecords(storageKey, idDifference.remoteOnlyIds());
+
+                if (remoteOnlyRecords.size() != idDifference.remoteOnlyIds().size()) {
+                    logger.debug("Could not find all remote-only records! Requested: "
+                            + idDifference.remoteOnlyIds()
+                            .size()
+                            + ", Found: "
+                            + remoteOnlyRecords.size()
+                            + ". These stragglers should naturally get deleted during the sync.");
+                }
+
+                final var unknownInserts = processKnownRecords(connection, remoteOnlyRecords);
+                final var unknownDeletes = idDifference.localOnlyIds()
+                        .stream()
+                        .filter(id -> !KNOWN_TYPES.contains(id.getType()))
+                        .toList();
+
+                logger.debug("Storage ids with unknown type: {} inserts, {} deletes",
+                        unknownInserts.size(),
+                        unknownDeletes.size());
+
+                account.getUnknownStorageIdStore().addUnknownStorageIds(connection, unknownInserts);
+                account.getUnknownStorageIdStore().deleteUnknownStorageIds(connection, unknownDeletes);
+            } else {
+                logger.debug("Remote version was newer, but there were no remote-only IDs.");
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+        return needsForcePush;
+    }
+
+    private void readRecordsWithPreviouslyUnknownTypes(final StorageKey storageKey) throws IOException {
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+            final var knownUnknownIds = account.getUnknownStorageIdStore()
+                    .getUnknownStorageIds(connection, KNOWN_TYPES);
+
+            if (!knownUnknownIds.isEmpty()) {
+                logger.debug("We have " + knownUnknownIds.size() + " unknown records that we can now process.");
+
+                final var remote = getSignalStorageRecords(storageKey, knownUnknownIds);
+
+                logger.debug("Found " + remote.size() + " of the known-unknowns remotely.");
+
+                processKnownRecords(connection, remote);
+                account.getUnknownStorageIdStore()
+                        .deleteUnknownStorageIds(connection, remote.stream().map(SignalStorageRecord::getId).toList());
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+    }
+
+    private boolean writeToStorage(
+            final StorageKey storageKey, final SignalStorageManifest remoteManifest, final boolean needsForcePush
+    ) throws IOException, RetryLaterException {
+        final WriteOperationResult remoteWriteOperation;
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+
+            final var localStorageIds = getAllLocalStorageIds(connection);
+            final var idDifference = findIdDifference(remoteManifest.getStorageIds(), localStorageIds);
+            logger.debug("ID Difference :: " + idDifference);
+
+            final var remoteDeletes = idDifference.remoteOnlyIds().stream().map(StorageId::getRaw).toList();
+            final var remoteInserts = buildLocalStorageRecords(connection, idDifference.localOnlyIds());
+            // TODO check if local storage record proto matches remote, then reset to remote storage_id
+
+            remoteWriteOperation = new WriteOperationResult(new SignalStorageManifest(remoteManifest.getVersion() + 1,
+                    account.getDeviceId(),
+                    localStorageIds), remoteInserts, remoteDeletes);
+
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+
+        if (remoteWriteOperation.isEmpty()) {
+            logger.debug("No remote writes needed. Still at version: " + remoteManifest.getVersion());
+            return false;
+        }
+
+        logger.debug("We have something to write remotely.");
+        logger.debug("WriteOperationResult :: " + remoteWriteOperation);
+
+        StorageSyncValidations.validate(remoteWriteOperation,
+                remoteManifest,
+                needsForcePush,
+                account.getSelfRecipientAddress());
+
+        final Optional<SignalStorageManifest> conflict;
         try {
-            records = dependencies.getAccountManager()
-                    .readStorageRecords(account.getStorageKey(), Collections.singletonList(accountId));
+            conflict = dependencies.getAccountManager()
+                    .writeStorageRecords(storageKey,
+                            remoteWriteOperation.manifest(),
+                            remoteWriteOperation.inserts(),
+                            remoteWriteOperation.deletes());
         } catch (InvalidKeyException e) {
-            logger.warn("Failed to read storage records, ignoring.");
-            return null;
+            logger.warn("Failed to decrypt conflicting storage manifest: {}", e.getMessage());
+            throw new IOException(e);
         }
-        return !records.isEmpty() ? records.getFirst() : null;
+
+        if (conflict.isPresent()) {
+            logger.debug("Hit a conflict when trying to resolve the conflict! Retrying.");
+            throw new RetryLaterException();
+        }
+
+        logger.debug("Saved new manifest. Now at version: " + remoteWriteOperation.manifest().getVersion());
+        storeManifestLocally(remoteWriteOperation.manifest());
+
+        return true;
     }
 
-    private List<SignalStorageRecord> getSignalStorageRecords(final Collection<StorageId> storageIds) throws IOException {
+    private void forcePushToStorage(
+            final StorageKey storageServiceKey
+    ) throws IOException, RetryLaterException {
+        logger.debug("Force pushing local state to remote storage");
+
+        final var currentVersion = dependencies.getAccountManager().getStorageManifestVersion();
+        final var newVersion = currentVersion + 1;
+        final var newStorageRecords = new ArrayList<SignalStorageRecord>();
+        final Map<RecipientId, StorageId> newContactStorageIds;
+        final Map<GroupIdV1, StorageId> newGroupV1StorageIds;
+        final Map<GroupIdV2, StorageId> newGroupV2StorageIds;
+
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+
+            final var recipientIds = account.getRecipientStore().getRecipientIds(connection);
+            newContactStorageIds = generateContactStorageIds(recipientIds);
+            for (final var recipientId : recipientIds) {
+                final var storageId = newContactStorageIds.get(recipientId);
+                if (storageId.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue()) {
+                    final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
+                    final var accountRecord = StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
+                            recipient,
+                            account.getUsernameLink(),
+                            storageId.getRaw());
+                    newStorageRecords.add(accountRecord);
+                } else {
+                    final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
+                    final var address = recipient.getAddress().getIdentifier();
+                    final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, address);
+                    final var record = StorageSyncModels.localToRemoteRecord(recipient, identity, storageId.getRaw());
+                    newStorageRecords.add(record);
+                }
+            }
+
+            final var groupV1Ids = account.getGroupStore().getGroupV1Ids(connection);
+            newGroupV1StorageIds = generateGroupV1StorageIds(groupV1Ids);
+            for (final var groupId : groupV1Ids) {
+                final var storageId = newGroupV1StorageIds.get(groupId);
+                final var group = account.getGroupStore().getGroup(connection, groupId);
+                final var record = StorageSyncModels.localToRemoteRecord(group, storageId.getRaw());
+                newStorageRecords.add(record);
+            }
+
+            final var groupV2Ids = account.getGroupStore().getGroupV2Ids(connection);
+            newGroupV2StorageIds = generateGroupV2StorageIds(groupV2Ids);
+            for (final var groupId : groupV2Ids) {
+                final var storageId = newGroupV2StorageIds.get(groupId);
+                final var group = account.getGroupStore().getGroup(connection, groupId);
+                final var record = StorageSyncModels.localToRemoteRecord(group, storageId.getRaw());
+                newStorageRecords.add(record);
+            }
+
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+        final var newStorageIds = newStorageRecords.stream().map(SignalStorageRecord::getId).toList();
+
+        final var manifest = new SignalStorageManifest(newVersion, account.getDeviceId(), newStorageIds);
+
+        StorageSyncValidations.validateForcePush(manifest, newStorageRecords, account.getSelfRecipientAddress());
+
+        final Optional<SignalStorageManifest> conflict;
+        try {
+            if (newVersion > 1) {
+                logger.trace("Force-pushing data. Inserting {} IDs.", newStorageRecords.size());
+                conflict = dependencies.getAccountManager()
+                        .resetStorageRecords(storageServiceKey, manifest, newStorageRecords);
+            } else {
+                logger.trace("First version, normal push. Inserting {} IDs.", newStorageRecords.size());
+                conflict = dependencies.getAccountManager()
+                        .writeStorageRecords(storageServiceKey, manifest, newStorageRecords, Collections.emptyList());
+            }
+        } catch (InvalidKeyException e) {
+            logger.debug("Hit an invalid key exception, which likely indicates a conflict.", e);
+            throw new RetryLaterException();
+        }
+
+        if (conflict.isPresent()) {
+            logger.debug("Hit a conflict. Trying again.");
+            throw new RetryLaterException();
+        }
+
+        logger.debug("Force push succeeded. Updating local manifest version to: " + manifest.getVersion());
+        storeManifestLocally(manifest);
+
+        try (final var connection = account.getAccountDatabase().getConnection()) {
+            connection.setAutoCommit(false);
+            account.getRecipientStore().updateStorageIds(connection, newContactStorageIds);
+            account.getGroupStore().updateStorageIds(connection, newGroupV1StorageIds, newGroupV2StorageIds);
+
+            // delete all unknown storage ids
+            account.getUnknownStorageIdStore().deleteAllUnknownStorageIds(connection);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed to sync remote storage", e);
+        }
+    }
+
+    private Map<RecipientId, StorageId> generateContactStorageIds(List<RecipientId> recipientIds) {
+        final var selfRecipientId = account.getSelfRecipientId();
+        return recipientIds.stream().collect(Collectors.toMap(recipientId -> recipientId, recipientId -> {
+            if (recipientId.equals(selfRecipientId)) {
+                return StorageId.forAccount(KeyUtils.createRawStorageId());
+            } else {
+                return StorageId.forContact(KeyUtils.createRawStorageId());
+            }
+        }));
+    }
+
+    private Map<GroupIdV1, StorageId> generateGroupV1StorageIds(List<GroupIdV1> groupIds) {
+        return groupIds.stream()
+                .collect(Collectors.toMap(recipientId -> recipientId,
+                        recipientId -> StorageId.forGroupV1(KeyUtils.createRawStorageId())));
+    }
+
+    private Map<GroupIdV2, StorageId> generateGroupV2StorageIds(List<GroupIdV2> groupIds) {
+        return groupIds.stream()
+                .collect(Collectors.toMap(recipientId -> recipientId,
+                        recipientId -> StorageId.forGroupV2(KeyUtils.createRawStorageId())));
+    }
+
+    private void storeManifestLocally(
+            final SignalStorageManifest remoteManifest
+    ) {
+        account.setStorageManifestVersion(remoteManifest.getVersion());
+        account.setStorageManifest(remoteManifest);
+    }
+
+    private List<SignalStorageRecord> getSignalStorageRecords(
+            final StorageKey storageKey, final List<StorageId> storageIds
+    ) throws IOException {
         List<SignalStorageRecord> records;
         try {
-            records = dependencies.getAccountManager()
-                    .readStorageRecords(account.getStorageKey(), new ArrayList<>(storageIds));
+            records = dependencies.getAccountManager().readStorageRecords(storageKey, storageIds);
         } catch (InvalidKeyException e) {
             logger.warn("Failed to read storage records, ignoring.");
             return List.of();
         }
         return records;
     }
+
+    private List<StorageId> getAllLocalStorageIds(final Connection connection) throws SQLException {
+        final var storageIds = new ArrayList<StorageId>();
+        storageIds.addAll(account.getUnknownStorageIdStore().getUnknownStorageIds(connection));
+        storageIds.addAll(account.getGroupStore().getStorageIds(connection));
+        storageIds.addAll(account.getRecipientStore().getStorageIds(connection));
+        storageIds.add(account.getRecipientStore().getSelfStorageId(connection));
+        return storageIds;
+    }
+
+    private List<SignalStorageRecord> buildLocalStorageRecords(
+            final Connection connection, final List<StorageId> storageIds
+    ) throws SQLException {
+        final var records = new ArrayList<SignalStorageRecord>();
+        for (final var storageId : storageIds) {
+            final var record = buildLocalStorageRecord(connection, storageId);
+            if (record != null) {
+                records.add(record);
+            }
+        }
+        return records;
+    }
+
+    private SignalStorageRecord buildLocalStorageRecord(
+            Connection connection, StorageId storageId
+    ) throws SQLException {
+        return switch (ManifestRecord.Identifier.Type.fromValue(storageId.getType())) {
+            case ManifestRecord.Identifier.Type.CONTACT -> {
+                final var recipient = account.getRecipientStore().getRecipient(connection, storageId);
+                final var address = recipient.getAddress().getIdentifier();
+                final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, address);
+                yield StorageSyncModels.localToRemoteRecord(recipient, identity, storageId.getRaw());
+            }
+            case ManifestRecord.Identifier.Type.GROUPV1 -> {
+                final var groupV1 = account.getGroupStore().getGroupV1(connection, storageId);
+                yield StorageSyncModels.localToRemoteRecord(groupV1, storageId.getRaw());
+            }
+            case ManifestRecord.Identifier.Type.GROUPV2 -> {
+                final var groupV2 = account.getGroupStore().getGroupV2(connection, storageId);
+                yield StorageSyncModels.localToRemoteRecord(groupV2, storageId.getRaw());
+            }
+            case ManifestRecord.Identifier.Type.ACCOUNT -> {
+                final var selfRecipient = account.getRecipientStore()
+                        .getRecipient(connection, account.getSelfRecipientId());
+                yield StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
+                        selfRecipient,
+                        account.getUsernameLink(),
+                        storageId.getRaw());
+            }
+            case null, default -> throw new AssertionError("Got unknown local storage record type: " + storageId);
+        };
+    }
+
+    /**
+     * Given a list of all the local and remote keys you know about, this will
+     * return a result telling
+     * you which keys are exclusively remote and which are exclusively local.
+     *
+     * @param remoteIds All remote keys available.
+     * @param localIds  All local keys available.
+     * @return An object describing which keys are exclusive to the remote data set
+     * and which keys are
+     * exclusive to the local data set.
+     */
+    private static IdDifferenceResult findIdDifference(
+            Collection<StorageId> remoteIds, Collection<StorageId> localIds
+    ) {
+        final var base64Encoder = Base64.getEncoder();
+        final var remoteByRawId = remoteIds.stream()
+                .collect(Collectors.toMap(id -> base64Encoder.encodeToString(id.getRaw()), id -> id));
+        final var localByRawId = localIds.stream()
+                .collect(Collectors.toMap(id -> base64Encoder.encodeToString(id.getRaw()), id -> id));
+
+        boolean hasTypeMismatch = remoteByRawId.size() != remoteIds.size() || localByRawId.size() != localIds.size();
+
+        final var remoteOnlyRawIds = SetUtil.difference(remoteByRawId.keySet(), localByRawId.keySet());
+        final var localOnlyRawIds = SetUtil.difference(localByRawId.keySet(), remoteByRawId.keySet());
+        final var sharedRawIds = SetUtil.intersection(localByRawId.keySet(), remoteByRawId.keySet());
+
+        for (String rawId : sharedRawIds) {
+            final var remote = remoteByRawId.get(rawId);
+            final var local = localByRawId.get(rawId);
+
+            if (remote.getType() != local.getType()) {
+                remoteOnlyRawIds.remove(rawId);
+                localOnlyRawIds.remove(rawId);
+                hasTypeMismatch = true;
+                logger.debug("Remote type {} did not match local type {} for {}!",
+                        remote.getType(),
+                        local.getType(),
+                        rawId);
+            }
+        }
+
+        final var remoteOnlyKeys = remoteOnlyRawIds.stream().map(remoteByRawId::get).toList();
+        final var localOnlyKeys = localOnlyRawIds.stream().map(localByRawId::get).toList();
+
+        return new IdDifferenceResult(remoteOnlyKeys, localOnlyKeys, hasTypeMismatch);
+    }
+
+    private List<StorageId> processKnownRecords(
+            final Connection connection, List<SignalStorageRecord> records
+    ) throws SQLException {
+        final var unknownRecords = new ArrayList<StorageId>();
+
+        final var accountRecordProcessor = new AccountRecordProcessor(account, connection, context.getJobExecutor());
+        final var contactRecordProcessor = new ContactRecordProcessor(account, connection, context.getJobExecutor());
+        final var groupV1RecordProcessor = new GroupV1RecordProcessor(account, connection);
+        final var groupV2RecordProcessor = new GroupV2RecordProcessor(account, connection);
+
+        for (final var record : records) {
+            logger.debug("Reading record of type {}", record.getType());
+            switch (ManifestRecord.Identifier.Type.fromValue(record.getType())) {
+                case ACCOUNT -> accountRecordProcessor.process(record.getAccount().get());
+                case GROUPV1 -> groupV1RecordProcessor.process(record.getGroupV1().get());
+                case GROUPV2 -> groupV2RecordProcessor.process(record.getGroupV2().get());
+                case CONTACT -> contactRecordProcessor.process(record.getContact().get());
+                case null, default -> unknownRecords.add(record.getId());
+            }
+        }
+
+        return unknownRecords;
+    }
+
+    /**
+     * hasTypeMismatches is True if there exist some keys that have matching raw ID's but different types, otherwise false.
+     */
+    private record IdDifferenceResult(
+            List<StorageId> remoteOnlyIds, List<StorageId> localOnlyIds, boolean hasTypeMismatches
+    ) {
+
+        public boolean isEmpty() {
+            return remoteOnlyIds.isEmpty() && localOnlyIds.isEmpty();
+        }
+    }
+
+    private static class RetryLaterException extends Throwable {}
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index f6392ea9..ac611046 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -79,6 +79,11 @@ public class SyncHelper {
                 .sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
     }
 
+    public void sendSyncFetchStorageMessage() {
+        context.getSendHelper()
+                .sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.STORAGE_MANIFEST));
+    }
+
     public void sendGroups() throws IOException {
         var groupsFile = IOUtils.createTempFile();
 
@@ -222,7 +227,7 @@ public class SyncHelper {
     }
 
     public SendMessageResult sendKeysMessage() {
-        var keysMessage = new KeysMessage(Optional.ofNullable(account.getStorageKey()),
+        var keysMessage = new KeysMessage(Optional.ofNullable(account.getOrCreateStorageKey()),
                 Optional.ofNullable(account.getOrCreatePinMasterKey()));
         return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
index ee4c2222..a76924d8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/JobExecutor.java
@@ -70,11 +70,13 @@ public class JobExecutor implements AutoCloseable {
 
     @Override
     public void close() {
+        final boolean queueEmpty;
         synchronized (queue) {
-            if (queue.isEmpty()) {
-                executorService.close();
-                return;
-            }
+            queueEmpty = queue.isEmpty();
+        }
+        if (queueEmpty) {
+            executorService.close();
+            return;
         }
         synchronized (this) {
             try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 29f3d2ab..a2575e90 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -66,6 +66,7 @@ import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.helper.RecipientHelper.RegisteredUser;
+import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
@@ -125,6 +126,7 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ManagerImpl implements Manager {
 
@@ -193,22 +195,25 @@ public class ManagerImpl implements Manager {
                 this.notifyAll();
             }
         });
-        disposable.add(account.getIdentityKeyStore().getIdentityChanges().subscribe(serviceId -> {
-            logger.trace("Archiving old sessions for {}", serviceId);
-            account.getAccountData(ServiceIdType.ACI).getSessionStore().archiveSessions(serviceId);
-            account.getAccountData(ServiceIdType.PNI).getSessionStore().archiveSessions(serviceId);
-            account.getSenderKeyStore().deleteSharedWith(serviceId);
-            final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
-            final var profile = account.getProfileStore().getProfile(recipientId);
-            if (profile != null) {
-                account.getProfileStore()
-                        .storeProfile(recipientId,
-                                Profile.newBuilder(profile)
-                                        .withUnidentifiedAccessMode(Profile.UnidentifiedAccessMode.UNKNOWN)
-                                        .withLastUpdateTimestamp(0)
-                                        .build());
-            }
-        }));
+        disposable.add(account.getIdentityKeyStore()
+                .getIdentityChanges()
+                .observeOn(Schedulers.from(executor))
+                .subscribe(serviceId -> {
+                    logger.trace("Archiving old sessions for {}", serviceId);
+                    account.getAccountData(ServiceIdType.ACI).getSessionStore().archiveSessions(serviceId);
+                    account.getAccountData(ServiceIdType.PNI).getSessionStore().archiveSessions(serviceId);
+                    account.getSenderKeyStore().deleteSharedWith(serviceId);
+                    final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
+                    final var profile = account.getProfileStore().getProfile(recipientId);
+                    if (profile != null) {
+                        account.getProfileStore()
+                                .storeProfile(recipientId,
+                                        Profile.newBuilder(profile)
+                                                .withUnidentifiedAccessMode(Profile.UnidentifiedAccessMode.UNKNOWN)
+                                                .withLastUpdateTimestamp(0)
+                                                .build());
+                    }
+                }));
     }
 
     @Override
@@ -295,13 +300,7 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void updateConfiguration(
-            Configuration configuration
-    ) throws NotPrimaryDeviceException {
-        if (!account.isPrimaryDevice()) {
-            throw new NotPrimaryDeviceException();
-        }
-
+    public void updateConfiguration(Configuration configuration) {
         final var configurationStore = account.getConfigurationStore();
         if (configuration.readReceipts().isPresent()) {
             configurationStore.setReadReceipts(configuration.readReceipts().get());
@@ -316,6 +315,7 @@ public class ManagerImpl implements Manager {
             configurationStore.setLinkPreviews(configuration.linkPreviews().get());
         }
         context.getSyncHelper().sendConfigurationMessage();
+        syncRemoteStorage();
     }
 
     @Override
@@ -870,6 +870,7 @@ public class ManagerImpl implements Manager {
         if (recipientIdOptional.isPresent()) {
             context.getContactHelper().setContactHidden(recipientIdOptional.get(), true);
             account.removeRecipient(recipientIdOptional.get());
+            syncRemoteStorage();
         }
     }
 
@@ -878,6 +879,7 @@ public class ManagerImpl implements Manager {
         final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
         if (recipientIdOptional.isPresent()) {
             account.removeRecipient(recipientIdOptional.get());
+            syncRemoteStorage();
         }
     }
 
@@ -886,6 +888,7 @@ public class ManagerImpl implements Manager {
         final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
         if (recipientIdOptional.isPresent()) {
             account.getContactStore().deleteContact(recipientIdOptional.get());
+            syncRemoteStorage();
         }
     }
 
@@ -898,15 +901,13 @@ public class ManagerImpl implements Manager {
         }
         context.getContactHelper()
                 .setContactName(context.getRecipientHelper().resolveRecipient(recipient), givenName, familyName);
+        syncRemoteStorage();
     }
 
     @Override
     public void setContactsBlocked(
             Collection<RecipientIdentifier.Single> recipients, boolean blocked
-    ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException {
-        if (!account.isPrimaryDevice()) {
-            throw new NotPrimaryDeviceException();
-        }
+    ) throws IOException, UnregisteredRecipientException {
         if (recipients.isEmpty()) {
             return;
         }
@@ -930,15 +931,13 @@ public class ManagerImpl implements Manager {
             context.getProfileHelper().rotateProfileKey();
         }
         context.getSyncHelper().sendBlockedList();
+        syncRemoteStorage();
     }
 
     @Override
     public void setGroupsBlocked(
             final Collection<GroupId> groupIds, final boolean blocked
-    ) throws GroupNotFoundException, NotPrimaryDeviceException, IOException {
-        if (!account.isPrimaryDevice()) {
-            throw new NotPrimaryDeviceException();
-        }
+    ) throws GroupNotFoundException, IOException {
         if (groupIds.isEmpty()) {
             return;
         }
@@ -954,6 +953,7 @@ public class ManagerImpl implements Manager {
             context.getProfileHelper().rotateProfileKey();
         }
         context.getSyncHelper().sendBlockedList();
+        syncRemoteStorage();
     }
 
     @Override
@@ -968,6 +968,7 @@ public class ManagerImpl implements Manager {
         } catch (NotAGroupMemberException | GroupNotFoundException | GroupSendingNotAllowedException e) {
             throw new AssertionError(e);
         }
+        syncRemoteStorage();
     }
 
     @Override
@@ -1025,13 +1026,13 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void requestAllSyncData() throws IOException {
+    public void requestAllSyncData() {
         context.getSyncHelper().requestAllSyncData();
-        retrieveRemoteStorage();
+        syncRemoteStorage();
     }
 
-    void retrieveRemoteStorage() throws IOException {
-        context.getStorageHelper().readDataFromStorage();
+    void syncRemoteStorage() {
+        context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 6a2f3633..839bdd48 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -169,7 +169,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
             m.refreshPreKeys();
             if (response.isStorageCapable()) {
-                m.retrieveRemoteStorage();
+                m.syncRemoteStorage();
             }
             // Set an initial empty profile so user can be added to groups
             try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileJob.java
new file mode 100644
index 00000000..22796864
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/DownloadProfileJob.java
@@ -0,0 +1,24 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DownloadProfileJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(DownloadProfileJob.class);
+    private final RecipientAddress address;
+
+    public DownloadProfileJob(RecipientAddress address) {
+        this.address = address;
+    }
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Refreshing profile for {}", address);
+        final var account = context.getAccount();
+        final var recipientId = account.getRecipientStore().resolveRecipient(address);
+        context.getProfileHelper().refreshRecipientProfile(recipientId);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java
new file mode 100644
index 00000000..85cfbe2c
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java
@@ -0,0 +1,22 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class SyncStorageJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(SyncStorageJob.class);
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Running storage sync job");
+        try {
+            context.getStorageHelper().syncDataWithStorage();
+        } catch (IOException e) {
+            logger.warn("Failed to sync storage data", e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 43a146a7..c49e56ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -32,7 +32,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 19;
+    private static final long DATABASE_VERSION = 20;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -57,6 +57,7 @@ public class AccountDatabase extends Database {
         SenderKeySharedStore.createSql(connection);
         KeyValueStore.createSql(connection);
         CdsiStore.createSql(connection);
+        UnknownStorageIdStore.createSql(connection);
     }
 
     @Override
@@ -539,5 +540,23 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 20) {
+            logger.debug("Updating database: Creating storage id tables and columns");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        CREATE TABLE storage_id (
+                                          _id INTEGER PRIMARY KEY,
+                                          type INTEGER NOT NULL,
+                                          storage_id BLOB NOT NULL
+                                        ) STRICT;
+                                        ALTER TABLE group_v1 ADD COLUMN storage_id BLOB;
+                                        ALTER TABLE group_v1 ADD COLUMN storage_record BLOB;
+                                        ALTER TABLE group_v2 ADD COLUMN storage_id BLOB;
+                                        ALTER TABLE group_v2 ADD COLUMN storage_record BLOB;
+                                        ALTER TABLE recipient ADD COLUMN storage_id BLOB;
+                                        ALTER TABLE recipient ADD COLUMN storage_record BLOB;
+                                        """);
+            }
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 6860e239..41c05b98 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -168,6 +168,7 @@ public class SignalAccount implements Closeable {
     private GroupStore groupStore;
     private RecipientStore recipientStore;
     private StickerStore stickerStore;
+    private UnknownStorageIdStore unknownStorageIdStore;
     private ConfigurationStore configurationStore;
     private KeyValueStore keyValueStore;
     private CdsiStore cdsiStore;
@@ -176,6 +177,7 @@ public class SignalAccount implements Closeable {
     private MessageSendLogStore messageSendLogStore;
 
     private AccountDatabase accountDatabase;
+    private RecipientId selfRecipientId;
 
     private SignalAccount(final FileChannel fileChannel, final FileLock lock) {
         this.fileChannel = fileChannel;
@@ -194,6 +196,7 @@ public class SignalAccount implements Closeable {
             signalAccount.load(dataPath, accountPath, settings);
             logger.trace("Migrating legacy parts of account file");
             signalAccount.migrateLegacyConfigs();
+            signalAccount.init();
 
             return signalAccount;
         } catch (Throwable e) {
@@ -240,7 +243,7 @@ public class SignalAccount implements Closeable {
         signalAccount.registered = false;
 
         signalAccount.previousStorageVersion = CURRENT_STORAGE_VERSION;
-        signalAccount.migrateLegacyConfigs();
+        signalAccount.init();
         signalAccount.save();
 
         return signalAccount;
@@ -286,6 +289,7 @@ public class SignalAccount implements Closeable {
         this.number = number;
         this.aciAccountData.setServiceId(aci);
         this.pniAccountData.setServiceId(pni);
+        this.init();
         getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
         this.password = password;
         this.profileKey = profileKey;
@@ -337,6 +341,7 @@ public class SignalAccount implements Closeable {
         this.registered = true;
         this.aciAccountData.setServiceId(aci);
         this.pniAccountData.setServiceId(pni);
+        init();
         this.registrationLockPin = pin;
         getKeyValueStore().storeEntry(lastReceiveTimestamp, 0L);
         save();
@@ -356,6 +361,10 @@ public class SignalAccount implements Closeable {
         getAccountDatabase();
     }
 
+    private void init() {
+        this.selfRecipientId = getRecipientResolver().resolveRecipient(getSelfRecipientAddress());
+    }
+
     private void migrateLegacyConfigs() {
         if (isPrimaryDevice() && getPniIdentityKeyPair() == null) {
             setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
@@ -1158,7 +1167,9 @@ public class SignalAccount implements Closeable {
 
     public IdentityKeyStore getIdentityKeyStore() {
         return getOrCreate(() -> identityKeyStore,
-                () -> identityKeyStore = new IdentityKeyStore(getAccountDatabase(), settings.trustNewIdentity()));
+                () -> identityKeyStore = new IdentityKeyStore(getAccountDatabase(),
+                        settings.trustNewIdentity(),
+                        getRecipientStore()));
     }
 
     public GroupStore getGroupStore() {
@@ -1216,9 +1227,13 @@ public class SignalAccount implements Closeable {
         return getOrCreate(() -> keyValueStore, () -> keyValueStore = new KeyValueStore(getAccountDatabase()));
     }
 
+    public UnknownStorageIdStore getUnknownStorageIdStore() {
+        return getOrCreate(() -> unknownStorageIdStore, () -> unknownStorageIdStore = new UnknownStorageIdStore());
+    }
+
     public ConfigurationStore getConfigurationStore() {
         return getOrCreate(() -> configurationStore,
-                () -> configurationStore = new ConfigurationStore(getKeyValueStore()));
+                () -> configurationStore = new ConfigurationStore(getKeyValueStore(), getRecipientStore()));
     }
 
     public MessageCache getMessageCache() {
@@ -1387,7 +1402,7 @@ public class SignalAccount implements Closeable {
     }
 
     public RecipientId getSelfRecipientId() {
-        return getRecipientResolver().resolveRecipient(getSelfRecipientAddress());
+        return selfRecipientId;
     }
 
     public String getSessionId(final String forNumber) {
@@ -1472,22 +1487,29 @@ public class SignalAccount implements Closeable {
         return pinMasterKey;
     }
 
-    public StorageKey getStorageKey() {
-        if (pinMasterKey != null) {
-            return pinMasterKey.deriveStorageServiceKey();
+    public void setMasterKey(MasterKey masterKey) {
+        if (isPrimaryDevice()) {
+            return;
         }
-        return storageKey;
+        this.pinMasterKey = masterKey;
+        save();
     }
 
     public StorageKey getOrCreateStorageKey() {
-        if (isPrimaryDevice()) {
-            return getOrCreatePinMasterKey().deriveStorageServiceKey();
+        if (pinMasterKey != null) {
+            return pinMasterKey.deriveStorageServiceKey();
+        } else if (storageKey != null) {
+            return storageKey;
+        } else if (!isPrimaryDevice() || !isMultiDevice()) {
+            // Only upload storage, if a pin master key already exists or linked devices exist
+            return null;
         }
-        return storageKey;
+
+        return getOrCreatePinMasterKey().deriveStorageServiceKey();
     }
 
     public void setStorageKey(final StorageKey storageKey) {
-        if (storageKey.equals(this.storageKey)) {
+        if (isPrimaryDevice() || storageKey.equals(this.storageKey)) {
             return;
         }
         this.storageKey = storageKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
new file mode 100644
index 00000000..6e00ad75
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
@@ -0,0 +1,104 @@
+package org.asamk.signal.manager.storage;
+
+import org.whispersystems.signalservice.api.storage.StorageId;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class UnknownStorageIdStore {
+
+    private static final String TABLE_STORAGE_ID = "storage_id";
+
+    public static void createSql(Connection connection) throws SQLException {
+        // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
+        try (final var statement = connection.createStatement()) {
+            statement.executeUpdate("""
+                                    CREATE TABLE storage_id (
+                                      _id INTEGER PRIMARY KEY,
+                                      type INTEGER NOT NULL,
+                                      storage_id BLOB UNIQUE NOT NULL
+                                    ) STRICT;
+                                    """);
+        }
+    }
+
+    public Collection<StorageId> getUnknownStorageIds(Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT s.type, s.storage_id
+                FROM %s s
+                """
+        ).formatted(TABLE_STORAGE_ID);
+        try (final var statement = connection.prepareStatement(sql)) {
+            try (var result = Utils.executeQueryForStream(statement, this::getStorageIdFromResultSet)) {
+                return result.toList();
+            }
+        }
+    }
+
+    public List<StorageId> getUnknownStorageIds(
+            Connection connection, Collection<Integer> types
+    ) throws SQLException {
+        final var typesCommaSeparated = types.stream().map(String::valueOf).collect(Collectors.joining(","));
+        final var sql = (
+                """
+                SELECT s.type, s.storage_id
+                FROM %s s
+                WHERE s.type IN (%s)
+                """
+        ).formatted(TABLE_STORAGE_ID, typesCommaSeparated);
+        try (final var statement = connection.prepareStatement(sql)) {
+            try (var result = Utils.executeQueryForStream(statement, this::getStorageIdFromResultSet)) {
+                return result.toList();
+            }
+        }
+    }
+
+    public void addUnknownStorageIds(Connection connection, Collection<StorageId> storageIds) throws SQLException {
+        final var sql = (
+                """
+                INSERT OR REPLACE INTO %s (type, storage_id)
+                VALUES (?, ?)
+                """
+        ).formatted(TABLE_STORAGE_ID);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var storageId : storageIds) {
+                statement.setInt(1, storageId.getType());
+                statement.setBytes(2, storageId.getRaw());
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public void deleteUnknownStorageIds(Connection connection, Collection<StorageId> storageIds) throws SQLException {
+        final var sql = (
+                """
+                DELETE FROM %s
+                WHERE storage_id = ?
+                """
+        ).formatted(TABLE_STORAGE_ID);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var storageId : storageIds) {
+                statement.setBytes(1, storageId.getRaw());
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public void deleteAllUnknownStorageIds(Connection connection) throws SQLException {
+        final var sql = "DELETE FROM %s".formatted(TABLE_STORAGE_ID);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.executeUpdate();
+        }
+    }
+
+    private StorageId getStorageIdFromResultSet(ResultSet resultSet) throws SQLException {
+        final var type = resultSet.getInt("type");
+        final var storageId = resultSet.getBytes("storage_id");
+        return StorageId.forType(storageId, type);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
index f85d3d80..558d4f86 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
@@ -3,10 +3,15 @@ package org.asamk.signal.manager.storage.configuration;
 import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.storage.keyValue.KeyValueEntry;
 import org.asamk.signal.manager.storage.keyValue.KeyValueStore;
+import org.asamk.signal.manager.storage.recipients.RecipientStore;
+
+import java.sql.Connection;
+import java.sql.SQLException;
 
 public class ConfigurationStore {
 
     private final KeyValueStore keyValueStore;
+    private final RecipientStore recipientStore;
 
     private final KeyValueEntry<Boolean> readReceipts = new KeyValueEntry<>("config-read-receipts", Boolean.class);
     private final KeyValueEntry<Boolean> unidentifiedDeliveryIndicators = new KeyValueEntry<>(
@@ -20,9 +25,11 @@ public class ConfigurationStore {
     private final KeyValueEntry<PhoneNumberSharingMode> phoneNumberSharingMode = new KeyValueEntry<>(
             "config-phone-number-sharing-mode",
             PhoneNumberSharingMode.class);
+    private final KeyValueEntry<String> usernameLinkColor = new KeyValueEntry<>("username-link-color", String.class);
 
-    public ConfigurationStore(final KeyValueStore keyValueStore) {
+    public ConfigurationStore(final KeyValueStore keyValueStore, RecipientStore recipientStore) {
         this.keyValueStore = keyValueStore;
+        this.recipientStore = recipientStore;
     }
 
     public Boolean getReadReceipts() {
@@ -30,7 +37,15 @@ public class ConfigurationStore {
     }
 
     public void setReadReceipts(final boolean value) {
-        keyValueStore.storeEntry(readReceipts, value);
+        if (keyValueStore.storeEntry(readReceipts, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setReadReceipts(final Connection connection, final boolean value) throws SQLException {
+        if (keyValueStore.storeEntry(connection, readReceipts, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public Boolean getUnidentifiedDeliveryIndicators() {
@@ -38,7 +53,17 @@ public class ConfigurationStore {
     }
 
     public void setUnidentifiedDeliveryIndicators(final boolean value) {
-        keyValueStore.storeEntry(unidentifiedDeliveryIndicators, value);
+        if (keyValueStore.storeEntry(unidentifiedDeliveryIndicators, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setUnidentifiedDeliveryIndicators(
+            final Connection connection, final boolean value
+    ) throws SQLException {
+        if (keyValueStore.storeEntry(connection, unidentifiedDeliveryIndicators, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public Boolean getTypingIndicators() {
@@ -46,7 +71,15 @@ public class ConfigurationStore {
     }
 
     public void setTypingIndicators(final boolean value) {
-        keyValueStore.storeEntry(typingIndicators, value);
+        if (keyValueStore.storeEntry(typingIndicators, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setTypingIndicators(final Connection connection, final boolean value) throws SQLException {
+        if (keyValueStore.storeEntry(connection, typingIndicators, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public Boolean getLinkPreviews() {
@@ -54,7 +87,15 @@ public class ConfigurationStore {
     }
 
     public void setLinkPreviews(final boolean value) {
-        keyValueStore.storeEntry(linkPreviews, value);
+        if (keyValueStore.storeEntry(linkPreviews, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setLinkPreviews(final Connection connection, final boolean value) throws SQLException {
+        if (keyValueStore.storeEntry(connection, linkPreviews, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public Boolean getPhoneNumberUnlisted() {
@@ -62,7 +103,15 @@ public class ConfigurationStore {
     }
 
     public void setPhoneNumberUnlisted(final boolean value) {
-        keyValueStore.storeEntry(phoneNumberUnlisted, value);
+        if (keyValueStore.storeEntry(phoneNumberUnlisted, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setPhoneNumberUnlisted(final Connection connection, final boolean value) throws SQLException {
+        if (keyValueStore.storeEntry(connection, phoneNumberUnlisted, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 
     public PhoneNumberSharingMode getPhoneNumberSharingMode() {
@@ -70,6 +119,32 @@ public class ConfigurationStore {
     }
 
     public void setPhoneNumberSharingMode(final PhoneNumberSharingMode value) {
-        keyValueStore.storeEntry(phoneNumberSharingMode, value);
+        if (keyValueStore.storeEntry(phoneNumberSharingMode, value)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setPhoneNumberSharingMode(
+            final Connection connection, final PhoneNumberSharingMode value
+    ) throws SQLException {
+        if (keyValueStore.storeEntry(connection, phoneNumberSharingMode, value)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
+    }
+
+    public String getUsernameLinkColor() {
+        return keyValueStore.getEntry(usernameLinkColor);
+    }
+
+    public void setUsernameLinkColor(final String color) {
+        if (keyValueStore.storeEntry(usernameLinkColor, color)) {
+            recipientStore.rotateSelfStorageId();
+        }
+    }
+
+    public void setUsernameLinkColor(final Connection connection, final String color) throws SQLException {
+        if (keyValueStore.storeEntry(connection, usernameLinkColor, color)) {
+            recipientStore.rotateSelfStorageId(connection);
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
index ba09337c..fd7bfe85 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
@@ -25,6 +25,7 @@ public final class GroupInfoV1 extends GroupInfo {
     public int messageExpirationTime;
     public boolean blocked;
     public boolean archived;
+    private byte[] storageRecord;
 
     public GroupInfoV1(GroupIdV1 groupId) {
         this.groupId = groupId;
@@ -38,7 +39,8 @@ public final class GroupInfoV1 extends GroupInfo {
             final String color,
             final int messageExpirationTime,
             final boolean blocked,
-            final boolean archived
+            final boolean archived,
+            final byte[] storageRecord
     ) {
         this.groupId = groupId;
         this.expectedV2Id = expectedV2Id;
@@ -48,6 +50,7 @@ public final class GroupInfoV1 extends GroupInfo {
         this.messageExpirationTime = messageExpirationTime;
         this.blocked = blocked;
         this.archived = archived;
+        this.storageRecord = storageRecord;
     }
 
     @Override
@@ -123,4 +126,8 @@ public final class GroupInfoV1 extends GroupInfo {
     public void removeMember(RecipientId recipientId) {
         this.members.removeIf(member -> member.equals(recipientId));
     }
+
+    public byte[] getStorageRecord() {
+        return storageRecord;
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index c263aa9b..8ddec54e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -24,6 +24,7 @@ public final class GroupInfoV2 extends GroupInfo {
     private final DistributionId distributionId;
     private boolean blocked;
     private DecryptedGroup group;
+    private byte[] storageRecord;
     private boolean permissionDenied;
 
     private final RecipientResolver recipientResolver;
@@ -44,6 +45,7 @@ public final class GroupInfoV2 extends GroupInfo {
             final DistributionId distributionId,
             final boolean blocked,
             final boolean permissionDenied,
+            final byte[] storageRecord,
             final RecipientResolver recipientResolver
     ) {
         this.groupId = groupId;
@@ -52,6 +54,7 @@ public final class GroupInfoV2 extends GroupInfo {
         this.distributionId = distributionId;
         this.blocked = blocked;
         this.permissionDenied = permissionDenied;
+        this.storageRecord = storageRecord;
         this.recipientResolver = recipientResolver;
     }
 
@@ -64,6 +67,10 @@ public final class GroupInfoV2 extends GroupInfo {
         return masterKey;
     }
 
+    public byte[] getStorageRecord() {
+        return storageRecord;
+    }
+
     public DistributionId getDistributionId() {
         return distributionId;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 33bb2532..e7cf5752 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -9,6 +9,7 @@ import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientIdCreator;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
@@ -16,6 +17,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.DistributionId;
+import org.whispersystems.signalservice.api.storage.StorageId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;
@@ -23,9 +25,11 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -48,6 +52,8 @@ public class GroupStore {
             statement.executeUpdate("""
                                     CREATE TABLE group_v2 (
                                       _id INTEGER PRIMARY KEY,
+                                      storage_id BLOB UNIQUE,
+                                      storage_record BLOB,
                                       group_id BLOB UNIQUE NOT NULL,
                                       master_key BLOB NOT NULL,
                                       group_data BLOB,
@@ -57,6 +63,8 @@ public class GroupStore {
                                     ) STRICT;
                                     CREATE TABLE group_v1 (
                                       _id INTEGER PRIMARY KEY,
+                                      storage_id BLOB UNIQUE,
+                                      storage_record BLOB,
                                       group_id BLOB UNIQUE NOT NULL,
                                       group_id_v2 BLOB UNIQUE,
                                       name TEXT,
@@ -111,6 +119,28 @@ public class GroupStore {
         insertOrReplaceGroup(connection, internalId, group);
     }
 
+    public void storeStorageRecord(
+            final Connection connection, final GroupId groupId, final StorageId storageId, final byte[] storageRecord
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?, storage_record = ?
+                WHERE group_id = ?
+                """
+        ).formatted(groupId instanceof GroupIdV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            if (storageRecord == null) {
+                statement.setNull(2, Types.BLOB);
+            } else {
+                statement.setBytes(2, storageRecord);
+            }
+            statement.setBytes(3, groupId.serialize());
+            statement.executeUpdate();
+        }
+    }
+
     public void deleteGroup(GroupId groupId) {
         if (groupId instanceof GroupIdV1 groupIdV1) {
             deleteGroup(groupIdV1);
@@ -249,6 +279,34 @@ public class GroupStore {
         return Stream.concat(getGroupsV2().stream(), getGroupsV1().stream()).toList();
     }
 
+    public List<GroupIdV1> getGroupV1Ids(Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id
+                FROM %s g
+                """
+        ).formatted(TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            return Utils.executeQueryForStream(statement, this::getGroupIdV1FromResultSet)
+                    .filter(Objects::nonNull)
+                    .toList();
+        }
+    }
+
+    public List<GroupIdV2> getGroupV2Ids(Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id
+                FROM %s g
+                """
+        ).formatted(TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            return Utils.executeQueryForStream(statement, this::getGroupIdV2FromResultSet)
+                    .filter(Objects::nonNull)
+                    .toList();
+        }
+    }
+
     public void mergeRecipients(
             final Connection connection, final RecipientId recipientId, final RecipientId toBeMergedRecipientId
     ) throws SQLException {
@@ -269,6 +327,106 @@ public class GroupStore {
         }
     }
 
+    public List<StorageId> getStorageIds(Connection connection) throws SQLException {
+        final var storageIds = new ArrayList<StorageId>();
+        final var sql = """
+                        SELECT g.storage_id
+                        FROM %s g WHERE g.storage_id IS NOT NULL
+                        """;
+        try (final var statement = connection.prepareStatement(sql.formatted(TABLE_GROUP_V1))) {
+            Utils.executeQueryForStream(statement, this::getGroupV1StorageIdFromResultSet).forEach(storageIds::add);
+        }
+        try (final var statement = connection.prepareStatement(sql.formatted(TABLE_GROUP_V2))) {
+            Utils.executeQueryForStream(statement, this::getGroupV2StorageIdFromResultSet).forEach(storageIds::add);
+        }
+        return storageIds;
+    }
+
+    public void updateStorageIds(
+            Connection connection, Map<GroupIdV1, StorageId> storageIdV1Map, Map<GroupIdV2, StorageId> storageIdV2Map
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE group_id = ?
+                """
+        );
+        try (final var statement = connection.prepareStatement(sql.formatted(TABLE_GROUP_V1))) {
+            for (final var entry : storageIdV1Map.entrySet()) {
+                statement.setBytes(1, entry.getValue().getRaw());
+                statement.setBytes(2, entry.getKey().serialize());
+                statement.executeUpdate();
+            }
+        }
+        try (final var statement = connection.prepareStatement(sql.formatted(TABLE_GROUP_V2))) {
+            for (final var entry : storageIdV2Map.entrySet()) {
+                statement.setBytes(1, entry.getValue().getRaw());
+                statement.setBytes(2, entry.getKey().serialize());
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public void updateStorageId(
+            Connection connection, GroupId groupId, StorageId storageId
+    ) throws SQLException {
+        final var sqlV1 = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE group_id = ?
+                """
+        ).formatted(groupId instanceof GroupIdV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sqlV1)) {
+            statement.setBytes(1, storageId.getRaw());
+            statement.setBytes(2, groupId.serialize());
+            statement.executeUpdate();
+        }
+    }
+
+    public void setMissingStorageIds() {
+        final var selectSql = (
+                """
+                SELECT g.group_id
+                FROM %s g
+                WHERE g.storage_id IS NULL
+                """
+        );
+        final var updateSql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE group_id = ?
+                """
+        );
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            try (final var selectStmt = connection.prepareStatement(selectSql.formatted(TABLE_GROUP_V1))) {
+                final var groupIds = Utils.executeQueryForStream(selectStmt, this::getGroupIdV1FromResultSet).toList();
+                try (final var updateStmt = connection.prepareStatement(updateSql.formatted(TABLE_GROUP_V1))) {
+                    for (final var groupId : groupIds) {
+                        updateStmt.setBytes(1, KeyUtils.createRawStorageId());
+                        updateStmt.setBytes(2, groupId.serialize());
+                    }
+                }
+            }
+            try (final var selectStmt = connection.prepareStatement(selectSql.formatted(TABLE_GROUP_V2))) {
+                final var groupIds = Utils.executeQueryForStream(selectStmt, this::getGroupIdV2FromResultSet).toList();
+                try (final var updateStmt = connection.prepareStatement(updateSql.formatted(TABLE_GROUP_V2))) {
+                    for (final var groupId : groupIds) {
+                        updateStmt.setBytes(1, KeyUtils.createRawStorageId());
+                        updateStmt.setBytes(2, groupId.serialize());
+                        updateStmt.executeUpdate();
+                    }
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update group store", e);
+        }
+    }
+
     void addLegacyGroups(final Collection<GroupInfo> groups) {
         logger.debug("Migrating legacy groups to database");
         long start = System.nanoTime();
@@ -296,8 +454,8 @@ public class GroupStore {
                 }
             }
             final var sql = """
-                            INSERT OR REPLACE INTO %s (_id, group_id, group_id_v2, name, color, expiration_time, blocked, archived)
-                            VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                            INSERT OR REPLACE INTO %s (_id, group_id, group_id_v2, name, color, expiration_time, blocked, archived, storage_id)
+                            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
                             RETURNING _id
                             """.formatted(TABLE_GROUP_V1);
             try (final var statement = connection.prepareStatement(sql)) {
@@ -313,6 +471,7 @@ public class GroupStore {
                 statement.setLong(6, groupV1.getMessageExpirationTimer());
                 statement.setBoolean(7, groupV1.isBlocked());
                 statement.setBoolean(8, groupV1.archived);
+                statement.setBytes(9, KeyUtils.createRawStorageId());
                 final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
 
                 if (internalId == null) {
@@ -337,8 +496,8 @@ public class GroupStore {
         } else if (group instanceof GroupInfoV2 groupV2) {
             final var sql = (
                     """
-                    INSERT OR REPLACE INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, distribution_id)
-                    VALUES (?, ?, ?, ?, ?, ?, ?)
+                    INSERT OR REPLACE INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, distribution_id, storage_id)
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
                     """
             ).formatted(TABLE_GROUP_V2);
             try (final var statement = connection.prepareStatement(sql)) {
@@ -357,6 +516,7 @@ public class GroupStore {
                 statement.setBytes(5, UuidUtil.toByteArray(groupV2.getDistributionId().asUuid()));
                 statement.setBoolean(6, groupV2.isBlocked());
                 statement.setBoolean(7, groupV2.isPermissionDenied());
+                statement.setBytes(8, KeyUtils.createRawStorageId());
                 statement.executeUpdate();
             }
         } else {
@@ -367,7 +527,7 @@ public class GroupStore {
     private List<GroupInfoV2> getGroupsV2() {
         final var sql = (
                 """
-                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.permission_denied
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.permission_denied, g.storage_record
                 FROM %s g
                 """
         ).formatted(TABLE_GROUP_V2);
@@ -382,10 +542,10 @@ public class GroupStore {
         }
     }
 
-    private GroupInfoV2 getGroup(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
+    public GroupInfoV2 getGroup(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
         final var sql = (
                 """
-                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.permission_denied
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.permission_denied, g.storage_record
                 FROM %s g
                 WHERE g.group_id = ?
                 """
@@ -396,6 +556,45 @@ public class GroupStore {
         }
     }
 
+    public StorageId getGroupStorageId(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.storage_id
+                FROM %s g
+                WHERE g.group_id = ?
+                """
+        ).formatted(TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV2.serialize());
+            final var storageId = Utils.executeQueryForOptional(statement, this::getGroupV2StorageIdFromResultSet);
+            if (storageId.isPresent()) {
+                return storageId.get();
+            }
+        }
+        final var newStorageId = StorageId.forGroupV2(KeyUtils.createRawStorageId());
+        updateStorageId(connection, groupIdV2, newStorageId);
+        return newStorageId;
+    }
+
+    public GroupInfoV2 getGroupV2(Connection connection, StorageId storageId) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.permission_denied, g.storage_record
+                FROM %s g
+                WHERE g.storage_id = ?
+                """
+        ).formatted(TABLE_GROUP_V2);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            return Utils.executeQueryForOptional(statement, this::getGroupInfoV2FromResultSet).orElse(null);
+        }
+    }
+
+    private GroupIdV2 getGroupIdV2FromResultSet(ResultSet resultSet) throws SQLException {
+        final var groupId = resultSet.getBytes("group_id");
+        return GroupId.v2(groupId);
+    }
+
     private GroupInfoV2 getGroupInfoV2FromResultSet(ResultSet resultSet) throws SQLException {
         try {
             final var groupId = resultSet.getBytes("group_id");
@@ -404,22 +603,38 @@ public class GroupStore {
             final var distributionId = resultSet.getBytes("distribution_id");
             final var blocked = resultSet.getBoolean("blocked");
             final var permissionDenied = resultSet.getBoolean("permission_denied");
+            final var storageRecord = resultSet.getBytes("storage_record");
             return new GroupInfoV2(GroupId.v2(groupId),
                     new GroupMasterKey(masterKey),
                     groupData == null ? null : DecryptedGroup.ADAPTER.decode(groupData),
                     DistributionId.from(UuidUtil.parseOrThrow(distributionId)),
                     blocked,
                     permissionDenied,
+                    storageRecord,
                     recipientResolver);
         } catch (InvalidInputException | IOException e) {
             return null;
         }
     }
 
+    private StorageId getGroupV1StorageIdFromResultSet(ResultSet resultSet) throws SQLException {
+        final var storageId = resultSet.getBytes("storage_id");
+        return storageId == null
+                ? StorageId.forGroupV1(KeyUtils.createRawStorageId())
+                : StorageId.forGroupV1(storageId);
+    }
+
+    private StorageId getGroupV2StorageIdFromResultSet(ResultSet resultSet) throws SQLException {
+        final var storageId = resultSet.getBytes("storage_id");
+        return storageId == null
+                ? StorageId.forGroupV2(KeyUtils.createRawStorageId())
+                : StorageId.forGroupV2(storageId);
+    }
+
     private List<GroupInfoV1> getGroupsV1() {
         final var sql = (
                 """
-                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
                 FROM %s g
                 """
         ).formatted(TABLE_GROUP_V1_MEMBER, TABLE_GROUP_V1);
@@ -434,10 +649,10 @@ public class GroupStore {
         }
     }
 
-    private GroupInfoV1 getGroup(Connection connection, GroupIdV1 groupIdV1) throws SQLException {
+    public GroupInfoV1 getGroup(Connection connection, GroupIdV1 groupIdV1) throws SQLException {
         final var sql = (
                 """
-                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
                 FROM %s g
                 WHERE g.group_id = ?
                 """
@@ -448,6 +663,45 @@ public class GroupStore {
         }
     }
 
+    public StorageId getGroupStorageId(Connection connection, GroupIdV1 groupIdV1) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.storage_id
+                FROM %s g
+                WHERE g.group_id = ?
+                """
+        ).formatted(TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, groupIdV1.serialize());
+            final var storageId = Utils.executeQueryForOptional(statement, this::getGroupV1StorageIdFromResultSet);
+            if (storageId.isPresent()) {
+                return storageId.get();
+            }
+        }
+        final var newStorageId = StorageId.forGroupV1(KeyUtils.createRawStorageId());
+        updateStorageId(connection, groupIdV1, newStorageId);
+        return newStorageId;
+    }
+
+    public GroupInfoV1 getGroupV1(Connection connection, StorageId storageId) throws SQLException {
+        final var sql = (
+                """
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
+                FROM %s g
+                WHERE g.storage_id = ?
+                """
+        ).formatted(TABLE_GROUP_V1_MEMBER, TABLE_GROUP_V1);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            return Utils.executeQueryForOptional(statement, this::getGroupInfoV1FromResultSet).orElse(null);
+        }
+    }
+
+    private GroupIdV1 getGroupIdV1FromResultSet(ResultSet resultSet) throws SQLException {
+        final var groupId = resultSet.getBytes("group_id");
+        return GroupId.v1(groupId);
+    }
+
     private GroupInfoV1 getGroupInfoV1FromResultSet(ResultSet resultSet) throws SQLException {
         final var groupId = resultSet.getBytes("group_id");
         final var groupIdV2 = resultSet.getBytes("group_id_v2");
@@ -463,6 +717,7 @@ public class GroupStore {
         final var expirationTime = resultSet.getInt("expiration_time");
         final var blocked = resultSet.getBoolean("blocked");
         final var archived = resultSet.getBoolean("archived");
+        final var storagRecord = resultSet.getBytes("storage_record");
         return new GroupInfoV1(GroupId.v1(groupId),
                 groupIdV2 == null ? null : GroupId.v2(groupIdV2),
                 name,
@@ -470,7 +725,8 @@ public class GroupStore {
                 color,
                 expirationTime,
                 blocked,
-                archived);
+                archived,
+                storagRecord);
     }
 
     private GroupInfoV2 getGroupV2ByV1Id(final Connection connection, final GroupIdV1 groupId) throws SQLException {
@@ -480,7 +736,7 @@ public class GroupStore {
     private GroupInfoV1 getGroupV1ByV2Id(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
         final var sql = (
                 """
-                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived
+                SELECT g.group_id, g.group_id_v2, g.name, g.color, (select group_concat(gm.recipient_id) from %s gm where gm.group_id = g._id) as members, g.expiration_time, g.blocked, g.archived, g.storage_record
                 FROM %s g
                 WHERE g.group_id_v2 = ?
                 """
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index a87759b3..a35d4513 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -59,7 +59,8 @@ public class LegacyGroupStore {
                         g1.color,
                         g1.messageExpirationTime,
                         g1.blocked,
-                        g1.archived);
+                        g1.archived,
+                        null);
             }
 
             final var g2 = (Storage.GroupV2) g;
@@ -77,6 +78,7 @@ public class LegacyGroupStore {
                     g2.distributionId == null ? DistributionId.create() : DistributionId.from(g2.distributionId),
                     g2.blocked,
                     g2.permissionDenied,
+                    null,
                     recipientResolver);
         }).toList();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index bcb40669..a4b355ea 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -4,6 +4,7 @@ import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.api.TrustNewIdentity;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
+import org.asamk.signal.manager.storage.recipients.RecipientStore;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.state.IdentityKeyStore.Direction;
@@ -27,6 +28,7 @@ public class IdentityKeyStore {
     private static final String TABLE_IDENTITY = "identity";
     private final Database database;
     private final TrustNewIdentity trustNewIdentity;
+    private final RecipientStore recipientStore;
     private final PublishSubject<ServiceId> identityChanges = PublishSubject.create();
 
     private boolean isRetryingDecryption = false;
@@ -46,9 +48,12 @@ public class IdentityKeyStore {
         }
     }
 
-    public IdentityKeyStore(final Database database, final TrustNewIdentity trustNewIdentity) {
+    public IdentityKeyStore(
+            final Database database, final TrustNewIdentity trustNewIdentity, RecipientStore recipientStore
+    ) {
         this.database = database;
         this.trustNewIdentity = trustNewIdentity;
+        this.recipientStore = recipientStore;
     }
 
     public Observable<ServiceId> getIdentityChanges() {
@@ -59,58 +64,79 @@ public class IdentityKeyStore {
         return saveIdentity(serviceId.toString(), identityKey);
     }
 
+    public boolean saveIdentity(
+            final Connection connection, final ServiceId serviceId, final IdentityKey identityKey
+    ) throws SQLException {
+        return saveIdentity(connection, serviceId.toString(), identityKey);
+    }
+
     boolean saveIdentity(final String address, final IdentityKey identityKey) {
         if (isRetryingDecryption) {
             return false;
         }
         try (final var connection = database.getConnection()) {
-            final var identityInfo = loadIdentity(connection, address);
-            if (identityInfo != null && identityInfo.getIdentityKey().equals(identityKey)) {
-                // Identity already exists, not updating the trust level
-                logger.trace("Not storing new identity for recipient {}, identity already stored", address);
-                return false;
-            }
-
-            saveNewIdentity(connection, address, identityKey, identityInfo == null);
-            return true;
+            return saveIdentity(connection, address, identityKey);
         } catch (SQLException e) {
             throw new RuntimeException("Failed update identity store", e);
         }
     }
 
+    private boolean saveIdentity(
+            final Connection connection, final String address, final IdentityKey identityKey
+    ) throws SQLException {
+        final var identityInfo = loadIdentity(connection, address);
+        if (identityInfo != null && identityInfo.getIdentityKey().equals(identityKey)) {
+            // Identity already exists, not updating the trust level
+            logger.trace("Not storing new identity for recipient {}, identity already stored", address);
+            return false;
+        }
+
+        saveNewIdentity(connection, address, identityKey, identityInfo == null);
+        return true;
+    }
+
     public void setRetryingDecryption(final boolean retryingDecryption) {
         isRetryingDecryption = retryingDecryption;
     }
 
     public boolean setIdentityTrustLevel(ServiceId serviceId, IdentityKey identityKey, TrustLevel trustLevel) {
         try (final var connection = database.getConnection()) {
-            final var address = serviceId.toString();
-            final var identityInfo = loadIdentity(connection, address);
-            if (identityInfo == null) {
-                logger.debug("Not updating trust level for recipient {}, identity not found", serviceId);
-                return false;
-            }
-            if (!identityInfo.getIdentityKey().equals(identityKey)) {
-                logger.debug("Not updating trust level for recipient {}, different identity found", serviceId);
-                return false;
-            }
-            if (identityInfo.getTrustLevel() == trustLevel) {
-                logger.trace("Not updating trust level for recipient {}, trust level already matches", serviceId);
-                return false;
-            }
-
-            logger.debug("Updating trust level for recipient {} with trust {}", serviceId, trustLevel);
-            final var newIdentityInfo = new IdentityInfo(address,
-                    identityKey,
-                    trustLevel,
-                    identityInfo.getDateAddedTimestamp());
-            storeIdentity(connection, newIdentityInfo);
-            return true;
+            return setIdentityTrustLevel(connection, serviceId, identityKey, trustLevel);
         } catch (SQLException e) {
             throw new RuntimeException("Failed update identity store", e);
         }
     }
 
+    public boolean setIdentityTrustLevel(
+            final Connection connection,
+            final ServiceId serviceId,
+            final IdentityKey identityKey,
+            final TrustLevel trustLevel
+    ) throws SQLException {
+        final var address = serviceId.toString();
+        final var identityInfo = loadIdentity(connection, address);
+        if (identityInfo == null) {
+            logger.debug("Not updating trust level for recipient {}, identity not found", serviceId);
+            return false;
+        }
+        if (!identityInfo.getIdentityKey().equals(identityKey)) {
+            logger.debug("Not updating trust level for recipient {}, different identity found", serviceId);
+            return false;
+        }
+        if (identityInfo.getTrustLevel() == trustLevel) {
+            logger.trace("Not updating trust level for recipient {}, trust level already matches", serviceId);
+            return false;
+        }
+
+        logger.debug("Updating trust level for recipient {} with trust {}", serviceId, trustLevel);
+        final var newIdentityInfo = new IdentityInfo(address,
+                identityKey,
+                trustLevel,
+                identityInfo.getDateAddedTimestamp());
+        storeIdentity(connection, newIdentityInfo);
+        return true;
+    }
+
     public boolean isTrustedIdentity(ServiceId serviceId, IdentityKey identityKey, Direction direction) {
         return isTrustedIdentity(serviceId.toString(), identityKey, direction);
     }
@@ -159,6 +185,10 @@ public class IdentityKeyStore {
         }
     }
 
+    public IdentityInfo getIdentityInfo(Connection connection, String address) throws SQLException {
+        return loadIdentity(connection, address);
+    }
+
     public List<IdentityInfo> getIdentities() {
         try (final var connection = database.getConnection()) {
             final var sql = (
@@ -252,6 +282,7 @@ public class IdentityKeyStore {
             statement.setInt(4, identityInfo.getTrustLevel().ordinal());
             statement.executeUpdate();
         }
+        recipientStore.rotateStorageId(connection, identityInfo.getServiceId());
     }
 
     private void deleteIdentity(final Connection connection, final String address) throws SQLException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index 9addcc7d..c51f32f1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -10,6 +10,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.Objects;
 
 public class KeyValueStore {
 
@@ -43,9 +44,9 @@ public class KeyValueStore {
         }
     }
 
-    public <T> void storeEntry(KeyValueEntry<T> key, T value) {
+    public <T> boolean storeEntry(KeyValueEntry<T> key, T value) {
         try (final var connection = database.getConnection()) {
-            storeEntry(connection, key, value);
+            return storeEntry(connection, key, value);
         } catch (SQLException e) {
             throw new RuntimeException("Failed update key_value store", e);
         }
@@ -72,9 +73,14 @@ public class KeyValueStore {
         }
     }
 
-    private <T> void storeEntry(
+    public <T> boolean storeEntry(
             final Connection connection, final KeyValueEntry<T> key, final T value
     ) throws SQLException {
+        final var entry = getEntry(key);
+        if (Objects.equals(entry, value)) {
+            return false;
+        }
+
         final var sql = (
                 """
                 INSERT INTO %s (key, value)
@@ -87,6 +93,7 @@ public class KeyValueStore {
             setParameterValue(statement, 2, key.clazz(), value);
             statement.executeUpdate();
         }
+        return true;
     }
 
     @SuppressWarnings("unchecked")
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index 55231cb7..02061a66 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -83,7 +83,13 @@ public class LegacyRecipientStore2 {
                                     .collect(Collectors.toSet()));
                 }
 
-                return new Recipient(recipientId, address, contact, profileKey, expiringProfileKeyCredential, profile);
+                return new Recipient(recipientId,
+                        address,
+                        contact,
+                        profileKey,
+                        expiringProfileKeyCredential,
+                        profile,
+                        null);
             }).collect(Collectors.toMap(Recipient::getRecipientId, r -> r));
 
             recipientStore.addLegacyRecipients(recipients);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
index 3790ecde..1d5fb9c8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
@@ -21,13 +21,16 @@ public class Recipient {
 
     private final Profile profile;
 
+    private final byte[] storageRecord;
+
     public Recipient(
             final RecipientId recipientId,
             final RecipientAddress address,
             final Contact contact,
             final ProfileKey profileKey,
             final ExpiringProfileKeyCredential expiringProfileKeyCredential,
-            final Profile profile
+            final Profile profile,
+            final byte[] storageRecord
     ) {
         this.recipientId = recipientId;
         this.address = address;
@@ -35,6 +38,7 @@ public class Recipient {
         this.profileKey = profileKey;
         this.expiringProfileKeyCredential = expiringProfileKeyCredential;
         this.profile = profile;
+        this.storageRecord = storageRecord;
     }
 
     private Recipient(final Builder builder) {
@@ -42,8 +46,9 @@ public class Recipient {
         address = builder.address;
         contact = builder.contact;
         profileKey = builder.profileKey;
-        expiringProfileKeyCredential = builder.expiringProfileKeyCredential1;
+        expiringProfileKeyCredential = builder.expiringProfileKeyCredential;
         profile = builder.profile;
+        storageRecord = builder.storageRecord;
     }
 
     public static Builder newBuilder() {
@@ -56,8 +61,9 @@ public class Recipient {
         builder.address = copy.getAddress();
         builder.contact = copy.getContact();
         builder.profileKey = copy.getProfileKey();
-        builder.expiringProfileKeyCredential1 = copy.getExpiringProfileKeyCredential();
+        builder.expiringProfileKeyCredential = copy.getExpiringProfileKeyCredential();
         builder.profile = copy.getProfile();
+        builder.storageRecord = copy.getStorageRecord();
         return builder;
     }
 
@@ -85,6 +91,10 @@ public class Recipient {
         return profile;
     }
 
+    public byte[] getStorageRecord() {
+        return storageRecord;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
@@ -109,8 +119,9 @@ public class Recipient {
         private RecipientAddress address;
         private Contact contact;
         private ProfileKey profileKey;
-        private ExpiringProfileKeyCredential expiringProfileKeyCredential1;
+        private ExpiringProfileKeyCredential expiringProfileKeyCredential;
         private Profile profile;
+        private byte[] storageRecord;
 
         private Builder() {
         }
@@ -136,7 +147,7 @@ public class Recipient {
         }
 
         public Builder withExpiringProfileKeyCredential(final ExpiringProfileKeyCredential val) {
-            expiringProfileKeyCredential1 = val;
+            expiringProfileKeyCredential = val;
             return this;
         }
 
@@ -145,6 +156,11 @@ public class Recipient {
             return this;
         }
 
+        public Builder withStorageRecord(final byte[] val) {
+            storageRecord = val;
+            return this;
+        }
+
         public Recipient build() {
             return new Recipient(this);
         }
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 86ada86a..e4c24c99 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
@@ -89,6 +89,10 @@ public record RecipientAddress(
                 address.username.equals(this.username) ? Optional.empty() : this.username);
     }
 
+    public Optional<ACI> aci() {
+        return serviceId.map(s -> s instanceof ServiceId.ACI aci ? aci : null);
+    }
+
     public String getIdentifier() {
         if (serviceId.isPresent()) {
             return serviceId.get().toString();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 96a8f224..926f09bd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -8,6 +8,7 @@ import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.contacts.ContactsStore;
 import org.asamk.signal.manager.storage.profiles.ProfileStore;
+import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
@@ -17,11 +18,13 @@ import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.storage.StorageId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -56,6 +59,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.executeUpdate("""
                                     CREATE TABLE recipient (
                                       _id INTEGER PRIMARY KEY AUTOINCREMENT,
+                                      storage_id BLOB UNIQUE,
+                                      storage_record BLOB,
                                       number TEXT UNIQUE,
                                       username TEXT UNIQUE,
                                       uuid BLOB UNIQUE,
@@ -273,6 +278,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    public RecipientId resolveRecipient(Connection connection, RecipientAddress address) throws SQLException {
+        return resolveRecipientLocked(connection, address);
+    }
+
     @Override
     public RecipientId resolveSelfRecipientTrusted(RecipientAddress address) {
         return resolveRecipientTrusted(address, true);
@@ -283,6 +292,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return resolveRecipientTrusted(address, false);
     }
 
+    public RecipientId resolveRecipientTrusted(Connection connection, RecipientAddress address) throws SQLException {
+        final var pair = resolveRecipientTrustedLocked(connection, address, false);
+        if (!pair.second().isEmpty()) {
+            mergeRecipients(connection, pair.first(), pair.second());
+        }
+        return pair.first();
+    }
+
     @Override
     public RecipientId resolveRecipientTrusted(SignalServiceAddress address) {
         return resolveRecipientTrusted(new RecipientAddress(address));
@@ -341,6 +358,44 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    public Recipient getRecipient(Connection connection, RecipientId recipientId) throws SQLException {
+        final var sql = (
+                """
+                SELECT r._id,
+                       r.number, r.uuid, r.pni, r.username,
+                       r.profile_key, r.profile_key_credential,
+                       r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden,
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
+                       r.storage_record
+                FROM %s r
+                WHERE r._id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            return Utils.executeQuerySingleRow(statement, this::getRecipientFromResultSet);
+        }
+    }
+
+    public Recipient getRecipient(Connection connection, StorageId storageId) throws SQLException {
+        final var sql = (
+                """
+                SELECT r._id,
+                       r.number, r.uuid, r.pni, r.username,
+                       r.profile_key, r.profile_key_credential,
+                       r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden,
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
+                       r.storage_record
+                FROM %s r
+                WHERE r.storage_id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            return Utils.executeQuerySingleRow(statement, this::getRecipientFromResultSet);
+        }
+    }
+
     public List<Recipient> getRecipients(
             boolean onlyContacts, Optional<Boolean> blocked, Set<RecipientId> recipientIds, Optional<String> name
     ) {
@@ -364,7 +419,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                        r.number, r.uuid, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
                        r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden,
-                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
+                       r.storage_record
                 FROM %s r
                 WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL) AND %s
                 """
@@ -447,6 +503,53 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    public List<RecipientId> getRecipientIds(Connection connection) throws SQLException {
+        final var sql = (
+                """
+                SELECT r._id
+                FROM %s r
+                WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL)
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            return Utils.executeQueryForStream(statement, this::getRecipientIdFromResultSet).toList();
+        }
+    }
+
+    public void setMissingStorageIds() {
+        final var selectSql = (
+                """
+                SELECT r._id
+                FROM %s r
+                WHERE r.storage_id IS NULL
+                """
+        ).formatted(TABLE_RECIPIENT);
+        final var updateSql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            try (final var selectStmt = connection.prepareStatement(selectSql)) {
+                final var recipientIds = Utils.executeQueryForStream(selectStmt, this::getRecipientIdFromResultSet)
+                        .toList();
+                try (final var updateStmt = connection.prepareStatement(updateSql)) {
+                    for (final var recipientId : recipientIds) {
+                        updateStmt.setBytes(1, KeyUtils.createRawStorageId());
+                        updateStmt.setLong(2, recipientId.id());
+                        updateStmt.executeUpdate();
+                    }
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
     @Override
     public void deleteContact(RecipientId recipientId) {
         storeContact(recipientId, null);
@@ -509,12 +612,18 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     @Override
     public void storeProfileKey(RecipientId recipientId, final ProfileKey profileKey) {
         try (final var connection = database.getConnection()) {
-            storeProfileKey(connection, recipientId, profileKey, true);
+            storeProfileKey(connection, recipientId, profileKey);
         } catch (SQLException e) {
             throw new RuntimeException("Failed update recipient store", e);
         }
     }
 
+    public void storeProfileKey(
+            Connection connection, RecipientId recipientId, final ProfileKey profileKey
+    ) throws SQLException {
+        storeProfileKey(connection, recipientId, profileKey, true);
+    }
+
     @Override
     public void storeExpiringProfileKeyCredential(
             RecipientId recipientId, final ExpiringProfileKeyCredential profileKeyCredential
@@ -526,6 +635,121 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    public void rotateSelfStorageId() {
+        try (final var connection = database.getConnection()) {
+            rotateSelfStorageId(connection);
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
+    public void rotateSelfStorageId(final Connection connection) throws SQLException {
+        final var selfRecipientId = resolveRecipient(connection, selfAddressProvider.getSelfAddress());
+        rotateStorageId(connection, selfRecipientId);
+    }
+
+    public StorageId rotateStorageId(final Connection connection, final ServiceId serviceId) throws SQLException {
+        final var selfRecipientId = resolveRecipient(connection, new RecipientAddress(serviceId));
+        return rotateStorageId(connection, selfRecipientId);
+    }
+
+    public List<StorageId> getStorageIds(Connection connection) throws SQLException {
+        final var sql = """
+                        SELECT r.storage_id
+                        FROM %s r WHERE r.storage_id IS NOT NULL AND r._id != ? AND (r.uuid IS NOT NULL OR r.pni IS NOT NULL)
+                        """.formatted(TABLE_RECIPIENT);
+        final var selfRecipientId = resolveRecipient(connection, selfAddressProvider.getSelfAddress());
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, selfRecipientId.id());
+            return Utils.executeQueryForStream(statement, this::getContactStorageIdFromResultSet).toList();
+        }
+    }
+
+    public void updateStorageId(
+            Connection connection, RecipientId recipientId, StorageId storageId
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    public void updateStorageIds(Connection connection, Map<RecipientId, StorageId> storageIdMap) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var entry : storageIdMap.entrySet()) {
+                statement.setBytes(1, entry.getValue().getRaw());
+                statement.setLong(2, entry.getKey().id());
+                statement.executeUpdate();
+            }
+        }
+    }
+
+    public StorageId getSelfStorageId(final Connection connection) throws SQLException {
+        final var selfRecipientId = resolveRecipient(connection, selfAddressProvider.getSelfAddress());
+        return StorageId.forAccount(getStorageId(connection, selfRecipientId).getRaw());
+    }
+
+    public StorageId getStorageId(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var sql = """
+                        SELECT r.storage_id
+                        FROM %s r WHERE r._id = ? AND r.storage_id IS NOT NULL
+                        """.formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            final var storageId = Utils.executeQueryForOptional(statement, this::getContactStorageIdFromResultSet);
+            if (storageId.isPresent()) {
+                return storageId.get();
+            }
+        }
+        return rotateStorageId(connection, recipientId);
+    }
+
+    private StorageId rotateStorageId(final Connection connection, final RecipientId recipientId) throws SQLException {
+        final var newStorageId = StorageId.forAccount(KeyUtils.createRawStorageId());
+        updateStorageId(connection, recipientId, newStorageId);
+        return newStorageId;
+    }
+
+    public void storeStorageRecord(
+            final Connection connection,
+            final RecipientId recipientId,
+            final StorageId storageId,
+            final byte[] storageRecord
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = ?, storage_record = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBytes(1, storageId.getRaw());
+            if (storageRecord == null) {
+                statement.setNull(2, Types.BLOB);
+            } else {
+                statement.setBytes(2, storageRecord);
+            }
+            statement.setLong(3, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
     void addLegacyRecipients(final Map<RecipientId, Recipient> recipients) {
         logger.debug("Migrating legacy recipients to database");
         long start = System.nanoTime();
@@ -587,7 +811,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return recipientId;
     }
 
-    private void storeContact(
+    public void storeContact(
             final Connection connection, final RecipientId recipientId, final Contact contact
     ) throws SQLException {
         final var sql = (
@@ -608,6 +832,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setLong(8, recipientId.id());
             statement.executeUpdate();
         }
+        rotateStorageId(connection, recipientId);
     }
 
     private void storeExpiringProfileKeyCredential(
@@ -629,7 +854,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    private void storeProfile(
+    public void storeProfile(
             final Connection connection, final RecipientId recipientId, final Profile profile
     ) throws SQLException {
         final var sql = (
@@ -655,6 +880,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setLong(10, recipientId.id());
             statement.executeUpdate();
         }
+        rotateStorageId(connection, recipientId);
     }
 
     private void storeProfileKey(
@@ -686,6 +912,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setLong(2, recipientId.id());
             statement.executeUpdate();
         }
+        rotateStorageId(connection, recipientId);
     }
 
     private RecipientId resolveRecipientTrusted(RecipientAddress address, boolean isSelf) {
@@ -693,17 +920,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         synchronized (recipientsLock) {
             try (final var connection = database.getConnection()) {
                 connection.setAutoCommit(false);
-                if (address.hasSingleIdentifier() || (
-                        !isSelf && selfAddressProvider.getSelfAddress().matches(address)
-                )) {
-                    pair = new Pair<>(resolveRecipientLocked(connection, address), List.of());
-                } else {
-                    pair = MergeRecipientHelper.resolveRecipientTrustedLocked(new HelperStore(connection), address);
-
-                    for (final var toBeMergedRecipientId : pair.second()) {
-                        mergeRecipientsLocked(connection, pair.first(), toBeMergedRecipientId);
-                    }
-                }
+                pair = resolveRecipientTrustedLocked(connection, address, isSelf);
                 connection.commit();
             } catch (SQLException e) {
                 throw new RuntimeException("Failed update recipient store", e);
@@ -712,13 +929,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
         if (!pair.second().isEmpty()) {
             try (final var connection = database.getConnection()) {
-                for (final var toBeMergedRecipientId : pair.second()) {
-                    recipientMergeHandler.mergeRecipients(connection, pair.first(), toBeMergedRecipientId);
-                    deleteRecipient(connection, toBeMergedRecipientId);
-                    synchronized (recipientsLock) {
-                        recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(toBeMergedRecipientId));
-                    }
-                }
+                connection.setAutoCommit(false);
+                mergeRecipients(connection, pair.first(), pair.second());
+                connection.commit();
             } catch (SQLException e) {
                 throw new RuntimeException("Failed update recipient store", e);
             }
@@ -726,15 +939,44 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return pair.first();
     }
 
+    private Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
+            final Connection connection, final RecipientAddress address, final boolean isSelf
+    ) throws SQLException {
+        if (address.hasSingleIdentifier() || (
+                !isSelf && selfAddressProvider.getSelfAddress().matches(address)
+        )) {
+            return new Pair<>(resolveRecipientLocked(connection, address), List.of());
+        } else {
+            final var pair = MergeRecipientHelper.resolveRecipientTrustedLocked(new HelperStore(connection), address);
+
+            for (final var toBeMergedRecipientId : pair.second()) {
+                mergeRecipientsLocked(connection, pair.first(), toBeMergedRecipientId);
+            }
+            return pair;
+        }
+    }
+
+    private void mergeRecipients(
+            final Connection connection, final RecipientId recipientId, final List<RecipientId> toBeMergedRecipientIds
+    ) throws SQLException {
+        for (final var toBeMergedRecipientId : toBeMergedRecipientIds) {
+            recipientMergeHandler.mergeRecipients(connection, recipientId, toBeMergedRecipientId);
+            deleteRecipient(connection, toBeMergedRecipientId);
+            synchronized (recipientsLock) {
+                recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(toBeMergedRecipientId));
+            }
+        }
+    }
+
     private RecipientId resolveRecipientLocked(
             Connection connection, RecipientAddress address
     ) throws SQLException {
-        final var byServiceId = address.serviceId().isEmpty()
+        final var aci = address.aci().isEmpty()
                 ? Optional.<RecipientWithAddress>empty()
-                : findByServiceId(connection, address.serviceId().get());
+                : findByServiceId(connection, address.aci().get());
 
-        if (byServiceId.isPresent()) {
-            return byServiceId.get().id();
+        if (aci.isPresent()) {
+            return aci.get().id();
         }
 
         final var byPni = address.pni().isEmpty()
@@ -796,8 +1038,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, address.number().orElse(null));
-            statement.setBytes(2,
-                    address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(2, address.aci().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setString(4, address.username().orElse(null));
             final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
@@ -817,7 +1058,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final var sql = (
                     """
                     UPDATE %s
-                    SET number = NULL, uuid = NULL, pni = NULL, username = NULL
+                    SET number = NULL, uuid = NULL, pni = NULL, username = NULL, storage_id = NULL
                     WHERE _id = ?
                     """
             ).formatted(TABLE_RECIPIENT);
@@ -842,13 +1083,13 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             ).formatted(TABLE_RECIPIENT);
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setString(1, address.number().orElse(null));
-                statement.setBytes(2,
-                        address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+                statement.setBytes(2, address.aci().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
                 statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
                 statement.setString(4, address.username().orElse(null));
                 statement.setLong(5, recipientId.id());
                 statement.executeUpdate();
             }
+            rotateStorageId(connection, recipientId);
         }
     }
 
@@ -936,9 +1177,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = """
                         SELECT r._id, r.number, r.uuid, r.pni, r.username
                         FROM %s r
-                        WHERE r.uuid = ?1 OR r.pni = ?1
+                        WHERE %s = ?1
                         LIMIT 1
-                        """.formatted(TABLE_RECIPIENT);
+                        """.formatted(TABLE_RECIPIENT, serviceId instanceof ACI ? "r.uuid" : "r.pni");
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setBytes(1, UuidUtil.toByteArray(serviceId.getRawUuid()));
             recipientWithAddress = Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
@@ -953,14 +1194,13 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = """
                         SELECT r._id, r.number, r.uuid, r.pni, r.username
                         FROM %s r
-                        WHERE r.uuid = ?1 OR r.pni = ?1 OR
-                              r.uuid = ?2 OR r.pni = ?2 OR
+                        WHERE r.uuid = ?1 OR
+                              r.pni = ?2 OR
                               r.number = ?3 OR
                               r.username = ?4
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1,
-                    address.serviceId().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setBytes(1, address.aci().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setBytes(2, address.pni().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
             statement.setString(3, address.number().orElse(null));
             statement.setString(4, address.username().orElse(null));
@@ -1018,7 +1258,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    private Profile getProfile(final Connection connection, final RecipientId recipientId) throws SQLException {
+    public Profile getProfile(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
                 SELECT r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities
@@ -1057,7 +1297,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 getContactFromResultSet(resultSet),
                 getProfileKeyFromResultSet(resultSet),
                 getExpiringProfileKeyCredentialFromResultSet(resultSet),
-                getProfileFromResultSet(resultSet));
+                getProfileFromResultSet(resultSet),
+                getStorageRecordFromResultSet(resultSet));
     }
 
     private Contact getContactFromResultSet(ResultSet resultSet) throws SQLException {
@@ -1118,6 +1359,15 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    private StorageId getContactStorageIdFromResultSet(ResultSet resultSet) throws SQLException {
+        final var storageId = resultSet.getBytes("storage_id");
+        return StorageId.forContact(storageId);
+    }
+
+    private byte[] getStorageRecordFromResultSet(ResultSet resultSet) throws SQLException {
+        return resultSet.getBytes("storage_record");
+    }
+
     public interface RecipientMergeHandler {
 
         void mergeRecipients(
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
new file mode 100644
index 00000000..9250505c
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -0,0 +1,225 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.internal.JobExecutor;
+import org.asamk.signal.manager.jobs.CheckWhoAmIJob;
+import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
+import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
+import org.whispersystems.signalservice.api.util.OptionalUtil;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.storage.protos.OptionalBool;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Processes {@link SignalAccountRecord}s.
+ */
+public class AccountRecordProcessor extends DefaultStorageRecordProcessor<SignalAccountRecord> {
+
+    private static final Logger logger = LoggerFactory.getLogger(AccountRecordProcessor.class);
+    private final SignalAccountRecord localAccountRecord;
+    private final SignalAccount account;
+    private final Connection connection;
+    private final JobExecutor jobExecutor;
+
+    public AccountRecordProcessor(
+            SignalAccount account, Connection connection, final JobExecutor jobExecutor
+    ) throws SQLException {
+        this.account = account;
+        this.connection = connection;
+        this.jobExecutor = jobExecutor;
+        final var selfRecipientId = account.getSelfRecipientId();
+        final var recipient = account.getRecipientStore().getRecipient(connection, selfRecipientId);
+        final var storageId = account.getRecipientStore().getSelfStorageId(connection);
+        this.localAccountRecord = StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
+                recipient,
+                account.getUsernameLink(),
+                storageId.getRaw()).getAccount().get();
+    }
+
+    @Override
+    protected boolean isInvalid(SignalAccountRecord remote) {
+        return false;
+    }
+
+    @Override
+    protected Optional<SignalAccountRecord> getMatching(SignalAccountRecord record) {
+        return Optional.of(localAccountRecord);
+    }
+
+    @Override
+    protected SignalAccountRecord merge(SignalAccountRecord remote, SignalAccountRecord local) {
+        String givenName;
+        String familyName;
+        if (remote.getGivenName().isPresent() || remote.getFamilyName().isPresent()) {
+            givenName = remote.getGivenName().orElse("");
+            familyName = remote.getFamilyName().orElse("");
+        } else {
+            givenName = local.getGivenName().orElse("");
+            familyName = local.getFamilyName().orElse("");
+        }
+
+        final var payments = remote.getPayments().getEntropy().isPresent() ? remote.getPayments() : local.getPayments();
+        final var subscriber = remote.getSubscriber().getId().isPresent()
+                ? remote.getSubscriber()
+                : local.getSubscriber();
+        final var storyViewReceiptsState = remote.getStoryViewReceiptsState() == OptionalBool.UNSET
+                ? local.getStoryViewReceiptsState()
+                : remote.getStoryViewReceiptsState();
+        final var unknownFields = remote.serializeUnknownFields();
+        final var avatarUrlPath = OptionalUtil.or(remote.getAvatarUrlPath(), local.getAvatarUrlPath()).orElse("");
+        final var profileKey = OptionalUtil.or(remote.getProfileKey(), local.getProfileKey()).orElse(null);
+        final var noteToSelfArchived = remote.isNoteToSelfArchived();
+        final var noteToSelfForcedUnread = remote.isNoteToSelfForcedUnread();
+        final var readReceipts = remote.isReadReceiptsEnabled();
+        final var typingIndicators = remote.isTypingIndicatorsEnabled();
+        final var sealedSenderIndicators = remote.isSealedSenderIndicatorsEnabled();
+        final var linkPreviews = remote.isLinkPreviewsEnabled();
+        final var unlisted = remote.isPhoneNumberUnlisted();
+        final var pinnedConversations = remote.getPinnedConversations();
+        final var phoneNumberSharingMode = remote.getPhoneNumberSharingMode();
+        final var preferContactAvatars = remote.isPreferContactAvatars();
+        final var universalExpireTimer = remote.getUniversalExpireTimer();
+        final var e164 = local.getE164();
+        final var defaultReactions = !remote.getDefaultReactions().isEmpty()
+                ? remote.getDefaultReactions()
+                : local.getDefaultReactions();
+        final var displayBadgesOnProfile = remote.isDisplayBadgesOnProfile();
+        final var subscriptionManuallyCancelled = remote.isSubscriptionManuallyCancelled();
+        final var keepMutedChatsArchived = remote.isKeepMutedChatsArchived();
+        final var hasSetMyStoriesPrivacy = remote.hasSetMyStoriesPrivacy();
+        final var hasViewedOnboardingStory = remote.hasViewedOnboardingStory() || local.hasViewedOnboardingStory();
+        final var storiesDisabled = remote.isStoriesDisabled();
+        final var hasSeenGroupStoryEducation = remote.hasSeenGroupStoryEducationSheet()
+                || local.hasSeenGroupStoryEducationSheet();
+        final var username = remote.getUsername() != null && !remote.getUsername().isEmpty()
+                ? remote.getUsername()
+                : local.getUsername() != null && !local.getUsername().isEmpty() ? local.getUsername() : null;
+        final var usernameLink = remote.getUsernameLink() != null ? remote.getUsernameLink() : local.getUsernameLink();
+
+        final var mergedBuilder = new SignalAccountRecord.Builder(remote.getId().getRaw(), unknownFields).setGivenName(
+                        givenName)
+                .setFamilyName(familyName)
+                .setAvatarUrlPath(avatarUrlPath)
+                .setProfileKey(profileKey)
+                .setNoteToSelfArchived(noteToSelfArchived)
+                .setNoteToSelfForcedUnread(noteToSelfForcedUnread)
+                .setReadReceiptsEnabled(readReceipts)
+                .setTypingIndicatorsEnabled(typingIndicators)
+                .setSealedSenderIndicatorsEnabled(sealedSenderIndicators)
+                .setLinkPreviewsEnabled(linkPreviews)
+                .setUnlistedPhoneNumber(unlisted)
+                .setPhoneNumberSharingMode(phoneNumberSharingMode)
+                .setUnlistedPhoneNumber(unlisted)
+                .setPinnedConversations(pinnedConversations)
+                .setPreferContactAvatars(preferContactAvatars)
+                .setPayments(payments.isEnabled(), payments.getEntropy().orElse(null))
+                .setUniversalExpireTimer(universalExpireTimer)
+                .setDefaultReactions(defaultReactions)
+                .setSubscriber(subscriber)
+                .setDisplayBadgesOnProfile(displayBadgesOnProfile)
+                .setSubscriptionManuallyCancelled(subscriptionManuallyCancelled)
+                .setKeepMutedChatsArchived(keepMutedChatsArchived)
+                .setHasSetMyStoriesPrivacy(hasSetMyStoriesPrivacy)
+                .setHasViewedOnboardingStory(hasViewedOnboardingStory)
+                .setStoriesDisabled(storiesDisabled)
+                .setHasSeenGroupStoryEducationSheet(hasSeenGroupStoryEducation)
+                .setStoryViewReceiptsState(storyViewReceiptsState)
+                .setUsername(username)
+                .setUsernameLink(usernameLink)
+                .setE164(e164);
+        final var merged = mergedBuilder.build();
+
+        final var matchesRemote = doProtosMatch(merged, remote);
+        if (matchesRemote) {
+            return remote;
+        }
+
+        final var matchesLocal = doProtosMatch(merged, local);
+        if (matchesLocal) {
+            return local;
+        }
+
+        return mergedBuilder.setId(KeyUtils.createRawStorageId()).build();
+    }
+
+    @Override
+    protected void insertLocal(SignalAccountRecord record) {
+        throw new UnsupportedOperationException(
+                "We should always have a local AccountRecord, so we should never been inserting a new one.");
+    }
+
+    @Override
+    protected void updateLocal(StorageRecordUpdate<SignalAccountRecord> update) throws SQLException {
+        final var accountRecord = update.newRecord();
+
+        if (!accountRecord.getE164().equals(account.getNumber())) {
+            jobExecutor.enqueueJob(new CheckWhoAmIJob());
+        }
+
+        account.getConfigurationStore().setReadReceipts(connection, accountRecord.isReadReceiptsEnabled());
+        account.getConfigurationStore().setTypingIndicators(connection, accountRecord.isTypingIndicatorsEnabled());
+        account.getConfigurationStore()
+                .setUnidentifiedDeliveryIndicators(connection, accountRecord.isSealedSenderIndicatorsEnabled());
+        account.getConfigurationStore().setLinkPreviews(connection, accountRecord.isLinkPreviewsEnabled());
+        account.getConfigurationStore()
+                .setPhoneNumberSharingMode(connection,
+                        StorageSyncModels.remoteToLocal(accountRecord.getPhoneNumberSharingMode()));
+        account.getConfigurationStore().setPhoneNumberUnlisted(connection, accountRecord.isPhoneNumberUnlisted());
+
+        account.setUsername(accountRecord.getUsername() != null && !accountRecord.getUsername().isEmpty()
+                ? accountRecord.getUsername()
+                : null);
+        if (accountRecord.getUsernameLink() != null) {
+            final var usernameLink = accountRecord.getUsernameLink();
+            account.setUsernameLink(new UsernameLinkComponents(usernameLink.entropy.toByteArray(),
+                    UuidUtil.parseOrThrow(usernameLink.serverId.toByteArray())));
+            account.getConfigurationStore().setUsernameLinkColor(connection, usernameLink.color.name());
+        }
+
+        if (accountRecord.getProfileKey().isPresent()) {
+            ProfileKey profileKey;
+            try {
+                profileKey = new ProfileKey(accountRecord.getProfileKey().get());
+            } catch (InvalidInputException e) {
+                logger.debug("Received invalid profile key from storage");
+                profileKey = null;
+            }
+            if (profileKey != null) {
+                account.setProfileKey(profileKey);
+                final var avatarPath = accountRecord.getAvatarUrlPath().orElse(null);
+                jobExecutor.enqueueJob(new DownloadProfileAvatarJob(avatarPath));
+            }
+        }
+
+        final var profile = account.getRecipientStore().getProfile(connection, account.getSelfRecipientId());
+        final var builder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
+        builder.withGivenName(accountRecord.getGivenName().orElse(null));
+        builder.withFamilyName(accountRecord.getFamilyName().orElse(null));
+        account.getRecipientStore().storeProfile(connection, account.getSelfRecipientId(), builder.build());
+        account.getRecipientStore()
+                .storeStorageRecord(connection,
+                        account.getSelfRecipientId(),
+                        accountRecord.getId(),
+                        accountRecord.toProto().encode());
+    }
+
+    @Override
+    public int compare(SignalAccountRecord lhs, SignalAccountRecord rhs) {
+        return 0;
+    }
+
+    private static boolean doProtosMatch(SignalAccountRecord merged, SignalAccountRecord other) {
+        return Arrays.equals(merged.toProto().encode(), other.toProto().encode());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
new file mode 100644
index 00000000..2e557e1a
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -0,0 +1,336 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.Profile;
+import org.asamk.signal.manager.internal.JobExecutor;
+import org.asamk.signal.manager.jobs.DownloadProfileJob;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
+import org.whispersystems.signalservice.api.storage.SignalContactRecord;
+import org.whispersystems.signalservice.api.util.OptionalUtil;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.regex.Pattern;
+
+public class ContactRecordProcessor extends DefaultStorageRecordProcessor<SignalContactRecord> {
+
+    private static final Logger logger = LoggerFactory.getLogger(ContactRecordProcessor.class);
+
+    private static final Pattern E164_PATTERN = Pattern.compile("^\\+[1-9]\\d{0,18}$");
+
+    private final ACI selfAci;
+    private final PNI selfPni;
+    private final String selfNumber;
+    private final SignalAccount account;
+    private final Connection connection;
+    private final JobExecutor jobExecutor;
+
+    public ContactRecordProcessor(SignalAccount account, Connection connection, final JobExecutor jobExecutor) {
+        this.account = account;
+        this.connection = connection;
+        this.jobExecutor = jobExecutor;
+        this.selfAci = account.getAci();
+        this.selfPni = account.getPni();
+        this.selfNumber = account.getNumber();
+    }
+
+    /**
+     * Error cases:
+     * - You can't have a contact record without an ACI or PNI.
+     * - You can't have a contact record for yourself. That should be an account record.
+     */
+    @Override
+    protected boolean isInvalid(SignalContactRecord remote) {
+        boolean hasAci = remote.getAci().isPresent() && remote.getAci().get().isValid();
+        boolean hasPni = remote.getPni().isPresent() && remote.getPni().get().isValid();
+
+        if (!hasAci && !hasPni) {
+            logger.debug("Found a ContactRecord with neither an ACI nor a PNI -- marking as invalid.");
+            return true;
+        } else if (selfAci != null && selfAci.equals(remote.getAci().orElse(null)) || (
+                selfPni != null && selfPni.equals(remote.getPni().orElse(null))
+        ) || (selfNumber != null && selfNumber.equals(remote.getNumber().orElse(null)))) {
+            logger.debug("Found a ContactRecord for ourselves -- marking as invalid.");
+            return true;
+        } else if (remote.getNumber().isPresent() && !isValidE164(remote.getNumber().get())) {
+            logger.debug("Found a record with an invalid E164. Marking as invalid.");
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    protected Optional<SignalContactRecord> getMatching(SignalContactRecord remote) throws SQLException {
+        final var address = getRecipientAddress(remote);
+        final var recipientId = account.getRecipientStore().resolveRecipient(connection, address);
+        final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
+
+        final var identifier = recipient.getAddress().getIdentifier();
+        final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, identifier);
+        final var storageId = account.getRecipientStore().getStorageId(connection, recipientId);
+
+        return Optional.of(StorageSyncModels.localToRemoteRecord(recipient, identity, storageId.getRaw())
+                .getContact()
+                .get());
+    }
+
+    @Override
+    protected SignalContactRecord merge(
+            SignalContactRecord remote, SignalContactRecord local
+    ) {
+        String profileGivenName;
+        String profileFamilyName;
+        if (remote.getProfileGivenName().isPresent() || remote.getProfileFamilyName().isPresent()) {
+            profileGivenName = remote.getProfileGivenName().orElse("");
+            profileFamilyName = remote.getProfileFamilyName().orElse("");
+        } else {
+            profileGivenName = local.getProfileGivenName().orElse("");
+            profileFamilyName = local.getProfileFamilyName().orElse("");
+        }
+
+        IdentityState identityState;
+        byte[] identityKey;
+        if ((remote.getIdentityState() != local.getIdentityState() && remote.getIdentityKey().isPresent())
+                || (remote.getIdentityKey().isPresent() && local.getIdentityKey().isEmpty())) {
+            identityState = remote.getIdentityState();
+            identityKey = remote.getIdentityKey().get();
+        } else {
+            identityState = local.getIdentityState();
+            identityKey = local.getIdentityKey().orElse(null);
+        }
+
+        if (local.getAci().isPresent() && identityKey != null && remote.getIdentityKey().isPresent() && !Arrays.equals(
+                identityKey,
+                remote.getIdentityKey().get())) {
+            logger.debug("The local and remote identity keys do not match for {}. Enqueueing a profile fetch.",
+                    local.getAci().orElse(null));
+            final var address = getRecipientAddress(local);
+            jobExecutor.enqueueJob(new DownloadProfileJob(address));
+        }
+
+        final var e164sMatchButPnisDont = local.getNumber().isPresent()
+                && local.getNumber()
+                .get()
+                .equals(remote.getNumber().orElse(null))
+                && local.getPni().isPresent()
+                && remote.getPni().isPresent()
+                && !local.getPni().get().equals(remote.getPni().get());
+
+        final var pnisMatchButE164sDont = local.getPni().isPresent()
+                && local.getPni()
+                .get()
+                .equals(remote.getPni().orElse(null))
+                && local.getNumber().isPresent()
+                && remote.getNumber().isPresent()
+                && !local.getNumber().get().equals(remote.getNumber().get());
+
+        PNI pni;
+        String e164;
+        if (e164sMatchButPnisDont) {
+            logger.debug("Matching E164s, but the PNIs differ! Trusting our local pair.");
+            // TODO [pnp] Schedule CDS fetch?
+            pni = local.getPni().get();
+            e164 = local.getNumber().get();
+        } else if (pnisMatchButE164sDont) {
+            logger.debug("Matching PNIs, but the E164s differ! Trusting our local pair.");
+            // TODO [pnp] Schedule CDS fetch?
+            pni = local.getPni().get();
+            e164 = local.getNumber().get();
+        } else {
+            pni = OptionalUtil.or(remote.getPni(), local.getPni()).orElse(null);
+            e164 = OptionalUtil.or(remote.getNumber(), local.getNumber()).orElse(null);
+        }
+
+        final var unknownFields = remote.serializeUnknownFields();
+        final var aci = local.getAci().isEmpty() ? remote.getAci().orElse(null) : local.getAci().get();
+        final var profileKey = OptionalUtil.or(remote.getProfileKey(), local.getProfileKey()).orElse(null);
+        final var username = OptionalUtil.or(remote.getUsername(), local.getUsername()).orElse("");
+        final var blocked = remote.isBlocked();
+        final var profileSharing = remote.isProfileSharingEnabled();
+        final var archived = remote.isArchived();
+        final var forcedUnread = remote.isForcedUnread();
+        final var muteUntil = remote.getMuteUntil();
+        final var hideStory = remote.shouldHideStory();
+        final var unregisteredTimestamp = remote.getUnregisteredTimestamp();
+        final var hidden = remote.isHidden();
+        final var systemGivenName = account.isPrimaryDevice()
+                ? local.getSystemGivenName().orElse("")
+                : remote.getSystemGivenName().orElse("");
+        final var systemFamilyName = account.isPrimaryDevice()
+                ? local.getSystemFamilyName().orElse("")
+                : remote.getSystemFamilyName().orElse("");
+        final var systemNickname = remote.getSystemNickname().orElse("");
+
+        final var mergedBuilder = new SignalContactRecord.Builder(remote.getId().getRaw(), aci, unknownFields).setE164(
+                        e164)
+                .setPni(pni)
+                .setProfileGivenName(profileGivenName)
+                .setProfileFamilyName(profileFamilyName)
+                .setSystemGivenName(systemGivenName)
+                .setSystemFamilyName(systemFamilyName)
+                .setSystemNickname(systemNickname)
+                .setProfileKey(profileKey)
+                .setUsername(username)
+                .setIdentityState(identityState)
+                .setIdentityKey(identityKey)
+                .setBlocked(blocked)
+                .setProfileSharingEnabled(profileSharing)
+                .setArchived(archived)
+                .setForcedUnread(forcedUnread)
+                .setMuteUntil(muteUntil)
+                .setHideStory(hideStory)
+                .setUnregisteredTimestamp(unregisteredTimestamp)
+                .setHidden(hidden);
+        final var merged = mergedBuilder.build();
+
+        final var matchesRemote = doProtosMatch(merged, remote);
+        if (matchesRemote) {
+            return remote;
+        }
+
+        final var matchesLocal = doProtosMatch(merged, local);
+        if (matchesLocal) {
+            return local;
+        }
+
+        return mergedBuilder.setId(KeyUtils.createRawStorageId()).build();
+    }
+
+    @Override
+    protected void insertLocal(SignalContactRecord record) throws SQLException {
+        StorageRecordUpdate<SignalContactRecord> update = new StorageRecordUpdate<>(null, record);
+        updateLocal(update);
+    }
+
+    @Override
+    protected void updateLocal(StorageRecordUpdate<SignalContactRecord> update) throws SQLException {
+        final var contactRecord = update.newRecord();
+        final var address = getRecipientAddress(contactRecord);
+        final var recipientId = account.getRecipientStore().resolveRecipientTrusted(connection, address);
+        final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
+
+        final var contact = recipient.getContact();
+        final var blocked = contact != null && contact.isBlocked();
+        final var profileShared = contact != null && contact.isProfileSharingEnabled();
+        final var archived = contact != null && contact.isArchived();
+        final var hidden = contact != null && contact.isHidden();
+        final var contactGivenName = contact == null ? null : contact.givenName();
+        final var contactFamilyName = contact == null ? null : contact.familyName();
+        if (blocked != contactRecord.isBlocked()
+                || profileShared != contactRecord.isProfileSharingEnabled()
+                || archived != contactRecord.isArchived()
+                || hidden != contactRecord.isHidden()
+                || (
+                contactRecord.getSystemGivenName().isPresent() && !contactRecord.getSystemGivenName()
+                        .get()
+                        .equals(contactGivenName)
+        )
+                || (
+                contactRecord.getSystemFamilyName().isPresent() && !contactRecord.getSystemFamilyName()
+                        .get()
+                        .equals(contactFamilyName)
+        )) {
+            logger.debug("Storing new or updated contact {}", recipientId);
+            final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+            final var newContact = contactBuilder.withIsBlocked(contactRecord.isBlocked())
+                    .withIsProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
+                    .withIsArchived(contactRecord.isArchived())
+                    .withIsHidden(contactRecord.isHidden());
+            if (contactRecord.getSystemGivenName().isPresent() || contactRecord.getSystemFamilyName().isPresent()) {
+                newContact.withGivenName(contactRecord.getSystemGivenName().orElse(null))
+                        .withFamilyName(contactRecord.getSystemFamilyName().orElse(null));
+            }
+            account.getRecipientStore().storeContact(connection, recipientId, newContact.build());
+        }
+
+        final var profile = recipient.getProfile();
+        final var profileGivenName = profile == null ? null : profile.getGivenName();
+        final var profileFamilyName = profile == null ? null : profile.getFamilyName();
+        if ((
+                contactRecord.getProfileGivenName().isPresent() && !contactRecord.getProfileGivenName()
+                        .get()
+                        .equals(profileGivenName)
+        ) || (
+                contactRecord.getProfileFamilyName().isPresent() && !contactRecord.getProfileFamilyName()
+                        .get()
+                        .equals(profileFamilyName)
+        )) {
+            final var profileBuilder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
+            final var newProfile = profileBuilder.withGivenName(contactRecord.getProfileGivenName().orElse(null))
+                    .withFamilyName(contactRecord.getProfileFamilyName().orElse(null))
+                    .build();
+            account.getRecipientStore().storeProfile(connection, recipientId, newProfile);
+        }
+        if (contactRecord.getProfileKey().isPresent()) {
+            try {
+                logger.trace("Storing profile key {}", recipientId);
+                final var profileKey = new ProfileKey(contactRecord.getProfileKey().get());
+                account.getRecipientStore().storeProfileKey(connection, recipientId, profileKey);
+            } catch (InvalidInputException e) {
+                logger.warn("Received invalid contact profile key from storage");
+            }
+        }
+        if (contactRecord.getIdentityKey().isPresent() && contactRecord.getAci().orElse(null) != null) {
+            try {
+                logger.trace("Storing identity key {}", recipientId);
+                final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get());
+                account.getIdentityKeyStore()
+                        .saveIdentity(connection, contactRecord.getAci().orElse(null), identityKey);
+
+                final var trustLevel = StorageSyncModels.remoteToLocal(contactRecord.getIdentityState());
+                if (trustLevel != null) {
+                    account.getIdentityKeyStore()
+                            .setIdentityTrustLevel(connection,
+                                    contactRecord.getAci().orElse(null),
+                                    identityKey,
+                                    trustLevel);
+                }
+            } catch (InvalidKeyException e) {
+                logger.warn("Received invalid contact identity key from storage");
+            }
+        }
+        account.getRecipientStore()
+                .storeStorageRecord(connection, recipientId, contactRecord.getId(), contactRecord.toProto().encode());
+    }
+
+    private static RecipientAddress getRecipientAddress(final SignalContactRecord contactRecord) {
+        return new RecipientAddress(contactRecord.getAci().orElse(null),
+                contactRecord.getPni().orElse(null),
+                contactRecord.getNumber().orElse(null),
+                contactRecord.getUsername().orElse(null));
+    }
+
+    @Override
+    public int compare(SignalContactRecord lhs, SignalContactRecord rhs) {
+        if ((lhs.getAci().isPresent() && Objects.equals(lhs.getAci(), rhs.getAci())) || (
+                lhs.getNumber().isPresent() && Objects.equals(lhs.getNumber(), rhs.getNumber())
+        ) || (lhs.getPni().isPresent() && Objects.equals(lhs.getPni(), rhs.getPni()))) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    private static boolean isValidE164(String value) {
+        return E164_PATTERN.matcher(value).matches();
+    }
+
+    private static boolean doProtosMatch(SignalContactRecord merged, SignalContactRecord other) {
+        return Arrays.equals(merged.toProto().encode(), other.toProto().encode());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
new file mode 100644
index 00000000..2b6334e0
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
@@ -0,0 +1,96 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.storage.SignalRecord;
+import org.whispersystems.signalservice.api.storage.StorageId;
+
+import java.sql.SQLException;
+import java.util.Comparator;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeSet;
+
+/**
+ * An implementation of {@link StorageRecordProcessor} that solidifies a pattern and reduces
+ * duplicate code in individual implementations.
+ * <p>
+ * Concerning the implementation of {@link #compare(Object, Object)}, it's purpose is to detect if
+ * two items would map to the same logical entity (i.e. they would correspond to the same record in
+ * our local store). We use it for a {@link TreeSet}, so mainly it's just important that the '0'
+ * case is correct. Other cases are whatever, just make it something stable.
+ */
+abstract class DefaultStorageRecordProcessor<E extends SignalRecord> implements StorageRecordProcessor<E>, Comparator<E> {
+
+    private static final Logger logger = LoggerFactory.getLogger(DefaultStorageRecordProcessor.class);
+    private final Set<E> matchedRecords = new TreeSet<>(this);
+
+    /**
+     * One type of invalid remote data this handles is two records mapping to the same local data. We
+     * have to trim this bad data out, because if we don't, we'll upload an ID set that only has one
+     * of the IDs in it, but won't properly delete the dupes, which will then fail our validation
+     * checks.
+     * <p>
+     * This is a bit tricky -- as we process records, IDs are written back to the local store, so we
+     * can't easily be like "oh multiple records are mapping to the same local storage ID". And in
+     * general we rely on SignalRecords to implement an equals() that includes the StorageId, so using
+     * a regular set is out. Instead, we use a {@link TreeSet}, which allows us to define a custom
+     * comparator for checking equality. Then we delegate to the subclass to tell us if two items are
+     * the same based on their actual data (i.e. two contacts having the same UUID, or two groups
+     * having the same MasterKey).
+     */
+    @Override
+    public void process(E remote) throws SQLException {
+        if (isInvalid(remote)) {
+            debug(remote.getId(), remote, "Found invalid key! Ignoring it.");
+            return;
+        }
+
+        final var local = getMatching(remote);
+
+        if (local.isEmpty()) {
+            debug(remote.getId(), remote, "No matching local record. Inserting.");
+            insertLocal(remote);
+            return;
+        }
+
+        if (matchedRecords.contains(local.get())) {
+            debug(remote.getId(), remote, "Multiple remote records map to the same local record! Ignoring this one.");
+            return;
+        }
+
+        matchedRecords.add(local.get());
+
+        final var merged = merge(remote, local.get());
+        if (!merged.equals(remote)) {
+            debug(remote.getId(), remote, "[Remote Update] " + merged.describeDiff(remote));
+        }
+
+        if (!merged.equals(local.get())) {
+            final var update = new StorageRecordUpdate<>(local.get(), merged);
+            debug(remote.getId(), remote, "[Local Update] " + update);
+            updateLocal(update);
+        }
+    }
+
+    private void debug(StorageId i, E record, String message) {
+        logger.debug("[" + i + "][" + record.getClass().getSimpleName() + "] " + message);
+    }
+
+    /**
+     * @return True if the record is invalid and should be removed from storage service, otherwise false.
+     */
+    protected abstract boolean isInvalid(E remote) throws SQLException;
+
+    /**
+     * Only records that pass the validity check (i.e. return false from {@link #isInvalid(SignalRecord)})
+     * make it to here, so you can assume all records are valid.
+     */
+    protected abstract Optional<E> getMatching(E remote) throws SQLException;
+
+    protected abstract E merge(E remote, E local);
+
+    protected abstract void insertLocal(E record) throws SQLException;
+
+    protected abstract void updateLocal(StorageRecordUpdate<E> update) throws SQLException;
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
new file mode 100644
index 00000000..be95591b
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
@@ -0,0 +1,137 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupIdV1;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Optional;
+
+/**
+ * Handles merging remote storage updates into local group v1 state.
+ */
+public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<SignalGroupV1Record> {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupV1RecordProcessor.class);
+    private final SignalAccount account;
+    private final Connection connection;
+
+    public GroupV1RecordProcessor(SignalAccount account, Connection connection) {
+        this.account = account;
+        this.connection = connection;
+    }
+
+    /**
+     * We want to catch:
+     * - Invalid group IDs
+     * - GV1 IDs that map to GV2 IDs, meaning we've already migrated them.
+     */
+    @Override
+    protected boolean isInvalid(SignalGroupV1Record remote) throws SQLException {
+        try {
+            final var id = GroupId.unknownVersion(remote.getGroupId());
+            if (!(id instanceof GroupIdV1)) {
+                return true;
+            }
+            final var group = account.getGroupStore().getGroup(connection, id);
+
+            if (group instanceof GroupInfoV2) {
+                logger.debug("We already have an upgraded V2 group for this V1 group -- marking as invalid.");
+                return true;
+            } else {
+                return false;
+            }
+        } catch (AssertionError e) {
+            logger.debug("Bad Group ID -- marking as invalid.");
+            return true;
+        }
+    }
+
+    @Override
+    protected Optional<SignalGroupV1Record> getMatching(SignalGroupV1Record remote) throws SQLException {
+        final var id = GroupId.v1(remote.getGroupId());
+        final var group = account.getGroupStore().getGroup(connection, id);
+
+        if (group == null) {
+            return Optional.empty();
+        }
+
+        final var storageId = account.getGroupStore().getGroupStorageId(connection, id);
+        return Optional.of(StorageSyncModels.localToRemoteRecord(group, storageId.getRaw()).getGroupV1().get());
+    }
+
+    @Override
+    protected SignalGroupV1Record merge(SignalGroupV1Record remote, SignalGroupV1Record local) {
+        final var unknownFields = remote.serializeUnknownFields();
+        final var blocked = remote.isBlocked();
+        final var profileSharing = remote.isProfileSharingEnabled();
+        final var archived = remote.isArchived();
+        final var forcedUnread = remote.isForcedUnread();
+        final var muteUntil = remote.getMuteUntil();
+
+        final var mergedBuilder = new SignalGroupV1Record.Builder(remote.getId().getRaw(),
+                remote.getGroupId(),
+                unknownFields).setBlocked(blocked)
+                .setProfileSharingEnabled(profileSharing)
+                .setForcedUnread(forcedUnread)
+                .setMuteUntil(muteUntil)
+                .setArchived(archived);
+
+        final var merged = mergedBuilder.build();
+
+        final var matchesRemote = doProtosMatch(merged, remote);
+        if (matchesRemote) {
+            return remote;
+        }
+
+        final var matchesLocal = doProtosMatch(merged, local);
+        if (matchesLocal) {
+            return local;
+        }
+
+        return mergedBuilder.setId(KeyUtils.createRawStorageId()).build();
+    }
+
+    @Override
+    protected void insertLocal(SignalGroupV1Record record) throws SQLException {
+        // TODO send group info request (after server message queue is empty)
+        // context.getGroupHelper().sendGroupInfoRequest(groupIdV1, account.getSelfRecipientId());
+        StorageRecordUpdate<SignalGroupV1Record> update = new StorageRecordUpdate<>(null, record);
+        updateLocal(update);
+    }
+
+    @Override
+    protected void updateLocal(StorageRecordUpdate<SignalGroupV1Record> update) throws SQLException {
+        final var groupV1Record = update.newRecord();
+        final var groupIdV1 = GroupId.v1(groupV1Record.getGroupId());
+
+        final var group = account.getGroupStore().getGroup(connection, groupIdV1);
+        group.setBlocked(groupV1Record.isBlocked());
+        account.getGroupStore().updateGroup(connection, group);
+        account.getGroupStore()
+                .storeStorageRecord(connection,
+                        group.getGroupId(),
+                        groupV1Record.getId(),
+                        groupV1Record.toProto().encode());
+    }
+
+    @Override
+    public int compare(SignalGroupV1Record lhs, SignalGroupV1Record rhs) {
+        if (Arrays.equals(lhs.getGroupId(), rhs.getGroupId())) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    private static boolean doProtosMatch(SignalGroupV1Record merged, SignalGroupV1Record other) {
+        return Arrays.equals(merged.toProto().encode(), other.toProto().encode());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
new file mode 100644
index 00000000..4d41901a
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
@@ -0,0 +1,115 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.groups.GroupUtils;
+import org.asamk.signal.manager.storage.SignalAccount;
+import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Optional;
+
+public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<SignalGroupV2Record> {
+
+    private static final Logger logger = LoggerFactory.getLogger(GroupV2RecordProcessor.class);
+    private final SignalAccount account;
+    private final Connection connection;
+
+    public GroupV2RecordProcessor(SignalAccount account, Connection connection) {
+        this.account = account;
+        this.connection = connection;
+    }
+
+    @Override
+    protected boolean isInvalid(SignalGroupV2Record remote) {
+        return remote.getMasterKeyBytes().length != GroupMasterKey.SIZE;
+    }
+
+    @Override
+    protected Optional<SignalGroupV2Record> getMatching(SignalGroupV2Record remote) throws SQLException {
+        final var id = GroupUtils.getGroupIdV2(remote.getMasterKeyOrThrow());
+        final var group = account.getGroupStore().getGroup(connection, id);
+
+        if (group == null) {
+            return Optional.empty();
+        }
+
+        final var storageId = account.getGroupStore().getGroupStorageId(connection, id);
+        return Optional.of(StorageSyncModels.localToRemoteRecord(group, storageId.getRaw()).getGroupV2().get());
+    }
+
+    @Override
+    protected SignalGroupV2Record merge(SignalGroupV2Record remote, SignalGroupV2Record local) {
+        final var unknownFields = remote.serializeUnknownFields();
+        final var blocked = remote.isBlocked();
+        final var profileSharing = remote.isProfileSharingEnabled();
+        final var archived = remote.isArchived();
+        final var forcedUnread = remote.isForcedUnread();
+        final var muteUntil = remote.getMuteUntil();
+        final var notifyForMentionsWhenMuted = remote.notifyForMentionsWhenMuted();
+        final var hideStory = remote.shouldHideStory();
+        final var storySendMode = remote.getStorySendMode();
+
+        final var mergedBuilder = new SignalGroupV2Record.Builder(remote.getId().getRaw(),
+                remote.getMasterKeyBytes(),
+                unknownFields).setBlocked(blocked)
+                .setProfileSharingEnabled(profileSharing)
+                .setArchived(archived)
+                .setForcedUnread(forcedUnread)
+                .setMuteUntil(muteUntil)
+                .setNotifyForMentionsWhenMuted(notifyForMentionsWhenMuted)
+                .setHideStory(hideStory)
+                .setStorySendMode(storySendMode);
+        final var merged = mergedBuilder.build();
+
+        final var matchesRemote = doProtosMatch(merged, remote);
+        if (matchesRemote) {
+            return remote;
+        }
+
+        final var matchesLocal = doProtosMatch(merged, local);
+        if (matchesLocal) {
+            return local;
+        }
+
+        return mergedBuilder.setId(KeyUtils.createRawStorageId()).build();
+    }
+
+    @Override
+    protected void insertLocal(SignalGroupV2Record record) throws SQLException {
+        StorageRecordUpdate<SignalGroupV2Record> update = new StorageRecordUpdate<>(null, record);
+        updateLocal(update);
+    }
+
+    @Override
+    protected void updateLocal(StorageRecordUpdate<SignalGroupV2Record> update) throws SQLException {
+        final var groupV2Record = update.newRecord();
+        final var groupMasterKey = groupV2Record.getMasterKeyOrThrow();
+
+        final var group = account.getGroupStore().getGroupOrPartialMigrate(connection, groupMasterKey);
+        group.setBlocked(groupV2Record.isBlocked());
+        account.getGroupStore().updateGroup(connection, group);
+        account.getGroupStore()
+                .storeStorageRecord(connection,
+                        group.getGroupId(),
+                        groupV2Record.getId(),
+                        groupV2Record.toProto().encode());
+    }
+
+    @Override
+    public int compare(SignalGroupV2Record lhs, SignalGroupV2Record rhs) {
+        if (Arrays.equals(lhs.getMasterKeyBytes(), rhs.getMasterKeyBytes())) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    private static boolean doProtosMatch(SignalGroupV2Record merged, SignalGroupV2Record other) {
+        return Arrays.equals(merged.toProto().encode(), other.toProto().encode());
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
new file mode 100644
index 00000000..45a99562
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
@@ -0,0 +1,14 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.whispersystems.signalservice.api.storage.SignalRecord;
+
+import java.sql.SQLException;
+
+/**
+ * Handles processing a remote record, which involves applying any local changes that need to be
+ * made based on the remote records.
+ */
+interface StorageRecordProcessor<E extends SignalRecord> {
+
+    void process(E remoteRecord) throws SQLException;
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
new file mode 100644
index 00000000..8dcb7b34
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
@@ -0,0 +1,14 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.whispersystems.signalservice.api.storage.SignalRecord;
+
+/**
+ * Represents a pair of records: one old, and one new. The new record should replace the old.
+ */
+record StorageRecordUpdate<E extends SignalRecord>(E oldRecord, E newRecord) {
+
+    @Override
+    public String toString() {
+        return newRecord.describeDiff(oldRecord);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
new file mode 100644
index 00000000..c18434c3
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -0,0 +1,145 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.TrustLevel;
+import org.asamk.signal.manager.storage.configuration.ConfigurationStore;
+import org.asamk.signal.manager.storage.groups.GroupInfoV1;
+import org.asamk.signal.manager.storage.groups.GroupInfoV2;
+import org.asamk.signal.manager.storage.identities.IdentityInfo;
+import org.asamk.signal.manager.storage.recipients.Recipient;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
+import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
+import org.whispersystems.signalservice.api.storage.SignalContactRecord;
+import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
+import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
+import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
+import org.whispersystems.signalservice.internal.storage.protos.AccountRecord.UsernameLink;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
+
+import java.util.Optional;
+
+import okio.ByteString;
+
+public final class StorageSyncModels {
+
+    private StorageSyncModels() {
+    }
+
+    public static AccountRecord.PhoneNumberSharingMode localToRemote(PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
+        return switch (phoneNumberPhoneNumberSharingMode) {
+            case EVERYBODY -> AccountRecord.PhoneNumberSharingMode.EVERYBODY;
+            case CONTACTS, NOBODY -> AccountRecord.PhoneNumberSharingMode.NOBODY;
+        };
+    }
+
+    public static PhoneNumberSharingMode remoteToLocal(AccountRecord.PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
+        return switch (phoneNumberPhoneNumberSharingMode) {
+            case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
+            case UNKNOWN, NOBODY -> PhoneNumberSharingMode.NOBODY;
+        };
+    }
+
+    public static SignalStorageRecord localToRemoteRecord(
+            ConfigurationStore configStore,
+            Recipient self,
+            UsernameLinkComponents usernameLinkComponents,
+            byte[] rawStorageId
+    ) {
+        final var builder = new SignalAccountRecord.Builder(rawStorageId, self.getStorageRecord());
+        if (self.getProfileKey() != null) {
+            builder.setProfileKey(self.getProfileKey().serialize());
+        }
+        if (self.getProfile() != null) {
+            builder.setGivenName(self.getProfile().getGivenName())
+                    .setFamilyName(self.getProfile().getFamilyName())
+                    .setAvatarUrlPath(self.getProfile().getAvatarUrlPath());
+        }
+        builder.setTypingIndicatorsEnabled(Optional.ofNullable(configStore.getTypingIndicators()).orElse(true))
+                .setReadReceiptsEnabled(Optional.ofNullable(configStore.getReadReceipts()).orElse(true))
+                .setSealedSenderIndicatorsEnabled(Optional.ofNullable(configStore.getUnidentifiedDeliveryIndicators())
+                        .orElse(true))
+                .setLinkPreviewsEnabled(Optional.ofNullable(configStore.getLinkPreviews()).orElse(true))
+                .setUnlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted()).orElse(true))
+                .setPhoneNumberSharingMode(localToRemote(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
+                        .orElse(PhoneNumberSharingMode.EVERYBODY)))
+                .setE164(self.getAddress().number().orElse(""))
+                .setUsername(self.getAddress().username().orElse(null));
+        if (usernameLinkComponents != null) {
+            final var linkColor = configStore.getUsernameLinkColor();
+            builder.setUsernameLink(new UsernameLink.Builder().entropy(ByteString.of(usernameLinkComponents.getEntropy()))
+                    .serverId(UuidUtil.toByteString(usernameLinkComponents.getServerId()))
+                    .color(linkColor == null ? UsernameLink.Color.UNKNOWN : UsernameLink.Color.valueOf(linkColor))
+                    .build());
+        }
+
+        return SignalStorageRecord.forAccount(builder.build());
+    }
+
+    public static SignalStorageRecord localToRemoteRecord(
+            Recipient recipient, IdentityInfo identity, byte[] rawStorageId
+    ) {
+        final var address = recipient.getAddress();
+        final var builder = new SignalContactRecord.Builder(rawStorageId,
+                address.aci().orElse(null),
+                recipient.getStorageRecord()).setE164(address.number().orElse(null))
+                .setPni(address.pni().orElse(null))
+                .setUsername(address.username().orElse(null))
+                .setProfileKey(recipient.getProfileKey() == null ? null : recipient.getProfileKey().serialize());
+        if (recipient.getProfile() != null) {
+            builder.setProfileGivenName(recipient.getProfile().getGivenName())
+                    .setProfileFamilyName(recipient.getProfile().getFamilyName());
+        }
+        if (recipient.getContact() != null) {
+            builder.setSystemGivenName(recipient.getContact().givenName())
+                    .setSystemFamilyName((recipient.getContact().familyName()))
+                    .setBlocked(recipient.getContact().isBlocked())
+                    .setProfileSharingEnabled(recipient.getContact().isProfileSharingEnabled())
+                    .setArchived(recipient.getContact().isArchived())
+                    .setHidden(recipient.getContact().isHidden());
+        }
+        if (identity != null) {
+            builder.setIdentityKey(identity.getIdentityKey().serialize())
+                    .setIdentityState(localToRemote(identity.getTrustLevel()));
+        }
+        return SignalStorageRecord.forContact(builder.build());
+    }
+
+    public static SignalStorageRecord localToRemoteRecord(
+            GroupInfoV1 group, byte[] rawStorageId
+    ) {
+        final var builder = new SignalGroupV1Record.Builder(rawStorageId,
+                group.getGroupId().serialize(),
+                group.getStorageRecord());
+        builder.setBlocked(group.isBlocked()).setArchived(group.archived);
+        return SignalStorageRecord.forGroupV1(builder.build());
+    }
+
+    public static SignalStorageRecord localToRemoteRecord(
+            GroupInfoV2 group, byte[] rawStorageId
+    ) {
+        final var builder = new SignalGroupV2Record.Builder(rawStorageId,
+                group.getMasterKey(),
+                group.getStorageRecord());
+        builder.setBlocked(group.isBlocked());
+        return SignalStorageRecord.forGroupV2(builder.build());
+    }
+
+    public static TrustLevel remoteToLocal(ContactRecord.IdentityState identityState) {
+        return switch (identityState) {
+            case DEFAULT -> TrustLevel.TRUSTED_UNVERIFIED;
+            case UNVERIFIED -> TrustLevel.UNTRUSTED;
+            case VERIFIED -> TrustLevel.TRUSTED_VERIFIED;
+        };
+    }
+
+    private static IdentityState localToRemote(TrustLevel local) {
+        return switch (local) {
+            case TRUSTED_VERIFIED -> IdentityState.VERIFIED;
+            case UNTRUSTED -> IdentityState.UNVERIFIED;
+            default -> IdentityState.DEFAULT;
+        };
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
new file mode 100644
index 00000000..2168a2ef
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
@@ -0,0 +1,238 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.signal.core.util.Base64;
+import org.signal.core.util.SetUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
+import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
+
+import java.nio.ByteBuffer;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public final class StorageSyncValidations {
+
+    private static final Logger logger = LoggerFactory.getLogger(StorageSyncValidations.class);
+
+    private StorageSyncValidations() {
+    }
+
+    public static void validate(
+            WriteOperationResult result,
+            SignalStorageManifest previousManifest,
+            boolean forcePushPending,
+            RecipientAddress self
+    ) {
+        validateManifestAndInserts(result.manifest(), result.inserts(), self);
+
+        if (!result.deletes().isEmpty()) {
+            Set<String> allSetEncoded = result.manifest()
+                    .getStorageIds()
+                    .stream()
+                    .map(StorageId::getRaw)
+                    .map(Base64::encodeWithPadding)
+                    .collect(Collectors.toSet());
+
+            for (byte[] delete : result.deletes()) {
+                String encoded = Base64.encodeWithPadding(delete);
+                if (allSetEncoded.contains(encoded)) {
+                    throw new DeletePresentInFullIdSetError();
+                }
+            }
+        }
+
+        if (previousManifest.getVersion() == 0) {
+            logger.debug(
+                    "Previous manifest is empty, not bothering with additional validations around the diffs between the two manifests.");
+            return;
+        }
+
+        if (result.manifest().getVersion() != previousManifest.getVersion() + 1) {
+            throw new IncorrectManifestVersionError();
+        }
+
+        if (forcePushPending) {
+            logger.debug(
+                    "Force push pending, not bothering with additional validations around the diffs between the two manifests.");
+            return;
+        }
+
+        Set<ByteBuffer> previousIds = previousManifest.getStorageIds()
+                .stream()
+                .map(id -> ByteBuffer.wrap(id.getRaw()))
+                .collect(Collectors.toSet());
+        Set<ByteBuffer> newIds = result.manifest()
+                .getStorageIds()
+                .stream()
+                .map(id -> ByteBuffer.wrap(id.getRaw()))
+                .collect(Collectors.toSet());
+
+        Set<ByteBuffer> manifestInserts = SetUtil.difference(newIds, previousIds);
+        Set<ByteBuffer> manifestDeletes = SetUtil.difference(previousIds, newIds);
+
+        Set<ByteBuffer> declaredInserts = result.inserts()
+                .stream()
+                .map(r -> ByteBuffer.wrap(r.getId().getRaw()))
+                .collect(Collectors.toSet());
+        Set<ByteBuffer> declaredDeletes = result.deletes().stream().map(ByteBuffer::wrap).collect(Collectors.toSet());
+
+        if (declaredInserts.size() > manifestInserts.size()) {
+            logger.debug("DeclaredInserts: " + declaredInserts.size() + ", ManifestInserts: " + manifestInserts.size());
+            throw new MoreInsertsThanExpectedError();
+        }
+
+        if (declaredInserts.size() < manifestInserts.size()) {
+            logger.debug("DeclaredInserts: " + declaredInserts.size() + ", ManifestInserts: " + manifestInserts.size());
+            throw new LessInsertsThanExpectedError();
+        }
+
+        if (!declaredInserts.containsAll(manifestInserts)) {
+            throw new InsertMismatchError();
+        }
+
+        if (declaredDeletes.size() > manifestDeletes.size()) {
+            logger.debug("DeclaredDeletes: " + declaredDeletes.size() + ", ManifestDeletes: " + manifestDeletes.size());
+            throw new MoreDeletesThanExpectedError();
+        }
+
+        if (declaredDeletes.size() < manifestDeletes.size()) {
+            logger.debug("DeclaredDeletes: " + declaredDeletes.size() + ", ManifestDeletes: " + manifestDeletes.size());
+            throw new LessDeletesThanExpectedError();
+        }
+
+        if (!declaredDeletes.containsAll(manifestDeletes)) {
+            throw new DeleteMismatchError();
+        }
+    }
+
+    public static void validateForcePush(
+            SignalStorageManifest manifest, List<SignalStorageRecord> inserts, RecipientAddress self
+    ) {
+        validateManifestAndInserts(manifest, inserts, self);
+    }
+
+    private static void validateManifestAndInserts(
+            SignalStorageManifest manifest, List<SignalStorageRecord> inserts, RecipientAddress self
+    ) {
+        int accountCount = 0;
+        for (StorageId id : manifest.getStorageIds()) {
+            accountCount += id.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue() ? 1 : 0;
+        }
+
+        if (accountCount > 1) {
+            throw new MultipleAccountError();
+        }
+
+        if (accountCount == 0) {
+            throw new MissingAccountError();
+        }
+
+        Set<StorageId> allSet = new HashSet<>(manifest.getStorageIds());
+        Set<StorageId> insertSet = inserts.stream().map(SignalStorageRecord::getId).collect(Collectors.toSet());
+        Set<ByteBuffer> rawIdSet = allSet.stream().map(id -> ByteBuffer.wrap(id.getRaw())).collect(Collectors.toSet());
+
+        if (allSet.size() != manifest.getStorageIds().size()) {
+            throw new DuplicateStorageIdError();
+        }
+
+        if (rawIdSet.size() != allSet.size()) {
+            List<StorageId> ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.CONTACT.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateContactIdError();
+            }
+
+            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.GROUPV1.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateGroupV1IdError();
+            }
+
+            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.GROUPV2.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateGroupV2IdError();
+            }
+
+            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.STORY_DISTRIBUTION_LIST.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateDistributionListIdError();
+            }
+
+            throw new DuplicateRawIdAcrossTypesError();
+        }
+
+        if (inserts.size() > insertSet.size()) {
+            throw new DuplicateInsertInWriteError();
+        }
+
+        for (SignalStorageRecord insert : inserts) {
+            if (!allSet.contains(insert.getId())) {
+                throw new InsertNotPresentInFullIdSetError();
+            }
+
+            if (insert.isUnknown()) {
+                throw new UnknownInsertError();
+            }
+
+            if (insert.getContact().isPresent()) {
+                final var contact = insert.getContact().get();
+                final var serviceId = contact.getServiceId().map(ServiceId.class::cast);
+                final var pni = contact.getPni();
+                final var number = contact.getNumber();
+                final var username = contact.getUsername();
+                final var address = new RecipientAddress(serviceId, pni, number, username);
+                if (self.matches(address)) {
+                    throw new SelfAddedAsContactError();
+                }
+            }
+            if (insert.getAccount().isPresent() && insert.getAccount().get().getProfileKey().isEmpty()) {
+                logger.debug("Uploading a null profile key in our AccountRecord!");
+            }
+        }
+    }
+
+    private static final class DuplicateStorageIdError extends Error {}
+
+    private static final class DuplicateRawIdAcrossTypesError extends Error {}
+
+    private static final class DuplicateContactIdError extends Error {}
+
+    private static final class DuplicateGroupV1IdError extends Error {}
+
+    private static final class DuplicateGroupV2IdError extends Error {}
+
+    private static final class DuplicateDistributionListIdError extends Error {}
+
+    private static final class DuplicateInsertInWriteError extends Error {}
+
+    private static final class InsertNotPresentInFullIdSetError extends Error {}
+
+    private static final class DeletePresentInFullIdSetError extends Error {}
+
+    private static final class UnknownInsertError extends Error {}
+
+    private static final class MultipleAccountError extends Error {}
+
+    private static final class MissingAccountError extends Error {}
+
+    private static final class SelfAddedAsContactError extends Error {}
+
+    private static final class IncorrectManifestVersionError extends Error {}
+
+    private static final class MoreInsertsThanExpectedError extends Error {}
+
+    private static final class LessInsertsThanExpectedError extends Error {}
+
+    private static final class InsertMismatchError extends Error {}
+
+    private static final class MoreDeletesThanExpectedError extends Error {}
+
+    private static final class LessDeletesThanExpectedError extends Error {}
+
+    private static final class DeleteMismatchError extends Error {}
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java
new file mode 100644
index 00000000..97e3579a
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java
@@ -0,0 +1,30 @@
+package org.asamk.signal.manager.syncStorage;
+
+import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
+import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
+
+import java.util.List;
+import java.util.Locale;
+
+public record WriteOperationResult(
+        SignalStorageManifest manifest, List<SignalStorageRecord> inserts, List<byte[]> deletes
+) {
+
+    public boolean isEmpty() {
+        return inserts.isEmpty() && deletes.isEmpty();
+    }
+
+    @Override
+    public String toString() {
+        if (isEmpty()) {
+            return "Empty";
+        } else {
+            return String.format(Locale.ROOT,
+                    "ManifestVersion: %d, Total Keys: %d, Inserts: %d, Deletes: %d",
+                    manifest.getVersion(),
+                    manifest.getStorageIds().size(),
+                    inserts.size(),
+                    deletes.size());
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 486e3655..bfcb750c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -113,6 +113,10 @@ public class KeyUtils {
         return MasterKey.createNew(secureRandom);
     }
 
+    public static byte[] createRawStorageId() {
+        return getSecretBytes(16);
+    }
+
     private static String getSecret(int size) {
         var secret = getSecretBytes(size);
         return Base64.getEncoder().encodeToString(secret);

From f92466f6be7d598bc75b6769c4d020d268eb1646 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 27 Jan 2024 17:22:21 +0100
Subject: [PATCH 349/672] Store recipient unregistered state

---
 .../signal/manager/config/ServiceConfig.java  |  1 +
 .../manager/helper/RecipientHelper.java       |  4 +
 .../signal/manager/helper/StorageHelper.java  | 11 +++
 .../manager/storage/AccountDatabase.java      | 11 ++-
 .../storage/recipients/RecipientStore.java    | 77 ++++++++++++++++++-
 5 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index d46b6988..ea47b8a6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -24,6 +24,7 @@ public class ServiceConfig {
     public static final boolean AUTOMATIC_NETWORK_RETRY = true;
     public static final int GROUP_MAX_SIZE = 1001;
     public static final int MAXIMUM_ONE_OFF_REQUEST_SIZE = 3;
+    public static final long UNREGISTERED_LIFESPAN = TimeUnit.DAYS.toMillis(30);
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var giftBadges = !isPrimaryDevice;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 4a0bc9c4..83646052 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -164,6 +164,10 @@ public class RecipientHelper {
         registeredUsers.forEach((number, u) -> account.getRecipientTrustedResolver()
                 .resolveRecipientTrusted(u.aci, u.pni, Optional.of(number)));
 
+        final var unregisteredUsers = new HashSet<>(numbers);
+        unregisteredUsers.removeAll(registeredUsers.keySet());
+        account.getRecipientStore().markUnregistered(unregisteredUsers);
+
         return registeredUsers;
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 8c8ac6fc..5bccfd05 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -149,6 +149,17 @@ public class StorageHelper {
 
             logger.debug("Pre-Merge ID Difference :: " + idDifference);
 
+            if (!idDifference.localOnlyIds().isEmpty()) {
+                final var updated = account.getRecipientStore()
+                        .removeStorageIdsFromLocalOnlyUnregisteredRecipients(connection, idDifference.localOnlyIds());
+
+                if (updated > 0) {
+                    logger.warn(
+                            "Found {} records that were deleted remotely but only marked unregistered locally. Removed those from local store. Recalculating diff.",
+                            updated);
+                }
+            }
+
             if (!idDifference.isEmpty()) {
                 final var remoteOnlyRecords = getSignalStorageRecords(storageKey, idDifference.remoteOnlyIds());
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index c49e56ab..9e9eebf8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -32,7 +32,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 20;
+    private static final long DATABASE_VERSION = 21;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -558,5 +558,14 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 21) {
+            logger.debug("Updating database: Create unregistered column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD unregistered_timestamp INTEGER;
+                                        UPDATE recipient SET pni = NULL WHERE uuid IS NOT NULL;
+                                        """);
+            }
+        }
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 926f09bd..46f8652c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -37,6 +37,8 @@ import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import static org.asamk.signal.manager.config.ServiceConfig.UNREGISTERED_LIFESPAN;
+
 public class RecipientStore implements RecipientIdCreator, RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore {
 
     private static final Logger logger = LoggerFactory.getLogger(RecipientStore.class);
@@ -65,6 +67,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       username TEXT UNIQUE,
                                       uuid BLOB UNIQUE,
                                       pni BLOB UNIQUE,
+                                      unregistered_timestamp INTEGER,
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
 
@@ -521,7 +524,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
                 SELECT r._id
                 FROM %s r
-                WHERE r.storage_id IS NULL
+                WHERE r.storage_id IS NULL AND (r.unregistered_timestamp IS NULL OR r.unregistered_timestamp > ?)
                 """
         ).formatted(TABLE_RECIPIENT);
         final var updateSql = (
@@ -534,6 +537,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
             try (final var selectStmt = connection.prepareStatement(selectSql)) {
+                selectStmt.setLong(1, System.currentTimeMillis() - UNREGISTERED_LIFESPAN);
                 final var recipientIds = Utils.executeQueryForStream(selectStmt, this::getRecipientIdFromResultSet)
                         .toList();
                 try (final var updateStmt = connection.prepareStatement(updateSql)) {
@@ -835,6 +839,76 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         rotateStorageId(connection, recipientId);
     }
 
+    public int removeStorageIdsFromLocalOnlyUnregisteredRecipients(
+            final Connection connection, final List<StorageId> storageIds
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET storage_id = NULL
+                WHERE storage_id = ? AND storage_id IS NOT NULL AND unregistered_timestamp IS NOT NULL
+                """
+        ).formatted(TABLE_RECIPIENT);
+        var count = 0;
+        try (final var statement = connection.prepareStatement(sql)) {
+            for (final var storageId : storageIds) {
+                statement.setBytes(1, storageId.getRaw());
+                count += statement.executeUpdate();
+            }
+        }
+        return count;
+    }
+
+    public void markUnregistered(final Set<String> unregisteredUsers) {
+        logger.debug("Marking {} numbers as unregistered", unregisteredUsers.size());
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var number : unregisteredUsers) {
+                final var recipient = findByNumber(connection, number);
+                if (recipient.isPresent()) {
+                    markUnregistered(connection, recipient.get().id());
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
+    private void markRegistered(
+            final Connection connection, final RecipientId recipientId
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET unregistered_timestamp = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setNull(1, Types.INTEGER);
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
+    private void markUnregistered(
+            final Connection connection, final RecipientId recipientId
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET unregistered_timestamp = ?
+                WHERE _id = ? AND unregistered_timestamp IS NULL
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, System.currentTimeMillis());
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
     private void storeExpiringProfileKeyCredential(
             final Connection connection,
             final RecipientId recipientId,
@@ -948,6 +1022,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             return new Pair<>(resolveRecipientLocked(connection, address), List.of());
         } else {
             final var pair = MergeRecipientHelper.resolveRecipientTrustedLocked(new HelperStore(connection), address);
+            markRegistered(connection, pair.first());
 
             for (final var toBeMergedRecipientId : pair.second()) {
                 mergeRecipientsLocked(connection, pair.first(), toBeMergedRecipientId);

From 90df256e8524281db7ae2f4d569d5861498746c0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 28 Jan 2024 11:46:34 +0100
Subject: [PATCH 350/672] Fix storage sync issues

---
 .../signal/manager/helper/StorageHelper.java  |  4 +-
 .../signal/manager/helper/SyncHelper.java     |  7 ++-
 .../signal/manager/internal/ManagerImpl.java  |  2 +-
 .../signal/manager/storage/SignalAccount.java |  2 +-
 .../manager/storage/groups/GroupStore.java    | 14 ++++-
 .../storage/recipients/RecipientStore.java    | 23 ++++---
 .../syncStorage/ContactRecordProcessor.java   | 62 ++++++++-----------
 .../DefaultStorageRecordProcessor.java        |  4 +-
 8 files changed, 67 insertions(+), 51 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 5bccfd05..c18e8df3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -155,7 +155,7 @@ public class StorageHelper {
 
                 if (updated > 0) {
                     logger.warn(
-                            "Found {} records that were deleted remotely but only marked unregistered locally. Removed those from local store. Recalculating diff.",
+                            "Found {} records that were deleted remotely but only marked unregistered locally. Removed those from local store.",
                             updated);
                 }
             }
@@ -502,7 +502,7 @@ public class StorageHelper {
             final var remote = remoteByRawId.get(rawId);
             final var local = localByRawId.get(rawId);
 
-            if (remote.getType() != local.getType()) {
+            if (remote.getType() != local.getType() && local.getType() != 0) {
                 remoteOnlyRawIds.remove(rawId);
                 localOnlyRawIds.remove(rawId);
                 hasTypeMismatch = true;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index ac611046..de3a495a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -324,7 +324,12 @@ public class SyncHelper {
             final var recipientId = account.getRecipientTrustedResolver().resolveRecipientTrusted(c.getAddress());
             var contact = account.getContactStore().getContact(recipientId);
             final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            if (c.getName().isPresent()) {
+            if (c.getName().isPresent() && (
+                    contact == null || (
+                            contact.givenName() == null
+                                    && contact.familyName() == null
+                    )
+            )) {
                 builder.withGivenName(c.getName().get());
                 builder.withFamilyName(null);
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index a2575e90..75dcb138 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1355,8 +1355,8 @@ public class ManagerImpl implements Manager {
         if (thread != null) {
             stopReceiveThread(thread);
         }
-        executor.close();
         context.close();
+        executor.close();
 
         dependencies.getSignalWebSocket().disconnect();
         dependencies.getPushServiceSocket().close();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 41c05b98..fa5496d2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -362,7 +362,7 @@ public class SignalAccount implements Closeable {
     }
 
     private void init() {
-        this.selfRecipientId = getRecipientResolver().resolveRecipient(getSelfRecipientAddress());
+        this.selfRecipientId = getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
     }
 
     private void migrateLegacyConfigs() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index e7cf5752..5079da07 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -122,13 +122,25 @@ public class GroupStore {
     public void storeStorageRecord(
             final Connection connection, final GroupId groupId, final StorageId storageId, final byte[] storageRecord
     ) throws SQLException {
+        final var groupTable = groupId instanceof GroupIdV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2;
+        final var deleteSql = (
+                """
+                UPDATE %s
+                SET storage_id = NULL
+                WHERE storage_id = ?
+                """
+        ).formatted(groupTable);
+        try (final var statement = connection.prepareStatement(deleteSql)) {
+            statement.setBytes(1, storageId.getRaw());
+            statement.executeUpdate();
+        }
         final var sql = (
                 """
                 UPDATE %s
                 SET storage_id = ?, storage_record = ?
                 WHERE group_id = ?
                 """
-        ).formatted(groupId instanceof GroupIdV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2);
+        ).formatted(groupTable);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setBytes(1, storageId.getRaw());
             if (storageRecord == null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 46f8652c..285d5cf6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -37,8 +37,6 @@ import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static org.asamk.signal.manager.config.ServiceConfig.UNREGISTERED_LIFESPAN;
-
 public class RecipientStore implements RecipientIdCreator, RecipientResolver, RecipientTrustedResolver, ContactsStore, ProfileStore {
 
     private static final Logger logger = LoggerFactory.getLogger(RecipientStore.class);
@@ -524,7 +522,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
                 SELECT r._id
                 FROM %s r
-                WHERE r.storage_id IS NULL AND (r.unregistered_timestamp IS NULL OR r.unregistered_timestamp > ?)
+                WHERE r.storage_id IS NULL AND r.unregistered_timestamp IS NULL
                 """
         ).formatted(TABLE_RECIPIENT);
         final var updateSql = (
@@ -537,7 +535,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
             try (final var selectStmt = connection.prepareStatement(selectSql)) {
-                selectStmt.setLong(1, System.currentTimeMillis() - UNREGISTERED_LIFESPAN);
                 final var recipientIds = Utils.executeQueryForStream(selectStmt, this::getRecipientIdFromResultSet)
                         .toList();
                 try (final var updateStmt = connection.prepareStatement(updateSql)) {
@@ -735,14 +732,25 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final StorageId storageId,
             final byte[] storageRecord
     ) throws SQLException {
-        final var sql = (
+        final var deleteSql = (
+                """
+                UPDATE %s
+                SET storage_id = NULL
+                WHERE storage_id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(deleteSql)) {
+            statement.setBytes(1, storageId.getRaw());
+            statement.executeUpdate();
+        }
+        final var insertSql = (
                 """
                 UPDATE %s
                 SET storage_id = ?, storage_record = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
-        try (final var statement = connection.prepareStatement(sql)) {
+        try (final var statement = connection.prepareStatement(insertSql)) {
             statement.setBytes(1, storageId.getRaw());
             if (storageRecord == null) {
                 statement.setNull(2, Types.BLOB);
@@ -846,7 +854,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
                 UPDATE %s
                 SET storage_id = NULL
-                WHERE storage_id = ? AND storage_id IS NOT NULL AND unregistered_timestamp IS NOT NULL
+                WHERE storage_id = ? AND unregistered_timestamp IS NOT NULL
                 """
         ).formatted(TABLE_RECIPIENT);
         var count = 0;
@@ -1002,6 +1010,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
 
         if (!pair.second().isEmpty()) {
+            logger.debug("Resolved address {}, merging {} other recipients", address, pair.second().size());
             try (final var connection = database.getConnection()) {
                 connection.setAutoCommit(false);
                 mergeRecipients(connection, pair.first(), pair.second());
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 2e557e1a..6114a018 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -105,8 +105,12 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
 
         IdentityState identityState;
         byte[] identityKey;
-        if ((remote.getIdentityState() != local.getIdentityState() && remote.getIdentityKey().isPresent())
-                || (remote.getIdentityKey().isPresent() && local.getIdentityKey().isEmpty())) {
+        if (remote.getIdentityKey().isPresent() && (
+                remote.getIdentityState() != local.getIdentityState()
+                        || local.getIdentityKey().isEmpty()
+                        || !account.isPrimaryDevice()
+
+        )) {
             identityState = remote.getIdentityState();
             identityKey = remote.getIdentityKey().get();
         } else {
@@ -114,9 +118,10 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
             identityKey = local.getIdentityKey().orElse(null);
         }
 
-        if (local.getAci().isPresent() && identityKey != null && remote.getIdentityKey().isPresent() && !Arrays.equals(
-                identityKey,
-                remote.getIdentityKey().get())) {
+        if (local.getAci().isPresent()
+                && local.getIdentityKey().isPresent()
+                && remote.getIdentityKey().isPresent()
+                && !Arrays.equals(local.getIdentityKey().get(), remote.getIdentityKey().get())) {
             logger.debug("The local and remote identity keys do not match for {}. Enqueueing a profile fetch.",
                     local.getAci().orElse(null));
             final var address = getRecipientAddress(local);
@@ -141,13 +146,12 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
 
         PNI pni;
         String e164;
-        if (e164sMatchButPnisDont) {
-            logger.debug("Matching E164s, but the PNIs differ! Trusting our local pair.");
-            // TODO [pnp] Schedule CDS fetch?
-            pni = local.getPni().get();
-            e164 = local.getNumber().get();
-        } else if (pnisMatchButE164sDont) {
-            logger.debug("Matching PNIs, but the E164s differ! Trusting our local pair.");
+        if (!account.isPrimaryDevice() && (e164sMatchButPnisDont || pnisMatchButE164sDont)) {
+            if (e164sMatchButPnisDont) {
+                logger.debug("Matching E164s, but the PNIs differ! Trusting our local pair.");
+            } else if (pnisMatchButE164sDont) {
+                logger.debug("Matching PNIs, but the E164s differ! Trusting our local pair.");
+            }
             // TODO [pnp] Schedule CDS fetch?
             pni = local.getPni().get();
             e164 = local.getNumber().get();
@@ -235,41 +239,25 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 || profileShared != contactRecord.isProfileSharingEnabled()
                 || archived != contactRecord.isArchived()
                 || hidden != contactRecord.isHidden()
-                || (
-                contactRecord.getSystemGivenName().isPresent() && !contactRecord.getSystemGivenName()
-                        .get()
-                        .equals(contactGivenName)
-        )
-                || (
-                contactRecord.getSystemFamilyName().isPresent() && !contactRecord.getSystemFamilyName()
-                        .get()
-                        .equals(contactFamilyName)
-        )) {
+                || !Objects.equals(contactRecord.getSystemGivenName().orElse(null), contactGivenName)
+                || !Objects.equals(contactRecord.getSystemFamilyName().orElse(null), contactFamilyName)) {
             logger.debug("Storing new or updated contact {}", recipientId);
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
             final var newContact = contactBuilder.withIsBlocked(contactRecord.isBlocked())
                     .withIsProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
                     .withIsArchived(contactRecord.isArchived())
-                    .withIsHidden(contactRecord.isHidden());
-            if (contactRecord.getSystemGivenName().isPresent() || contactRecord.getSystemFamilyName().isPresent()) {
-                newContact.withGivenName(contactRecord.getSystemGivenName().orElse(null))
-                        .withFamilyName(contactRecord.getSystemFamilyName().orElse(null));
-            }
+                    .withIsHidden(contactRecord.isHidden())
+                    .withGivenName(contactRecord.getSystemGivenName().orElse(null))
+                    .withFamilyName(contactRecord.getSystemFamilyName().orElse(null));
             account.getRecipientStore().storeContact(connection, recipientId, newContact.build());
         }
 
         final var profile = recipient.getProfile();
         final var profileGivenName = profile == null ? null : profile.getGivenName();
         final var profileFamilyName = profile == null ? null : profile.getFamilyName();
-        if ((
-                contactRecord.getProfileGivenName().isPresent() && !contactRecord.getProfileGivenName()
-                        .get()
-                        .equals(profileGivenName)
-        ) || (
-                contactRecord.getProfileFamilyName().isPresent() && !contactRecord.getProfileFamilyName()
-                        .get()
-                        .equals(profileFamilyName)
-        )) {
+        if (!Objects.equals(contactRecord.getProfileGivenName().orElse(null), profileGivenName) || !Objects.equals(
+                contactRecord.getProfileFamilyName().orElse(null),
+                profileFamilyName)) {
             final var profileBuilder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
             final var newProfile = profileBuilder.withGivenName(contactRecord.getProfileGivenName().orElse(null))
                     .withFamilyName(contactRecord.getProfileFamilyName().orElse(null))
@@ -285,7 +273,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 logger.warn("Received invalid contact profile key from storage");
             }
         }
-        if (contactRecord.getIdentityKey().isPresent() && contactRecord.getAci().orElse(null) != null) {
+        if (contactRecord.getIdentityKey().isPresent() && contactRecord.getAci().isPresent()) {
             try {
                 logger.trace("Storing identity key {}", recipientId);
                 final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get());
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
index 2b6334e0..68b5f9cc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
@@ -55,7 +55,9 @@ abstract class DefaultStorageRecordProcessor<E extends SignalRecord> implements
         }
 
         if (matchedRecords.contains(local.get())) {
-            debug(remote.getId(), remote, "Multiple remote records map to the same local record! Ignoring this one.");
+            debug(remote.getId(),
+                    remote,
+                    "Multiple remote records map to the same local record " + local.get() + "! Ignoring this one.");
             return;
         }
 

From 76fe6ad7999dee19ddbe80f518c62c4685ef95b4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 28 Jan 2024 17:57:40 +0100
Subject: [PATCH 351/672] Recreate recipient database with aci column

---
 graalvm-config-dir/reflect-config.json        |   9 +-
 graalvm-config-dir/resource-config.json       |   2 +-
 .../org/asamk/signal/manager/api/Contact.java |  40 +++-
 .../manager/storage/AccountDatabase.java      | 171 ++++++++++++------
 .../signal/manager/storage/SignalAccount.java |  17 +-
 .../storage/groups/LegacyGroupStore.java      |   2 +-
 .../storage/profiles/LegacyProfileStore.java  |   4 +-
 .../recipients/LegacyRecipientStore.java      |   2 +-
 .../recipients/LegacyRecipientStore2.java     |   6 +-
 .../recipients/MergeRecipientHelper.java      |  25 +--
 .../storage/recipients/RecipientAddress.java  | 115 ++++++------
 .../storage/recipients/RecipientStore.java    | 143 ++++++++-------
 .../syncStorage/ContactRecordProcessor.java   |  20 +-
 .../syncStorage/StorageSyncModels.java        |   8 +-
 .../syncStorage/StorageSyncValidations.java   |   5 +-
 .../recipients/MergeRecipientHelperTest.java  |  32 ++--
 .../asamk/signal/dbus/DbusManagerImpl.java    |  13 +-
 17 files changed, 375 insertions(+), 239 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index ea6babe4..186f507f 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2619,7 +2619,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }, {"name":"getUsernameLinkEncryptedValue","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }, {"name":"<init>","parameterTypes":["java.lang.String","boolean"] }, {"name":"getKeepLinkHandle","parameterTypes":[] }, {"name":"getUsernameLinkEncryptedValue","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.push.SetUsernameLinkResponseBody",
@@ -2648,6 +2648,13 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"getCaptcha","parameterTypes":[] }, {"name":"getMcc","parameterTypes":[] }, {"name":"getMnc","parameterTypes":[] }, {"name":"getPushChallenge","parameterTypes":[] }, {"name":"getPushToken","parameterTypes":[] }, {"name":"getPushTokenType","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.VerificationCodeFailureResponseBody",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["boolean","java.lang.String"] }, {"name":"<init>","parameterTypes":["boolean","java.lang.String","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.VerificationSessionMetadataRequestBody",
   "allDeclaredFields":true,
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 6902124a..2c5463f7 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -215,6 +215,6 @@
   }]},
   "bundles":[{
     "name":"net.sourceforge.argparse4j.internal.ArgumentParserImpl",
-    "locales":["", "en", "und"]
+    "locales":["", "de", "en", "und"]
   }]
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
index f84c667b..cfe3f894 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -5,23 +5,31 @@ import org.whispersystems.signalservice.internal.util.Util;
 public record Contact(
         String givenName,
         String familyName,
+        String nickName,
         String color,
         int messageExpirationTime,
+        long muteUntil,
+        boolean hideStory,
         boolean isBlocked,
         boolean isArchived,
         boolean isProfileSharingEnabled,
-        boolean isHidden
+        boolean isHidden,
+        Long unregisteredTimestamp
 ) {
 
     private Contact(final Builder builder) {
         this(builder.givenName,
                 builder.familyName,
+                builder.nickName,
                 builder.color,
                 builder.messageExpirationTime,
+                builder.muteUntil,
+                builder.hideStory,
                 builder.isBlocked,
                 builder.isArchived,
                 builder.isProfileSharingEnabled,
-                builder.isHidden);
+                builder.isHidden,
+                builder.unregisteredTimestamp);
     }
 
     public static Builder newBuilder() {
@@ -32,12 +40,16 @@ public record Contact(
         Builder builder = new Builder();
         builder.givenName = copy.givenName();
         builder.familyName = copy.familyName();
+        builder.nickName = copy.nickName();
         builder.color = copy.color();
         builder.messageExpirationTime = copy.messageExpirationTime();
+        builder.muteUntil = copy.muteUntil();
+        builder.hideStory = copy.hideStory();
         builder.isBlocked = copy.isBlocked();
         builder.isArchived = copy.isArchived();
         builder.isProfileSharingEnabled = copy.isProfileSharingEnabled();
         builder.isHidden = copy.isHidden();
+        builder.unregisteredTimestamp = copy.unregisteredTimestamp();
         return builder;
     }
 
@@ -60,12 +72,16 @@ public record Contact(
 
         private String givenName;
         private String familyName;
+        private String nickName;
         private String color;
         private int messageExpirationTime;
+        private long muteUntil;
+        private boolean hideStory;
         private boolean isBlocked;
         private boolean isArchived;
         private boolean isProfileSharingEnabled;
         private boolean isHidden;
+        private Long unregisteredTimestamp;
 
         private Builder() {
         }
@@ -84,6 +100,11 @@ public record Contact(
             return this;
         }
 
+        public Builder withNickName(final String val) {
+            nickName = val;
+            return this;
+        }
+
         public Builder withColor(final String val) {
             color = val;
             return this;
@@ -94,6 +115,16 @@ public record Contact(
             return this;
         }
 
+        public Builder withMuteUntil(final long val) {
+            muteUntil = val;
+            return this;
+        }
+
+        public Builder withHideStory(final boolean val) {
+            hideStory = val;
+            return this;
+        }
+
         public Builder withIsBlocked(final boolean val) {
             isBlocked = val;
             return this;
@@ -114,6 +145,11 @@ public record Contact(
             return this;
         }
 
+        public Builder withUnregisteredTimestamp(final Long val) {
+            unregisteredTimestamp = val;
+            return this;
+        }
+
         public Contact build() {
             return new Contact(this);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 9e9eebf8..bedf4332 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -25,6 +25,7 @@ import org.whispersystems.signalservice.api.util.UuidUtil;
 import java.io.File;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.HashMap;
 import java.util.Optional;
 import java.util.UUID;
@@ -32,7 +33,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 21;
+    private static final long DATABASE_VERSION = 22;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -361,60 +362,7 @@ public class AccountDatabase extends Database {
         if (oldVersion < 15) {
             logger.debug("Updating database: Store serviceId as TEXT");
             try (final var statement = connection.createStatement()) {
-                statement.executeUpdate("""
-                                        CREATE TABLE tmp_mapping_table (
-                                          uuid BLOB NOT NULL,
-                                          address TEXT NOT NULL
-                                        ) STRICT;
-                                        """);
-
-                final var sql = (
-                        """
-                        SELECT r.uuid, r.pni
-                        FROM recipient r
-                        """
-                );
-                final var uuidAddressMapping = new HashMap<UUID, ServiceId>();
-                try (final var preparedStatement = connection.prepareStatement(sql)) {
-                    try (var result = Utils.executeQueryForStream(preparedStatement, (resultSet) -> {
-                        final var pni = Optional.ofNullable(resultSet.getBytes("pni"))
-                                .map(UuidUtil::parseOrNull)
-                                .map(ServiceId.PNI::from);
-                        final var serviceIdUuid = Optional.ofNullable(resultSet.getBytes("uuid"))
-                                .map(UuidUtil::parseOrNull);
-                        final var serviceId = serviceIdUuid.isPresent() && pni.isPresent() && serviceIdUuid.get()
-                                .equals(pni.get().getRawUuid())
-                                ? pni.<ServiceId>map(p -> p)
-                                : serviceIdUuid.<ServiceId>map(ACI::from);
-
-                        return new Pair<>(serviceId, pni);
-                    })) {
-                        result.forEach(p -> {
-                            final var serviceId = p.first();
-                            final var pni = p.second();
-                            if (serviceId.isPresent()) {
-                                uuidAddressMapping.put(serviceId.get().getRawUuid(), serviceId.get());
-                            }
-                            if (pni.isPresent()) {
-                                uuidAddressMapping.put(pni.get().getRawUuid(), pni.get());
-                            }
-                        });
-                    }
-                }
-
-                final var insertSql = """
-                                      INSERT INTO tmp_mapping_table (uuid, address)
-                                      VALUES (?,?)
-                                      """;
-                try (final var insertStatement = connection.prepareStatement(insertSql)) {
-                    for (final var entry : uuidAddressMapping.entrySet()) {
-                        final var uuid = entry.getKey();
-                        final var serviceId = entry.getValue();
-                        insertStatement.setBytes(1, UuidUtil.toByteArray(uuid));
-                        insertStatement.setString(2, serviceId.toString());
-                        insertStatement.execute();
-                    }
-                }
+                createUuidMappingTable(connection, statement);
 
                 statement.executeUpdate("""
                                         CREATE TABLE identity2 (
@@ -563,9 +511,120 @@ public class AccountDatabase extends Database {
             try (final var statement = connection.createStatement()) {
                 statement.executeUpdate("""
                                         ALTER TABLE recipient ADD unregistered_timestamp INTEGER;
-                                        UPDATE recipient SET pni = NULL WHERE uuid IS NOT NULL;
+                                        """);
+            }
+        }
+        if (oldVersion < 22) {
+            logger.debug("Updating database: Store recipient aci/pni as TEXT");
+            try (final var statement = connection.createStatement()) {
+                createUuidMappingTable(connection, statement);
+
+                statement.executeUpdate("""
+                                        CREATE TABLE recipient2 (
+                                          _id INTEGER PRIMARY KEY AUTOINCREMENT,
+                                          storage_id BLOB UNIQUE,
+                                          storage_record BLOB,
+                                          number TEXT UNIQUE,
+                                          username TEXT UNIQUE,
+                                          aci TEXT UNIQUE,
+                                          pni TEXT UNIQUE,
+                                          unregistered_timestamp INTEGER,
+                                          profile_key BLOB,
+                                          profile_key_credential BLOB,
+
+                                          given_name TEXT,
+                                          family_name TEXT,
+                                          nick_name TEXT,
+                                          color TEXT,
+
+                                          expiration_time INTEGER NOT NULL DEFAULT 0,
+                                          mute_until INTEGER NOT NULL DEFAULT 0,
+                                          blocked INTEGER NOT NULL DEFAULT FALSE,
+                                          archived INTEGER NOT NULL DEFAULT FALSE,
+                                          profile_sharing INTEGER NOT NULL DEFAULT FALSE,
+                                          hide_story INTEGER NOT NULL DEFAULT FALSE,
+                                          hidden INTEGER NOT NULL DEFAULT FALSE,
+
+                                          profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
+                                          profile_given_name TEXT,
+                                          profile_family_name TEXT,
+                                          profile_about TEXT,
+                                          profile_about_emoji TEXT,
+                                          profile_avatar_url_path TEXT,
+                                          profile_mobile_coin_address BLOB,
+                                          profile_unidentified_access_mode TEXT,
+                                          profile_capabilities TEXT
+                                        ) STRICT;
+                                        INSERT INTO recipient2 (_id, aci, pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities)
+                                          SELECT r._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.uuid AND t.address not like 'PNI:%') aci, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.pni AND t.address like 'PNI:%') pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities
+                                          FROM recipient r;
+                                        DROP TABLE recipient;
+                                        ALTER TABLE recipient2 RENAME TO recipient;
+
+                                        DROP TABLE tmp_mapping_table;
                                         """);
             }
         }
     }
+
+    private static void createUuidMappingTable(
+            final Connection connection, final Statement statement
+    ) throws SQLException {
+        statement.executeUpdate("""
+                                CREATE TABLE tmp_mapping_table (
+                                  uuid BLOB NOT NULL,
+                                  address TEXT NOT NULL
+                                ) STRICT;
+                                """);
+
+        final var sql = (
+                """
+                SELECT r.uuid, r.pni
+                FROM recipient r
+                """
+        );
+        final var uuidAddressMapping = new HashMap<UUID, ServiceId>();
+        try (final var preparedStatement = connection.prepareStatement(sql)) {
+            try (var result = Utils.executeQueryForStream(preparedStatement, (resultSet) -> {
+                final var pni = Optional.ofNullable(resultSet.getBytes("pni"))
+                        .map(UuidUtil::parseOrNull)
+                        .map(ServiceId.PNI::from);
+                final var serviceIdUuid = Optional.ofNullable(resultSet.getBytes("uuid")).map(UuidUtil::parseOrNull);
+                final var serviceId = serviceIdUuid.isPresent() && pni.isPresent() && serviceIdUuid.get()
+                        .equals(pni.get().getRawUuid())
+                        ? pni.<ServiceId>map(p -> p)
+                        : serviceIdUuid.<ServiceId>map(ACI::from);
+
+                return new Pair<>(serviceId, pni);
+            })) {
+                result.forEach(p -> {
+                    final var serviceId = p.first();
+                    final var pni = p.second();
+                    if (serviceId.isPresent()) {
+                        final var rawUuid = serviceId.get().getRawUuid();
+                        if (!uuidAddressMapping.containsKey(rawUuid)) {
+                            uuidAddressMapping.put(rawUuid, serviceId.get());
+                        }
+                    }
+                    if (pni.isPresent()) {
+                        uuidAddressMapping.put(pni.get().getRawUuid(), pni.get());
+                    }
+                });
+            }
+        }
+
+        final var insertSql = """
+                              INSERT INTO tmp_mapping_table (uuid, address)
+                              VALUES (?,?)
+                              """;
+        try (final var insertStatement = connection.prepareStatement(insertSql)) {
+            for (final var entry : uuidAddressMapping.entrySet()) {
+                final var uuid = entry.getKey();
+                final var serviceId = entry.getValue();
+                insertStatement.setBytes(1, UuidUtil.toByteArray(uuid));
+                insertStatement.setString(2, serviceId.toString());
+                insertStatement.execute();
+            }
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index fa5496d2..c324b012 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -385,8 +385,15 @@ public class SignalAccount implements Closeable {
         }
         getRecipientStore().deleteRecipientData(recipientId);
         getMessageCache().deleteMessages(recipientId);
-        if (recipientAddress.serviceId().isPresent()) {
-            final var serviceId = recipientAddress.serviceId().get();
+        if (recipientAddress.aci().isPresent()) {
+            final var serviceId = recipientAddress.aci().get();
+            aciAccountData.getSessionStore().deleteAllSessions(serviceId);
+            pniAccountData.getSessionStore().deleteAllSessions(serviceId);
+            getIdentityKeyStore().deleteIdentity(serviceId);
+            getSenderKeyStore().deleteAll(serviceId);
+        }
+        if (recipientAddress.pni().isPresent()) {
+            final var serviceId = recipientAddress.pni().get();
             aciAccountData.getSessionStore().deleteAllSessions(serviceId);
             pniAccountData.getSessionStore().deleteAllSessions(serviceId);
             getIdentityKeyStore().deleteIdentity(serviceId);
@@ -837,13 +844,17 @@ public class SignalAccount implements Closeable {
                 final var recipientId = getRecipientStore().resolveRecipientTrusted(contact.getAddress());
                 getContactStore().storeContact(recipientId,
                         new Contact(contact.name,
+                                null,
                                 null,
                                 contact.color,
                                 contact.messageExpirationTime,
+                                0,
+                                false,
                                 contact.blocked,
                                 contact.archived,
                                 false,
-                                false));
+                                false,
+                                null));
 
                 // Store profile keys only in profile store
                 var profileKeyString = contact.profileKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index a35d4513..b5698b51 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -45,7 +45,7 @@ public class LegacyGroupStore {
             if (g instanceof Storage.GroupV1 g1) {
                 final var members = g1.members.stream().map(m -> {
                     if (m.recipientId == null) {
-                        return recipientResolver.resolveRecipient(new RecipientAddress(ServiceId.parseOrNull(m.uuid),
+                        return recipientResolver.resolveRecipient(new RecipientAddress(ServiceId.ACI.parseOrNull(m.uuid),
                                 m.number));
                     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
index cf100257..abb66470 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
@@ -43,7 +43,9 @@ public class LegacyProfileStore {
             if (node.isArray()) {
                 for (var entry : node) {
                     var name = entry.hasNonNull("name") ? entry.get("name").asText() : null;
-                    var serviceId = entry.hasNonNull("uuid") ? ServiceId.parseOrNull(entry.get("uuid").asText()) : null;
+                    var serviceId = entry.hasNonNull("uuid")
+                            ? ServiceId.ACI.parseOrNull(entry.get("uuid").asText())
+                            : null;
                     final var address = new RecipientAddress(serviceId, name);
                     ProfileKey profileKey = null;
                     try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
index 039e8471..fb1e188b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
@@ -36,7 +36,7 @@ public class LegacyRecipientStore {
             if (node.isArray()) {
                 for (var recipient : node) {
                     var recipientName = recipient.get("name").asText();
-                    var serviceId = ServiceId.parseOrThrow(recipient.get("uuid").asText());
+                    var serviceId = ServiceId.ACI.parseOrThrow(recipient.get("uuid").asText());
                     addresses.add(new RecipientAddress(serviceId, recipientName));
                 }
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index 02061a66..17f136ec 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -39,13 +39,17 @@ public class LegacyRecipientStore2 {
                 Contact contact = null;
                 if (r.contact != null) {
                     contact = new Contact(r.contact.name,
+                            null,
                             null,
                             r.contact.color,
                             r.contact.messageExpirationTime,
+                            0,
+                            false,
                             r.contact.blocked,
                             r.contact.archived,
                             r.contact.profileSharingEnabled,
-                            false);
+                            false,
+                            null);
                 }
 
                 ProfileKey profileKey = null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index dd18f401..2fa91a59 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -32,22 +32,19 @@ public class MergeRecipientHelper {
                 return new Pair<>(recipient.id(), List.of());
             }
 
-            if (recipient.address().serviceId().isEmpty() || (
-                    recipient.address().serviceId().equals(address.serviceId())
-            ) || (
-                    recipient.address().pni().isPresent() && recipient.address().pni().equals(address.serviceId())
-            ) || (
-                    recipient.address().serviceId().equals(address.pni())
-            ) || (
-                    address.pni().isPresent() && address.pni().equals(recipient.address().pni())
-            )) {
+            if (recipient.address().aci().isEmpty() || (
+                    address.aci().isEmpty() && (
+                            address.pni().isEmpty()
+                                    || recipient.address().pni().equals(address.pni())
+                    )
+            ) || recipient.address().aci().equals(address.aci())) {
                 logger.debug("Got existing recipient {}, updating with high trust address", recipient.id());
                 store.updateRecipientAddress(recipient.id(), recipient.address().withIdentifiersFrom(address));
                 return new Pair<>(recipient.id(), List.of());
             }
 
             logger.debug(
-                    "Got recipient {} existing with number/pni/username, but different serviceId, so stripping its number and adding new recipient",
+                    "Got recipient {} existing with number/pni/username, but different aci, so stripping its number and adding new recipient",
                     recipient.id());
             store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(address));
 
@@ -55,14 +52,10 @@ public class MergeRecipientHelper {
         }
 
         var resultingRecipient = recipients.stream()
-                .filter(r -> r.address().serviceId().equals(address.serviceId()) || r.address()
-                        .pni()
-                        .equals(address.serviceId()))
+                .filter(r -> r.address().aci().isPresent() && r.address().aci().equals(address.aci()))
                 .findFirst();
         if (resultingRecipient.isEmpty() && address.pni().isPresent()) {
-            resultingRecipient = recipients.stream().filter(r -> r.address().serviceId().equals(address.pni()) || (
-                    address.serviceId().equals(address.pni()) && r.address().pni().equals(address.pni())
-            )).findFirst();
+            resultingRecipient = recipients.stream().filter(r -> r.address().pni().equals(address.pni())).findFirst();
         }
 
         final Set<RecipientWithAddress> remainingRecipients;
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 e4c24c99..33b8a5f9 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
@@ -8,59 +8,60 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import java.util.Optional;
 
 public record RecipientAddress(
-        Optional<ServiceId> serviceId, Optional<PNI> pni, Optional<String> number, Optional<String> username
+        Optional<ACI> aci, Optional<PNI> pni, Optional<String> number, Optional<String> username
 ) {
 
     /**
      * Construct a RecipientAddress.
      *
-     * @param serviceId The ACI or PNI of the user, if available.
-     * @param number    The phone number of the user, if available.
+     * @param aci      The ACI of the user, if available.
+     * @param pni      The PNI of the user, if available.
+     * @param number   The phone number of the user, if available.
+     * @param username The username of the user, if available.
      */
     public RecipientAddress {
-        if (serviceId.isPresent() && serviceId.get().isUnknown()) {
-            serviceId = Optional.empty();
+        if (aci.isPresent() && aci.get().isUnknown()) {
+            aci = Optional.empty();
         }
         if (pni.isPresent() && pni.get().isUnknown()) {
             pni = Optional.empty();
         }
-        if (serviceId.isEmpty() && pni.isPresent()) {
-            serviceId = Optional.of(pni.get());
-        }
-        if (serviceId.isPresent() && serviceId.get() instanceof PNI sPNI) {
-            if (pni.isPresent() && !sPNI.equals(pni.get())) {
-                throw new AssertionError("Must not have two different PNIs!");
-            }
-            if (pni.isEmpty()) {
-                pni = Optional.of(sPNI);
-            }
-        }
-        if (serviceId.isEmpty() && number.isEmpty()) {
+        if (aci.isEmpty() && pni.isEmpty() && number.isEmpty()) {
             throw new AssertionError("Must have either a ServiceId or E164 number!");
         }
     }
 
     public RecipientAddress(Optional<ServiceId> serviceId, Optional<String> number) {
-        this(serviceId, Optional.empty(), number, Optional.empty());
+        this(serviceId.filter(s -> s instanceof ACI).map(s -> (ACI) s),
+                serviceId.filter(s -> s instanceof PNI).map(s -> (PNI) s),
+                number,
+                Optional.empty());
     }
 
-    public RecipientAddress(ServiceId serviceId, String e164) {
-        this(Optional.ofNullable(serviceId), Optional.empty(), Optional.ofNullable(e164), Optional.empty());
+    public RecipientAddress(ACI aci, String e164) {
+        this(Optional.ofNullable(aci), Optional.empty(), Optional.ofNullable(e164), Optional.empty());
     }
 
-    public RecipientAddress(ServiceId serviceId, PNI pni, String e164) {
-        this(Optional.ofNullable(serviceId), Optional.ofNullable(pni), Optional.ofNullable(e164), Optional.empty());
+    public RecipientAddress(String e164) {
+        this(Optional.empty(), Optional.empty(), Optional.ofNullable(e164), Optional.empty());
     }
 
-    public RecipientAddress(ServiceId serviceId, PNI pni, String e164, String username) {
-        this(Optional.ofNullable(serviceId),
+    public RecipientAddress(ACI aci, PNI pni, String e164) {
+        this(Optional.ofNullable(aci), Optional.ofNullable(pni), Optional.ofNullable(e164), Optional.empty());
+    }
+
+    public RecipientAddress(ACI aci, PNI pni, String e164, String username) {
+        this(Optional.ofNullable(aci),
                 Optional.ofNullable(pni),
                 Optional.ofNullable(e164),
                 Optional.ofNullable(username));
     }
 
     public RecipientAddress(SignalServiceAddress address) {
-        this(Optional.of(address.getServiceId()), Optional.empty(), address.getNumber(), Optional.empty());
+        this(address.getServiceId() instanceof ACI ? Optional.of((ACI) address.getServiceId()) : Optional.empty(),
+                address.getServiceId() instanceof PNI ? Optional.of((PNI) address.getServiceId()) : Optional.empty(),
+                address.getNumber(),
+                Optional.empty());
     }
 
     public RecipientAddress(org.asamk.signal.manager.api.RecipientAddress address) {
@@ -72,30 +73,28 @@ public record RecipientAddress(
     }
 
     public RecipientAddress withIdentifiersFrom(RecipientAddress address) {
-        return new RecipientAddress((
-                this.serviceId.isEmpty() || this.isServiceIdPNI() || this.serviceId.equals(address.pni)
-        ) && !address.isServiceIdPNI() ? address.serviceId : this.serviceId,
+        return new RecipientAddress(address.aci.or(this::aci),
                 address.pni.or(this::pni),
                 address.number.or(this::number),
                 address.username.or(this::username));
     }
 
     public RecipientAddress removeIdentifiersFrom(RecipientAddress address) {
-        return new RecipientAddress(address.serviceId.equals(this.serviceId) || address.pni.equals(this.serviceId)
-                ? Optional.empty()
-                : this.serviceId,
-                address.pni.equals(this.pni) || address.serviceId.equals(this.pni) ? Optional.empty() : this.pni,
+        return new RecipientAddress(address.aci.equals(this.aci) ? Optional.empty() : this.aci,
+                address.pni.equals(this.pni) ? Optional.empty() : this.pni,
                 address.number.equals(this.number) ? Optional.empty() : this.number,
                 address.username.equals(this.username) ? Optional.empty() : this.username);
     }
 
-    public Optional<ACI> aci() {
-        return serviceId.map(s -> s instanceof ServiceId.ACI aci ? aci : null);
+    public Optional<ServiceId> serviceId() {
+        return aci.map(aci -> (ServiceId) aci).or(this::pni);
     }
 
     public String getIdentifier() {
-        if (serviceId.isPresent()) {
-            return serviceId.get().toString();
+        if (aci.isPresent()) {
+            return aci.get().toString();
+        } else if (pni.isPresent()) {
+            return pni.get().toString();
         } else if (number.isPresent()) {
             return number.get();
         } else {
@@ -106,38 +105,31 @@ public record RecipientAddress(
     public String getLegacyIdentifier() {
         if (number.isPresent()) {
             return number.get();
-        } else if (serviceId.isPresent()) {
-            return serviceId.get().toString();
+        } else if (aci.isPresent()) {
+            return aci.get().toString();
+        } else if (pni.isPresent()) {
+            return pni.get().toString();
         } else {
             throw new AssertionError("Given the checks in the constructor, this should not be possible.");
         }
     }
 
     public boolean matches(RecipientAddress other) {
-        return (serviceId.isPresent() && other.serviceId.isPresent() && serviceId.get().equals(other.serviceId.get()))
-                || (
-                pni.isPresent() && other.serviceId.isPresent() && pni.get().equals(other.serviceId.get())
-        )
-                || (
-                serviceId.isPresent() && other.pni.isPresent() && serviceId.get().equals(other.pni.get())
-        )
-                || (
+        return (aci.isPresent() && other.aci.isPresent() && aci.get().equals(other.aci.get())) || (
                 pni.isPresent() && other.pni.isPresent() && pni.get().equals(other.pni.get())
-        )
-                || (
+        ) || (
                 number.isPresent() && other.number.isPresent() && number.get().equals(other.number.get())
         );
     }
 
     public boolean hasSingleIdentifier() {
-        final var identifiersCount = serviceId().map(s -> 1).orElse(0)
-                + number().map(s -> 1).orElse(0)
-                + username().map(s -> 1).orElse(0);
+        final var identifiersCount = aci().map(s -> 1).orElse(0) + pni().map(s -> 1).orElse(0) + number().map(s -> 1)
+                .orElse(0) + username().map(s -> 1).orElse(0);
         return identifiersCount == 1;
     }
 
     public boolean hasIdentifiersOf(RecipientAddress address) {
-        return (address.serviceId.isEmpty() || address.serviceId.equals(serviceId) || address.serviceId.equals(pni))
+        return (address.aci.isEmpty() || address.aci.equals(aci))
                 && (address.pni.isEmpty() || address.pni.equals(pni))
                 && (address.number.isEmpty() || address.number.equals(number))
                 && (address.username.isEmpty() || address.username.equals(username));
@@ -145,13 +137,12 @@ public record RecipientAddress(
 
     public boolean hasAdditionalIdentifiersThan(RecipientAddress address) {
         return (
-                serviceId.isPresent() && (
-                        address.serviceId.isEmpty() || (
-                                !address.serviceId.equals(serviceId) && !address.pni.equals(serviceId)
-                        )
+                aci.isPresent() && (
+                        address.aci.isEmpty() || !address.aci.equals(aci)
+
                 )
         ) || (
-                pni.isPresent() && !address.serviceId.equals(pni) && (
+                pni.isPresent() && (
                         address.pni.isEmpty() || !address.pni.equals(pni)
                 )
         ) || (
@@ -166,19 +157,15 @@ public record RecipientAddress(
     }
 
     public boolean hasOnlyPniAndNumber() {
-        return pni.isPresent() && serviceId.equals(pni) && number.isPresent();
-    }
-
-    public boolean isServiceIdPNI() {
-        return serviceId.isPresent() && (pni.isPresent() && serviceId.equals(pni));
+        return pni.isPresent() && aci.isEmpty() && number.isPresent();
     }
 
     public SignalServiceAddress toSignalServiceAddress() {
-        return new SignalServiceAddress(serviceId.orElse(ACI.UNKNOWN), number);
+        return new SignalServiceAddress(aci.orElse(ACI.UNKNOWN), number);
     }
 
     public org.asamk.signal.manager.api.RecipientAddress toApiRecipientAddress() {
-        return new org.asamk.signal.manager.api.RecipientAddress(serviceId().map(ServiceId::getRawUuid),
+        return new org.asamk.signal.manager.api.RecipientAddress(aci().map(ServiceId::getRawUuid),
                 number(),
                 username());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 285d5cf6..6be22754 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -19,7 +19,6 @@ import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.storage.StorageId;
-import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -41,7 +40,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private static final Logger logger = LoggerFactory.getLogger(RecipientStore.class);
     private static final String TABLE_RECIPIENT = "recipient";
-    private static final String SQL_IS_CONTACT = "r.given_name IS NOT NULL OR r.family_name IS NOT NULL OR r.expiration_time > 0 OR r.profile_sharing = TRUE OR r.color IS NOT NULL OR r.blocked = TRUE OR r.archived = TRUE";
+    private static final String SQL_IS_CONTACT = "r.given_name IS NOT NULL OR r.family_name IS NOT NULL OR r.nick_name IS NOT NULL OR r.expiration_time > 0 OR r.profile_sharing = TRUE OR r.color IS NOT NULL OR r.blocked = TRUE OR r.archived = TRUE";
 
     private final RecipientMergeHandler recipientMergeHandler;
     private final SelfAddressProvider selfAddressProvider;
@@ -63,20 +62,23 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       storage_record BLOB,
                                       number TEXT UNIQUE,
                                       username TEXT UNIQUE,
-                                      uuid BLOB UNIQUE,
-                                      pni BLOB UNIQUE,
+                                      aci TEXT UNIQUE,
+                                      pni TEXT UNIQUE,
                                       unregistered_timestamp INTEGER,
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
 
                                       given_name TEXT,
                                       family_name TEXT,
+                                      nick_name TEXT,
                                       color TEXT,
 
                                       expiration_time INTEGER NOT NULL DEFAULT 0,
+                                      mute_until INTEGER NOT NULL DEFAULT 0,
                                       blocked INTEGER NOT NULL DEFAULT FALSE,
                                       archived INTEGER NOT NULL DEFAULT FALSE,
                                       profile_sharing INTEGER NOT NULL DEFAULT FALSE,
+                                      hide_story INTEGER NOT NULL DEFAULT FALSE,
                                       hidden INTEGER NOT NULL DEFAULT FALSE,
 
                                       profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
@@ -108,7 +110,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public RecipientAddress resolveRecipientAddress(RecipientId recipientId) {
         final var sql = (
                 """
-                SELECT r.number, r.uuid, r.pni, r.username
+                SELECT r.number, r.aci, r.pni, r.username
                 FROM %s r
                 WHERE r._id = ?
                 """
@@ -310,8 +312,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public RecipientId resolveRecipientTrusted(
             final Optional<ACI> aci, final Optional<PNI> pni, final Optional<String> number
     ) {
-        final var serviceId = aci.map(a -> (ServiceId) a).or(() -> pni);
-        return resolveRecipientTrusted(new RecipientAddress(serviceId, pni, number, Optional.empty()));
+        return resolveRecipientTrusted(new RecipientAddress(aci, pni, number, Optional.empty()));
     }
 
     @Override
@@ -341,9 +342,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public List<Pair<RecipientId, Contact>> getContacts() {
         final var sql = (
                 """
-                SELECT r._id, r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden
+                SELECT r._id, r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                 FROM %s r
-                WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL) AND %s AND r.hidden = FALSE
+                WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
                 """
         ).formatted(TABLE_RECIPIENT, SQL_IS_CONTACT);
         try (final var connection = database.getConnection()) {
@@ -363,9 +364,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 SELECT r._id,
-                       r.number, r.uuid, r.pni, r.username,
+                       r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden,
+                       r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
                        r.storage_record
                 FROM %s r
@@ -382,9 +383,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 SELECT r._id,
-                       r.number, r.uuid, r.pni, r.username,
+                       r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden,
+                       r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
                        r.storage_record
                 FROM %s r
@@ -417,16 +418,16 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 SELECT r._id,
-                       r.number, r.uuid, r.pni, r.username,
+                       r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden,
+                       r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
                        r.storage_record
                 FROM %s r
-                WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL) AND %s
+                WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s
                 """
         ).formatted(TABLE_RECIPIENT, sqlWhere.isEmpty() ? "TRUE" : String.join(" AND ", sqlWhere));
-        final var selfServiceId = selfAddressProvider.getSelfAddress().serviceId();
+        final var selfAddress = selfAddressProvider.getSelfAddress();
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 if (blocked.isPresent()) {
@@ -436,7 +437,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                     return result.filter(r -> name.isEmpty() || (
                             r.getContact() != null && name.get().equals(r.getContact().getName())
                     ) || (r.getProfile() != null && name.get().equals(r.getProfile().getDisplayName()))).map(r -> {
-                        if (r.getAddress().serviceId().equals(selfServiceId)) {
+                        if (r.getAddress().matches(selfAddress)) {
                             return Recipient.newBuilder(r)
                                     .withProfileKey(selfProfileKeyProvider.getSelfProfileKey())
                                     .build();
@@ -482,21 +483,21 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public Map<ServiceId, ProfileKey> getServiceIdToProfileKeyMap() {
         final var sql = (
                 """
-                SELECT r.uuid, r.profile_key
+                SELECT r.aci, r.profile_key
                 FROM %s r
-                WHERE r.uuid IS NOT NULL AND r.profile_key IS NOT NULL
+                WHERE r.aci IS NOT NULL AND r.profile_key IS NOT NULL
                 """
         ).formatted(TABLE_RECIPIENT);
-        final var selfServiceId = selfAddressProvider.getSelfAddress().serviceId().orElse(null);
+        final var selfAci = selfAddressProvider.getSelfAddress().aci().orElse(null);
         try (final var connection = database.getConnection()) {
             try (final var statement = connection.prepareStatement(sql)) {
                 return Utils.executeQueryForStream(statement, resultSet -> {
-                    final var serviceId = ServiceId.parseOrThrow(resultSet.getBytes("uuid"));
-                    if (serviceId.equals(selfServiceId)) {
-                        return new Pair<>(serviceId, selfProfileKeyProvider.getSelfProfileKey());
+                    final var aci = ACI.parseOrThrow(resultSet.getString("aci"));
+                    if (aci.equals(selfAci)) {
+                        return new Pair<>(aci, selfProfileKeyProvider.getSelfProfileKey());
                     }
                     final var profileKey = getProfileKeyFromResultSet(resultSet);
-                    return new Pair<>(serviceId, profileKey);
+                    return new Pair<>(aci, profileKey);
                 }).filter(Objects::nonNull).collect(Collectors.toMap(Pair::first, Pair::second));
             }
         } catch (SQLException e) {
@@ -509,7 +510,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
                 SELECT r._id
                 FROM %s r
-                WHERE (r.number IS NOT NULL OR r.uuid IS NOT NULL)
+                WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL)
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
@@ -657,7 +658,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public List<StorageId> getStorageIds(Connection connection) throws SQLException {
         final var sql = """
                         SELECT r.storage_id
-                        FROM %s r WHERE r.storage_id IS NOT NULL AND r._id != ? AND (r.uuid IS NOT NULL OR r.pni IS NOT NULL)
+                        FROM %s r WHERE r.storage_id IS NOT NULL AND r._id != ? AND (r.aci IS NOT NULL OR r.pni IS NOT NULL)
                         """.formatted(TABLE_RECIPIENT);
         final var selfRecipientId = resolveRecipient(connection, selfAddressProvider.getSelfAddress());
         try (final var statement = connection.prepareStatement(sql)) {
@@ -767,7 +768,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         long start = System.nanoTime();
         final var sql = (
                 """
-                INSERT INTO %s (_id, number, uuid)
+                INSERT INTO %s (_id, number, aci)
                 VALUES (?, ?, ?)
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -780,12 +781,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 for (final var recipient : recipients.values()) {
                     statement.setLong(1, recipient.getRecipientId().id());
                     statement.setString(2, recipient.getAddress().number().orElse(null));
-                    statement.setBytes(3,
-                            recipient.getAddress()
-                                    .serviceId()
-                                    .map(ServiceId::getRawUuid)
-                                    .map(UuidUtil::toByteArray)
-                                    .orElse(null));
+                    statement.setString(3, recipient.getAddress().aci().map(ACI::toString).orElse(null));
                     statement.executeUpdate();
                 }
             }
@@ -829,19 +825,27 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET given_name = ?, family_name = ?, expiration_time = ?, profile_sharing = ?, color = ?, blocked = ?, archived = ?
+                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, archived = ?, unregistered_timestamp = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, contact == null ? null : contact.givenName());
             statement.setString(2, contact == null ? null : contact.familyName());
-            statement.setInt(3, contact == null ? 0 : contact.messageExpirationTime());
-            statement.setBoolean(4, contact != null && contact.isProfileSharingEnabled());
-            statement.setString(5, contact == null ? null : contact.color());
-            statement.setBoolean(6, contact != null && contact.isBlocked());
-            statement.setBoolean(7, contact != null && contact.isArchived());
-            statement.setLong(8, recipientId.id());
+            statement.setString(3, contact == null ? null : contact.nickName());
+            statement.setInt(4, contact == null ? 0 : contact.messageExpirationTime());
+            statement.setLong(5, contact == null ? 0 : contact.muteUntil());
+            statement.setBoolean(6, contact != null && contact.hideStory());
+            statement.setBoolean(7, contact != null && contact.isProfileSharingEnabled());
+            statement.setString(8, contact == null ? null : contact.color());
+            statement.setBoolean(9, contact != null && contact.isBlocked());
+            statement.setBoolean(10, contact != null && contact.isArchived());
+            if (contact == null || contact.unregisteredTimestamp() == null) {
+                statement.setNull(11, Types.INTEGER);
+            } else {
+                statement.setLong(11, contact.unregisteredTimestamp());
+            }
+            statement.setLong(12, recipientId.id());
             statement.executeUpdate();
         }
         rotateStorageId(connection, recipientId);
@@ -1055,12 +1059,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     private RecipientId resolveRecipientLocked(
             Connection connection, RecipientAddress address
     ) throws SQLException {
-        final var aci = address.aci().isEmpty()
+        final var byAci = address.aci().isEmpty()
                 ? Optional.<RecipientWithAddress>empty()
                 : findByServiceId(connection, address.aci().get());
 
-        if (aci.isPresent()) {
-            return aci.get().id();
+        if (byAci.isPresent()) {
+            return byAci.get().id();
         }
 
         final var byPni = address.pni().isEmpty()
@@ -1104,7 +1108,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
         if (recipient.isEmpty()) {
             logger.debug("Got new recipient, number is unknown");
-            return addNewRecipient(connection, new RecipientAddress(null, number));
+            return addNewRecipient(connection, new RecipientAddress(number));
         }
 
         return recipient.get().id();
@@ -1115,15 +1119,15 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     ) throws SQLException {
         final var sql = (
                 """
-                INSERT INTO %s (number, uuid, pni, username)
+                INSERT INTO %s (number, aci, pni, username)
                 VALUES (?, ?, ?, ?)
                 RETURNING _id
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, address.number().orElse(null));
-            statement.setBytes(2, address.aci().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setString(2, address.aci().map(ACI::toString).orElse(null));
+            statement.setString(3, address.pni().map(PNI::toString).orElse(null));
             statement.setString(4, address.username().orElse(null));
             final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
             if (generatedKey.isPresent()) {
@@ -1142,7 +1146,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final var sql = (
                     """
                     UPDATE %s
-                    SET number = NULL, uuid = NULL, pni = NULL, username = NULL, storage_id = NULL
+                    SET number = NULL, aci = NULL, pni = NULL, username = NULL, storage_id = NULL
                     WHERE _id = ?
                     """
             ).formatted(TABLE_RECIPIENT);
@@ -1161,14 +1165,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final var sql = (
                     """
                     UPDATE %s
-                    SET number = ?, uuid = ?, pni = ?, username = ?
+                    SET number = ?, aci = ?, pni = ?, username = ?
                     WHERE _id = ?
                     """
             ).formatted(TABLE_RECIPIENT);
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setString(1, address.number().orElse(null));
-                statement.setBytes(2, address.aci().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
-                statement.setBytes(3, address.pni().map(PNI::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+                statement.setString(2, address.aci().map(ACI::toString).orElse(null));
+                statement.setString(3, address.pni().map(PNI::toString).orElse(null));
                 statement.setString(4, address.username().orElse(null));
                 statement.setLong(5, recipientId.id());
                 statement.executeUpdate();
@@ -1225,7 +1229,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Connection connection, final String number
     ) throws SQLException {
         final var sql = """
-                        SELECT r._id, r.number, r.uuid, r.pni, r.username
+                        SELECT r._id, r.number, r.aci, r.pni, r.username
                         FROM %s r
                         WHERE r.number = ?
                         LIMIT 1
@@ -1240,7 +1244,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Connection connection, final String username
     ) throws SQLException {
         final var sql = """
-                        SELECT r._id, r.number, r.uuid, r.pni, r.username
+                        SELECT r._id, r.number, r.aci, r.pni, r.username
                         FROM %s r
                         WHERE r.username = ?
                         LIMIT 1
@@ -1259,13 +1263,13 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             return recipientWithAddress;
         }
         final var sql = """
-                        SELECT r._id, r.number, r.uuid, r.pni, r.username
+                        SELECT r._id, r.number, r.aci, r.pni, r.username
                         FROM %s r
                         WHERE %s = ?1
                         LIMIT 1
-                        """.formatted(TABLE_RECIPIENT, serviceId instanceof ACI ? "r.uuid" : "r.pni");
+                        """.formatted(TABLE_RECIPIENT, serviceId instanceof ACI ? "r.aci" : "r.pni");
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, UuidUtil.toByteArray(serviceId.getRawUuid()));
+            statement.setString(1, serviceId.toString());
             recipientWithAddress = Utils.executeQueryForOptional(statement, this::getRecipientWithAddressFromResultSet);
             recipientWithAddress.ifPresent(r -> recipientAddressCache.put(serviceId, r));
             return recipientWithAddress;
@@ -1276,16 +1280,16 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final Connection connection, final RecipientAddress address
     ) throws SQLException {
         final var sql = """
-                        SELECT r._id, r.number, r.uuid, r.pni, r.username
+                        SELECT r._id, r.number, r.aci, r.pni, r.username
                         FROM %s r
-                        WHERE r.uuid = ?1 OR
+                        WHERE r.aci = ?1 OR
                               r.pni = ?2 OR
                               r.number = ?3 OR
                               r.username = ?4
                         """.formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, address.aci().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
-            statement.setBytes(2, address.pni().map(ServiceId::getRawUuid).map(UuidUtil::toByteArray).orElse(null));
+            statement.setString(1, address.aci().map(ServiceId::toString).orElse(null));
+            statement.setString(2, address.pni().map(ServiceId::toString).orElse(null));
             statement.setString(3, address.number().orElse(null));
             statement.setString(4, address.username().orElse(null));
             return Utils.executeQueryForStream(statement, this::getRecipientWithAddressFromResultSet)
@@ -1296,7 +1300,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     private Contact getContact(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
-                SELECT r.given_name, r.family_name, r.expiration_time, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden
+                SELECT r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                 FROM %s r
                 WHERE r._id = ? AND (%s)
                 """
@@ -1357,13 +1361,11 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private RecipientAddress getRecipientAddressFromResultSet(ResultSet resultSet) throws SQLException {
-        final var pni = Optional.ofNullable(resultSet.getBytes("pni")).map(UuidUtil::parseOrNull).map(PNI::from);
-        final var serviceIdUuid = Optional.ofNullable(resultSet.getBytes("uuid")).map(UuidUtil::parseOrNull);
-        final var serviceId = serviceIdUuid.isPresent() && pni.isPresent() && serviceIdUuid.get()
-                .equals(pni.get().getRawUuid()) ? pni.<ServiceId>map(p -> p) : serviceIdUuid.<ServiceId>map(ACI::from);
+        final var aci = Optional.ofNullable(resultSet.getString("aci")).map(ACI::parseOrThrow);
+        final var pni = Optional.ofNullable(resultSet.getString("pni")).map(PNI::parseOrThrow);
         final var number = Optional.ofNullable(resultSet.getString("number"));
         final var username = Optional.ofNullable(resultSet.getString("username"));
-        return new RecipientAddress(serviceId, pni, number, username);
+        return new RecipientAddress(aci, pni, number, username);
     }
 
     private RecipientId getRecipientIdFromResultSet(ResultSet resultSet) throws SQLException {
@@ -1386,14 +1388,19 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private Contact getContactFromResultSet(ResultSet resultSet) throws SQLException {
+        final var unregisteredTimestamp = resultSet.getLong("unregistered_timestamp");
         return new Contact(resultSet.getString("given_name"),
                 resultSet.getString("family_name"),
+                resultSet.getString("nick_name"),
                 resultSet.getString("color"),
                 resultSet.getInt("expiration_time"),
+                resultSet.getLong("mute_until"),
+                resultSet.getBoolean("hide_story"),
                 resultSet.getBoolean("blocked"),
                 resultSet.getBoolean("archived"),
                 resultSet.getBoolean("profile_sharing"),
-                resultSet.getBoolean("hidden"));
+                resultSet.getBoolean("hidden"),
+                unregisteredTimestamp == 0 ? null : unregisteredTimestamp);
     }
 
     private Profile getProfileFromResultSet(ResultSet resultSet) throws SQLException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 6114a018..b79cb957 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -233,22 +233,38 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var profileShared = contact != null && contact.isProfileSharingEnabled();
         final var archived = contact != null && contact.isArchived();
         final var hidden = contact != null && contact.isHidden();
+        final var hideStory = contact != null && contact.hideStory();
+        final var muteUntil = contact == null ? 0 : contact.muteUntil();
+        final var unregisteredTimestamp = contact == null || contact.unregisteredTimestamp() == null
+                ? 0
+                : contact.unregisteredTimestamp();
         final var contactGivenName = contact == null ? null : contact.givenName();
         final var contactFamilyName = contact == null ? null : contact.familyName();
+        final var contactNickName = contact == null ? null : contact.nickName();
         if (blocked != contactRecord.isBlocked()
                 || profileShared != contactRecord.isProfileSharingEnabled()
                 || archived != contactRecord.isArchived()
                 || hidden != contactRecord.isHidden()
+                || hideStory != contactRecord.shouldHideStory()
+                || muteUntil != contactRecord.getMuteUntil()
+                || unregisteredTimestamp != contactRecord.getUnregisteredTimestamp()
                 || !Objects.equals(contactRecord.getSystemGivenName().orElse(null), contactGivenName)
-                || !Objects.equals(contactRecord.getSystemFamilyName().orElse(null), contactFamilyName)) {
+                || !Objects.equals(contactRecord.getSystemFamilyName().orElse(null), contactFamilyName)
+                || !Objects.equals(contactRecord.getSystemNickname().orElse(null), contactNickName)) {
             logger.debug("Storing new or updated contact {}", recipientId);
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
             final var newContact = contactBuilder.withIsBlocked(contactRecord.isBlocked())
                     .withIsProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
                     .withIsArchived(contactRecord.isArchived())
                     .withIsHidden(contactRecord.isHidden())
+                    .withMuteUntil(contactRecord.getMuteUntil())
+                    .withHideStory(contactRecord.shouldHideStory())
                     .withGivenName(contactRecord.getSystemGivenName().orElse(null))
-                    .withFamilyName(contactRecord.getSystemFamilyName().orElse(null));
+                    .withFamilyName(contactRecord.getSystemFamilyName().orElse(null))
+                    .withNickName(contactRecord.getSystemNickname().orElse(null))
+                    .withUnregisteredTimestamp(contactRecord.getUnregisteredTimestamp() == 0
+                            ? null
+                            : contactRecord.getUnregisteredTimestamp());
             account.getRecipientStore().storeContact(connection, recipientId, newContact.build());
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index c18434c3..c438570c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -94,9 +94,15 @@ public final class StorageSyncModels {
         }
         if (recipient.getContact() != null) {
             builder.setSystemGivenName(recipient.getContact().givenName())
-                    .setSystemFamilyName((recipient.getContact().familyName()))
+                    .setSystemFamilyName(recipient.getContact().familyName())
+                    .setSystemNickname(recipient.getContact().nickName())
                     .setBlocked(recipient.getContact().isBlocked())
                     .setProfileSharingEnabled(recipient.getContact().isProfileSharingEnabled())
+                    .setMuteUntil(recipient.getContact().muteUntil())
+                    .setHideStory(recipient.getContact().hideStory())
+                    .setUnregisteredTimestamp(recipient.getContact().unregisteredTimestamp() == null
+                            ? 0
+                            : recipient.getContact().unregisteredTimestamp())
                     .setArchived(recipient.getContact().isArchived())
                     .setHidden(recipient.getContact().isHidden());
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
index 2168a2ef..e69481ed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
@@ -5,7 +5,6 @@ import org.signal.core.util.Base64;
 import org.signal.core.util.SetUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
@@ -181,11 +180,11 @@ public final class StorageSyncValidations {
 
             if (insert.getContact().isPresent()) {
                 final var contact = insert.getContact().get();
-                final var serviceId = contact.getServiceId().map(ServiceId.class::cast);
+                final var aci = contact.getAci();
                 final var pni = contact.getPni();
                 final var number = contact.getNumber();
                 final var username = contact.getUsername();
-                final var address = new RecipientAddress(serviceId, pni, number, username);
+                final var address = new RecipientAddress(aci, pni, number, username);
                 if (self.matches(address)) {
                     throw new SelfAddedAsContactError();
                 }
diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
index eae8958f..b57dc6fc 100644
--- a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
@@ -3,7 +3,7 @@ package org.asamk.signal.manager.storage.recipients;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.whispersystems.signalservice.api.push.ServiceId;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 
 import java.util.Arrays;
@@ -17,8 +17,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class MergeRecipientHelperTest {
 
-    static final ServiceId SERVICE_ID_A = ServiceId.ACI.from(UUID.randomUUID());
-    static final ServiceId SERVICE_ID_B = ServiceId.ACI.from(UUID.randomUUID());
+    static final ACI ACI_A = ACI.from(UUID.randomUUID());
+    static final ACI ACI_B = ACI.from(UUID.randomUUID());
     static final PNI PNI_A = PNI.from(UUID.randomUUID());
     static final PNI PNI_B = PNI.from(UUID.randomUUID());
     static final String NUMBER_A = "+AAA";
@@ -26,8 +26,8 @@ class MergeRecipientHelperTest {
     static final String USERNAME_A = "USER.1";
     static final String USERNAME_B = "USER.2";
 
-    static final PartialAddresses ADDR_A = new PartialAddresses(SERVICE_ID_A, PNI_A, NUMBER_A, USERNAME_A);
-    static final PartialAddresses ADDR_B = new PartialAddresses(SERVICE_ID_B, PNI_B, NUMBER_B, USERNAME_B);
+    static final PartialAddresses ADDR_A = new PartialAddresses(ACI_A, PNI_A, NUMBER_A, USERNAME_A);
+    static final PartialAddresses ADDR_B = new PartialAddresses(ACI_B, PNI_B, NUMBER_B, USERNAME_B);
 
     static final T[] testInstancesNone = new T[]{
             new T(Set.of(), ADDR_A.FULL, Set.of(rec(1000000, ADDR_A.FULL))),
@@ -53,9 +53,7 @@ class MergeRecipientHelperTest {
             new T(Set.of(rec(1, ADDR_A.PNI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.PNI), rec(1000000, ADDR_A.ACI_NUM))),
             new T(Set.of(rec(1, ADDR_A.NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
             new T(Set.of(rec(1, ADDR_A.ACI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.ACI_NUM))),
-            new T(Set.of(rec(1, ADDR_A.PNI_NUM)),
-                    ADDR_A.ACI_NUM,
-                    Set.of(rec(1, ADDR_A.PNI), rec(1000000, ADDR_A.ACI_NUM))),
+            new T(Set.of(rec(1, ADDR_A.PNI_NUM)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
             new T(Set.of(rec(1, ADDR_A.ACI_PNI)), ADDR_A.ACI_NUM, Set.of(rec(1, ADDR_A.FULL))),
 
             new T(Set.of(rec(1, ADDR_A.FULL)), ADDR_A.PNI_NUM, Set.of(rec(1, ADDR_A.FULL))),
@@ -186,7 +184,7 @@ class MergeRecipientHelperTest {
         @Override
         public String toString() {
             return "T{#input=%s, request=%s_%s_%s, #output=%s}".formatted(input.size(),
-                    request.serviceId().isPresent() ? "SVI" : "",
+                    request.aci().isPresent() ? "ACI" : "",
                     request.pni().isPresent() ? "PNI" : "",
                     request.number().isPresent() ? "NUM" : "",
                     output.size());
@@ -245,17 +243,17 @@ class MergeRecipientHelperTest {
             RecipientAddress ACI_USERNAME
     ) {
 
-        PartialAddresses(ServiceId serviceId, PNI pni, String number, String username) {
-            this(new RecipientAddress(serviceId, pni, number),
-                    new RecipientAddress(serviceId, pni, number, username),
-                    new RecipientAddress(serviceId, null, null),
+        PartialAddresses(ACI aci, PNI pni, String number, String username) {
+            this(new RecipientAddress(aci, pni, number),
+                    new RecipientAddress(aci, pni, number, username),
+                    new RecipientAddress(aci, null, null),
                     new RecipientAddress(null, pni, null),
                     new RecipientAddress(null, null, number),
-                    new RecipientAddress(serviceId, null, number),
-                    new RecipientAddress(serviceId, null, number, username),
+                    new RecipientAddress(aci, null, number),
+                    new RecipientAddress(aci, null, number, username),
                     new RecipientAddress(null, pni, number),
-                    new RecipientAddress(serviceId, pni, null),
-                    new RecipientAddress(serviceId, null, null, username));
+                    new RecipientAddress(aci, pni, null),
+                    new RecipientAddress(aci, null, null, username));
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 9ba19348..3d0e2263 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -670,7 +670,18 @@ public class DbusManagerImpl implements Manager {
             }
             return Recipient.newBuilder()
                     .withAddress(new RecipientAddress(null, n))
-                    .withContact(new Contact(contactName, null, null, 0, contactBlocked, false, false, false))
+                    .withContact(new Contact(contactName,
+                            null,
+                            null,
+                            null,
+                            0,
+                            0,
+                            false,
+                            contactBlocked,
+                            false,
+                            false,
+                            false,
+                            null))
                     .build();
         }).filter(Objects::nonNull).toList();
     }

From e2f308a57a5d5162c4820fbc4daa06f72e16a1ab Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 28 Jan 2024 18:18:40 +0100
Subject: [PATCH 352/672] Store profile sharing for group v2

---
 .../asamk/signal/manager/helper/GroupHelper.java   |  2 ++
 .../asamk/signal/manager/helper/ProfileHelper.java |  2 +-
 .../asamk/signal/manager/helper/SendHelper.java    |  4 ++++
 .../signal/manager/storage/AccountDatabase.java    | 10 +++++++++-
 .../signal/manager/storage/groups/GroupInfo.java   |  4 ++++
 .../signal/manager/storage/groups/GroupInfoV1.java |  9 +++++++++
 .../signal/manager/storage/groups/GroupInfoV2.java | 13 +++++++++++++
 .../signal/manager/storage/groups/GroupStore.java  | 14 +++++++++-----
 .../manager/storage/groups/LegacyGroupStore.java   |  1 +
 .../syncStorage/GroupV2RecordProcessor.java        |  1 +
 .../manager/syncStorage/StorageSyncModels.java     |  5 ++++-
 11 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index dec9185a..8f7b2869 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -166,6 +166,7 @@ public class GroupHelper {
         if (gv2Pair == null) {
             // Failed to create v2 group, creating v1 group instead
             var gv1 = new GroupInfoV1(GroupIdV1.createRandom());
+            gv1.setProfileSharingEnabled(true);
             gv1.addMembers(List.of(selfRecipientId));
             final var result = updateGroupV1(gv1, name, members, avatarBytes);
             return new Pair<>(gv1.getGroupId(), result);
@@ -175,6 +176,7 @@ public class GroupHelper {
         final var decryptedGroup = gv2Pair.second();
 
         gv2.setGroup(decryptedGroup);
+        gv2.setProfileSharingEnabled(true);
         if (avatarBytes != null) {
             context.getAvatarStore()
                     .storeGroupAvatar(gv2.getGroupId(), outputStream -> outputStream.write(avatarBytes));
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index dbde28a7..5d6b90d4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -80,7 +80,7 @@ public final class ProfileHelper {
         final var activeGroupIds = account.getGroupStore()
                 .getGroups()
                 .stream()
-                .filter(g -> g instanceof GroupInfoV2 && g.isMember(selfRecipientId))
+                .filter(g -> g instanceof GroupInfoV2 && g.isMember(selfRecipientId) && g.isProfileSharingEnabled())
                 .map(g -> (GroupInfoV2) g)
                 .map(GroupInfoV2::getGroupId)
                 .toList();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 38e8de17..a9ca6a12 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -454,6 +454,10 @@ public class SendHelper {
         if (!g.isMember(account.getSelfRecipientId())) {
             throw new NotAGroupMemberException(groupId, g.getTitle());
         }
+        if (!g.isProfileSharingEnabled()) {
+            g.setProfileSharingEnabled(true);
+            account.getGroupStore().updateGroup(g);
+        }
         return g;
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index bedf4332..ba51d9c0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -33,7 +33,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 22;
+    private static final long DATABASE_VERSION = 23;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -565,6 +565,14 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 23) {
+            logger.debug("Updating database: Create group profile sharing column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE group_v2 ADD profile_sharing INTEGER NOT NULL DEFAULT TRUE;
+                                        """);
+            }
+        }
     }
 
     private static void createUuidMappingTable(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
index a16af0ff..7de3a8f9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
@@ -46,6 +46,10 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {
 
     public abstract void setBlocked(boolean blocked);
 
+    public abstract boolean isProfileSharingEnabled();
+
+    public abstract void setProfileSharingEnabled(boolean profileSharingEnabled);
+
     public abstract int getMessageExpirationTimer();
 
     public abstract boolean isAnnouncementGroup();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
index fd7bfe85..f377ff2d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java
@@ -94,6 +94,15 @@ public final class GroupInfoV1 extends GroupInfo {
         this.blocked = blocked;
     }
 
+    @Override
+    public boolean isProfileSharingEnabled() {
+        return true;
+    }
+
+    @Override
+    public void setProfileSharingEnabled(final boolean profileSharingEnabled) {
+    }
+
     @Override
     public int getMessageExpirationTimer() {
         return messageExpirationTime;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index 8ddec54e..89306ecd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -23,6 +23,7 @@ public final class GroupInfoV2 extends GroupInfo {
     private final GroupMasterKey masterKey;
     private final DistributionId distributionId;
     private boolean blocked;
+    private boolean profileSharingEnabled;
     private DecryptedGroup group;
     private byte[] storageRecord;
     private boolean permissionDenied;
@@ -44,6 +45,7 @@ public final class GroupInfoV2 extends GroupInfo {
             final DecryptedGroup group,
             final DistributionId distributionId,
             final boolean blocked,
+            final boolean profileSharingEnabled,
             final boolean permissionDenied,
             final byte[] storageRecord,
             final RecipientResolver recipientResolver
@@ -53,6 +55,7 @@ public final class GroupInfoV2 extends GroupInfo {
         this.group = group;
         this.distributionId = distributionId;
         this.blocked = blocked;
+        this.profileSharingEnabled = profileSharingEnabled;
         this.permissionDenied = permissionDenied;
         this.storageRecord = storageRecord;
         this.recipientResolver = recipientResolver;
@@ -183,6 +186,16 @@ public final class GroupInfoV2 extends GroupInfo {
         this.blocked = blocked;
     }
 
+    @Override
+    public boolean isProfileSharingEnabled() {
+        return profileSharingEnabled;
+    }
+
+    @Override
+    public void setProfileSharingEnabled(final boolean profileSharingEnabled) {
+        this.profileSharingEnabled = profileSharingEnabled;
+    }
+
     @Override
     public int getMessageExpirationTimer() {
         return this.group != null && this.group.disappearingMessagesTimer != null
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 5079da07..5ebac9c5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -59,6 +59,7 @@ public class GroupStore {
                                       group_data BLOB,
                                       distribution_id BLOB UNIQUE NOT NULL,
                                       blocked INTEGER NOT NULL DEFAULT FALSE,
+                                      profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                       permission_denied INTEGER NOT NULL DEFAULT FALSE
                                     ) STRICT;
                                     CREATE TABLE group_v1 (
@@ -508,8 +509,8 @@ public class GroupStore {
         } else if (group instanceof GroupInfoV2 groupV2) {
             final var sql = (
                     """
-                    INSERT OR REPLACE INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, distribution_id, storage_id)
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                    INSERT OR REPLACE INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, permission_denied, storage_id, profile_sharing)
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
                     """
             ).formatted(TABLE_GROUP_V2);
             try (final var statement = connection.prepareStatement(sql)) {
@@ -529,6 +530,7 @@ public class GroupStore {
                 statement.setBoolean(6, groupV2.isBlocked());
                 statement.setBoolean(7, groupV2.isPermissionDenied());
                 statement.setBytes(8, KeyUtils.createRawStorageId());
+                statement.setBoolean(9, groupV2.isProfileSharingEnabled());
                 statement.executeUpdate();
             }
         } else {
@@ -539,7 +541,7 @@ public class GroupStore {
     private List<GroupInfoV2> getGroupsV2() {
         final var sql = (
                 """
-                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.permission_denied, g.storage_record
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
                 FROM %s g
                 """
         ).formatted(TABLE_GROUP_V2);
@@ -557,7 +559,7 @@ public class GroupStore {
     public GroupInfoV2 getGroup(Connection connection, GroupIdV2 groupIdV2) throws SQLException {
         final var sql = (
                 """
-                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.permission_denied, g.storage_record
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
                 FROM %s g
                 WHERE g.group_id = ?
                 """
@@ -591,7 +593,7 @@ public class GroupStore {
     public GroupInfoV2 getGroupV2(Connection connection, StorageId storageId) throws SQLException {
         final var sql = (
                 """
-                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.permission_denied, g.storage_record
+                SELECT g.group_id, g.master_key, g.group_data, g.distribution_id, g.blocked, g.profile_sharing, g.permission_denied, g.storage_record
                 FROM %s g
                 WHERE g.storage_id = ?
                 """
@@ -614,6 +616,7 @@ public class GroupStore {
             final var groupData = resultSet.getBytes("group_data");
             final var distributionId = resultSet.getBytes("distribution_id");
             final var blocked = resultSet.getBoolean("blocked");
+            final var profileSharingEnabled = resultSet.getBoolean("profile_sharing");
             final var permissionDenied = resultSet.getBoolean("permission_denied");
             final var storageRecord = resultSet.getBytes("storage_record");
             return new GroupInfoV2(GroupId.v2(groupId),
@@ -621,6 +624,7 @@ public class GroupStore {
                     groupData == null ? null : DecryptedGroup.ADAPTER.decode(groupData),
                     DistributionId.from(UuidUtil.parseOrThrow(distributionId)),
                     blocked,
+                    profileSharingEnabled,
                     permissionDenied,
                     storageRecord,
                     recipientResolver);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index b5698b51..1d8c8799 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -77,6 +77,7 @@ public class LegacyGroupStore {
                     loadDecryptedGroupLocked(groupId, groupCachePath),
                     g2.distributionId == null ? DistributionId.create() : DistributionId.from(g2.distributionId),
                     g2.blocked,
+                    true,
                     g2.permissionDenied,
                     null,
                     recipientResolver);
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
index 4d41901a..1b182769 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
@@ -92,6 +92,7 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
 
         final var group = account.getGroupStore().getGroupOrPartialMigrate(connection, groupMasterKey);
         group.setBlocked(groupV2Record.isBlocked());
+        group.setProfileSharingEnabled(groupV2Record.isProfileSharingEnabled());
         account.getGroupStore().updateGroup(connection, group);
         account.getGroupStore()
                 .storeStorageRecord(connection,
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index c438570c..a8d10142 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -119,7 +119,9 @@ public final class StorageSyncModels {
         final var builder = new SignalGroupV1Record.Builder(rawStorageId,
                 group.getGroupId().serialize(),
                 group.getStorageRecord());
-        builder.setBlocked(group.isBlocked()).setArchived(group.archived);
+        builder.setBlocked(group.isBlocked());
+        builder.setArchived(group.archived);
+        builder.setProfileSharingEnabled(true);
         return SignalStorageRecord.forGroupV1(builder.build());
     }
 
@@ -130,6 +132,7 @@ public final class StorageSyncModels {
                 group.getMasterKey(),
                 group.getStorageRecord());
         builder.setBlocked(group.isBlocked());
+        builder.setProfileSharingEnabled(group.isProfileSharingEnabled());
         return SignalStorageRecord.forGroupV2(builder.build());
     }
 

From 888d6bf09178e800051d79dca66da00a171d02e7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 28 Jan 2024 22:12:52 +0100
Subject: [PATCH 353/672] Split unregistered recipients

---
 .../storage/recipients/RecipientAddress.java  |  4 ++
 .../storage/recipients/RecipientStore.java    | 46 ++++++++++++++-----
 2 files changed, 38 insertions(+), 12 deletions(-)

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 33b8a5f9..b655e067 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
@@ -42,6 +42,10 @@ public record RecipientAddress(
         this(Optional.ofNullable(aci), Optional.empty(), Optional.ofNullable(e164), Optional.empty());
     }
 
+    public RecipientAddress(PNI pni, String e164) {
+        this(Optional.empty(), Optional.ofNullable(pni), Optional.ofNullable(e164), Optional.empty());
+    }
+
     public RecipientAddress(String e164) {
         this(Optional.empty(), Optional.empty(), Optional.ofNullable(e164), Optional.empty());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 6be22754..68ea4895 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -108,18 +108,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public RecipientAddress resolveRecipientAddress(RecipientId recipientId) {
-        final var sql = (
-                """
-                SELECT r.number, r.aci, r.pni, r.username
-                FROM %s r
-                WHERE r._id = ?
-                """
-        ).formatted(TABLE_RECIPIENT);
         try (final var connection = database.getConnection()) {
-            try (final var statement = connection.prepareStatement(sql)) {
-                statement.setLong(1, recipientId.id());
-                return Utils.executeQuerySingleRow(statement, this::getRecipientAddressFromResultSet);
-            }
+            return resolveRecipientAddress(connection, recipientId);
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from recipient store", e);
         }
@@ -848,6 +838,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setLong(12, recipientId.id());
             statement.executeUpdate();
         }
+        if (contact != null && contact.unregisteredTimestamp() != null) {
+            markUnregisteredAndSplitIfNecessary(connection, recipientId);
+        }
         rotateStorageId(connection, recipientId);
     }
 
@@ -878,7 +871,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             for (final var number : unregisteredUsers) {
                 final var recipient = findByNumber(connection, number);
                 if (recipient.isPresent()) {
-                    markUnregistered(connection, recipient.get().id());
+                    final var recipientId = recipient.get().id();
+                    markUnregisteredAndSplitIfNecessary(connection, recipientId);
                 }
             }
             connection.commit();
@@ -887,6 +881,18 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    private void markUnregisteredAndSplitIfNecessary(
+            final Connection connection, final RecipientId recipientId
+    ) throws SQLException {
+        markUnregistered(connection, recipientId);
+        final var address = resolveRecipientAddress(connection, recipientId);
+        if (address.aci().isPresent() && address.pni().isPresent()) {
+            final var numberAddress = new RecipientAddress(address.pni().get(), address.number().orElse(null));
+            updateRecipientAddress(connection, recipientId, address.removeIdentifiersFrom(numberAddress));
+            addNewRecipient(connection, numberAddress);
+        }
+    }
+
     private void markRegistered(
             final Connection connection, final RecipientId recipientId
     ) throws SQLException {
@@ -1001,6 +1007,22 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         rotateStorageId(connection, recipientId);
     }
 
+    private RecipientAddress resolveRecipientAddress(
+            final Connection connection, final RecipientId recipientId
+    ) throws SQLException {
+        final var sql = (
+                """
+                SELECT r.number, r.aci, r.pni, r.username
+                FROM %s r
+                WHERE r._id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            return Utils.executeQuerySingleRow(statement, this::getRecipientAddressFromResultSet);
+        }
+    }
+
     private RecipientId resolveRecipientTrusted(RecipientAddress address, boolean isSelf) {
         final Pair<RecipientId, List<RecipientId>> pair;
         synchronized (recipientsLock) {

From 0840e0dedb2fd272da590bd0d3168d54f3733739 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 28 Jan 2024 22:37:53 +0100
Subject: [PATCH 354/672] Add CDSI recipients refresh job

---
 .../signal/manager/internal/ManagerImpl.java  | 10 ++------
 .../manager/jobs/RefreshRecipientsJob.java    | 23 +++++++++++++++++++
 .../syncStorage/ContactRecordProcessor.java   |  3 ++-
 3 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/jobs/RefreshRecipientsJob.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 75dcb138..9814d95c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -66,6 +66,7 @@ import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.helper.RecipientHelper.RegisteredUser;
+import org.asamk.signal.manager.jobs.RefreshRecipientsJob;
 import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.storage.AvatarStore;
@@ -226,14 +227,7 @@ public class ManagerImpl implements Manager {
         final var lastRecipientsRefresh = account.getLastRecipientsRefresh();
         if (lastRecipientsRefresh == null
                 || lastRecipientsRefresh < System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1)) {
-            try {
-                context.getRecipientHelper().refreshUsers();
-            } catch (Exception e) {
-                logger.warn("Full CDSI recipients refresh failed, ignoring: {} ({})",
-                        e.getMessage(),
-                        e.getClass().getSimpleName());
-                logger.debug("Full CDSI refresh failed", e);
-            }
+            context.getJobExecutor().enqueueJob(new RefreshRecipientsJob());
             context.getAccountHelper().checkWhoAmiI();
         }
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/RefreshRecipientsJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/RefreshRecipientsJob.java
new file mode 100644
index 00000000..472bbac1
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/RefreshRecipientsJob.java
@@ -0,0 +1,23 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RefreshRecipientsJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(RefreshRecipientsJob.class);
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Full CDSI recipients refresh");
+        try {
+            context.getRecipientHelper().refreshUsers();
+        } catch (Exception e) {
+            logger.warn("Full CDSI recipients refresh failed, ignoring: {} ({})",
+                    e.getMessage(),
+                    e.getClass().getSimpleName());
+            logger.debug("Full CDSI refresh failed", e);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index b79cb957..7598b5ea 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -4,6 +4,7 @@ import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.internal.JobExecutor;
 import org.asamk.signal.manager.jobs.DownloadProfileJob;
+import org.asamk.signal.manager.jobs.RefreshRecipientsJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.util.KeyUtils;
@@ -152,7 +153,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
             } else if (pnisMatchButE164sDont) {
                 logger.debug("Matching PNIs, but the E164s differ! Trusting our local pair.");
             }
-            // TODO [pnp] Schedule CDS fetch?
+            jobExecutor.enqueueJob(new RefreshRecipientsJob());
             pni = local.getPni().get();
             e164 = local.getNumber().get();
         } else {

From d1e32f2b11e1b497d6c34d364f600feee32bfe67 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 29 Jan 2024 18:21:44 +0100
Subject: [PATCH 355/672] Improve some log output

---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index c324b012..a493f0d1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -192,9 +192,7 @@ public class SignalAccount implements Closeable {
         final var pair = openFileChannel(fileName, waitForLock);
         try {
             var signalAccount = new SignalAccount(pair.first(), pair.second());
-            logger.trace("Loading account file");
             signalAccount.load(dataPath, accountPath, settings);
-            logger.trace("Migrating legacy parts of account file");
             signalAccount.migrateLegacyConfigs();
             signalAccount.init();
 
@@ -367,6 +365,7 @@ public class SignalAccount implements Closeable {
 
     private void migrateLegacyConfigs() {
         if (isPrimaryDevice() && getPniIdentityKeyPair() == null) {
+            logger.trace("Migrating legacy parts of account file");
             setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
         }
     }
@@ -438,6 +437,7 @@ public class SignalAccount implements Closeable {
     private void load(
             File dataPath, String accountPath, final Settings settings
     ) throws IOException {
+        logger.trace("Loading account file {}", accountPath);
         this.dataPath = dataPath;
         this.accountPath = accountPath;
         this.settings = settings;

From 080c14d111dbb5ad1c070828116ed6b778f7aa4d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 30 Jan 2024 17:21:29 +0100
Subject: [PATCH 356/672] Clean old prekeys only after server message queue is
 empty

---
 .../signal/manager/helper/PreKeyHelper.java      |  9 ++++++++-
 .../signal/manager/helper/ReceiveHelper.java     |  2 ++
 .../signal/manager/jobs/CleanOldPreKeysJob.java  | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/jobs/CleanOldPreKeysJob.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index e8ef3fd6..6dd579c6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -118,8 +118,15 @@ public class PreKeyHelper {
                 logger.warn("Failed to updated pre keys: {}", e.getMessage());
             }
         }
+    }
 
-        cleanSignedPreKeys((serviceIdType));
+    public void cleanOldPreKeys() {
+        cleanOldPreKeys(ServiceIdType.ACI);
+        cleanOldPreKeys(ServiceIdType.PNI);
+    }
+
+    private void cleanOldPreKeys(final ServiceIdType serviceIdType) {
+        cleanSignedPreKeys(serviceIdType);
         cleanOneTimePreKeys(serviceIdType);
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index 713ca5d7..a66d6ff6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -5,6 +5,7 @@ import org.asamk.signal.manager.actions.HandleAction;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.UntrustedIdentityException;
 import org.asamk.signal.manager.internal.SignalDependencies;
+import org.asamk.signal.manager.jobs.CleanOldPreKeysJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.messageCache.CachedMessage;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
@@ -176,6 +177,7 @@ public class ReceiveHelper {
                     handleQueuedActions(queuedActions.keySet());
                     queuedActions.clear();
 
+                    context.getJobExecutor().enqueueJob(new CleanOldPreKeysJob());
                     hasCaughtUpWithOldMessages = true;
                     caughtUpWithOldMessagesListener.call();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/CleanOldPreKeysJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/CleanOldPreKeysJob.java
new file mode 100644
index 00000000..d933fb0f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/CleanOldPreKeysJob.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.manager.jobs;
+
+import org.asamk.signal.manager.helper.Context;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class CleanOldPreKeysJob implements Job {
+
+    private static final Logger logger = LoggerFactory.getLogger(CleanOldPreKeysJob.class);
+
+    @Override
+    public void run(Context context) {
+        logger.trace("Cleaning old prekeys");
+        context.getPreKeyHelper().cleanOldPreKeys();
+    }
+}

From 2ab5b2817e865ca474a8fde1add7304ec2c356bb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 30 Jan 2024 17:44:51 +0100
Subject: [PATCH 357/672] Deprecate daemon mode without explicit mode flag

---
 data/signal-cli.service                       |  2 +-
 data/signal-cli@.service                      |  2 +-
 man/signal-cli.1.adoc                         | 23 ++++++++++---------
 .../asamk/signal/commands/DaemonCommand.java  |  6 ++---
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/data/signal-cli.service b/data/signal-cli.service
index 1e4a5a5c..a0bba768 100644
--- a/data/signal-cli.service
+++ b/data/signal-cli.service
@@ -8,7 +8,7 @@ After=network-online.target
 [Service]
 Type=dbus
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon --system
+ExecStart=%dir%/bin/signal-cli --config /var/lib/signal-cli daemon --dbus-system
 User=signal-cli
 BusName=org.asamk.Signal
 
diff --git a/data/signal-cli@.service b/data/signal-cli@.service
index d96352e8..c5698ca7 100644
--- a/data/signal-cli@.service
+++ b/data/signal-cli@.service
@@ -8,7 +8,7 @@ After=network-online.target
 [Service]
 Type=dbus
 Environment="SIGNAL_CLI_OPTS=-Xms2m"
-ExecStart=%dir%/bin/signal-cli -a %I --config /var/lib/signal-cli daemon --system
+ExecStart=%dir%/bin/signal-cli -a %I --config /var/lib/signal-cli daemon --dbus-system
 User=signal-cli
 BusName=org.asamk.Signal
 
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index bd855ab4..7bc17905 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -25,7 +25,7 @@ For this use-case, it has a dbus and a JSON-RPC interface, that can be used to s
 
 For some functionality the Signal protocol requires that all messages have been received from the server.
 The `receive` command should be regularly executed.
-In daemon mode messages are continuously received.
+In daemon mode messages are by default continuously received.
 
 == Options
 
@@ -720,16 +720,9 @@ Alternatively, specify the group IDs for which to get the attachment.
 
 === daemon
 
-signal-cli can run in daemon mode and provides an experimental dbus or JSON-RPC interface.
-If no `-a` account is given, all local accounts will be exported as separate dbus objects under the same bus name.
-
-*--dbus*::
-Export DBus interface on user bus. +
-See **signal-cli-dbus**(5) for info on the dbus interface.
-
-*--dbus-system*::
-Export DBus interface on system bus. +
-See **signal-cli-dbus**(5) for info on the dbus interface.
+signal-cli can run in daemon mode and provides JSON-RPC or an experimental dbus interface.
+If no `-a` account is given, all local accounts will be loaded.
+Multiple interfaces can be used at the same time, e.g. `daemon --socket --dbus`
 
 *--socket [SOCKET]*::
 Export a JSON-RPC interface on a UNIX socket (default $XDG_RUNTIME_DIR/signal-cli/socket). +
@@ -744,6 +737,14 @@ Expose a JSON-RPC interface as http endpoint (default localhost:8080).
 The JSON-RPC endpoint is `/api/v1/rpc`. +
 See **signal-cli-jsonrpc**(5) for info on the JSON-RPC interface.
 
+*--dbus*::
+Export DBus interface on user bus. +
+See **signal-cli-dbus**(5) for info on the dbus interface.
+
+*--dbus-system*::
+Export DBus interface on system bus. +
+See **signal-cli-dbus**(5) for info on the dbus interface.
+
 *--ignore-attachments*::
 Don’t download attachments of received messages.
 
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 561ee8c3..f4d701b1 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -46,9 +46,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         final var defaultSocketPath = new File(new File(IOUtils.getRuntimeDir(), "signal-cli"), "socket");
         subparser.help("Run in daemon mode and provide a JSON-RPC or an experimental dbus interface.");
-        subparser.addArgument("--dbus")
-                .action(Arguments.storeTrue())
-                .help("Expose a DBus interface on the user bus (the default, if no other options are given).");
+        subparser.addArgument("--dbus").action(Arguments.storeTrue()).help("Expose a DBus interface on the user bus.");
         subparser.addArgument("--dbus-system", "--system")
                 .action(Arguments.storeTrue())
                 .help("Expose a DBus interface on the system bus.");
@@ -190,6 +188,8 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                         && httpAddress == null
                         && inheritedChannel == null
         )) {
+            logger.warn(
+                    "Running daemon command without explicit mode is deprecated. Use --dbus to use the dbus interface.");
             daemonHandler.runDbus(false);
         }
     }

From e13dcdc85ab0e40976499765a27e70930576ab64 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 30 Jan 2024 17:59:59 +0100
Subject: [PATCH 358/672] Prevent empty username

---
 .../org/asamk/signal/manager/storage/SignalAccount.java     | 6 ++++++
 .../signal/manager/syncStorage/AccountRecordProcessor.java  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index a493f0d1..762e95ce 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -473,6 +473,9 @@ public class SignalAccount implements Closeable {
             registered = storage.registered;
             number = storage.number;
             username = storage.username;
+            if ("".equals(username)) {
+                username = null;
+            }
             encryptedDeviceName = storage.encryptedDeviceName;
             deviceId = storage.deviceId;
             isMultiDevice = storage.isMultiDevice;
@@ -549,6 +552,9 @@ public class SignalAccount implements Closeable {
         registered = Utils.getNotNullNode(rootNode, "registered").asBoolean();
         if (rootNode.hasNonNull("usernameIdentifier")) {
             username = rootNode.get("usernameIdentifier").asText();
+            if ("".equals(username)) {
+                username = null;
+            }
         }
         if (rootNode.hasNonNull("uuid")) {
             try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 9250505c..0e1a02b7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -104,7 +104,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 || local.hasSeenGroupStoryEducationSheet();
         final var username = remote.getUsername() != null && !remote.getUsername().isEmpty()
                 ? remote.getUsername()
-                : local.getUsername() != null && !local.getUsername().isEmpty() ? local.getUsername() : null;
+                : local.getUsername();
         final var usernameLink = remote.getUsernameLink() != null ? remote.getUsernameLink() : local.getUsernameLink();
 
         final var mergedBuilder = new SignalAccountRecord.Builder(remote.getId().getRaw(), unknownFields).setGivenName(

From 15c9d047033f2dd64a677aca8139a3ecd34e9472 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 30 Jan 2024 18:52:43 +0100
Subject: [PATCH 359/672] Add missing command to json-rpc client

---
 client/src/cli.rs     |  69 ++++++++++++++++----
 client/src/jsonrpc.rs |  70 +++++++++++++++++----
 client/src/main.rs    | 142 +++++++++++++++++++++++++++++-------------
 3 files changed, 211 insertions(+), 70 deletions(-)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 0b513268..dea3a7df 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -1,9 +1,10 @@
-use clap::{crate_version, Parser, Subcommand, ValueEnum};
 use std::{ffi::OsString, net::SocketAddr};
 
+use clap::{crate_version, Parser, Subcommand, ValueEnum};
+
 /// JSON-RPC client for signal-cli
 #[derive(Parser, Debug)]
-#[command(rename_all = "kebab-case", version=crate_version!())]
+#[command(rename_all = "kebab-case", version = crate_version!())]
 pub struct Cli {
     /// Account to use (for daemon in multi-account mode)
     #[arg(short = 'a', long)]
@@ -21,9 +22,6 @@ pub struct Cli {
     #[arg(long, conflicts_with = "json_rpc_socket")]
     pub json_rpc_http: Option<Option<String>>,
 
-    #[arg(value_enum, long, default_value_t = OutputTypes::Json)]
-    pub output: OutputTypes,
-
     #[arg(long)]
     pub verbose: bool,
 
@@ -31,21 +29,18 @@ pub struct Cli {
     pub command: CliCommands,
 }
 
-#[derive(ValueEnum, Clone, Debug)]
-#[value(rename_all = "kebab-case")]
-pub enum OutputTypes {
-    PlainText,
-    Json,
-}
-
 #[allow(clippy::large_enum_variant)]
 #[derive(Subcommand, Debug)]
-#[command(rename_all = "camelCase", version=crate_version!())]
+#[command(rename_all = "camelCase", version = crate_version!())]
 pub enum CliCommands {
     AddDevice {
         #[arg(long)]
         uri: String,
     },
+    AddStickerPack {
+        #[arg(long)]
+        uri: String,
+    },
     #[command(rename_all = "kebab-case")]
     Block {
         recipient: Vec<String>,
@@ -57,6 +52,22 @@ pub enum CliCommands {
         #[arg(long = "ignore-registered")]
         ignore_registered: Option<bool>,
     },
+    FinishChangeNumber {
+        number: String,
+        #[arg(short = 'v', long = "verification-code")]
+        verification_code: String,
+
+        #[arg(short = 'p', long)]
+        pin: Option<String>,
+    },
+    GetAttachment {
+        #[arg(long)]
+        id: String,
+        #[arg(long)]
+        recipient: Option<String>,
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Option<String>,
+    },
     GetUserStatus {
         recipient: Vec<String>,
     },
@@ -112,6 +123,8 @@ pub enum CliCommands {
         recipient: String,
         #[arg(long)]
         forget: bool,
+        #[arg(long)]
+        hide: bool,
     },
     RemoveDevice {
         #[arg(short = 'd', long = "device-id")]
@@ -152,6 +165,9 @@ pub enum CliCommands {
         #[arg(long)]
         mention: Vec<String>,
 
+        #[arg(long)]
+        text_style: Vec<String>,
+
         #[arg(long)]
         quote_timestamp: Option<u64>,
 
@@ -164,9 +180,24 @@ pub enum CliCommands {
         #[arg(long)]
         quote_mention: Vec<String>,
 
+        #[arg(long)]
+        quote_text_style: Vec<String>,
+
         #[arg(long)]
         quote_attachment: Vec<String>,
 
+        #[arg(long)]
+        preview_url: Option<String>,
+
+        #[arg(long)]
+        preview_title: Option<String>,
+
+        #[arg(long)]
+        preview_description: Option<String>,
+
+        #[arg(long)]
+        preview_image: Option<String>,
+
         #[arg(long)]
         sticker: Option<String>,
 
@@ -175,6 +206,9 @@ pub enum CliCommands {
 
         #[arg(long)]
         story_author: Option<String>,
+
+        #[arg(long)]
+        edit_timestamp: Option<u64>,
     },
     SendContacts,
     SendPaymentNotification {
@@ -232,6 +266,13 @@ pub enum CliCommands {
     SetPin {
         pin: String,
     },
+    StartChangeNumber {
+        number: String,
+        #[arg(short = 'v', long)]
+        voice: bool,
+        #[arg(long)]
+        captcha: Option<String>,
+    },
     SubmitRateLimitChallenge {
         challenge: String,
         captcha: String,
@@ -259,6 +300,8 @@ pub enum CliCommands {
     UpdateAccount {
         #[arg(short = 'n', long = "device-name")]
         device_name: Option<String>,
+        #[arg(long = "unrestricted-unidentified-sender")]
+        unrestricted_unidentified_sender: Option<bool>,
     },
     UpdateConfiguration {
         #[arg(long = "read-receipts")]
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index e3031bf3..3a117ff4 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -18,6 +18,13 @@ pub trait Rpc {
         uri: String,
     ) -> Result<Value, ErrorObjectOwned>;
 
+    #[method(name = "addStickerPack", param_kind = map)]
+    async fn add_sticker_pack(
+        &self,
+        account: Option<String>,
+        uri: String,
+    ) -> Result<Value, ErrorObjectOwned>;
+
     #[method(name = "block", param_kind = map)]
     fn block(
         &self,
@@ -33,6 +40,15 @@ pub trait Rpc {
         #[allow(non_snake_case)] ignoreRegistered: Option<bool>,
     ) -> Result<Value, ErrorObjectOwned>;
 
+    #[method(name = "getAttachment", param_kind = map)]
+    fn get_attachment(
+        &self,
+        account: Option<String>,
+        id: String,
+        recipient: Option<String>,
+        group_id: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
+
     #[method(name = "getUserStatus", param_kind = map)]
     fn get_user_status(
         &self,
@@ -43,6 +59,16 @@ pub trait Rpc {
     #[method(name = "joinGroup", param_kind = map)]
     fn join_group(&self, account: Option<String>, uri: String) -> Result<Value, ErrorObjectOwned>;
 
+    #[allow(non_snake_case)]
+    #[method(name = "finishChangeNumber", param_kind = map)]
+    fn finish_change_number(
+        &self,
+        account: Option<String>,
+        number: String,
+        verificationCode: String,
+        pin: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
+
     #[method(name = "finishLink", param_kind = map)]
     fn finish_link(
         &self,
@@ -106,6 +132,7 @@ pub trait Rpc {
         account: Option<String>,
         recipient: String,
         forget: bool,
+        hide: bool,
     ) -> Result<Value, ErrorObjectOwned>;
 
     #[method(name = "removeDevice", param_kind = map)]
@@ -128,25 +155,33 @@ pub trait Rpc {
         #[allow(non_snake_case)] noteToSelf: bool,
     ) -> Result<Value, ErrorObjectOwned>;
 
+    #[allow(non_snake_case)]
     #[method(name = "send", param_kind = map)]
     fn send(
         &self,
         account: Option<String>,
         recipients: Vec<String>,
-        #[allow(non_snake_case)] groupIds: Vec<String>,
-        #[allow(non_snake_case)] noteToSelf: bool,
-        #[allow(non_snake_case)] endSession: bool,
+        groupIds: Vec<String>,
+        noteToSelf: bool,
+        endSession: bool,
         message: String,
         attachments: Vec<String>,
         mentions: Vec<String>,
-        #[allow(non_snake_case)] quoteTimestamp: Option<u64>,
-        #[allow(non_snake_case)] quoteAuthor: Option<String>,
-        #[allow(non_snake_case)] quoteMessage: Option<String>,
-        #[allow(non_snake_case)] quoteMention: Vec<String>,
-        #[allow(non_snake_case)] quoteAttachment: Vec<String>,
+        textStyle: Vec<String>,
+        quoteTimestamp: Option<u64>,
+        quoteAuthor: Option<String>,
+        quoteMessage: Option<String>,
+        quoteMention: Vec<String>,
+        quoteTextStyle: Vec<String>,
+        quoteAttachment: Vec<String>,
+        preview_url: Option<String>,
+        preview_title: Option<String>,
+        preview_description: Option<String>,
+        preview_image: Option<String>,
         sticker: Option<String>,
-        #[allow(non_snake_case)] storyTimestamp: Option<u64>,
-        #[allow(non_snake_case)] storyAuthor: Option<String>,
+        storyTimestamp: Option<u64>,
+        storyAuthor: Option<String>,
+        editTimestamp: Option<u64>,
     ) -> Result<Value, ErrorObjectOwned>;
 
     #[method(name = "sendContacts", param_kind = map)]
@@ -207,6 +242,15 @@ pub trait Rpc {
         captcha: String,
     ) -> Result<Value, ErrorObjectOwned>;
 
+    #[method(name = "startChangeNumber", param_kind = map)]
+    fn start_change_number(
+        &self,
+        account: Option<String>,
+        number: String,
+        voice: bool,
+        captcha: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
+
     #[method(name = "startLink", param_kind = map)]
     fn start_link(&self, account: Option<String>) -> Result<JsonLink, ErrorObjectOwned>;
 
@@ -234,18 +278,20 @@ pub trait Rpc {
         #[allow(non_snake_case)] deleteAccount: bool,
     ) -> Result<Value, ErrorObjectOwned>;
 
+    #[allow(non_snake_case)]
     #[method(name = "updateAccount", param_kind = map)]
     fn update_account(
         &self,
         account: Option<String>,
-        #[allow(non_snake_case)] deviceName: Option<String>,
+        deviceName: Option<String>,
+        unrestrictedUnidentifiedSender: Option<bool>,
     ) -> Result<Value, ErrorObjectOwned>;
 
     #[method(name = "updateConfiguration", param_kind = map)]
     fn update_configuration(
         &self,
         account: Option<String>,
-        #[allow(non_snake_case)] readReceiptes: Option<bool>,
+        #[allow(non_snake_case)] readReceipts: Option<bool>,
         #[allow(non_snake_case)] unidentifiedDeliveryIndicators: Option<bool>,
         #[allow(non_snake_case)] typingIndicators: Option<bool>,
         #[allow(non_snake_case)] linkPreviews: Option<bool>,
diff --git a/client/src/main.rs b/client/src/main.rs
index 958d9d9f..03aff481 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -1,13 +1,14 @@
 use std::{path::PathBuf, time::Duration};
 
 use clap::Parser;
-use cli::Cli;
 use jsonrpsee::core::client::{Subscription, SubscriptionClientT};
 use jsonrpsee::core::Error as RpcError;
 use serde_json::Value;
 use tokio::{select, time::sleep};
 
-use crate::cli::{GroupPermission, LinkState};
+use cli::Cli;
+
+use crate::cli::{CliCommands, GroupPermission, LinkState};
 use crate::jsonrpc::RpcClient;
 
 mod cli;
@@ -38,7 +39,7 @@ async fn handle_command(
     client: impl SubscriptionClientT + Sync,
 ) -> Result<Value, RpcError> {
     match cli.command {
-        cli::CliCommands::Receive { timeout } => {
+        CliCommands::Receive { timeout } => {
             let mut stream = client.subscribe_receive(cli.account).await?;
 
             {
@@ -50,21 +51,21 @@ async fn handle_command(
             stream.unsubscribe().await?;
             Ok(Value::Null)
         }
-        cli::CliCommands::AddDevice { uri } => client.add_device(cli.account, uri).await,
-        cli::CliCommands::Block {
+        CliCommands::AddDevice { uri } => client.add_device(cli.account, uri).await,
+        CliCommands::Block {
             recipient,
             group_id,
         } => client.block(cli.account, recipient, group_id).await,
-        cli::CliCommands::DeleteLocalAccountData { ignore_registered } => {
+        CliCommands::DeleteLocalAccountData { ignore_registered } => {
             client
                 .delete_local_account_data(cli.account, ignore_registered)
                 .await
         }
-        cli::CliCommands::GetUserStatus { recipient } => {
+        CliCommands::GetUserStatus { recipient } => {
             client.get_user_status(cli.account, recipient).await
         }
-        cli::CliCommands::JoinGroup { uri } => client.join_group(cli.account, uri).await,
-        cli::CliCommands::Link { name } => {
+        CliCommands::JoinGroup { uri } => client.join_group(cli.account, uri).await,
+        CliCommands::Link { name } => {
             let url = client
                 .start_link(cli.account)
                 .await
@@ -73,8 +74,8 @@ async fn handle_command(
             println!("{}", url);
             client.finish_link(url, name).await
         }
-        cli::CliCommands::ListAccounts => client.list_accounts().await,
-        cli::CliCommands::ListContacts {
+        CliCommands::ListAccounts => client.list_accounts().await,
+        CliCommands::ListContacts {
             recipient,
             all_recipients,
             blocked,
@@ -84,16 +85,14 @@ async fn handle_command(
                 .list_contacts(cli.account, recipient, all_recipients, blocked, name)
                 .await
         }
-        cli::CliCommands::ListDevices => client.list_devices(cli.account).await,
-        cli::CliCommands::ListGroups {
+        CliCommands::ListDevices => client.list_devices(cli.account).await,
+        CliCommands::ListGroups {
             detailed: _,
             group_id,
         } => client.list_groups(cli.account, group_id).await,
-        cli::CliCommands::ListIdentities { number } => {
-            client.list_identities(cli.account, number).await
-        }
-        cli::CliCommands::ListStickerPacks => client.list_sticker_packs(cli.account).await,
-        cli::CliCommands::QuitGroup {
+        CliCommands::ListIdentities { number } => client.list_identities(cli.account, number).await,
+        CliCommands::ListStickerPacks => client.list_sticker_packs(cli.account).await,
+        CliCommands::QuitGroup {
             group_id,
             delete,
             admin,
@@ -102,17 +101,23 @@ async fn handle_command(
                 .quit_group(cli.account, group_id, delete, admin)
                 .await
         }
-        cli::CliCommands::Register { voice, captcha } => {
+        CliCommands::Register { voice, captcha } => {
             client.register(cli.account, voice, captcha).await
         }
-        cli::CliCommands::RemoveContact { recipient, forget } => {
-            client.remove_contact(cli.account, recipient, forget).await
+        CliCommands::RemoveContact {
+            recipient,
+            forget,
+            hide,
+        } => {
+            client
+                .remove_contact(cli.account, recipient, forget, hide)
+                .await
         }
-        cli::CliCommands::RemoveDevice { device_id } => {
+        CliCommands::RemoveDevice { device_id } => {
             client.remove_device(cli.account, device_id).await
         }
-        cli::CliCommands::RemovePin => client.remove_pin(cli.account).await,
-        cli::CliCommands::RemoteDelete {
+        CliCommands::RemovePin => client.remove_pin(cli.account).await,
+        CliCommands::RemoteDelete {
             target_timestamp,
             recipient,
             group_id,
@@ -128,7 +133,7 @@ async fn handle_command(
                 )
                 .await
         }
-        cli::CliCommands::Send {
+        CliCommands::Send {
             recipient,
             group_id,
             note_to_self,
@@ -136,14 +141,21 @@ async fn handle_command(
             message,
             attachment,
             mention,
+            text_style,
             quote_timestamp,
             quote_author,
             quote_message,
             quote_mention,
+            quote_text_style,
             quote_attachment,
+            preview_url,
+            preview_title,
+            preview_description,
+            preview_image,
             sticker,
             story_timestamp,
             story_author,
+            edit_timestamp,
         } => {
             client
                 .send(
@@ -155,19 +167,26 @@ async fn handle_command(
                     message.unwrap_or_default(),
                     attachment,
                     mention,
+                    text_style,
                     quote_timestamp,
                     quote_author,
                     quote_message,
                     quote_mention,
+                    quote_text_style,
                     quote_attachment,
+                    preview_url,
+                    preview_title,
+                    preview_description,
+                    preview_image,
                     sticker,
                     story_timestamp,
                     story_author,
+                    edit_timestamp,
                 )
                 .await
         }
-        cli::CliCommands::SendContacts => client.send_contacts(cli.account).await,
-        cli::CliCommands::SendPaymentNotification {
+        CliCommands::SendContacts => client.send_contacts(cli.account).await,
+        CliCommands::SendPaymentNotification {
             recipient,
             receipt,
             note,
@@ -176,7 +195,7 @@ async fn handle_command(
                 .send_payment_notification(cli.account, recipient, receipt, note)
                 .await
         }
-        cli::CliCommands::SendReaction {
+        CliCommands::SendReaction {
             recipient,
             group_id,
             note_to_self,
@@ -200,7 +219,7 @@ async fn handle_command(
                 )
                 .await
         }
-        cli::CliCommands::SendReceipt {
+        CliCommands::SendReceipt {
             recipient,
             target_timestamp,
             r#type,
@@ -217,8 +236,8 @@ async fn handle_command(
                 )
                 .await
         }
-        cli::CliCommands::SendSyncRequest => client.send_sync_request(cli.account).await,
-        cli::CliCommands::SendTyping {
+        CliCommands::SendSyncRequest => client.send_sync_request(cli.account).await,
+        CliCommands::SendTyping {
             recipient,
             group_id,
             stop,
@@ -227,13 +246,13 @@ async fn handle_command(
                 .send_typing(cli.account, recipient, group_id, stop)
                 .await
         }
-        cli::CliCommands::SetPin { pin } => client.set_pin(cli.account, pin).await,
-        cli::CliCommands::SubmitRateLimitChallenge { challenge, captcha } => {
+        CliCommands::SetPin { pin } => client.set_pin(cli.account, pin).await,
+        CliCommands::SubmitRateLimitChallenge { challenge, captcha } => {
             client
                 .submit_rate_limit_challenge(cli.account, challenge, captcha)
                 .await
         }
-        cli::CliCommands::Trust {
+        CliCommands::Trust {
             recipient,
             trust_all_known_keys,
             verified_safety_number,
@@ -247,17 +266,22 @@ async fn handle_command(
                 )
                 .await
         }
-        cli::CliCommands::Unblock {
+        CliCommands::Unblock {
             recipient,
             group_id,
         } => client.unblock(cli.account, recipient, group_id).await,
-        cli::CliCommands::Unregister { delete_account } => {
+        CliCommands::Unregister { delete_account } => {
             client.unregister(cli.account, delete_account).await
         }
-        cli::CliCommands::UpdateAccount { device_name } => {
-            client.update_account(cli.account, device_name).await
+        CliCommands::UpdateAccount {
+            device_name,
+            unrestricted_unidentified_sender,
+        } => {
+            client
+                .update_account(cli.account, device_name, unrestricted_unidentified_sender)
+                .await
         }
-        cli::CliCommands::UpdateConfiguration {
+        CliCommands::UpdateConfiguration {
             read_receipts,
             unidentified_delivery_indicators,
             typing_indicators,
@@ -273,7 +297,7 @@ async fn handle_command(
                 )
                 .await
         }
-        cli::CliCommands::UpdateContact {
+        CliCommands::UpdateContact {
             recipient,
             expiration,
             name,
@@ -282,7 +306,7 @@ async fn handle_command(
                 .update_contact(cli.account, recipient, name, expiration)
                 .await
         }
-        cli::CliCommands::UpdateGroup {
+        CliCommands::UpdateGroup {
             group_id,
             name,
             description,
@@ -335,7 +359,7 @@ async fn handle_command(
                 )
                 .await
         }
-        cli::CliCommands::UpdateProfile {
+        CliCommands::UpdateProfile {
             given_name,
             family_name,
             about,
@@ -357,14 +381,42 @@ async fn handle_command(
                 )
                 .await
         }
-        cli::CliCommands::UploadStickerPack { path } => {
+        CliCommands::UploadStickerPack { path } => {
             client.upload_sticker_pack(cli.account, path).await
         }
-        cli::CliCommands::Verify {
+        CliCommands::Verify {
             verification_code,
             pin,
         } => client.verify(cli.account, verification_code, pin).await,
-        cli::CliCommands::Version => client.version().await,
+        CliCommands::Version => client.version().await,
+        CliCommands::AddStickerPack { uri } => client.add_sticker_pack(cli.account, uri).await,
+        CliCommands::FinishChangeNumber {
+            number,
+            verification_code,
+            pin,
+        } => {
+            client
+                .finish_change_number(cli.account, number, verification_code, pin)
+                .await
+        }
+        CliCommands::GetAttachment {
+            id,
+            recipient,
+            group_id,
+        } => {
+            client
+                .get_attachment(cli.account, id, recipient, group_id)
+                .await
+        }
+        CliCommands::StartChangeNumber {
+            number,
+            voice,
+            captcha,
+        } => {
+            client
+                .start_change_number(cli.account, number, voice, captcha)
+                .await
+        }
     }
 }
 

From a40810e33e059cb641d1c1512d5da0e2caae8fd9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 30 Jan 2024 19:00:33 +0100
Subject: [PATCH 360/672] Update CHANGELOG.md

---
 CHANGELOG.md          | 232 +++++++++++++++++++++++++++++++++++++-----
 man/signal-cli.1.adoc |   2 +-
 2 files changed, 208 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4abfc108..994a048c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,43 +2,55 @@
 
 ## [Unreleased]
 
-**Attention**: Now requires Java 21 and libsignal-client version 0.37
+**Attention**: Now requires Java 21 and libsignal-client version 0.39.2
 
 ### Added
-- New --hidden parameter for removeContact command
-- New --notify-self parameter for send command, for sending a non-sync message when self is part of the recipients or groups.
-  With this parameter sending to the self number (+XXXX) now behaves the same as the --note-to-self parameter.
-- New --unrestricted-unidentified-sender parameter for updateAccount command
+
+- New `--hidden` parameter for `removeContact` command
+- New `--notify-self` parameter for `send` command, for sending a non-sync message when self is part of the recipients
+  or groups.
+
+  Sending to the self number (+XXXX) now behaves the same as the `--note-to-self` parameter. To get the previous
+  behavior, the `--notify-self` parameter can be added
+- New `--unrestricted-unidentified-sender` parameter for `updateAccount command`
 
 ### Improved
+
 - Better shutdown handling after Ctrl+C and SIGTERM
+- Implemented full remote storage sync.
+  Provides better contact and settings sync for linked devices.
 
 ## [0.12.7] - 2023-12-15
 
 **Attention**: Now requires native libsignal-client version 0.36.1
 
 ### Fixes
+
 - Fix linking to an existing account
 
 ## [0.12.6] - 2023-12-11
 
 ### Fixes
+
 - Fix linking to an existing account
 - Fix migration from old account data
 
 ## [0.12.5] - 2023-11-21
 
 ### Fixes
+
 - Fix issue with joining groups by group link for new accounts
 - Fix receiving address of shared contact
 - Fix receiving sync edit messages in groups
 
 ### Changed
+
 - Create safety numbers based on ACI instead of phone number
 
 ## [0.12.4] - 2023-10-22
 
 ### Fixes
+
 - Prevent ConcurrentModificationException
 - Update captcha help text
 
@@ -72,6 +84,7 @@
 - Add `libsignal_client_path` build property to override libsignal-client jar file
 
 ### Changed
+
 - `jsonRpc` command now supports multi-account mode including registering and linking
 
 ## [0.12.1] - 2023-08-26
@@ -81,97 +94,122 @@
 - New `addStickerPack` command
 
 ### Fixed
+
 - Fixed some issues with upgrading from older accounts
 
 ### Changed
+
 - Reverted receive notification in JSON-RPC to old format, only explicit subscriptions should use the new format
 
 ## [0.12.0] - 2023-08-11
+
 **Attention**: Now requires native libsignal-client version 0.30.0
 
 ### Breaking changes
+
 - Adapt receive subscription notification in JSON-RPC to have payload in result field
-  - Before: `{"jsonrpc":"2.0","method":"receive","params":{"envelope":{ ... },"account":"+XXX","subscription":0}}`
-  - After: `{"jsonrpc":"2.0","method":"receive","params":{"subscription":0,"result":{"envelope":{ ... },"account":"+XXX"}}}`
+    - Before: `{"jsonrpc":"2.0","method":"receive","params":{"envelope":{ ... },"account":"+XXX","subscription":0}}`
+    - After:
+      `{"jsonrpc":"2.0","method":"receive","params":{"subscription":0,"result":{"envelope":{ ... },"account":"+XXX"}}}`
 
 ### Added
+
 - Manage identities via DBus (Thanks @bublath)
 - Added support for SVR2 PINs
 
 ### Fixed
+
 - Fixed finishLink/receive/register/verify commands for JSON-RPC
 - Update to the latest libsignal to fix various issues
 
 ## [0.11.11] - 2023-05-24
+
 **Attention**: Now requires native libsignal-client version 0.25.0
 
 ### Added
+
 - New `--text-style` and `--quote-text-style` flags for `send` command
 
 ### Fixed
+
 - Fixed migration of older account files
 - Fix deleting old unregistered recipient
 
 ## [0.11.10] - 2023-05-11
+
 **Attention**: Now requires native libsignal-client version 0.23.1
 
 ### Added
+
 - Support for receiving and sending edit messages with `--edit-timestamp`
 
 ## [0.11.9.1] - 2023-04-23
 
 ### Fixed
+
 - Fix build with Java 20
 
 ## [0.11.9] - 2023-04-22
 
 ### Fixed
+
 - Workaround issue with linking to newer app versions
 
 ## [0.11.8] - 2023-04-05
 
 ### Added
+
 - Added file attachment attributes to JSON output (Thanks @signals-from-outer-space)
 
 ### Fixed
+
 - Scrub E164 number from dbus paths
 - Fix sending large text messages to multiple recipient
 - Fix deleting old group in dbus mode
 - Fix issue with unknown identity serviceId
 
 ### Improved
+
 - Relaxed Content-Type check in http daemon mode (Thanks @cedb)
 
 ## [0.11.7] - 2023-02-19
+
 **Attention**: Now requires native libsignal-client version 0.22.0
 
 ### Fixed
+
 - Fix issue with missing pni identity key
 - Fix graalvm sqlite issue (Thanks @Marvin A. Ruder)
 - Fix issue with forgetting recipient
 
 ### Changed
+
 - Allow JSON-RPC commands without account param if only one account exists
 
 ## [0.11.6] - 2022-12-18
 
 ### Added
+
 - Allow using data URIs for updateGroup/updateProfile
 - New alive check endpoint for http daemon (Thanks @ced-b)
 
 ### Fixed
+
 - Registration with voice verification now works if no system locale is set
 - Fixed retrieving attachments in JSON RPC mode (Thanks @ced-b)
 
 ## [0.11.5.1] - 2022-11-09
 
 ### Fixed
+
 - Fix updating from older signal-cli version
 
 ## [0.11.5] - 2022-11-07
+
 **Attention**: Now requires native libsignal-client version 0.21.1
 
 ### Added
+
 - Add `--http` flag to `daemon` command to provide a JSON-RPC http endpoint (`/api/v1/rpc`). (Thanks @ced-b)
 - The `receive` method is now also available in JSON-RPC daemon mode, for polling new messages.
 - Add `getAttachment` command to get attachment file base64 encoded. (Thanks @ced-b)
@@ -181,25 +219,30 @@
 - Add `--max-messages` to `receive` command, to only receive a certain number of messages.
 
 ### Changed
+
 - Send long text messages as attachment instead. This matches the behavior of the official clients.
 - Store attachments with a file extension, for common file types.
 
 ## [0.11.4] - 2022-10-19
 
 ### Added
+
 - Approve/Refuse group join requests, using same interface as adding/removing members
 - Add --ignore-stories flag to prevent receiving story messages
 
 ### Fixed
+
 - Fixed issue with receiving messages that can't be decrypted
 - Do not discard incoming group join messages
 
 ### Improved
+
 - Add code to receive new PNI after change number
 
 ## [0.11.3] - 2022-10-07
 
 ### Fixed
+
 - Fix sending messages to groups (in non-daemon mode)
 - Fix updating from older signal-cli version
 - Fix issue with handling decryption error message
@@ -208,162 +251,204 @@
 ## [0.11.2] - 2022-10-06
 
 ### Fixed
+
 - Update user agent version to work with new Signal-Server check
 
 ## [0.11.1] - 2022-10-05
 
 ### Fixed
+
 - Fix sending group messages
 - Fix store migration issue on Windows
 - Fix building fat jars
 
 ## [0.11.0] - 2022-10-02
+
 **Attention**: Now requires native libsignal-client version 0.20.0
 
 ### Breaking changes
+
 - Changed meaning of `-v` flag from `--version` to `--verbose`.
   So now extended logging can be achieved with `-vv`.
 - Remove deprecated fallback to reading from stdin if no message body is given.
   To read a message from stdin, use the `--message-from-stdin` flag.
 
 ### Added
+
 - Migrate PIN to new KBS enclave when Signal updates it
 - Add `--scrub-log` flag to remove possibly sensitive information from the log
 - Add `sendPaymentNotification` dbus method
 
 ### Fixed
+
 - Fix an issue where messages were sent without sender phone number
 
 ### Changed
+
 - Store data except base account data in sqlite database
 - Use new CDSI for contact discovery in compat mode
 
 ## [0.10.11] - 2022-08-17
+
 **Attention**: Now requires native libsignal-client version 0.19.3
 
 ### Added
+
 - Output content of received story messages
 
 ## [0.10.10] - 2022-07-30
+
 **Attention**: Now requires native libsignal-client version 0.18.1
 
 ### Fixed
+
 - Fix setPin/removePin commands which broke due to server side changes
 - Workaround GraalVM 22.2.0 issue with daemon connection
 
 ## [0.10.9] - 2022-07-16
 
 ### Changed
+
 - updateAccount command checks self number and PNI after updating account attributes
 
 ### Fixed
+
 - Fixed small issue with syncing contacts from storage
 - Fixed issue with opening older account files
 
 ## [0.10.8] - 2022-06-13
 
 ### Added
+
 - Attachments can now be given as data: URIs with base64 data instead of just file paths (Thanks @KevinRoebert)
 - `version` command can now be used on the commandline, in addition to the `--version` flag.
   In the next version the current short form `-v` will change its meaning to `--verbose`!
 
 ### Improved
+
 - An account can now be registered on both LIVE and STAGING environment in the same config directory.
 - Logging output for registering has been extended.
 
 ## [0.10.7] - 2022-05-29
 
 ### Added
+
 - Added profile information to `listContacts` command output
 - Added filter flags for `listContacts` command
 - New `sendPaymentNotification` command to send payment receipt blobs
 - New `--given-name` and `--family-name` parameters for `updateContact` command
 - Implement sending link previews with `--preview-url`, `--preview-title` parameters for the `send` command
-- New `--send-read-receipts` parameter for `receive` and `daemon` commands for automatically marking received messages as read
+- New `--send-read-receipts` parameter for `receive` and `daemon` commands for automatically marking received messages
+  as read
 
 ### Fixed
+
 - Issue with endless growing `pre-keys-pni` data directory
 
 ## [0.10.6] - 2022-05-19
+
 **Attention**: Now requires native libsignal-client version 0.17
 
 ### Added
+
 - Check if account is used on the environment it was registered (live or staging)
 - New command `deleteLocalAccountData` to delete all local data of an unregistered account
 - New parameter `-g` for `listGroups` command to filter for specific groups
 
 ### Fixed
+
 - Fix deleting a recipient which has no uuid
 
 ### Changed
+
 - Show warning when sending a message and no profile name has been set.
   (A profile name may become mandatory in the future)
 - After blocking a contact/group the profile key is now rotated
 - Only update profile keys from authoritative group changes
 
 ## [0.10.5] - 2022-04-11
+
 **Attention**: Now requires native libsignal-client version 0.15
 
 ### Added
+
 - New `--ban`, `--unban` flags for `updateGroup` command to ban users from joining by group link
 
 ### Fixed
+
 - Fix plain text output of blocked group ids
 - Fix error output in case of rate limiting
 - Fix error when creating a group with no members
 - Fix adding recent Signal-Desktop versions as linked devices
 
 ## [0.10.4.2] - 2022-03-17
+
 ### Fixed
+
 - Crash in json output when receiving message from untrusted identity
 - Fix multi account commands for newly created accounts
 
 ## [0.10.4.1] - 2022-03-02
+
 ### Fixed
+
 - Linking to current apps (which currently don't include a PNI identity yet)
 - Show better error message when --target-timestamp is missing for sendReceipt
 
 ## [0.10.4] - 2022-02-20
+
 ### Added
+
 - Implement support for change number as linked device
-- Add `--message-from-stdin` flag for send command.  The current behavior of
+- Add `--message-from-stdin` flag for send command. The current behavior of
   reading from stdin if the `-m` flag is not given, will be removed in a future
   version.
 
 ### Changed
+
 - Align receive timeout behavior for dbus client with cli and JSON-RPC.
   Timeout is reset by every incoming message
 - Renamed `error` field in json receive response to `exception`
 
 ### Fixed
+
 - Prevent a stale jsonrpc connection from interfering with message receiving
 
 ## [0.10.3] - 2022-02-01
+
 ### Added
+
 - MessageSendLog to cache sent message for 24h.
   For resending messages in case the recipient fails to decrypt the message.
 - New global `--log-file` parameter to write logs to a separate file.
   (`--verbose` can be used to increase the log level)
 
 ### Improved
+
 - Better subscription handling for JSON-RPC `subscribeReceive` command
 
 ### Fixed
+
 - Output receipt data for unsealed sender receipts again
 - Fix sending message resend requests to devices that happen to have the same deviceId
 
 ## [0.10.2] - 2022-01-22
+
 ### Fixed
+
 - Archive old sessions/sender keys when a recipient's identity key has changed
 - Fix profile fetch with an invalid LANG variable
 
 ## [0.10.1] - 2022-01-16
+
 ### Added
+
 - Send group messages with sender keys (more efficient for larger groups)
 - New command `listStickerPacks` to display all known sticker packs
 - New flag `--sticker` for `send` command to send stickers
 
 ### Changed
+
 - Improve exit code for message sending.
   Exit with 0 status code if the message was sent successfully to at least
   one recipient, otherwise exit with status code 2 or 4 (for untrusted).
@@ -373,109 +458,140 @@
 - Rename sandbox to staging environment, to match the upstream name.
 
 ### Fixed
+
 - The first incoming message after registration can now always be decrypted successfully
 - Ignore decryption failures from blocked contacts and don't send a resend request.
 
 ## [0.10.0] - 2021-12-11
+
 **Attention**: Now requires Java 17 and libsignal-client version 0.11
 
 ### Added
+
 - The daemon command now provides a JSON-RPC based socket interface (`--socket` and `--tcp`)
 - New daemon command flag `--receive-mode` to configure when messages are received
 - New daemon command flag `--no-receive-stdout` to prevent outputting messages on stdout
 - New command `listAccounts` that lists all registered local accounts
 - New command `removeContact`
-- Extend `send` command to allow sending mentions (`--mention`) and quotes (`--quote-timestamp`, `--quote-author`, `--quote-message`, `--quote-mention`)
+- Extend `send` command to allow sending mentions (`--mention`) and
+  quotes (`--quote-timestamp`, `--quote-author`, `--quote-message`, `--quote-mention`)
 - New dbus methods sendGroupTying, unregister, deleteAccount
-- New dbus events MessageReceivedV2, ReceiptReceivedV2, SyncMessageReceivedV2 that provide an extras parameter with additional message info as a key/value map
+- New dbus events MessageReceivedV2, ReceiptReceivedV2, SyncMessageReceivedV2 that provide an extras parameter with
+  additional message info as a key/value map
 - New dbus method sendViewedReceipt (Thanks @John Freed)
 - New dbus object Configuration to read and update configuration values (Thanks @John Freed)
 - Payment info in json receive output (Thanks @technillogue)
 - `-c` alias for `--config` (Thanks @technillogue)
 
 ### Changed
+
 - libzkgroup dependency is no longer required
-- Renamed `-u` and `--username` flags to `-a` and `--account` to prevent confusion with upcoming Signal usernames. The old flags are also still supported for now.
+- Renamed `-u` and `--username` flags to `-a` and `--account` to prevent confusion with upcoming Signal usernames. The
+  old flags are also still supported for now.
 - Respect phone number sharing mode and unlisted state set by primary device
 - Adapt register command to reactivate account if possible.
 - dbus-java now uses Java 16 native unix sockets, which should provide better cross-platform compatibility
-- If sending to a recipient fails (e.g. unregistered) signal-cli now exits with a success exit code and prints additional information about the failure.
+- If sending to a recipient fails (e.g. unregistered) signal-cli now exits with a success exit code and prints
+  additional information about the failure.
 
 ### Fixed
+
 - Registering an existing unregistered account now works reliably in daemon mode
 - Fixed an issue with loading some old config files without UUID
 - More reliable send behavior if some recipients are unregistered
 
 ## [0.9.2] - 2021-10-24
+
 ### Fixed
+
 - dbus `listNumbers` method works again
 
 ### Changed
+
 - Improved provisioning error handling if the last steps fail
 - Adapt behavior of receive command as dbus client to match normal mode
 - Update captcha url for proof required handling
 
 ## [0.9.1] - 2021-10-16
+
 **Attention**: Now requires native libzkgroup version 0.8
 
 ### Added
+
 - New command `updateConfiguration` which allows setting configurations for linked devices
 - Improved dbus daemon for group handling, groups are now exported as separate dbus objects
 - Linked devices can be managed via dbus
 - New dbus methods sendTyping and sendReadReceipt (Thanks @JtheSaw)
-- New dbus methods submitRateLimitChallenge, isRegistered, listDevices, setExpirationTimer, sendContacts, sendSyncRequest, uploadStickerPack, setPin and removePin (Thanks @John Freed)
+- New dbus methods submitRateLimitChallenge, isRegistered, listDevices, setExpirationTimer, sendContacts,
+  sendSyncRequest, uploadStickerPack, setPin and removePin (Thanks @John Freed)
 - New dbus method getSelfNumber
 
 ### Fixed
+
 - Do not send message resend request to own device
 - Allow message from pending member to accept group invitations
 - Fix issue which could cause signal-cli to repeatedly send the same delivery receipts
 - Reconnect websocket after connection loss
 
 ### Changed
+
 - Use new provisioning URL `sgnl://linkdevice` instead of `tsdevice:/`
 - The gradle command to build a graalvm native image is now `./gradlew nativeCompile`
 
 ## [0.9.0] - 2021-09-12
+
 **Attention**: Now requires native libsignal-client version 0.9
 
 ### Breaking changes
+
 - Removed deprecated `--json` parameter, use global parameter `--output=json` instead
 - Json output format of `listGroups` command changed:
   Members are now arrays of `{"number":"...","uuid":"..."}` objects instead of arrays of strings.
 - Removed deprecated fallback data paths, only `$XDG_DATA_HOME/signal-cli` is used now
-  For those still using the old paths (`$HOME/.config/signal`, `$HOME/.config/textsecure`) you need to move those to the new location.
+  For those still using the old paths (`$HOME/.config/signal`, `$HOME/.config/textsecure`) you need to move those to the
+  new location.
 
 ### Added
+
 - New global parameter `--trust-new-identities=always` to allow trusting any new identity key without verification
-- New parameter `--device-name` for `updateAccount` command to change the device name (also works for the primary device)
+- New parameter `--device-name` for `updateAccount` command to change the device name (also works for the primary
+  device)
 - New SignalControl DBus interface, to register/verify/link new accounts
 - New `jsonRpc` command that provides a JSON-RPC based API on stdout/stdin
 - Support for announcement groups
 - New parameter `--set-permission-send-messages` for `updateGroup` to create an announcement group
 - New `sendReceipt` command to send read and viewed receipts
-- Support for receiving sender key messages, mobile apps can now send messages more efficiently with server-side fan-out to groups with signal-cli members.
+- Support for receiving sender key messages, mobile apps can now send messages more efficiently with server-side fan-out
+  to groups with signal-cli members.
 - Support for reading data from remote Signal storage. Now v2 groups will be shown after linking a new device.
 - New `submitRateLimitChallenge` command that can be used to lift some rate-limits by solving a captcha
 
 ### Fixed
+
 - Store identity key correctly when sending a message after a recipient has changed keys
 
 ## [0.8.5] - 2021-08-07
+
 ### Added
+
 - Source name is included in JSON receive output (Thanks @technillogue)
 
 ### Fixed
+
 - Allow updateContact command to only set expiration timer without requiring a name parameter
 
 ## [0.8.4.1] - 2021-06-20
+
 ### Fixed
+
 - Incorrect error handling in register command
 
 ## [0.8.4] - 2021-06-13
+
 **Attention**: Now requires native libsignal-client version 0.8.1
 
 ### Added
+
 - New parameters for `updateGroup` command for group v2 features:
   `--description`, `--remove-member`, `--admin`, `--remove-admin`, `--reset-link`, `--link`, `--set-permission-add-member`, `--set-permission-edit-details`, `--expiration`
 - New `--admin` parameter for `quitGroup` to set an admin before leaving the group
@@ -483,6 +599,7 @@
 - New 'sendTyping' command to send typing indicators
 
 ### Fixed
+
 - Fixed issue that prevented registration with invalid locales
 - Prevent last admin of a group from leaving the group
 - All commands now show a short description with `--help`
@@ -492,11 +609,14 @@
 ## [0.8.3] - 2021-05-13
 
 ### Fixed
+
 - Upgrading from account files with older profiles
 - Building native image with graalvm
 
 ## [0.8.2] - 2021-05-11
+
 ### Added
+
 - A manual page for the DBus interface (Thanks @bublath, @exquo)
 - Remote message delete command (Thanks @adaptivegarage)
 - sendSyncRequest command to request complete contact/group list from primary device
@@ -504,6 +624,7 @@
 - New `--family-name` argument for updateProfile
 
 ### Fixed
+
 - Sending reaction to group (Thanks @adaptivegarage)
 - Displaying of address for messages from untrusted identities
 - Handling of recipient number or uuid changes (e.g. after account deletions)
@@ -511,6 +632,7 @@
 - Display of quit group messages
 
 ### Changed
+
 - Unlimited strength crypto is now enabled automatically for JREs that require it (Thanks @i-infra)
 - Only one identity key is stored per recipient and updated from profile (to match app behavior)
 - updateContact, block and unblock are now disabled for linked devices
@@ -518,44 +640,58 @@
 - If message decryption fails due to a broken session, the session is automatically renewed
 - Rework account storage for better reliability
 - Improved device linking flow
-  - Allow relinking existing account
-  - Encrypt/Decrypt device names
+    - Allow relinking existing account
+    - Encrypt/Decrypt device names
 
 ## [0.8.1] - 2021-03-02
+
 ### Added
-- New dbus commands: updateProfile, listNumbers, getContactNumber, quitGroup, isContactBlocked, isGroupBlocked, isMember, joinGroup (Thanks @bublath)
+
+- New dbus commands: updateProfile, listNumbers, getContactNumber, quitGroup, isContactBlocked, isGroupBlocked,
+  isMember, joinGroup (Thanks @bublath)
 - Additional output for json format: shared contacts (Thanks @Atomic-Bean)
 - Improved plain text output to be more consistent and synced messages are now indented
 
 ### Fixed
+
 - Issue with broken sessions with linked devices
 
 ### Changed
+
 - Behavior of `trust` command improved, when trusting a new identity key all other known keys for
   the same number are removed.
 
 ## [0.8.0] - 2021-02-14
-**Attention**: For all signal protocol functionality an additional native library is now required: [libsignal-client](https://github.com/signalapp/libsignal-client/).
+
+**Attention**: For all signal protocol functionality an additional native library is now
+required: [libsignal-client](https://github.com/signalapp/libsignal-client/).
 See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal for more information.
 
 ### Added
+
 - Experimental support for building a GraalVM native image
 - Support for setting profile about text and emoji
 
 ### Fixed
+
 - Incorrect error message when removing a non-existent profile avatar
 
 ## [0.7.4] - 2021-01-19
+
 ### Changed
+
 - Notify linked devices after profile has been updated
 
 ### Fixed
+
 - After registering a new account, receiving messages didn't work
   You may have to register and verify again to fix the issue.
 - Creating v1 groups works again
 
 ## [0.7.3] - 2021-01-17
+
 ### Added
+
 - `getUserStatus` command to check if a user is registered on Signal (Thanks @Atomic-Bean)
 - Global `--verbose` flag to increase log level
 - Global `--output=json` flag, currently supported by `receive`, `daemon`, `getUserStatus`, `listGroups`
@@ -563,6 +699,7 @@ See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal fo
 - More info for received messages in json output: stickers, viewOnce, typing, remoteDelete
 
 ### Changed
+
 - signal-cli can now be used without the username `-u` flag
   For daemon command all local users will be exposed as dbus objects.
   If only one local user exists, all other commands will use that user,
@@ -574,32 +711,42 @@ See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal fo
 - In json output unnecessary fields that are null are now omitted
 
 ### Fixed
+
 - Disable registration lock before removing the PIN
 - Fix PIN hash version to match the official clients.
   If you had previously set a PIN you need to set it again to be able to unlock the registration lock later.
 - Issue with saving account file after linking
 
 ## [0.7.2] - 2020-12-31
+
 ### Added
+
 - Implement new registration lock PIN with `setPin` and `removePin` (with KBS)
 - Include quotes, mentions and reactions in json output (Thanks @Atomic-Bean)
 
 ### Fixed
+
 - Retrieve avatars for v2 groups
 - Download attachment thumbnail for quoted attachments
 
 ## [0.7.1] - 2020-12-21
+
 ### Added
+
 - Accept group invitation with `updateGroup -g GROUP_ID`
 - Decline group invitation with `quitGroup -g GROUP_ID`
 - Join group via invitation link `joinGroup --uri https://signal.group/#...`
 
 ### Fixed
+
 - Include group ids for v2 groups in json output
 
 ## [0.7.0] - 2020-12-15
+
 ### Added
+
 Support for groups of new type/v2
+
 - Sending and receiving
 - Updating name, avatar and adding members with `updateGroup`
 - Quit group and decline invitation with `quitGroup`
@@ -609,28 +756,36 @@ Support for groups of new type/v2
 See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal for more information.
 
 ### Fixed
+
 - Rare NullPointerException when receiving messages
 
 ## [0.6.12] - 2020-11-22
+
 ### Added
+
 - Show additional message content (view once, remote delete, mention, …) for received messages
 - `--captcha` parameter for `register` command, required for some IP ranges
 
 ### Changed
+
 - Profile keys are now stored separately from contact list
 - Receipts from normal and unidentified messages now have the same format in json output
 
 ### Fixed
+
 - Issue where some messages were sent with an old counter index
 
 ## [0.6.11] - 2020-10-14
+
 - Fix issue with receiving message reactions
 
 ## [0.6.10] - 2020-09-11
+
 - Fix issue when retrieving profiles
 - Workaround issue with libzkgroup on platforms other than linux x86_64
 
 ## [0.6.9] - 2020-09-10
+
 - Minor bug fixes and improvements
 - dbus functionality now works on FreeBSD
 - signal-cli now requires Java 11
@@ -638,17 +793,21 @@ See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal fo
 **Warning: this version only works on Linux x86_64, will be fixed in 0.6.10**
 
 ## [0.6.8] - 2020-05-22
-- Switch to hypfvieh dbus-java, which doesn't require a native library anymore (drops requirement of libmatthew-unix-java)
+
+- Switch to hypfvieh dbus-java, which doesn't require a native library anymore (drops requirement of
+  libmatthew-unix-java)
 - Bugfixes for messages with uuids
 - Add `--expiration` parameter to `updateContact` command to set expiration timer
 
 ## [0.6.7] - 2020-04-03
+
 - Send command now returns the timestamp of the sent message
 - DBus daemon: Publish received sync message to SyncMessageReceived signal
 - Fix issue with resolving e164/uuid addresses for sessions
 - Fix pack key length for sticker upload
 
 ## [0.6.6] - 2020-03-29
+
 - Added listContacts command
 - Added block/unblock commands to block contacts and groups
 - Added uploadStickerPack command to upload sticker packs (see man page for more details)
@@ -657,21 +816,26 @@ See https://github.com/AsamK/signal-cli/wiki/Provide-native-lib-for-libsignal fo
 - Internal: support recipients with uuids
 
 ## [0.6.5] - 2019-11-11
+
 Supports receiving messages sent with unidentified sender
 
 ## [0.6.4] - 2019-11-02
+
 - Fix rounding error for attachment ids in json output
 - Add additional info to json output
 - Add commands to update profile name and avatar
 - Add command to update contact names
 
 ## [0.6.3] - 2019-09-05
+
 Bug fixes and small improvements
 
 ## [0.6.2] - 2018-12-16
+
 - Fixes sending of group messages
 
 ## [0.6.1] - 2018-12-09
+
 - Added getGroupIds dbus command
 - Use "NativePRNG" pseudo random number generator, if available
 - Switch default data path:
@@ -679,41 +843,49 @@ Bug fixes and small improvements
   Existing data paths will continue to work (used as fallback)
 
 ## [0.6.0] - 2018-05-03
+
 - Simple json output
 - dbus signal for receiving messages
 - Registration lock PIN
 - Output quoted message
 
 ## [0.5.6] - 2017-06-16
+
 * new listGroups command
 * Support for attachments with file names
 * Support for complete contacts sync
 * Support for contact verification sync
 * DBus interface:
- * Get/Set group info
- * Get/Set contact info
+* Get/Set group info
+* Get/Set contact info
 
 ## [0.5.5] - 2017-02-18
+
 - fix receiving messages on linked devices
 - add unregister command
 
 ## [0.5.4] - 2017-02-17
+
 - Fix linking of new devices
 
 ## [0.5.3] - 2017-01-29
+
 * New commandline parameter for receive: --ignore-attachments
 * Updated dependencies
 
 ## [0.5.2] - 2016-12-16
+
 - Add support for group info requests
 - Improve closing of file streams
 
 ## [0.5.1] - 2016-11-18
+
 - Support new safety numbers (https://whispersystems.org/blog/safety-number-updates/)
 - Add a man page
 - Support sending disappearing messages, if the recipient has activated it
 
 ## [0.5.0] - 2016-08-29
+
 - Check if a number is registered on Signal, before adding it to a group
 - Prevent sending to groups that the user has quit
 - Commands to trust new identity keys (see README)
@@ -721,38 +893,47 @@ Bug fixes and small improvements
 - Timestamps shown in ISO 8601 format
 
 ## [0.4.1] - 2016-07-18
+
 - Fix issue with creating groups
 - Lock config file to prevent parallel access by multiple instances of signal-cli
 - Improve return codes, always return non-zero code, when sending failed
 
 ## [0.4.0] - 2016-06-19
+
 - Linking to Signal-Desktop and Signal-Android is now possible (Provisioning)
 - Added a contact store, mainly for syncing contacts with linked devices (editing not yet possible via cli)
 - Avatars for groups and contacts are now stored (new folder "avatars" in the config path)
 
 ## [0.3.1] - 2016-04-03
+
 - Fix running with Oracle JRE 8
 - Fix registering
 - Fix unicode warning when compiling with non utf8 locale
 
 ## [0.3.0] - 2016-04-02
+
 - Renamed textsecure-cli to signal-cli, following the rename of libtextsecure-java to libsignal-service-java
 - The experimental dbus interface was also renamed to org.asamk.Signal
 - Upload new prekeys to the server, when there are less than 20 left, prekeys are needed to create new sessions
 
 ## [0.2.1] - 2016-02-10
+
 - Improve dbus service
 - New command line argument --config to specify config directory
 
 ## [0.2.0] - 2015-12-30
-Added an experimental dbus interface, for sending and receiving messages (The interface is unstable and may change with future releases).
+
+Added an experimental dbus interface, for sending and receiving messages (The interface is unstable and may change with
+future releases).
 
 This release works with Java 7 and 8.
 
 ## [0.1.0] - 2015-11-28
+
 Add support for creating/updating groups and sending to them
 
 ## [0.0.5] - 2015-11-21
+
 - Add receive timeout commandline parameter
 - Show message group info
 
@@ -761,4 +942,5 @@ Add support for creating/updating groups and sending to them
 ## [0.0.3] - 2015-08-07
 
 ## [0.0.2] - 2015-07-08
+
 First release
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 7bc17905..33f99a6f 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -700,7 +700,7 @@ Install a sticker pack for this account.
 
 *--uri* [URI]::
 Specify the uri of the sticker pack.
-e.g. https://signal.art/addstickers/#pack_id=XXX&pack_key=XXX)"
+e.g. https://signal.art/addstickers/#pack_id=XXX&pack_key=XXX
 
 === getAttachment
 

From 00e71ed0fc63959063e79b06bb31da6aa3e71e00 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 31 Jan 2024 20:33:01 +0100
Subject: [PATCH 361/672] Improve scrubbing of sensitive identifiers

Fixes #1189
---
 man/signal-cli.1.adoc                         |  1 +
 .../asamk/signal/logging/LogConfigurator.java |  2 ++
 .../org/asamk/signal/logging/Scrubber.java    | 30 +++++++++++++++++--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 33f99a6f..110f8021 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -44,6 +44,7 @@ If `--verbose` is also given, the detailed logs will only be written to the log
 
 *--scrub-log*::
 Scrub possibly sensitive information from the log, like phone numbers and UUIDs.
+Doesn't work reliably on dbus logs with very verbose logging (`-vvv`)
 
 *--config* CONFIG::
 Set the path, where to store the config.
diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 825495df..65e8c4f5 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -52,6 +52,8 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         rootLogger.addAppender(consoleAppender);
 
         lc.getLogger("org.asamk").setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO);
+        lc.getLogger("org.asamk.Signal")
+                .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN);
         lc.getLogger("com.zaxxer.hikari.pool.PoolBase")
                 .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN);
         lc.getLogger("org.sqlite.core.NativeDB")
diff --git a/src/main/java/org/asamk/signal/logging/Scrubber.java b/src/main/java/org/asamk/signal/logging/Scrubber.java
index c1d66893..6078c6ba 100644
--- a/src/main/java/org/asamk/signal/logging/Scrubber.java
+++ b/src/main/java/org/asamk/signal/logging/Scrubber.java
@@ -37,9 +37,17 @@ public final class Scrubber {
      * Supposedly, the shortest international phone numbers in use contain seven digits.
      * Handles URL encoded +, %2B
      */
-    private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B|/org/asamk/Signal/_)(\\d{5,13})(\\d{2})");
+    private static final Pattern E164_PATTERN = Pattern.compile("(\\+|%2B|_)(\\d{5,13})(\\d{2})");
     private static final String E164_CENSOR = "*************";
 
+    private static final Pattern GROUP_V1_ID_PATTERN = Pattern.compile(
+            "(/org/asamk/Signal/.*Groups/[a-zA-Z0-9/_+-]{2}|[a-zA-Z0-9/_+-]{2})([a-zA-Z0-9/_+-]{18})([a-zA-Z0-9/_+-]{2})(==|__)");
+    private static final String GROUP_V1_ID_CENSOR = "*".repeat(18);
+
+    private static final Pattern GROUP_V2_ID_PATTERN = Pattern.compile(
+            "(/org/asamk/Signal/.*Groups/[a-zA-Z0-9/_+-]{2}|[a-zA-Z0-9/_+-]{2})([a-zA-Z0-9/_+-]{39})([a-zA-Z0-9/_+-]{2})([=_])");
+    private static final String GROUP_V2_ID_CENSOR = "*".repeat(39);
+
     /**
      * The second group will be censored.
      */
@@ -172,9 +180,11 @@ public final class Scrubber {
 
     public static CharSequence scrub(CharSequence in) {
 
+        in = scrubUuids(in);
         in = scrubE164(in);
         in = scrubEmail(in);
-        in = scrubUuids(in);
+        in = scrubGroupV2Ids(in);
+        in = scrubGroupV1Ids(in);
         in = scrubDomains(in);
         in = scrubIpv4(in);
 
@@ -189,6 +199,22 @@ public final class Scrubber {
                         .append(matcher.group(3)));
     }
 
+    private static CharSequence scrubGroupV1Ids(CharSequence in) {
+        return scrub(in,
+                GROUP_V1_ID_PATTERN,
+                (matcher, output) -> output.append(matcher.group(1))
+                        .append(GROUP_V1_ID_CENSOR, 0, matcher.group(2).length())
+                        .append(matcher.group(3)));
+    }
+
+    private static CharSequence scrubGroupV2Ids(CharSequence in) {
+        return scrub(in,
+                GROUP_V2_ID_PATTERN,
+                (matcher, output) -> output.append(matcher.group(1))
+                        .append(GROUP_V2_ID_CENSOR, 0, matcher.group(2).length())
+                        .append(matcher.group(3)));
+    }
+
     private static CharSequence scrubEmail(CharSequence in) {
         return scrub(in,
                 CRUDE_EMAIL_PATTERN,

From 0b33cb55b81b9bb4ce4b67cdf24f079b20f3bd05 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 31 Jan 2024 20:49:12 +0100
Subject: [PATCH 362/672] Adapt listContacts to only show registered users

Fixes #1395
---
 .../asamk/signal/manager/storage/recipients/RecipientStore.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 68ea4895..1f6c0a0d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -393,6 +393,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     ) {
         final var sqlWhere = new ArrayList<String>();
         if (onlyContacts) {
+            sqlWhere.add("r.unregistered_timestamp IS NULL");
             sqlWhere.add("(" + SQL_IS_CONTACT + ")");
             sqlWhere.add("r.hidden = FALSE");
         }

From 3be1c24b1b18115becfaef1e2ea82c914a1fefea Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 31 Jan 2024 21:17:23 +0100
Subject: [PATCH 363/672] Update client dependencies

---
 client/Cargo.lock            | 663 +++++++++++++++++------------------
 client/Cargo.toml            |   2 +-
 client/src/jsonrpc.rs        |   9 +-
 client/src/main.rs           |   3 +-
 client/src/transports/ipc.rs |   2 +-
 client/src/transports/tcp.rs |   3 +-
 6 files changed, 340 insertions(+), 342 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index f44499d8..642559a1 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "anstream"
-version = "0.5.0"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -33,62 +33,64 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.2"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "async-lock"
-version = "2.8.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
 dependencies = [
  "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.73"
+version = "0.1.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.31",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -114,9 +116,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.3"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "beef"
@@ -134,10 +136,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
-name = "bumpalo"
-version = "3.13.0"
+name = "bitflags"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bytes"
@@ -162,9 +164,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.2"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -172,9 +174,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.2"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
  "anstream",
  "anstyle",
@@ -185,21 +187,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.31",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "colorchoice"
@@ -208,10 +210,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
-name = "core-foundation"
-version = "0.9.3"
+name = "concurrent-queue"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -219,9 +230,15 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "equivalent"
@@ -231,30 +248,34 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.3"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "event-listener"
-version = "2.5.3"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
 
 [[package]]
 name = "fnv"
@@ -264,50 +285,50 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
 
 [[package]]
 name = "futures-channel"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.31",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
@@ -317,9 +338,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -331,10 +352,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "gimli"
-version = "0.28.0"
+name = "getrandom"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "h2"
@@ -357,9 +389,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 
 [[package]]
 name = "heck"
@@ -369,15 +401,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
 dependencies = [
  "bytes",
  "fnv",
@@ -386,9 +418,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
  "http",
@@ -409,9 +441,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -424,7 +456,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -433,9 +465,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http",
@@ -449,9 +481,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -459,45 +491,25 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b"
 dependencies = [
  "equivalent",
  "hashbrown",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys",
-]
-
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-
-[[package]]
-name = "js-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-dependencies = [
- "wasm-bindgen",
-]
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jsonrpsee"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8002beb64691edce321fc16cdba91916b10d798f9d480a05467b0ee98463c03b"
+checksum = "9579d0ca9fb30da026bac2f0f7d9576ec93489aeb7cd4971dd5b4617d82c79b2"
 dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-http-client",
@@ -508,9 +520,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4278372ecb78ebb522c36a242209a29162f4af0997a41158c8b60450b081baf1"
+checksum = "776d009e2f591b78c038e0d053a796f94575d66ca4e77dd84bfc5e81419e436c"
 dependencies = [
  "anyhow",
  "async-lock",
@@ -520,19 +532,21 @@ dependencies = [
  "futures-util",
  "hyper",
  "jsonrpsee-types",
+ "pin-project",
  "rustc-hash",
  "serde",
  "serde_json",
  "thiserror",
  "tokio",
+ "tokio-stream",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2393386c97ce214851a9677568c5a38223ae4eada833617cb16d8464d1128f1b"
+checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572"
 dependencies = [
  "async-trait",
  "hyper",
@@ -550,9 +564,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "985d4a3753a08aaf120429924567795b2764c5c691489316a7fd076178e708b4"
+checksum = "d94b7505034e2737e688e1153bf81e6f93ad296695c43958d6da2e4321f0a990"
 dependencies = [
  "heck",
  "proc-macro-crate",
@@ -563,29 +577,28 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbea61f2d95b9592491228db0c4d2b1e43ea1154ed9713bb666169cf3919ea7d"
+checksum = "3266dfb045c9174b24c77c2dfe0084914bb23a6b2597d70c9dc6018392e1cd1b"
 dependencies = [
  "anyhow",
  "beef",
  "serde",
  "serde_json",
  "thiserror",
- "tracing",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.8"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "log"
@@ -595,9 +608,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "miniz_oxide"
@@ -610,13 +623,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.8"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -631,18 +644,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "openssl-probe"
@@ -651,29 +664,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
-name = "percent-encoding"
-version = "2.3.0"
+name = "parking"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.31",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -690,45 +709,44 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
 dependencies = [
- "once_cell",
+ "toml_datetime",
  "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "ring"
-version = "0.16.20"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
+ "getrandom",
  "libc",
- "once_cell",
  "spin",
  "untrusted",
- "web-sys",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -745,23 +763,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.37.25"
+version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
- "bitflags",
+ "bitflags 2.4.2",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.21.7"
+version = "0.21.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
+checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
 dependencies = [
  "log",
  "ring",
@@ -783,18 +800,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
  "base64",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.4"
+version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
  "ring",
  "untrusted",
@@ -802,24 +819,24 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
  "ring",
  "untrusted",
@@ -831,7 +848,7 @@ version = "2.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -850,29 +867,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.196"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.31",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
 dependencies = [
  "itoa",
  "ryu",
@@ -907,29 +924,19 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
 dependencies = [
  "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
-dependencies = [
- "libc",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "spin"
-version = "0.5.2"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "strsim"
@@ -950,9 +957,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.31"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -961,32 +968,32 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.2.6"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
  "rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.31",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1006,9 +1013,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1016,20 +1023,20 @@ dependencies = [
  "mio",
  "num_cpus",
  "pin-project-lite",
- "socket2 0.5.3",
+ "socket2",
  "tokio-macros",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.31",
+ "syn 2.0.48",
 ]
 
 [[package]]
@@ -1043,10 +1050,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio-util"
-version = "0.7.8"
+name = "tokio-stream"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1064,9 +1082,9 @@ checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1102,11 +1120,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -1115,41 +1132,41 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.31",
+ "syn 2.0.48",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.13"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -1162,15 +1179,15 @@ dependencies = [
 
 [[package]]
 name = "untrusted"
-version = "0.7.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -1198,99 +1215,22 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.31",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.31",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-
-[[package]]
-name = "web-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -1299,13 +1239,28 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
@@ -1314,36 +1269,72 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -1351,10 +1342,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
-name = "winnow"
-version = "0.5.15"
+name = "windows_x86_64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "winnow"
+version = "0.5.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249"
 dependencies = [
  "memchr",
 ]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 17cedc03..a32a600f 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -12,7 +12,7 @@ log = "0.4"
 serde = "1"
 serde_json = "1"
 tokio = { version = "1", features = ["rt", "macros", "net", "rt-multi-thread"] }
-jsonrpsee = { version = "0.20.0", features = [
+jsonrpsee = { version = "0.21.0", features = [
     "macros",
     "async-client",
     "http-client",
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 3a117ff4..cb1b4f8c 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -1,8 +1,7 @@
 use std::path::Path;
 
 use jsonrpsee::async_client::ClientBuilder;
-use jsonrpsee::core::client::SubscriptionClientT;
-use jsonrpsee::core::Error;
+use jsonrpsee::core::client::{Error, SubscriptionClientT};
 use jsonrpsee::http_client::HttpClientBuilder;
 use jsonrpsee::proc_macros::rpc;
 use serde::Deserialize;
@@ -374,7 +373,9 @@ pub struct JsonLink {
     pub device_link_uri: String,
 }
 
-pub async fn connect_tcp(tcp: impl ToSocketAddrs) -> Result<impl SubscriptionClientT, Error> {
+pub async fn connect_tcp(
+    tcp: impl ToSocketAddrs,
+) -> Result<impl SubscriptionClientT, std::io::Error> {
     let (sender, receiver) = super::transports::tcp::connect(tcp).await?;
 
     Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
@@ -382,7 +383,7 @@ pub async fn connect_tcp(tcp: impl ToSocketAddrs) -> Result<impl SubscriptionCli
 
 pub async fn connect_unix(
     socket_path: impl AsRef<Path>,
-) -> Result<impl SubscriptionClientT, Error> {
+) -> Result<impl SubscriptionClientT, std::io::Error> {
     let (sender, receiver) = super::transports::ipc::connect(socket_path).await?;
 
     Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
diff --git a/client/src/main.rs b/client/src/main.rs
index 03aff481..a4858440 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -1,8 +1,7 @@
 use std::{path::PathBuf, time::Duration};
 
 use clap::Parser;
-use jsonrpsee::core::client::{Subscription, SubscriptionClientT};
-use jsonrpsee::core::Error as RpcError;
+use jsonrpsee::core::client::{Error as RpcError, Subscription, SubscriptionClientT};
 use serde_json::Value;
 use tokio::{select, time::sleep};
 
diff --git a/client/src/transports/ipc.rs b/client/src/transports/ipc.rs
index 497955e3..b14063aa 100644
--- a/client/src/transports/ipc.rs
+++ b/client/src/transports/ipc.rs
@@ -1,8 +1,8 @@
+use std::io::Error;
 use std::path::Path;
 
 use futures_util::stream::StreamExt;
 use jsonrpsee::core::client::{TransportReceiverT, TransportSenderT};
-use jsonrpsee::core::Error;
 use tokio::net::UnixStream;
 use tokio_util::codec::Decoder;
 
diff --git a/client/src/transports/tcp.rs b/client/src/transports/tcp.rs
index 8d7a27dc..ae80759f 100644
--- a/client/src/transports/tcp.rs
+++ b/client/src/transports/tcp.rs
@@ -1,6 +1,7 @@
+use std::io::Error;
+
 use futures_util::stream::StreamExt;
 use jsonrpsee::core::client::{TransportReceiverT, TransportSenderT};
-use jsonrpsee::core::Error;
 use tokio::net::{TcpStream, ToSocketAddrs};
 use tokio_util::codec::Decoder;
 

From 7fb263fdf0eccd5fcd77819bc5cfe2f77e8a975b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 1 Feb 2024 17:54:26 +0100
Subject: [PATCH 364/672] Update dependencies

---
 build.gradle.kts                                              | 2 +-
 .../signal/manager/syncStorage/ContactRecordProcessor.java    | 4 +++-
 settings.gradle.kts                                           | 4 ++--
 src/main/java/org/asamk/signal/BaseConfig.java                | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b0a37747..cc9b6ceb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.9.28"
+    id("org.graalvm.buildtools.native") version "0.10.0"
 }
 
 version = "0.12.8-SNAPSHOT"
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 7598b5ea..5bae64c8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -180,6 +180,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 ? local.getSystemFamilyName().orElse("")
                 : remote.getSystemFamilyName().orElse("");
         final var systemNickname = remote.getSystemNickname().orElse("");
+        final var pniSignatureVerified = remote.isPniSignatureVerified() || local.isPniSignatureVerified();
 
         final var mergedBuilder = new SignalContactRecord.Builder(remote.getId().getRaw(), aci, unknownFields).setE164(
                         e164)
@@ -200,7 +201,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .setMuteUntil(muteUntil)
                 .setHideStory(hideStory)
                 .setUnregisteredTimestamp(unregisteredTimestamp)
-                .setHidden(hidden);
+                .setHidden(hidden)
+                .setPniSignatureVerified(pniSignatureVerified);
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d34fe85c..e28f8eaf 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,8 +15,8 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_93")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.0.0")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_94")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
             library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 648f19d0..406c3fb1 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -5,7 +5,7 @@ public class BaseConfig {
     public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    static final String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.39.1";
+    static final String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.46.0";
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From bea659f9484a2aba47c4d8dad503f18b0aaff19b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 5 Feb 2024 16:58:24 +0100
Subject: [PATCH 365/672] Add icon

---
 data/icon.svg | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 data/icon.svg

diff --git a/data/icon.svg b/data/icon.svg
new file mode 100644
index 00000000..69ca862b
--- /dev/null
+++ b/data/icon.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg">
+<g transform="translate(-32.279 -138.64)">
+<g transform="matrix(.45526 0 0 .45526 33.984 140.17)">
+<path d="m33.468 66.938c-18.454 0-33.468-15.014-33.468-33.469s15.014-33.469 33.468-33.469c18.455 0 33.469 15.014 33.469 33.469 0 5.621-1.421 11.161-4.116 16.076l4.608 17.2-16.849-4.516c-5.172 3.084-11.069 4.709-17.112 4.709z" fill="#fff"/>
+<path d="m33.468 67.184c-18.454 0-33.468-15.014-33.468-33.469s15.014-33.469 33.468-33.469c18.455 0 33.469 15.014 33.469 33.469 0 5.621-1.421 11.161-4.116 16.076l4.608 17.2-16.849-4.516c-5.172 3.084-11.069 4.709-17.112 4.709zm0-62.938c-16.249 0-29.468 13.22-29.468 29.469s13.219 29.469 29.468 29.469c5.582 0 11.021-1.574 15.729-4.554l0.74-0.468 11.835 3.171-3.243-12.1 0.419-0.72c2.609-4.484 3.988-9.602 3.988-14.799 0-16.248-13.219-29.468-29.468-29.468z"/>
+<path d="m25.515 45.296q-2.3937 0-4.2817-0.97772-1.8543-0.97772-2.9332-3.0343-1.0451-2.0566-1.0451-5.2595 0-3.3377 1.1126-5.428 1.1126-2.0903 3.0006-3.068 1.9217-0.97772 4.3492-0.97772 1.3823 0 2.6634 0.30343 1.2812 0.26972 2.0903 0.67429l-0.91029 2.4612q-0.80915-0.30343-1.888-0.57315t-2.0229-0.26972q-5.3269 0-5.3269 6.844 0 3.2703 1.2812 5.0235 1.3149 1.7194 3.8772 1.7194 1.4834 0 2.596-0.30343 1.1463-0.30343 2.0903-0.74172v2.6297q-0.91029 0.472-2.0229 0.708-1.0789 0.26972-2.6297 0.26972zm11.901-0.33714h-2.9669v-25.623h2.9669zm7.2486-24.848q0.67429 0 1.18 0.472 0.53943 0.43829 0.53943 1.416 0 0.94401-0.53943 1.416-0.50572 0.472-1.18 0.472-0.74172 0-1.2474-0.472-0.50572-0.472-0.50572-1.416 0-0.97772 0.50572-1.416 0.50572-0.472 1.2474-0.472zm1.4497 6.7766v18.071h-2.9669v-18.071z" aria-label="cli"/>
+</g>
+</g>
+</svg>

From a0f33ac9422aff12d651402022ea20d63e0e4cf8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 6 Feb 2024 00:10:40 +0100
Subject: [PATCH 366/672] Update reflect config

---
 graalvm-config-dir/reflect-config.json | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 186f507f..d4548612 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -568,7 +568,7 @@
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
   "allDeclaredClasses":true,
-  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getGroup","parameterTypes":["byte[]"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.util.List"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }]
+  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getDevice","parameterTypes":["long"] }, {"name":"getGroup","parameterTypes":["byte[]"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"getThisDevice","parameterTypes":[] }, {"name":"listDevices","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.util.List"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.Signal$Configuration",
@@ -1169,14 +1169,16 @@
   "name":"org.asamk.signal.manager.storage.contacts.LegacyContactInfo",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.contacts.LegacyJsonContactsStore",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "fields":[{"name":"contacts", "allowWrite":true}]
+  "fields":[{"name":"contacts", "allowWrite":true}],
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.groups.GroupInfo",
@@ -1271,7 +1273,8 @@
   "name":"org.asamk.signal.manager.storage.protocol.LegacyJsonSignalProtocolStore",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.protocol.LegacyJsonSignedPreKeyStore$JsonSignedPreKeyStoreDeserializer",
@@ -1358,6 +1361,17 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","boolean"] }, {"name":"installed","parameterTypes":[] }, {"name":"packId","parameterTypes":[] }, {"name":"packKey","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.manager.storage.threads.LegacyJsonThreadStore",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.manager.storage.threads.LegacyJsonThreadStore$ThreadsDeserializer",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.util.SecurityProvider$DefaultRandom",
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.security.SecureRandomParameters"] }]
@@ -1817,7 +1831,7 @@
   "name":"org.freedesktop.dbus.interfaces.Properties",
   "allDeclaredMethods":true,
   "allDeclaredClasses":true,
-  "methods":[{"name":"GetAll","parameterTypes":["java.lang.String"] }]
+  "methods":[{"name":"Get","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"GetAll","parameterTypes":["java.lang.String"] }]
 },
 {
   "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",

From a48fdaf8b77b068c1049cff8713cf16b0b2c7ddb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 6 Feb 2024 00:21:32 +0100
Subject: [PATCH 367/672] Bump version to 0.12.8

---
 CHANGELOG.md     | 5 +++++
 build.gradle.kts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 994a048c..cd76af67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,11 @@
 - Implemented full remote storage sync.
   Provides better contact and settings sync for linked devices.
 
+## [0.12.8] - 2024-02-06
+
+### Fixes
+- Update user agent
+
 ## [0.12.7] - 2023-12-15
 
 **Attention**: Now requires native libsignal-client version 0.36.1
diff --git a/build.gradle.kts b/build.gradle.kts
index cc9b6ceb..9214ae91 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.0"
 }
 
-version = "0.12.8-SNAPSHOT"
+version = "0.12.9-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 1bf703b012521ac8b887be8a50b01bc7b62ce677 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 9 Feb 2024 17:45:41 +0100
Subject: [PATCH 368/672] Add --bus-name option to use different D-Bus bus name

---
 CHANGELOG.md                                  |  2 +
 man/signal-cli.1.adoc                         |  6 ++
 src/main/java/org/asamk/signal/App.java       |  7 ++-
 .../asamk/signal/commands/DaemonCommand.java  | 37 +++++++-----
 .../asamk/signal/dbus/DbusCommandHandler.java | 57 +++++++++++--------
 .../org/asamk/signal/dbus/DbusHandler.java    | 20 +++++--
 .../asamk/signal/dbus/DbusManagerImpl.java    |  7 ++-
 .../dbus/DbusMultiAccountManagerImpl.java     | 15 +++--
 8 files changed, 98 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd76af67..39950184 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
   Sending to the self number (+XXXX) now behaves the same as the `--note-to-self` parameter. To get the previous
   behavior, the `--notify-self` parameter can be added
 - New `--unrestricted-unidentified-sender` parameter for `updateAccount command`
+- New `--bus-name` parameter for `daemon` command to use another D-Bus bus name
 
 ### Improved
 
@@ -23,6 +24,7 @@
 ## [0.12.8] - 2024-02-06
 
 ### Fixes
+
 - Update user agent
 
 ## [0.12.7] - 2023-12-15
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 110f8021..af11a2df 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -71,6 +71,9 @@ Make request via user dbus.
 *--dbus-system*::
 Make request via system dbus.
 
+*--bus-name*::
+Connect to another D-Bus bus name than the default.
+
 *-o* OUTPUT-MODE, *--output* OUTPUT-MODE::
 Specify if you want commands to output in either "plain-text" mode or in "json".
 Defaults to "plain-text"
@@ -746,6 +749,9 @@ See **signal-cli-dbus**(5) for info on the dbus interface.
 Export DBus interface on system bus. +
 See **signal-cli-dbus**(5) for info on the dbus interface.
 
+*--bus-name*::
+Claim another D-Bus bus name than the default.
+
 *--ignore-attachments*::
 Don’t download attachments of received messages.
 
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index d9ffa622..f8585386 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -76,6 +76,10 @@ public class App {
                 .dest("global-dbus-system")
                 .help("Make request via system dbus.")
                 .action(Arguments.storeTrue());
+        parser.addArgument("--bus-name")
+                .dest("global-bus-name")
+                .setDefault(DbusConfig.getBusname())
+                .help("Specify the D-Bus bus name to connect to.");
 
         parser.addArgument("-o", "--output")
                 .help("Choose to output in plain text or JSON")
@@ -125,8 +129,9 @@ public class App {
         final var useDbus = Boolean.TRUE.equals(ns.getBoolean("global-dbus"));
         final var useDbusSystem = Boolean.TRUE.equals(ns.getBoolean("global-dbus-system"));
         if (useDbus || useDbusSystem) {
+            final var busName = ns.getString("global-bus-name");
             // If account is null, it will connect to the default object path
-            initDbusClient(command, account, useDbusSystem, commandHandler);
+            initDbusClient(command, account, useDbusSystem, busName, commandHandler);
             return;
         }
 
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index f4d701b1..e4a14f4a 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -4,6 +4,7 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
+import org.asamk.signal.DbusConfig;
 import org.asamk.signal.OutputType;
 import org.asamk.signal.ReceiveMessageHandler;
 import org.asamk.signal.Shutdown;
@@ -50,6 +51,9 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         subparser.addArgument("--dbus-system", "--system")
                 .action(Arguments.storeTrue())
                 .help("Expose a DBus interface on the system bus.");
+        subparser.addArgument("--bus-name")
+                .setDefault(DbusConfig.getBusname())
+                .help("Specify the D-Bus bus name to connect to.");
         subparser.addArgument("--socket")
                 .nargs("?")
                 .type(File.class)
@@ -177,20 +181,25 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
         final var isDbusSystem = Boolean.TRUE.equals(ns.getBoolean("dbus-system"));
         if (isDbusSystem) {
-            daemonHandler.runDbus(true);
+            final var busName = ns.getString("bus-name");
+            daemonHandler.runDbus(true, busName);
         }
 
         final var isDbusSession = Boolean.TRUE.equals(ns.getBoolean("dbus"));
-        if (isDbusSession || (
-                !isDbusSystem
-                        && socketFile == null
-                        && tcpAddress == null
-                        && httpAddress == null
-                        && inheritedChannel == null
-        )) {
+        if (isDbusSession) {
+            final var busName = ns.getString("bus-name");
+            daemonHandler.runDbus(false, busName);
+        }
+
+        if (!isDbusSystem
+                && !isDbusSession
+                && socketFile == null
+                && tcpAddress == null
+                && httpAddress == null
+                && inheritedChannel == null) {
             logger.warn(
                     "Running daemon command without explicit mode is deprecated. Use --dbus to use the dbus interface.");
-            daemonHandler.runDbus(false);
+            daemonHandler.runDbus(false, DbusConfig.getBusname());
         }
     }
 
@@ -214,7 +223,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
         public abstract void runSocket(ServerSocketChannel serverChannel) throws CommandException;
 
-        public abstract void runDbus(boolean isDbusSystem) throws CommandException;
+        public abstract void runDbus(boolean isDbusSystem, final String busname) throws CommandException;
 
         public abstract void runHttp(InetSocketAddress address) throws CommandException;
 
@@ -267,8 +276,8 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         }
 
         @Override
-        public void runDbus(final boolean isDbusSystem) throws CommandException {
-            runDbus(new DbusHandler(isDbusSystem, m, receiveMode != ReceiveMode.ON_START));
+        public void runDbus(final boolean isDbusSystem, final String busname) throws CommandException {
+            runDbus(new DbusHandler(isDbusSystem, busname, m, receiveMode != ReceiveMode.ON_START));
         }
 
         @Override
@@ -292,8 +301,8 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
         }
 
         @Override
-        public void runDbus(final boolean isDbusSystem) throws CommandException {
-            runDbus(new DbusHandler(isDbusSystem, c, receiveMode != ReceiveMode.ON_START));
+        public void runDbus(final boolean isDbusSystem, final String busname) throws CommandException {
+            runDbus(new DbusHandler(isDbusSystem, busname, c, receiveMode != ReceiveMode.ON_START));
         }
 
         @Override
diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
index 4f320ad8..5e272895 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
@@ -24,12 +24,16 @@ import java.io.IOException;
 public class DbusCommandHandler {
 
     public static void initDbusClient(
-            final Command command, final String account, final boolean systemBus, final CommandHandler commandHandler
+            final Command command,
+            final String account,
+            final boolean systemBus,
+            final String busname,
+            final CommandHandler commandHandler
     ) throws CommandException {
         try {
             final var busType = systemBus ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
             try (var dBusConn = DBusConnectionBuilder.forType(busType).build()) {
-                handleCommand(command, account, dBusConn, commandHandler);
+                handleCommand(command, account, dBusConn, busname, commandHandler);
             }
         } catch (ServiceUnknown e) {
             throw new UserErrorException("signal-cli DBus daemon not running on "
@@ -45,6 +49,7 @@ public class DbusCommandHandler {
             final Command command,
             final String account,
             final DBusConnection dBusConn,
+            final String busname,
             final CommandHandler commandHandler
     ) throws CommandException, DBusException {
         try {
@@ -53,27 +58,27 @@ public class DbusCommandHandler {
                     throw new UserErrorException("You cannot specify a account (phone number) when linking");
                 }
 
-                handleProvisioningCommand(c, dBusConn, commandHandler);
+                handleProvisioningCommand(c, dBusConn, busname, commandHandler);
                 return;
             }
 
             if (account == null && command instanceof MultiLocalCommand c) {
-                handleMultiLocalCommand(c, dBusConn, commandHandler);
+                handleMultiLocalCommand(c, dBusConn, busname, commandHandler);
                 return;
             }
             if (account != null && command instanceof RegistrationCommand c) {
-                handleRegistrationCommand(c, account, dBusConn, commandHandler);
+                handleRegistrationCommand(c, account, dBusConn, busname, commandHandler);
                 return;
             }
             if (!(command instanceof LocalCommand localCommand)) {
                 throw new UserErrorException("Command only works in multi-account mode");
             }
 
-            var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn) : null;
+            var accountObjectPath = account == null ? tryGetSingleAccountObjectPath(dBusConn, busname) : null;
             if (accountObjectPath == null) {
                 accountObjectPath = DbusConfig.getObjectPath(account);
             }
-            handleLocalCommand(localCommand, accountObjectPath, dBusConn, commandHandler);
+            handleLocalCommand(localCommand, accountObjectPath, dBusConn, busname, commandHandler);
         } catch (UnsupportedOperationException e) {
             throw new UserErrorException("Command is not yet implemented via dbus", e);
         } catch (DBusExecutionException e) {
@@ -81,10 +86,10 @@ public class DbusCommandHandler {
         }
     }
 
-    private static String tryGetSingleAccountObjectPath(final DBusConnection dBusConn) throws DBusException, CommandException {
-        var control = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
+    private static String tryGetSingleAccountObjectPath(
+            final DBusConnection dBusConn, final String busname
+    ) throws DBusException, CommandException {
+        var control = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
         try {
             final var accounts = control.listAccounts();
             if (accounts.isEmpty()) {
@@ -102,12 +107,13 @@ public class DbusCommandHandler {
     }
 
     private static void handleMultiLocalCommand(
-            final MultiLocalCommand c, final DBusConnection dBusConn, final CommandHandler commandHandler
+            final MultiLocalCommand c,
+            final DBusConnection dBusConn,
+            final String busname,
+            final CommandHandler commandHandler
     ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
-        try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn)) {
+        final var signalControl = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
+        try (final var multiAccountManager = new DbusMultiAccountManagerImpl(signalControl, dBusConn, busname)) {
             commandHandler.handleMultiLocalCommand(c, multiAccountManager);
         }
     }
@@ -116,10 +122,11 @@ public class DbusCommandHandler {
             final LocalCommand c,
             String accountObjectPath,
             final DBusConnection dBusConn,
+            final String busname,
             final CommandHandler commandHandler
     ) throws CommandException, DBusException {
-        var signal = dBusConn.getRemoteObject(DbusConfig.getBusname(), accountObjectPath, Signal.class);
-        try (final var manager = new DbusManagerImpl(signal, dBusConn)) {
+        var signal = dBusConn.getRemoteObject(busname, accountObjectPath, Signal.class);
+        try (final var manager = new DbusManagerImpl(signal, dBusConn, busname)) {
             commandHandler.handleLocalCommand(c, manager);
         }
     }
@@ -128,24 +135,24 @@ public class DbusCommandHandler {
             final RegistrationCommand c,
             String account,
             final DBusConnection dBusConn,
+            final String busname,
             final CommandHandler commandHandler
 
     ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
+        final var signalControl = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
         try (final var registrationManager = new DbusRegistrationManagerImpl(account, signalControl, dBusConn)) {
             commandHandler.handleRegistrationCommand(c, registrationManager);
         }
     }
 
     private static void handleProvisioningCommand(
-            final ProvisioningCommand c, final DBusConnection dBusConn, final CommandHandler commandHandler
+            final ProvisioningCommand c,
+            final DBusConnection dBusConn,
+            final String busname,
+            final CommandHandler commandHandler
 
     ) throws CommandException, DBusException {
-        final var signalControl = dBusConn.getRemoteObject(DbusConfig.getBusname(),
-                DbusConfig.getObjectPath(),
-                SignalControl.class);
+        final var signalControl = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
         final var provisioningManager = new DbusProvisioningManagerImpl(signalControl, dBusConn);
         commandHandler.handleProvisioningCommand(c, provisioningManager);
     }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusHandler.java b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
index 8b1dd61e..e71d7281 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
@@ -21,12 +21,15 @@ public class DbusHandler implements AutoCloseable {
 
     private final boolean isDbusSystem;
     private DBusConnection dBusConnection;
+    private final String busname;
 
     private final List<AutoCloseable> closeables = new ArrayList<>();
     private final DbusRunner dbusRunner;
     private final boolean noReceiveOnStart;
 
-    public DbusHandler(final boolean isDbusSystem, final Manager m, final boolean noReceiveOnStart) {
+    public DbusHandler(
+            final boolean isDbusSystem, final String busname, final Manager m, final boolean noReceiveOnStart
+    ) {
         this.isDbusSystem = isDbusSystem;
         this.dbusRunner = (connection) -> {
             try {
@@ -35,9 +38,15 @@ public class DbusHandler implements AutoCloseable {
             }
         };
         this.noReceiveOnStart = noReceiveOnStart;
+        this.busname = busname;
     }
 
-    public DbusHandler(final boolean isDbusSystem, final MultiAccountManager c, final boolean noReceiveOnStart) {
+    public DbusHandler(
+            final boolean isDbusSystem,
+            final String busname,
+            final MultiAccountManager c,
+            final boolean noReceiveOnStart
+    ) {
         this.isDbusSystem = isDbusSystem;
         this.dbusRunner = (connection) -> {
             final var signalControl = new DbusSignalControlImpl(c, DbusConfig.getObjectPath());
@@ -72,6 +81,7 @@ public class DbusHandler implements AutoCloseable {
             }
         };
         this.noReceiveOnStart = noReceiveOnStart;
+        this.busname = busname;
     }
 
     public void init() throws CommandException {
@@ -79,7 +89,7 @@ public class DbusHandler implements AutoCloseable {
             throw new AssertionError("DbusHandler already initialized");
         }
         final var busType = isDbusSystem ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
-        logger.debug("Starting DBus server on {} bus: {}", busType, DbusConfig.getBusname());
+        logger.debug("Starting DBus server on {} bus: {}", busType, busname);
         try {
             dBusConnection = DBusConnectionBuilder.forType(busType).build();
             dbusRunner.run(dBusConnection);
@@ -90,13 +100,13 @@ public class DbusHandler implements AutoCloseable {
         }
 
         try {
-            dBusConnection.requestBusName(DbusConfig.getBusname());
+            dBusConnection.requestBusName(busname);
         } catch (DBusException e) {
             throw new UnexpectedErrorException("Dbus command failed, maybe signal-cli dbus daemon is already running: "
                     + e.getMessage(), e);
         }
 
-        logger.info("Started DBus server on {} bus: {}", busType, DbusConfig.getBusname());
+        logger.info("Started DBus server on {} bus: {}", busType, busname);
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 3d0e2263..f56a3ba4 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -1,7 +1,6 @@
 package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
-import org.asamk.signal.DbusConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
@@ -90,14 +89,16 @@ public class DbusManagerImpl implements Manager {
     private final Set<ReceiveMessageHandler> weakHandlers = new HashSet<>();
     private final Set<ReceiveMessageHandler> messageHandlers = new HashSet<>();
     private final List<Runnable> closedListeners = new ArrayList<>();
+    private final String busname;
     private DBusSigHandler<Signal.MessageReceivedV2> dbusMsgHandler;
     private DBusSigHandler<Signal.EditMessageReceived> dbusEditMsgHandler;
     private DBusSigHandler<Signal.ReceiptReceivedV2> dbusRcptHandler;
     private DBusSigHandler<Signal.SyncMessageReceivedV2> dbusSyncHandler;
 
-    public DbusManagerImpl(final Signal signal, DBusConnection connection) {
+    public DbusManagerImpl(final Signal signal, DBusConnection connection, final String busname) {
         this.signal = signal;
         this.connection = connection;
+        this.busname = busname;
     }
 
     @Override
@@ -820,7 +821,7 @@ public class DbusManagerImpl implements Manager {
 
     private <T extends DBusInterface> T getRemoteObject(final DBusPath path, final Class<T> type) {
         try {
-            return connection.getRemoteObject(DbusConfig.getBusname(), path.getPath(), type);
+            return connection.getRemoteObject(busname, path.getPath(), type);
         } catch (DBusException e) {
             throw new AssertionError(e);
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
index 2c5f720f..27e28779 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
@@ -2,7 +2,6 @@ package org.asamk.signal.dbus;
 
 import org.asamk.Signal;
 import org.asamk.SignalControl;
-import org.asamk.signal.DbusConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.manager.ProvisioningManager;
@@ -32,10 +31,14 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
     // TODO add listeners for added/removed accounts
     private final Set<Consumer<Manager>> onManagerAddedHandlers = new HashSet<>();
     private final Set<Consumer<Manager>> onManagerRemovedHandlers = new HashSet<>();
+    private final String busname;
 
-    public DbusMultiAccountManagerImpl(final SignalControl signalControl, DBusConnection connection) {
+    public DbusMultiAccountManagerImpl(
+            final SignalControl signalControl, DBusConnection connection, final String busname
+    ) {
         this.signalControl = signalControl;
         this.connection = connection;
+        this.busname = busname;
     }
 
     @Override
@@ -50,7 +53,7 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
     public List<Manager> getManagers() {
         return signalControl.listAccounts()
                 .stream()
-                .map(a -> (Manager) new DbusManagerImpl(getRemoteObject(a, Signal.class), connection))
+                .map(a -> (Manager) new DbusManagerImpl(getRemoteObject(a, Signal.class), connection, busname))
                 .toList();
     }
 
@@ -70,7 +73,9 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
 
     @Override
     public Manager getManager(final String phoneNumber) {
-        return new DbusManagerImpl(getRemoteObject(signalControl.getAccount(phoneNumber), Signal.class), connection);
+        return new DbusManagerImpl(getRemoteObject(signalControl.getAccount(phoneNumber), Signal.class),
+                connection,
+                busname);
     }
 
     @Override
@@ -98,7 +103,7 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
 
     private <T extends DBusInterface> T getRemoteObject(final DBusPath path, final Class<T> type) {
         try {
-            return connection.getRemoteObject(DbusConfig.getBusname(), path.getPath(), type);
+            return connection.getRemoteObject(busname, path.getPath(), type);
         } catch (DBusException e) {
             throw new AssertionError(e);
         }

From 4e61f2b2e51f4f3f35e719fc429c53884e5319f0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 9 Feb 2024 17:59:18 +0100
Subject: [PATCH 369/672] Use app id as dbus name for flatpak version

---
 src/main/java/org/asamk/signal/DbusConfig.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/DbusConfig.java b/src/main/java/org/asamk/signal/DbusConfig.java
index c4c923cf..39fbf68e 100644
--- a/src/main/java/org/asamk/signal/DbusConfig.java
+++ b/src/main/java/org/asamk/signal/DbusConfig.java
@@ -2,13 +2,20 @@ package org.asamk.signal;
 
 import org.asamk.signal.dbus.DbusUtils;
 
+import java.io.File;
+
 public class DbusConfig {
 
     private static final String SIGNAL_BUSNAME = "org.asamk.Signal";
+    private static final String SIGNAL_BUSNAME_FLATPAK = "org.asamk.SignalCli";
     private static final String SIGNAL_OBJECT_BASE_PATH = "/org/asamk/Signal";
 
     public static String getBusname() {
-        return SIGNAL_BUSNAME;
+        if (new File("/.flatpak-info").exists()) {
+            return SIGNAL_BUSNAME_FLATPAK;
+        } else {
+            return SIGNAL_BUSNAME;
+        }
     }
 
     public static String getObjectPath() {

From be699cbd859040a2b17a697504899c092d037053 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 9 Feb 2024 17:51:15 +0100
Subject: [PATCH 370/672] Fix potential dead lock in recipient store

---
 .../storage/recipients/RecipientStore.java    | 151 ++++++++----------
 1 file changed, 67 insertions(+), 84 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 1f6c0a0d..4ddab217 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -47,7 +47,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     private final SelfProfileKeyProvider selfProfileKeyProvider;
     private final Database database;
 
-    private final Object recipientsLock = new Object();
     private final Map<Long, Long> recipientsMerged = new HashMap<>();
 
     private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = new HashMap<>();
@@ -164,34 +163,30 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private RecipientId resolveRecipientByNumber(final String number) {
-        synchronized (recipientsLock) {
-            final RecipientId recipientId;
-            try (final var connection = database.getConnection()) {
-                connection.setAutoCommit(false);
-                recipientId = resolveRecipientLocked(connection, number);
-                connection.commit();
-            } catch (SQLException e) {
-                throw new RuntimeException("Failed read recipient store", e);
-            }
-            return recipientId;
+        final RecipientId recipientId;
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            recipientId = resolveRecipientLocked(connection, number);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read recipient store", e);
         }
+        return recipientId;
     }
 
     @Override
     public RecipientId resolveRecipient(final ServiceId serviceId) {
-        synchronized (recipientsLock) {
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
             final var recipientWithAddress = recipientAddressCache.get(serviceId);
             if (recipientWithAddress != null) {
                 return recipientWithAddress.id();
             }
-            try (final var connection = database.getConnection()) {
-                connection.setAutoCommit(false);
-                final var recipientId = resolveRecipientLocked(connection, serviceId);
-                connection.commit();
-                return recipientId;
-            } catch (SQLException e) {
-                throw new RuntimeException("Failed read recipient store", e);
-            }
+            final var recipientId = resolveRecipientLocked(connection, serviceId);
+            connection.commit();
+            return recipientId;
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read recipient store", e);
         }
     }
 
@@ -258,17 +253,15 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public RecipientId resolveRecipient(RecipientAddress address) {
-        synchronized (recipientsLock) {
-            final RecipientId recipientId;
-            try (final var connection = database.getConnection()) {
-                connection.setAutoCommit(false);
-                recipientId = resolveRecipientLocked(connection, address);
-                connection.commit();
-            } catch (SQLException e) {
-                throw new RuntimeException("Failed read recipient store", e);
-            }
-            return recipientId;
+        final RecipientId recipientId;
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            recipientId = resolveRecipientLocked(connection, address);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read recipient store", e);
         }
+        return recipientId;
     }
 
     public RecipientId resolveRecipient(Connection connection, RecipientAddress address) throws SQLException {
@@ -550,19 +543,17 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     public void deleteRecipientData(RecipientId recipientId) {
         logger.debug("Deleting recipient data for {}", recipientId);
-        synchronized (recipientsLock) {
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
             recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
-            try (final var connection = database.getConnection()) {
-                connection.setAutoCommit(false);
-                storeContact(connection, recipientId, null);
-                storeProfile(connection, recipientId, null);
-                storeProfileKey(connection, recipientId, null, false);
-                storeExpiringProfileKeyCredential(connection, recipientId, null);
-                deleteRecipient(connection, recipientId);
-                connection.commit();
-            } catch (SQLException e) {
-                throw new RuntimeException("Failed update recipient store", e);
-            }
+            storeContact(connection, recipientId, null);
+            storeProfile(connection, recipientId, null);
+            storeProfileKey(connection, recipientId, null, false);
+            storeExpiringProfileKeyCredential(connection, recipientId, null);
+            deleteRecipient(connection, recipientId);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
         }
     }
 
@@ -1026,14 +1017,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private RecipientId resolveRecipientTrusted(RecipientAddress address, boolean isSelf) {
         final Pair<RecipientId, List<RecipientId>> pair;
-        synchronized (recipientsLock) {
-            try (final var connection = database.getConnection()) {
-                connection.setAutoCommit(false);
-                pair = resolveRecipientTrustedLocked(connection, address, isSelf);
-                connection.commit();
-            } catch (SQLException e) {
-                throw new RuntimeException("Failed update recipient store", e);
-            }
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            pair = resolveRecipientTrustedLocked(connection, address, isSelf);
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
         }
 
         if (!pair.second().isEmpty()) {
@@ -1073,9 +1062,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         for (final var toBeMergedRecipientId : toBeMergedRecipientIds) {
             recipientMergeHandler.mergeRecipients(connection, recipientId, toBeMergedRecipientId);
             deleteRecipient(connection, toBeMergedRecipientId);
-            synchronized (recipientsLock) {
-                recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(toBeMergedRecipientId));
-            }
+            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(toBeMergedRecipientId));
         }
     }
 
@@ -1164,44 +1151,40 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private void removeRecipientAddress(Connection connection, RecipientId recipientId) throws SQLException {
-        synchronized (recipientsLock) {
-            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
-            final var sql = (
-                    """
-                    UPDATE %s
-                    SET number = NULL, aci = NULL, pni = NULL, username = NULL, storage_id = NULL
-                    WHERE _id = ?
-                    """
-            ).formatted(TABLE_RECIPIENT);
-            try (final var statement = connection.prepareStatement(sql)) {
-                statement.setLong(1, recipientId.id());
-                statement.executeUpdate();
-            }
+        recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
+        final var sql = (
+                """
+                UPDATE %s
+                SET number = NULL, aci = NULL, pni = NULL, username = NULL, storage_id = NULL
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setLong(1, recipientId.id());
+            statement.executeUpdate();
         }
     }
 
     private void updateRecipientAddress(
             Connection connection, RecipientId recipientId, final RecipientAddress address
     ) throws SQLException {
-        synchronized (recipientsLock) {
-            recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
-            final var sql = (
-                    """
-                    UPDATE %s
-                    SET number = ?, aci = ?, pni = ?, username = ?
-                    WHERE _id = ?
-                    """
-            ).formatted(TABLE_RECIPIENT);
-            try (final var statement = connection.prepareStatement(sql)) {
-                statement.setString(1, address.number().orElse(null));
-                statement.setString(2, address.aci().map(ACI::toString).orElse(null));
-                statement.setString(3, address.pni().map(PNI::toString).orElse(null));
-                statement.setString(4, address.username().orElse(null));
-                statement.setLong(5, recipientId.id());
-                statement.executeUpdate();
-            }
-            rotateStorageId(connection, recipientId);
+        recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
+        final var sql = (
+                """
+                UPDATE %s
+                SET number = ?, aci = ?, pni = ?, username = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setString(1, address.number().orElse(null));
+            statement.setString(2, address.aci().map(ACI::toString).orElse(null));
+            statement.setString(3, address.pni().map(PNI::toString).orElse(null));
+            statement.setString(4, address.username().orElse(null));
+            statement.setLong(5, recipientId.id());
+            statement.executeUpdate();
         }
+        rotateStorageId(connection, recipientId);
     }
 
     private void deleteRecipient(final Connection connection, final RecipientId recipientId) throws SQLException {

From d4865630990600e03c3e34ac96bd2d330269acd5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 9 Feb 2024 18:34:32 +0100
Subject: [PATCH 371/672] Ignore invalid ACI/PNI in recipient table

---
 .../signal/manager/storage/recipients/RecipientStore.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 4ddab217..9a0b5d00 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -1367,8 +1367,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private RecipientAddress getRecipientAddressFromResultSet(ResultSet resultSet) throws SQLException {
-        final var aci = Optional.ofNullable(resultSet.getString("aci")).map(ACI::parseOrThrow);
-        final var pni = Optional.ofNullable(resultSet.getString("pni")).map(PNI::parseOrThrow);
+        final var aci = Optional.ofNullable(resultSet.getString("aci")).map(ACI::parseOrNull);
+        final var pni = Optional.ofNullable(resultSet.getString("pni")).map(PNI::parseOrNull);
         final var number = Optional.ofNullable(resultSet.getString("number"));
         final var username = Optional.ofNullable(resultSet.getString("username"));
         return new RecipientAddress(aci, pni, number, username);

From 7cf3a989bf47dd81f8700dcfb6986ac81e1bf02e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 9 Feb 2024 22:06:46 +0100
Subject: [PATCH 372/672] Add command to retrieve avatars and stickers

Fixes #1125
---
 CHANGELOG.md                                  |  1 +
 client/src/cli.rs                             | 14 ++++
 client/src/jsonrpc.rs                         | 19 ++++-
 client/src/main.rs                            | 13 ++++
 .../org/asamk/signal/manager/Manager.java     |  9 +++
 .../signal/manager/api/StickerPackId.java     |  5 +-
 .../signal/manager/internal/ManagerImpl.java  | 53 +++++++++++++
 man/signal-cli.1.adoc                         | 25 ++++++
 .../org/asamk/signal/commands/Commands.java   |  2 +
 .../signal/commands/GetAttachmentCommand.java |  1 +
 .../signal/commands/GetAvatarCommand.java     | 76 +++++++++++++++++++
 .../signal/commands/GetStickerCommand.java    | 60 +++++++++++++++
 .../asamk/signal/dbus/DbusManagerImpl.java    | 21 +++++
 13 files changed, 296 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/commands/GetAvatarCommand.java
 create mode 100644 src/main/java/org/asamk/signal/commands/GetStickerCommand.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39950184..fa0aff9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
   behavior, the `--notify-self` parameter can be added
 - New `--unrestricted-unidentified-sender` parameter for `updateAccount command`
 - New `--bus-name` parameter for `daemon` command to use another D-Bus bus name
+- New `getAvatar` and `getSticker` commands to get avatar and sticker images
 
 ### Improved
 
diff --git a/client/src/cli.rs b/client/src/cli.rs
index dea3a7df..33403890 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -68,6 +68,20 @@ pub enum CliCommands {
         #[arg(short = 'g', long = "group-id")]
         group_id: Option<String>,
     },
+    GetAvatar {
+        #[arg(long)]
+        contact: Option<String>,
+        #[arg(long)]
+        profile: Option<String>,
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Option<String>,
+    },
+    GetSticker {
+        #[arg(long = "pack-id")]
+        pack_id: String,
+        #[arg(long = "sticker-id")]
+        sticker_id: u32,
+    },
     GetUserStatus {
         recipient: Vec<String>,
     },
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index cb1b4f8c..211eaad8 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -45,7 +45,24 @@ pub trait Rpc {
         account: Option<String>,
         id: String,
         recipient: Option<String>,
-        group_id: Option<String>,
+        #[allow(non_snake_case)] groupId: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
+
+    #[method(name = "getAvatar", param_kind = map)]
+    fn get_avatar(
+        &self,
+        account: Option<String>,
+        contact: Option<String>,
+        profile: Option<String>,
+        #[allow(non_snake_case)] groupId: Option<String>,
+    ) -> Result<Value, ErrorObjectOwned>;
+
+    #[method(name = "getSticker", param_kind = map)]
+    fn get_sticker(
+        &self,
+        account: Option<String>,
+        #[allow(non_snake_case)] packId: String,
+        #[allow(non_snake_case)] stickerId: u32,
     ) -> Result<Value, ErrorObjectOwned>;
 
     #[method(name = "getUserStatus", param_kind = map)]
diff --git a/client/src/main.rs b/client/src/main.rs
index a4858440..61cbabf2 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -407,6 +407,19 @@ async fn handle_command(
                 .get_attachment(cli.account, id, recipient, group_id)
                 .await
         }
+        CliCommands::GetAvatar {
+            contact,
+            profile,
+            group_id,
+        } => {
+            client
+                .get_avatar(cli.account, contact, profile, group_id)
+                .await
+        }
+        CliCommands::GetSticker {
+            pack_id,
+            sticker_id,
+        } => client.get_sticker(cli.account, pack_id, sticker_id).await,
         CliCommands::StartChangeNumber {
             number,
             voice,
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 6fe1a67f..e9eeb7c4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -34,6 +34,7 @@ import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.StickerPack;
+import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
 import org.asamk.signal.manager.api.TypingAction;
@@ -307,6 +308,14 @@ public interface Manager extends Closeable {
 
     InputStream retrieveAttachment(final String id) throws IOException;
 
+    InputStream retrieveContactAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException;
+
+    InputStream retrieveProfileAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException;
+
+    InputStream retrieveGroupAvatar(final GroupId groupId) throws IOException;
+
+    InputStream retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException;
+
     @Override
     void close();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
index ccb18708..e6b5a957 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/StickerPackId.java
@@ -1,7 +1,8 @@
 package org.asamk.signal.manager.api;
 
+import org.whispersystems.signalservice.internal.util.Hex;
+
 import java.util.Arrays;
-import java.util.Base64;
 
 public class StickerPackId {
 
@@ -36,6 +37,6 @@ public class StickerPackId {
 
     @Override
     public String toString() {
-        return "StickerPackId{" + Base64.getUrlEncoder().encodeToString(id) + '}';
+        return "StickerPackId{" + Hex.toStringCondensed(id) + '}';
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 9814d95c..b059e821 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -104,6 +104,7 @@ import org.whispersystems.signalservice.internal.util.Util;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -1337,6 +1338,58 @@ public class ManagerImpl implements Manager {
         return context.getAttachmentHelper().retrieveAttachment(id).getStream();
     }
 
+    @Override
+    public InputStream retrieveContactAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        final var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
+        final var address = account.getRecipientStore().resolveRecipientAddress(recipientId);
+        final var streamDetails = context.getAvatarStore().retrieveContactAvatar(address);
+        if (streamDetails == null) {
+            throw new FileNotFoundException();
+        }
+        return streamDetails.getStream();
+    }
+
+    @Override
+    public InputStream retrieveProfileAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        final var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
+        context.getProfileHelper().getRecipientProfile(recipientId);
+        final var address = account.getRecipientStore().resolveRecipientAddress(recipientId);
+        final var streamDetails = context.getAvatarStore().retrieveProfileAvatar(address);
+        if (streamDetails == null) {
+            throw new FileNotFoundException();
+        }
+        return streamDetails.getStream();
+    }
+
+    @Override
+    public InputStream retrieveGroupAvatar(final GroupId groupId) throws IOException {
+        final var streamDetails = context.getAvatarStore().retrieveGroupAvatar(groupId);
+        context.getGroupHelper().getGroup(groupId);
+        if (streamDetails == null) {
+            throw new FileNotFoundException();
+        }
+        return streamDetails.getStream();
+    }
+
+    @Override
+    public InputStream retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException {
+        var streamDetails = context.getStickerPackStore().retrieveSticker(stickerPackId, stickerId);
+        if (streamDetails == null) {
+            final var pack = account.getStickerStore().getStickerPack(stickerPackId);
+            if (pack != null) {
+                try {
+                    context.getStickerHelper().retrieveStickerPack(stickerPackId, pack.packKey());
+                } catch (InvalidMessageException e) {
+                    logger.warn("Failed to download sticker pack");
+                }
+            }
+        }
+        if (streamDetails == null) {
+            throw new FileNotFoundException();
+        }
+        return streamDetails.getStream();
+    }
+
     @Override
     public void close() {
         Thread thread;
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index af11a2df..c629d550 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -722,6 +722,31 @@ Referred to generally as recipient.
 *-g* [GROUP], *--group-id* [GROUP]::
 Alternatively, specify the group IDs for which to get the attachment.
 
+=== getAvatar
+
+Gets the raw data for a specified contact, contact's profile or group avatar.
+The attachment data is returned as a Base64 String.
+
+*--contact* [RECIPIENT]::
+Specify the number of a recipient.
+
+*--profile* [RECIPIENT]::
+Specify the number of a recipient.
+
+*-g* [GROUP], *--group-id* [GROUP]::
+Alternatively, specify the group ID for which to get the avatar.
+
+=== getSticker
+
+Gets the raw data for a specified sticker.
+The attachment data is returned as a Base64 String.
+
+*--pack-id* [PACK_ID]::
+Specify the id of a sticker pack (hex encoded).
+
+*--sticker-id* [STICKER_ID]::
+Specify the index of a sticker in the sticker pack.
+
 === daemon
 
 signal-cli can run in daemon mode and provides JSON-RPC or an experimental dbus interface.
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index 0f26c994..a963ce4e 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -17,6 +17,8 @@ public class Commands {
         addCommand(new FinishChangeNumberCommand());
         addCommand(new FinishLinkCommand());
         addCommand(new GetAttachmentCommand());
+        addCommand(new GetAvatarCommand());
+        addCommand(new GetStickerCommand());
         addCommand(new GetUserStatusCommand());
         addCommand(new AddStickerPackCommand());
         addCommand(new JoinGroupCommand());
diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
index 160e53bc..99ba1eca 100644
--- a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
@@ -26,6 +26,7 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Retrieve an already downloaded attachment base64 encoded.");
         subparser.addArgument("--id").required(true).help("The ID of the attachment file.");
         var mut = subparser.addMutuallyExclusiveGroup().required(true);
         mut.addArgument("--recipient").help("Sender of the attachment");
diff --git a/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java b/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java
new file mode 100644
index 00000000..c7573465
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java
@@ -0,0 +1,76 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.json.JsonAttachmentData;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.CommandUtil;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+
+public class GetAvatarCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "getAvatar";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Retrieve the avatar of a contact, contact's profile or group base64 encoded.");
+        var mut = subparser.addMutuallyExclusiveGroup().required(true);
+        mut.addArgument("-c", "--contact").help("Get a contact avatar");
+        mut.addArgument("-p", "--profile").help("Get a profile avatar");
+        mut.addArgument("-g", "--group-id").help("Get a group avatar");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var contactRecipient = ns.getString("contact");
+        final var profileRecipient = ns.getString("profile");
+        final var groupId = ns.getString("groupId");
+
+        final InputStream data;
+        try {
+            if (contactRecipient != null) {
+                data = m.retrieveContactAvatar(CommandUtil.getSingleRecipientIdentifier(contactRecipient,
+                        m.getSelfNumber()));
+            } else if (profileRecipient != null) {
+                data = m.retrieveProfileAvatar(CommandUtil.getSingleRecipientIdentifier(profileRecipient,
+                        m.getSelfNumber()));
+            } else {
+                data = m.retrieveGroupAvatar(CommandUtil.getGroupId(groupId));
+            }
+        } catch (FileNotFoundException ex) {
+            throw new UserErrorException("Could not find avatar", ex);
+        } catch (IOException ex) {
+            throw new UnexpectedErrorException("An error occurred reading avatar", ex);
+        } catch (UnregisteredRecipientException e) {
+            throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
+        }
+
+        try (data) {
+            final var bytes = data.readAllBytes();
+            final var base64 = Base64.getEncoder().encodeToString(bytes);
+            switch (outputWriter) {
+                case PlainTextWriter writer -> writer.println(base64);
+                case JsonWriter writer -> writer.write(new JsonAttachmentData(base64));
+            }
+        } catch (IOException ex) {
+            throw new UnexpectedErrorException("An error occurred reading avatar", ex);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/GetStickerCommand.java b/src/main/java/org/asamk/signal/commands/GetStickerCommand.java
new file mode 100644
index 00000000..aba5b26c
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/GetStickerCommand.java
@@ -0,0 +1,60 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.json.JsonAttachmentData;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.Hex;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Base64;
+
+public class GetStickerCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "getSticker";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Retrieve the sticker of a sticker pack base64 encoded.");
+        subparser.addArgument("--pack-id").required(true).help("The ID of the sticker pack.");
+        subparser.addArgument("--sticker-id").type(int.class).required(true).help("The ID of the sticker.");
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+
+        final var packId = StickerPackId.deserialize(Hex.toByteArray(ns.getString("pack-id")));
+        final var stickerId = ns.getInt("sticker-id");
+
+        try (InputStream data = m.retrieveSticker(packId, stickerId)) {
+            final var bytes = data.readAllBytes();
+            final var base64 = Base64.getEncoder().encodeToString(bytes);
+            switch (outputWriter) {
+                case PlainTextWriter writer -> writer.println(base64);
+                case JsonWriter writer -> writer.write(new JsonAttachmentData(base64));
+            }
+        } catch (FileNotFoundException ex) {
+            throw new UserErrorException("Could not find sticker with ID: " + stickerId + " in pack " + packId, ex);
+        } catch (IOException ex) {
+            throw new UnexpectedErrorException("An error occurred reading sticker with ID: "
+                    + stickerId
+                    + " in pack "
+                    + packId, ex);
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index f56a3ba4..a37fa3e3 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -38,6 +38,7 @@ import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.SendGroupMessageResults;
 import org.asamk.signal.manager.api.SendMessageResults;
 import org.asamk.signal.manager.api.StickerPack;
+import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
 import org.asamk.signal.manager.api.TypingAction;
@@ -1069,6 +1070,26 @@ public class DbusManagerImpl implements Manager {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public InputStream retrieveContactAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveProfileAvatar(final RecipientIdentifier.Single recipient) throws IOException, UnregisteredRecipientException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveGroupAvatar(final GroupId groupId) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream retrieveSticker(final StickerPackId stickerPackId, final int stickerId) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
     @SuppressWarnings("unchecked")
     private <T> T getValue(
             final Map<String, Variant<?>> stringVariantMap, final String field

From 9a5e29e01524de881f8698dfbe9f1e92bb343014 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 9 Feb 2024 22:11:01 +0100
Subject: [PATCH 373/672] Update CHANGELOG.md

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa0aff9c..183503e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,15 @@
 
 **Attention**: Now requires Java 21 and libsignal-client version 0.39.2
 
+### Breaking changes
+- Sending to the self number (+XXXX) now behaves the same as the `--note-to-self` parameter. To get the previous
+  behavior with notification, the `--notify-self` parameter can be added.
+
 ### Added
 
 - New `--hidden` parameter for `removeContact` command
 - New `--notify-self` parameter for `send` command, for sending a non-sync message when self is part of the recipients
   or groups.
-
-  Sending to the self number (+XXXX) now behaves the same as the `--note-to-self` parameter. To get the previous
-  behavior, the `--notify-self` parameter can be added
 - New `--unrestricted-unidentified-sender` parameter for `updateAccount command`
 - New `--bus-name` parameter for `daemon` command to use another D-Bus bus name
 - New `getAvatar` and `getSticker` commands to get avatar and sticker images

From c78299e7bc02997f23cde522d4f32fbe38c0e761 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 9 Feb 2024 22:11:50 +0100
Subject: [PATCH 374/672] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew.bat                              | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e093..a80b22ce 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85b..7101f8e4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

From fb85e1a0681052d2d229888e85bc49487e1b6987 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 9 Feb 2024 22:51:03 +0100
Subject: [PATCH 375/672] Update dependencies

---
 .../signal/manager/helper/SyncHelper.java     | 80 ++++++++++---------
 settings.gradle.kts                           |  8 +-
 2 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index de3a495a..9fd5076d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -6,10 +6,12 @@ import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.MimeUtils;
+import org.jetbrains.annotations.NotNull;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -138,42 +140,17 @@ public class SyncHelper {
                 for (var contactPair : account.getContactStore().getContacts()) {
                     final var recipientId = contactPair.first();
                     final var contact = contactPair.second();
-                    final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
+                    final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
 
-                    var currentIdentity = account.getIdentityKeyStore().getIdentityInfo(address.getServiceId());
-                    VerifiedMessage verifiedMessage = null;
-                    if (currentIdentity != null) {
-                        verifiedMessage = new VerifiedMessage(address,
-                                currentIdentity.getIdentityKey(),
-                                currentIdentity.getTrustLevel().toVerifiedState(),
-                                currentIdentity.getDateAddedTimestamp());
-                    }
-
-                    var profileKey = account.getProfileStore().getProfileKey(recipientId);
-                    out.write(new DeviceContact(address,
-                            Optional.ofNullable(contact.getName()),
-                            createContactAvatarAttachment(new RecipientAddress(address)),
-                            Optional.ofNullable(contact.color()),
-                            Optional.ofNullable(verifiedMessage),
-                            Optional.ofNullable(profileKey),
-                            contact.isBlocked(),
-                            Optional.of(contact.messageExpirationTime()),
-                            Optional.empty(),
-                            contact.isArchived()));
+                    out.write(getDeviceContact(address, recipientId, contact));
                 }
 
                 if (account.getProfileKey() != null) {
                     // Send our own profile key as well
-                    out.write(new DeviceContact(account.getSelfAddress(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            Optional.empty(),
-                            Optional.of(account.getProfileKey()),
-                            false,
-                            Optional.empty(),
-                            Optional.empty(),
-                            false));
+                    final var address = account.getSelfRecipientAddress();
+                    final var recipientId = account.getSelfRecipientId();
+                    final var contact = account.getContactStore().getContact(recipientId);
+                    out.write(getDeviceContact(address, recipientId, contact));
                 }
             }
 
@@ -199,6 +176,35 @@ public class SyncHelper {
         }
     }
 
+    @NotNull
+    private DeviceContact getDeviceContact(
+            final RecipientAddress address, final RecipientId recipientId, final Contact contact
+    ) throws IOException {
+        var currentIdentity = address.serviceId().isEmpty()
+                ? null
+                : account.getIdentityKeyStore().getIdentityInfo(address.serviceId().get());
+        VerifiedMessage verifiedMessage = null;
+        if (currentIdentity != null) {
+            verifiedMessage = new VerifiedMessage(address.toSignalServiceAddress(),
+                    currentIdentity.getIdentityKey(),
+                    currentIdentity.getTrustLevel().toVerifiedState(),
+                    currentIdentity.getDateAddedTimestamp());
+        }
+
+        var profileKey = account.getProfileStore().getProfileKey(recipientId);
+        return new DeviceContact(address.aci(),
+                address.number(),
+                Optional.ofNullable(contact == null ? null : contact.getName()),
+                createContactAvatarAttachment(address),
+                Optional.ofNullable(contact == null ? null : contact.color()),
+                Optional.ofNullable(verifiedMessage),
+                Optional.ofNullable(profileKey),
+                contact != null && contact.isBlocked(),
+                Optional.ofNullable(contact == null ? null : contact.messageExpirationTime()),
+                Optional.empty(),
+                contact != null && contact.isArchived());
+    }
+
     public SendMessageResult sendBlockedList() {
         var addresses = new ArrayList<SignalServiceAddress>();
         for (var record : account.getContactStore().getContacts()) {
@@ -315,19 +321,19 @@ public class SyncHelper {
                     throw e;
                 }
             }
-            if (c == null) {
+            if (c == null || (c.getAci().isEmpty() && c.getE164().isEmpty())) {
                 break;
             }
-            if (c.getAddress().matches(account.getSelfAddress()) && c.getProfileKey().isPresent()) {
+            final var address = new RecipientAddress(c.getAci(), Optional.empty(), c.getE164(), Optional.empty());
+            if (address.matches(account.getSelfRecipientAddress()) && c.getProfileKey().isPresent()) {
                 account.setProfileKey(c.getProfileKey().get());
             }
-            final var recipientId = account.getRecipientTrustedResolver().resolveRecipientTrusted(c.getAddress());
+            final var recipientId = account.getRecipientTrustedResolver().resolveRecipientTrusted(address);
             var contact = account.getContactStore().getContact(recipientId);
             final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
             if (c.getName().isPresent() && (
                     contact == null || (
-                            contact.givenName() == null
-                                    && contact.familyName() == null
+                            contact.givenName() == null && contact.familyName() == null
                     )
             )) {
                 builder.withGivenName(c.getName().get());
@@ -354,7 +360,7 @@ public class SyncHelper {
             account.getContactStore().storeContact(recipientId, builder.build());
 
             if (c.getAvatar().isPresent()) {
-                downloadContactAvatar(c.getAvatar().get(), new RecipientAddress(c.getAddress()));
+                downloadContactAvatar(c.getAvatar().get(), address);
             }
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e28f8eaf..2ff8bc5c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,16 +10,16 @@ dependencyResolutionManagement {
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.16.1")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
-            version("slf4j", "2.0.10")
+            version("slf4j", "2.0.12")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_94")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_95")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
-            library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.1")
-            library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.1")
+            library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
+            library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.2")
         }
     }
 }

From 9f6b6cb657e33e65a6455ebedaaddcc32a4bd656 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 10 Feb 2024 11:54:06 +0100
Subject: [PATCH 376/672] Implement account reregistration with recovery
 password

---
 .../internal/RegistrationManagerImpl.java     | 118 ++++++++++++------
 .../signal/manager/storage/SignalAccount.java |  10 +-
 2 files changed, 90 insertions(+), 38 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 839bdd48..4518fb01 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -39,6 +39,7 @@ import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
@@ -111,6 +112,11 @@ public class RegistrationManagerImpl implements RegistrationManager {
         }
 
         try {
+            final var recoveryPassword = account.getRecoveryPassword();
+            if (recoveryPassword != null && account.isPrimaryDevice() && attemptReregisterAccount(recoveryPassword)) {
+                return;
+            }
+
             if (account.getAci() != null && attemptReactivateAccount()) {
                 return;
             }
@@ -156,43 +162,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
             pin = null;
         }
 
-        //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
-        final var aci = ACI.parseOrThrow(response.getUuid());
-        final var pni = PNI.parseOrThrow(response.getPni());
-        account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
-        accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
-
-        ManagerImpl m = null;
-        try {
-            m = new ManagerImpl(account, pathConfig, accountFileUpdater, serviceEnvironmentConfig, userAgent);
-            account = null;
-
-            m.refreshPreKeys();
-            if (response.isStorageCapable()) {
-                m.syncRemoteStorage();
-            }
-            // Set an initial empty profile so user can be added to groups
-            try {
-                m.updateProfile(UpdateProfile.newBuilder().build());
-            } catch (NoClassDefFoundError e) {
-                logger.warn("Failed to set default profile: {}", e.getMessage());
-            }
-
-            try {
-                m.refreshCurrentUsername();
-            } catch (IOException | BaseUsernameException e) {
-                logger.warn("Failed to refresh current username", e);
-            }
-
-            if (newManagerListener != null) {
-                newManagerListener.accept(m);
-                m = null;
-            }
-        } finally {
-            if (m != null) {
-                m.close();
-            }
-        }
+        finishAccountRegistration(response, pin, masterKey, aciPreKeys, pniPreKeys);
     }
 
     @Override
@@ -207,6 +177,34 @@ public class RegistrationManagerImpl implements RegistrationManager {
         return account.isRegistered();
     }
 
+    private boolean attemptReregisterAccount(final String recoveryPassword) {
+        try {
+            if (account.getPniIdentityKeyPair() == null) {
+                account.setPniIdentityKeyPair(KeyUtils.generateIdentityKeyPair());
+            }
+
+            final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
+            final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
+            final var response = Utils.handleResponseException(accountManager.registerAccount(null,
+                    recoveryPassword,
+                    account.getAccountAttributes(null),
+                    aciPreKeys,
+                    pniPreKeys,
+                    null,
+                    true));
+            finishAccountRegistration(response,
+                    account.getRegistrationLockPin(),
+                    account.getPinBackedMasterKey(),
+                    aciPreKeys,
+                    pniPreKeys);
+            logger.info("Reregistered existing account, verify is not necessary.");
+            return true;
+        } catch (IOException e) {
+            logger.debug("Failed to reregister account with recovery password", e);
+        }
+        return false;
+    }
+
     private boolean attemptReactivateAccount() {
         try {
             final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
@@ -254,6 +252,52 @@ public class RegistrationManagerImpl implements RegistrationManager {
                 true));
     }
 
+    private void finishAccountRegistration(
+            final VerifyAccountResponse response,
+            final String pin,
+            final MasterKey masterKey,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
+    ) throws IOException {
+        //accountManager.setGcmId(Optional.of(GoogleCloudMessaging.getInstance(this).register(REGISTRATION_ID)));
+        final var aci = ACI.parseOrThrow(response.getUuid());
+        final var pni = PNI.parseOrThrow(response.getPni());
+        account.finishRegistration(aci, pni, masterKey, pin, aciPreKeys, pniPreKeys);
+        accountFileUpdater.updateAccountIdentifiers(account.getNumber(), aci);
+
+        ManagerImpl m = null;
+        try {
+            m = new ManagerImpl(account, pathConfig, accountFileUpdater, serviceEnvironmentConfig, userAgent);
+            account = null;
+
+            m.refreshPreKeys();
+            if (response.isStorageCapable()) {
+                m.syncRemoteStorage();
+            }
+            // Set an initial empty profile so user can be added to groups
+            try {
+                m.updateProfile(UpdateProfile.newBuilder().build());
+            } catch (NoClassDefFoundError e) {
+                logger.warn("Failed to set default profile: {}", e.getMessage());
+            }
+
+            try {
+                m.refreshCurrentUsername();
+            } catch (IOException | BaseUsernameException e) {
+                logger.warn("Failed to refresh current username", e);
+            }
+
+            if (newManagerListener != null) {
+                newManagerListener.accept(m);
+                m = null;
+            }
+        } finally {
+            if (m != null) {
+                m.close();
+            }
+        }
+    }
+
     @Override
     public void close() {
         if (account != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 762e95ce..e0d6598e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1351,7 +1351,7 @@ public class SignalAccount implements Closeable {
                 getAccountCapabilities(),
                 encryptedDeviceName,
                 pniAccountData.getLocalRegistrationId(),
-                null); // TODO recoveryPassword?
+                getRecoveryPassword());
     }
 
     public AccountAttributes.Capabilities getAccountCapabilities() {
@@ -1533,6 +1533,14 @@ public class SignalAccount implements Closeable {
         save();
     }
 
+    public String getRecoveryPassword() {
+        final var masterKey = getPinBackedMasterKey();
+        if (masterKey == null) {
+            return null;
+        }
+        return masterKey.deriveRegistrationRecoveryPassword();
+    }
+
     public long getStorageManifestVersion() {
         return getKeyValueStore().getEntry(storageManifestVersion);
     }

From e78146eb67da3e011028c9df6a23df114306ec1b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 10 Feb 2024 11:54:32 +0100
Subject: [PATCH 377/672] Fix saving username link components

---
 graalvm-config-dir/reflect-config.json             | 13 ++++++++++++-
 .../signal/manager/storage/SignalAccount.java      | 14 +++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index d4548612..8be37576 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1128,7 +1128,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"aciAccountData","parameterTypes":[] }, {"name":"deviceId","parameterTypes":[] }, {"name":"encryptedDeviceName","parameterTypes":[] }, {"name":"isMultiDevice","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"password","parameterTypes":[] }, {"name":"pinMasterKey","parameterTypes":[] }, {"name":"pniAccountData","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"registered","parameterTypes":[] }, {"name":"registrationLockPin","parameterTypes":[] }, {"name":"serviceEnvironment","parameterTypes":[] }, {"name":"storageKey","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"aciAccountData","parameterTypes":[] }, {"name":"deviceId","parameterTypes":[] }, {"name":"encryptedDeviceName","parameterTypes":[] }, {"name":"isMultiDevice","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"password","parameterTypes":[] }, {"name":"pinMasterKey","parameterTypes":[] }, {"name":"pniAccountData","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"registered","parameterTypes":[] }, {"name":"registrationLockPin","parameterTypes":[] }, {"name":"serviceEnvironment","parameterTypes":[] }, {"name":"storageKey","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"usernameLinkEntropy","parameterTypes":[] }, {"name":"usernameLinkServerId","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData",
@@ -2383,6 +2383,13 @@
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.ConfirmUsernameResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.util.UUID"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.util.UUID","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.DeviceCode",
   "allDeclaredFields":true,
@@ -2722,6 +2729,10 @@
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PinnedConversation$Contact",
   "fields":[{"name":"e164_"}, {"name":"serviceId_"}, {"name":"uuid_"}]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$UsernameLink",
+  "allDeclaredFields":true
+},
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index e0d6598e..5f37c402 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -102,6 +102,7 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -499,7 +500,10 @@ public class SignalAccount implements Closeable {
                             e);
                 }
             }
-
+            if (storage.usernameLinkEntropy != null && storage.usernameLinkServerId != null) {
+                usernameLink = new UsernameLinkComponents(base64.decode(storage.usernameLinkEntropy),
+                        UUID.fromString(storage.usernameLinkServerId));
+            }
         }
 
         if (migratedLegacyConfig) {
@@ -964,7 +968,9 @@ public class SignalAccount implements Closeable {
                     registrationLockPin,
                     pinMasterKey == null ? null : base64.encodeToString(pinMasterKey.serialize()),
                     storageKey == null ? null : base64.encodeToString(storageKey.serialize()),
-                    profileKey == null ? null : base64.encodeToString(profileKey.serialize()));
+                    profileKey == null ? null : base64.encodeToString(profileKey.serialize()),
+                    usernameLink == null ? null : base64.encodeToString(usernameLink.getEntropy()),
+                    usernameLink == null ? null : usernameLink.getServerId().toString());
             try {
                 try (var output = new ByteArrayOutputStream()) {
                     // Write to memory first to prevent corrupting the file in case of serialization errors
@@ -1853,7 +1859,9 @@ public class SignalAccount implements Closeable {
             String registrationLockPin,
             String pinMasterKey,
             String storageKey,
-            String profileKey
+            String profileKey,
+            String usernameLinkEntropy,
+            String usernameLinkServerId
     ) {
 
         public record AccountData(

From ed4b1e8f02a9e77079f57e03a6f9ca881761d886 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 10 Feb 2024 12:24:13 +0100
Subject: [PATCH 378/672] Improve sql query

---
 .../signal/manager/storage/recipients/RecipientStore.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 9a0b5d00..5bd972ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -891,13 +891,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET unregistered_timestamp = ?
+                SET unregistered_timestamp = NULL
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setNull(1, Types.INTEGER);
-            statement.setLong(2, recipientId.id());
+            statement.setLong(1, recipientId.id());
             statement.executeUpdate();
         }
     }

From bd792f5b7f027f1c4d52b35938cb1e7d6252c306 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 15:16:41 +0100
Subject: [PATCH 379/672] Update libsignal-service

---
 .../org/asamk/signal/manager/api/MessageEnvelope.java     | 8 ++++++--
 .../org/asamk/signal/manager/helper/RecipientHelper.java  | 5 ++---
 .../manager/syncStorage/AccountRecordProcessor.java       | 6 ++----
 settings.gradle.kts                                       | 2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index c964281f..c5da641c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -481,7 +481,7 @@ public record MessageEnvelope(
             ) {
 
                 static Address from(org.whispersystems.signalservice.api.messages.shared.SharedContact.PostalAddress address) {
-                    return new Address(Address.Type.from(address.getType()),
+                    return new Address(Type.from(address.getType()),
                             address.getLabel(),
                             address.getStreet(),
                             address.getPobox(),
@@ -690,7 +690,9 @@ public record MessageEnvelope(
                 DELETE,
                 BLOCK,
                 BLOCK_AND_DELETE,
-                UNBLOCK_AND_ACCEPT;
+                UNBLOCK_AND_ACCEPT,
+                SPAM,
+                BLOCK_AND_SPAM;
 
                 static Type from(MessageRequestResponseMessage.Type type) {
                     return switch (type) {
@@ -700,6 +702,8 @@ public record MessageEnvelope(
                         case BLOCK -> BLOCK;
                         case BLOCK_AND_DELETE -> BLOCK_AND_DELETE;
                         case UNBLOCK_AND_ACCEPT -> UNBLOCK_AND_ACCEPT;
+                        case SPAM -> SPAM;
+                        case BLOCK_AND_SPAM -> BLOCK_AND_SPAM;
                     };
                 }
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 83646052..947c251b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -158,7 +158,7 @@ public class RecipientHelper {
     private Map<String, RegisteredUser> getRegisteredUsers(
             final Set<String> numbers, final boolean isPartialRefresh
     ) throws IOException {
-        Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, isPartialRefresh, true);
+        Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, isPartialRefresh);
 
         // Store numbers as recipients, so we have the number/uuid association
         registeredUsers.forEach((number, u) -> account.getRecipientTrustedResolver()
@@ -186,7 +186,7 @@ public class RecipientHelper {
     }
 
     private Map<String, RegisteredUser> getRegisteredUsersV2(
-            final Set<String> numbers, boolean isPartialRefresh, boolean useCompat
+            final Set<String> numbers, boolean isPartialRefresh
     ) throws IOException {
         final var previousNumbers = isPartialRefresh ? Set.<String>of() : account.getCdsiStore().getAllNumbers();
         final var newNumbers = new HashSet<>(numbers) {{
@@ -210,7 +210,6 @@ public class RecipientHelper {
                     .getRegisteredUsersWithCdsi(previousNumbers,
                             newNumbers,
                             account.getRecipientStore().getServiceIdToProfileKeyMap(),
-                            useCompat,
                             token,
                             serviceEnvironmentConfig.cdsiMrenclave(),
                             null,
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 0e1a02b7..e9cd1fa6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -102,10 +102,8 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var storiesDisabled = remote.isStoriesDisabled();
         final var hasSeenGroupStoryEducation = remote.hasSeenGroupStoryEducationSheet()
                 || local.hasSeenGroupStoryEducationSheet();
-        final var username = remote.getUsername() != null && !remote.getUsername().isEmpty()
-                ? remote.getUsername()
-                : local.getUsername();
-        final var usernameLink = remote.getUsernameLink() != null ? remote.getUsernameLink() : local.getUsernameLink();
+        final var username = remote.getUsername();
+        final var usernameLink = remote.getUsernameLink();
 
         final var mergedBuilder = new SignalAccountRecord.Builder(remote.getId().getRaw(), unknownFields).setGivenName(
                         givenName)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2ff8bc5c..4cd47c4e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_95")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_96")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")

From 91ed49e0193ced5e8dda559cbc3dcc9c4fc78021 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 16:31:34 +0100
Subject: [PATCH 380/672] Includ pni signatures if necessary

---
 .../helper/IncomingMessageHandler.java        |  6 +++
 .../signal/manager/helper/SendHelper.java     | 47 ++++++++++++-------
 .../manager/storage/AccountDatabase.java      | 10 +++-
 .../storage/recipients/RecipientStore.java    | 39 +++++++++++++++
 4 files changed, 83 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 0f062828..f80b605c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -299,6 +299,12 @@ public final class IncomingMessageHandler {
         final var senderDeviceId = senderDeviceAddress.deviceId();
         final var destination = getDestination(envelope);
 
+        if (account.getPni().equals(destination.serviceId)) {
+            account.getRecipientStore().markNeedsPniSignature(destination.recipientId, true);
+        } else if (account.getAci().equals(destination.serviceId)) {
+            account.getRecipientStore().markNeedsPniSignature(destination.recipientId, false);
+        }
+
         if (content.getReceiptMessage().isPresent()) {
             final var message = content.getReceiptMessage().get();
             if (message.isDeliveryReceipt()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index a9ca6a12..d3068fc4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -127,10 +127,10 @@ public class SendHelper {
     ) {
         final var messageSendLogStore = account.getMessageSendLogStore();
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendReceipt(address,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendReceipt(address,
                         unidentifiedAccess,
                         receiptMessage,
-                        false));
+                        includePniSignature));
         messageSendLogStore.insertIfPossible(receiptMessage.getWhen(), result, ContentHint.IMPLICIT, false);
         handleSendMessageResult(result);
         return result;
@@ -144,13 +144,14 @@ public class SendHelper {
                 .withProfileKey(profileKey)
                 .build();
         return handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendDataMessage(address,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendDataMessage(
+                        address,
                         unidentifiedAccess,
                         ContentHint.IMPLICIT,
                         message,
                         SignalServiceMessageSender.IndividualSendEvents.EMPTY,
                         false,
-                        false));
+                        includePniSignature));
     }
 
     public SendMessageResult sendRetryReceipt(
@@ -161,7 +162,8 @@ public class SendHelper {
                 recipientId,
                 errorMessage.getDeviceId());
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendRetryReceipt(address,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendRetryReceipt(
+                        address,
                         unidentifiedAccess,
                         groupId.map(GroupId::serialize),
                         errorMessage));
@@ -170,7 +172,10 @@ public class SendHelper {
     }
 
     public SendMessageResult sendNullMessage(RecipientId recipientId) {
-        final var result = handleSendMessage(recipientId, SignalServiceMessageSender::sendNullMessage);
+        final var result = handleSendMessage(recipientId,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendNullMessage(
+                        address,
+                        unidentifiedAccess));
         handleSendMessageResult(result);
         return result;
     }
@@ -220,10 +225,8 @@ public class SendHelper {
             SignalServiceTypingMessage message, RecipientId recipientId
     ) {
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.sendTyping(List.of(address),
-                        List.of(unidentifiedAccess),
-                        message,
-                        null).getFirst());
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendTyping(List.of(
+                        address), List.of(unidentifiedAccess), message, null).getFirst());
         handleSendMessageResult(result);
         return result;
     }
@@ -247,7 +250,8 @@ public class SendHelper {
         logger.trace("Resending message {} to {}", timestamp, recipientId);
         if (messageSendLogEntry.groupId().isEmpty()) {
             return handleSendMessage(recipientId,
-                    (messageSender, address, unidentifiedAccess) -> messageSender.resendContent(address,
+                    (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.resendContent(
+                            address,
                             unidentifiedAccess,
                             timestamp,
                             messageSendLogEntry.content(),
@@ -277,7 +281,7 @@ public class SendHelper {
                 .build();
 
         final var result = handleSendMessage(recipientId,
-                (messageSender, address, unidentifiedAccess) -> messageSender.resendContent(address,
+                (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.resendContent(address,
                         unidentifiedAccess,
                         timestamp,
                         contentToSend,
@@ -660,17 +664,18 @@ public class SendHelper {
     ) {
         final var messageSendLogStore = account.getMessageSendLogStore();
         final var urgent = true;
-        final var includePniSignature = false;
         final var result = handleSendMessage(recipientId,
                 editTargetTimestamp.isEmpty()
-                        ? (messageSender, address, unidentifiedAccess) -> messageSender.sendDataMessage(address,
+                        ? (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendDataMessage(
+                        address,
                         unidentifiedAccess,
                         ContentHint.RESENDABLE,
                         message,
                         SignalServiceMessageSender.IndividualSendEvents.EMPTY,
                         urgent,
                         includePniSignature)
-                        : (messageSender, address, unidentifiedAccess) -> messageSender.sendEditMessage(address,
+                        : (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendEditMessage(
+                                address,
                                 unidentifiedAccess,
                                 ContentHint.RESENDABLE,
                                 message,
@@ -687,8 +692,12 @@ public class SendHelper {
 
         var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
         try {
+            final boolean includePniSignature = account.getRecipientStore().needsPniSignature(recipientId);
             try {
-                return s.send(messageSender, address, context.getUnidentifiedAccessHelper().getAccessFor(recipientId));
+                return s.send(messageSender,
+                        address,
+                        context.getUnidentifiedAccessHelper().getAccessFor(recipientId),
+                        includePniSignature);
             } catch (UnregisteredUserException e) {
                 final RecipientId newRecipientId;
                 try {
@@ -699,7 +708,8 @@ public class SendHelper {
                 address = context.getRecipientHelper().resolveSignalServiceAddress(newRecipientId);
                 return s.send(messageSender,
                         address,
-                        context.getUnidentifiedAccessHelper().getAccessFor(newRecipientId));
+                        context.getUnidentifiedAccessHelper().getAccessFor(newRecipientId),
+                        includePniSignature);
             }
         } catch (UnregisteredUserException e) {
             return SendMessageResult.unregisteredFailure(address);
@@ -774,7 +784,8 @@ public class SendHelper {
         SendMessageResult send(
                 SignalServiceMessageSender messageSender,
                 SignalServiceAddress address,
-                Optional<UnidentifiedAccessPair> unidentifiedAccess
+                Optional<UnidentifiedAccessPair> unidentifiedAccess,
+                boolean includePniSignature
         ) throws IOException, UnregisteredUserException, ProofRequiredException, RateLimitException, org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index ba51d9c0..6cf725a0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -33,7 +33,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 23;
+    private static final long DATABASE_VERSION = 24;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -573,6 +573,14 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 24) {
+            logger.debug("Updating database: Create needs_pni_signature column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD needs_pni_signature INTEGER NOT NULL DEFAULT FALSE;
+                                        """);
+            }
+        }
     }
 
     private static void createUuidMappingTable(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 5bd972ab..7d47839b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -66,6 +66,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       unregistered_timestamp INTEGER,
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
+                                      needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,
 
                                       given_name TEXT,
                                       family_name TEXT,
@@ -856,6 +857,44 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return count;
     }
 
+    public void markNeedsPniSignature(final RecipientId recipientId, final boolean value) {
+        logger.debug("Marking {} numbers as need pni signature = {}", recipientId, value);
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    UPDATE %s
+                    SET needs_pni_signature = ?
+                    WHERE _id = ?
+                    """
+            ).formatted(TABLE_RECIPIENT);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setBoolean(1, value);
+                statement.setLong(2, recipientId.id());
+                statement.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
+    public boolean needsPniSignature(final RecipientId recipientId) {
+        try (final var connection = database.getConnection()) {
+            final var sql = (
+                    """
+                    SELECT needs_pni_signature
+                    FROM %s
+                    WHERE _id = ?
+                    """
+            ).formatted(TABLE_RECIPIENT);
+            try (final var statement = connection.prepareStatement(sql)) {
+                statement.setLong(1, recipientId.id());
+                return Utils.executeQuerySingleRow(statement, resultSet -> resultSet.getBoolean("needs_pni_signature"));
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read recipient store", e);
+        }
+    }
+
     public void markUnregistered(final Set<String> unregisteredUsers) {
         logger.debug("Marking {} numbers as unregistered", unregisteredUsers.size());
         try (final var connection = database.getConnection()) {

From 25258db55d36af977444c5cc8bbf99dd6246aa74 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 16:32:50 +0100
Subject: [PATCH 381/672] Restructure pre key refresh to be more robust

---
 .../signal/manager/helper/PreKeyHelper.java   | 137 ++++++++++--------
 1 file changed, 75 insertions(+), 62 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 6dd579c6..f81623e4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -51,6 +51,14 @@ public class PreKeyHelper {
             return;
         }
 
+        if (refreshPreKeysIfNecessary(serviceIdType, identityKeyPair)) {
+            refreshPreKeysIfNecessary(serviceIdType, identityKeyPair);
+        }
+    }
+
+    private boolean refreshPreKeysIfNecessary(
+            final ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
+    ) throws IOException {
         OneTimePreKeyCounts preKeyCounts;
         try {
             preKeyCounts = dependencies.getAccountManager().getPreKeyCounts(serviceIdType);
@@ -59,65 +67,80 @@ public class PreKeyHelper {
             preKeyCounts = new OneTimePreKeyCounts(0, 0);
         }
 
-        SignedPreKeyRecord signedPreKeyRecord = null;
         List<PreKeyRecord> preKeyRecords = null;
-        KyberPreKeyRecord lastResortKyberPreKeyRecord = null;
-        List<KyberPreKeyRecord> kyberPreKeyRecords = null;
-
-        try {
-            if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
-                logger.debug("Refreshing {} ec pre keys, because only {} of min {} pre keys remain",
-                        serviceIdType,
-                        preKeyCounts.getEcCount(),
-                        ServiceConfig.PREKEY_MINIMUM_COUNT);
-                preKeyRecords = generatePreKeys(serviceIdType);
-            }
-            if (signedPreKeyNeedsRefresh(serviceIdType)) {
-                logger.debug("Refreshing {} signed pre key.", serviceIdType);
-                signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
-            }
-        } catch (Exception e) {
-            logger.warn("Failed to store new pre keys, resetting preKey id offset", e);
-            account.resetPreKeyOffsets(serviceIdType);
+        if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+            logger.debug("Refreshing {} ec pre keys, because only {} of min {} pre keys remain",
+                    serviceIdType,
+                    preKeyCounts.getEcCount(),
+                    ServiceConfig.PREKEY_MINIMUM_COUNT);
             preKeyRecords = generatePreKeys(serviceIdType);
+        }
+
+        SignedPreKeyRecord signedPreKeyRecord = null;
+        if (signedPreKeyNeedsRefresh(serviceIdType)) {
+            logger.debug("Refreshing {} signed pre key.", serviceIdType);
             signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
         }
 
-        try {
-            if (preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
-                logger.debug("Refreshing {} kyber pre keys, because only {} of min {} pre keys remain",
-                        serviceIdType,
-                        preKeyCounts.getKyberCount(),
-                        ServiceConfig.PREKEY_MINIMUM_COUNT);
-                kyberPreKeyRecords = generateKyberPreKeys(serviceIdType, identityKeyPair);
-            }
-            if (lastResortKyberPreKeyNeedsRefresh(serviceIdType)) {
-                logger.debug("Refreshing {} last resort kyber pre key.", serviceIdType);
-                lastResortKyberPreKeyRecord = generateLastResortKyberPreKey(serviceIdType, identityKeyPair);
-            }
-        } catch (Exception e) {
-            logger.warn("Failed to store new kyber pre keys, resetting preKey id offset", e);
-            account.resetKyberPreKeyOffsets(serviceIdType);
+        List<KyberPreKeyRecord> kyberPreKeyRecords = null;
+        if (preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+            logger.debug("Refreshing {} kyber pre keys, because only {} of min {} pre keys remain",
+                    serviceIdType,
+                    preKeyCounts.getKyberCount(),
+                    ServiceConfig.PREKEY_MINIMUM_COUNT);
             kyberPreKeyRecords = generateKyberPreKeys(serviceIdType, identityKeyPair);
+        }
+
+        KyberPreKeyRecord lastResortKyberPreKeyRecord = null;
+        if (lastResortKyberPreKeyNeedsRefresh(serviceIdType)) {
+            logger.debug("Refreshing {} last resort kyber pre key.", serviceIdType);
             lastResortKyberPreKeyRecord = generateLastResortKyberPreKey(serviceIdType, identityKeyPair);
         }
 
-        if (signedPreKeyRecord != null
-                || preKeyRecords != null
-                || lastResortKyberPreKeyRecord != null
-                || kyberPreKeyRecords != null) {
-            final var preKeyUpload = new PreKeyUpload(serviceIdType,
-                    signedPreKeyRecord,
-                    preKeyRecords,
-                    lastResortKyberPreKeyRecord,
-                    kyberPreKeyRecords);
-            try {
-                dependencies.getAccountManager().setPreKeys(preKeyUpload);
-            } catch (AuthorizationFailedException e) {
-                // This can happen when the primary device has changed phone number
-                logger.warn("Failed to updated pre keys: {}", e.getMessage());
-            }
+        if (signedPreKeyRecord == null
+                && preKeyRecords == null
+                && lastResortKyberPreKeyRecord == null
+                && kyberPreKeyRecords == null) {
+            return false;
         }
+
+        final var preKeyUpload = new PreKeyUpload(serviceIdType,
+                signedPreKeyRecord,
+                preKeyRecords,
+                lastResortKyberPreKeyRecord,
+                kyberPreKeyRecords);
+        var needsReset = false;
+        try {
+            dependencies.getAccountManager().setPreKeys(preKeyUpload);
+            try {
+                if (preKeyRecords != null) {
+                    account.addPreKeys(serviceIdType, preKeyRecords);
+                }
+                if (signedPreKeyRecord != null) {
+                    account.addSignedPreKey(serviceIdType, signedPreKeyRecord);
+                }
+            } catch (Exception e) {
+                logger.warn("Failed to store new pre keys, resetting preKey id offset", e);
+                account.resetPreKeyOffsets(serviceIdType);
+                needsReset = true;
+            }
+            try {
+                if (kyberPreKeyRecords != null) {
+                    account.addKyberPreKeys(serviceIdType, kyberPreKeyRecords);
+                }
+                if (lastResortKyberPreKeyRecord != null) {
+                    account.addLastResortKyberPreKey(serviceIdType, lastResortKyberPreKeyRecord);
+                }
+            } catch (Exception e) {
+                logger.warn("Failed to store new kyber pre keys, resetting preKey id offset", e);
+                account.resetKyberPreKeyOffsets(serviceIdType);
+                needsReset = true;
+            }
+        } catch (AuthorizationFailedException e) {
+            // This can happen when the primary device has changed phone number
+            logger.warn("Failed to updated pre keys: {}", e.getMessage());
+        }
+        return needsReset;
     }
 
     public void cleanOldPreKeys() {
@@ -135,7 +158,6 @@ public class PreKeyHelper {
         final var offset = accountData.getPreKeyMetadata().getNextPreKeyId();
 
         var records = KeyUtils.generatePreKeyRecords(offset);
-        account.addPreKeys(serviceIdType, records);
 
         return records;
     }
@@ -159,10 +181,7 @@ public class PreKeyHelper {
         final var accountData = account.getAccountData(serviceIdType);
         final var signedPreKeyId = accountData.getPreKeyMetadata().getNextSignedPreKeyId();
 
-        var record = KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
-        account.addSignedPreKey(serviceIdType, record);
-
-        return record;
+        return KeyUtils.generateSignedPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
     }
 
     private List<KyberPreKeyRecord> generateKyberPreKeys(
@@ -171,10 +190,7 @@ public class PreKeyHelper {
         final var accountData = account.getAccountData(serviceIdType);
         final var offset = accountData.getPreKeyMetadata().getNextKyberPreKeyId();
 
-        var records = KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey());
-        account.addKyberPreKeys(serviceIdType, records);
-
-        return records;
+        return KeyUtils.generateKyberPreKeyRecords(offset, identityKeyPair.getPrivateKey());
     }
 
     private boolean lastResortKyberPreKeyNeedsRefresh(ServiceIdType serviceIdType) {
@@ -199,10 +215,7 @@ public class PreKeyHelper {
         final var accountData = account.getAccountData(serviceIdType);
         final var signedPreKeyId = accountData.getPreKeyMetadata().getNextKyberPreKeyId();
 
-        var record = KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
-        account.addLastResortKyberPreKey(serviceIdType, record);
-
-        return record;
+        return KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
     }
 
     private void cleanSignedPreKeys(ServiceIdType serviceIdType) {

From 6cd57312a1396543f14b243ff19d2cf0db973588 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 19:24:23 +0100
Subject: [PATCH 382/672] Add parameter to configure phone number privacy

---
 client/src/cli.rs                               |  4 ++++
 client/src/jsonrpc.rs                           |  2 ++
 client/src/main.rs                              | 10 +++++++++-
 .../java/org/asamk/signal/manager/Manager.java  |  7 ++++++-
 .../signal/manager/internal/ManagerImpl.java    | 17 ++++++++++++++++-
 .../syncStorage/AccountRecordProcessor.java     |  1 -
 .../manager/syncStorage/StorageSyncModels.java  |  2 +-
 man/signal-cli.1.adoc                           |  6 ++++++
 .../signal/commands/UpdateAccountCommand.java   | 10 +++++++++-
 .../org/asamk/signal/dbus/DbusManagerImpl.java  |  7 ++++++-
 .../org/asamk/signal/dbus/DbusSignalImpl.java   |  2 +-
 11 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 33403890..e5a5a878 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -316,6 +316,10 @@ pub enum CliCommands {
         device_name: Option<String>,
         #[arg(long = "unrestricted-unidentified-sender")]
         unrestricted_unidentified_sender: Option<bool>,
+        #[arg(long = "discoverable-by-number")]
+        discoverable_by_number: Option<bool>,
+        #[arg(long = "number-sharing")]
+        number_sharing: Option<bool>,
     },
     UpdateConfiguration {
         #[arg(long = "read-receipts")]
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 211eaad8..266047c2 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -301,6 +301,8 @@ pub trait Rpc {
         account: Option<String>,
         deviceName: Option<String>,
         unrestrictedUnidentifiedSender: Option<bool>,
+        discoverableByNumber: Option<bool>,
+        numberSharing: Option<bool>,
     ) -> Result<Value, ErrorObjectOwned>;
 
     #[method(name = "updateConfiguration", param_kind = map)]
diff --git a/client/src/main.rs b/client/src/main.rs
index 61cbabf2..d934f800 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -275,9 +275,17 @@ async fn handle_command(
         CliCommands::UpdateAccount {
             device_name,
             unrestricted_unidentified_sender,
+            discoverable_by_number,
+            number_sharing,
         } => {
             client
-                .update_account(cli.account, device_name, unrestricted_unidentified_sender)
+                .update_account(
+                    cli.account,
+                    device_name,
+                    unrestricted_unidentified_sender,
+                    discoverable_by_number,
+                    number_sharing,
+                )
                 .await
         }
         CliCommands::UpdateConfiguration {
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index e9eeb7c4..52d0aaff 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -90,7 +90,12 @@ public interface Manager extends Closeable {
      */
     Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException;
 
-    void updateAccountAttributes(String deviceName, Boolean unrestrictedUnidentifiedSender) throws IOException;
+    void updateAccountAttributes(
+            String deviceName,
+            Boolean unrestrictedUnidentifiedSender,
+            final Boolean discoverableByNumber,
+            final Boolean numberSharing
+    ) throws IOException;
 
     Configuration getConfiguration();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index b059e821..bd484bb7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -43,6 +43,7 @@ import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.RateLimitException;
@@ -277,13 +278,27 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void updateAccountAttributes(String deviceName, Boolean unrestrictedUnidentifiedSender) throws IOException {
+    public void updateAccountAttributes(
+            String deviceName,
+            Boolean unrestrictedUnidentifiedSender,
+            final Boolean discoverableByNumber,
+            final Boolean numberSharing
+    ) throws IOException {
         if (deviceName != null) {
             context.getAccountHelper().setDeviceName(deviceName);
         }
         if (unrestrictedUnidentifiedSender != null) {
             account.setUnrestrictedUnidentifiedAccess(unrestrictedUnidentifiedSender);
         }
+        if (discoverableByNumber != null) {
+            account.getConfigurationStore().setPhoneNumberUnlisted(!discoverableByNumber);
+        }
+        if (numberSharing != null) {
+            account.getConfigurationStore()
+                    .setPhoneNumberSharingMode(numberSharing
+                            ? PhoneNumberSharingMode.EVERYBODY
+                            : PhoneNumberSharingMode.NOBODY);
+        }
         context.getAccountHelper().updateAccountAttributes();
         context.getAccountHelper().checkWhoAmiI();
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index e9cd1fa6..acce82e6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -118,7 +118,6 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .setLinkPreviewsEnabled(linkPreviews)
                 .setUnlistedPhoneNumber(unlisted)
                 .setPhoneNumberSharingMode(phoneNumberSharingMode)
-                .setUnlistedPhoneNumber(unlisted)
                 .setPinnedConversations(pinnedConversations)
                 .setPreferContactAvatars(preferContactAvatars)
                 .setPayments(payments.isEnabled(), payments.getEntropy().orElse(null))
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index a8d10142..8cf06048 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -62,7 +62,7 @@ public final class StorageSyncModels {
                 .setSealedSenderIndicatorsEnabled(Optional.ofNullable(configStore.getUnidentifiedDeliveryIndicators())
                         .orElse(true))
                 .setLinkPreviewsEnabled(Optional.ofNullable(configStore.getLinkPreviews()).orElse(true))
-                .setUnlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted()).orElse(true))
+                .setUnlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted()).orElse(false))
                 .setPhoneNumberSharingMode(localToRemote(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
                         .orElse(PhoneNumberSharingMode.EVERYBODY)))
                 .setE164(self.getAddress().number().orElse(""))
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index c629d550..d718571c 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -154,6 +154,12 @@ Set a new device name for the primary or linked device
 *--unrestricted-unidentified-sender* {true,false}::
 Enable if anyone should be able to send you unidentified sender messages.
 
+*--discoverable-by-number* {true,false}::
+Enable/disable if the account should be discoverable by phone number
+
+*--number-sharing* {true,false}::
+Indicates if Signal should share its phone number when sending a message.
+
 === startChangeNumber
 
 Change an account to a new phone number with SMS or voice verification.
diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index 95c0f4a4..a750bc88 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -31,6 +31,12 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--unrestricted-unidentified-sender")
                 .type(Boolean.class)
                 .help("Enable if anyone should be able to send you unidentified sender messages.");
+        subparser.addArgument("--discoverable-by-number")
+                .type(Boolean.class)
+                .help("Enable/disable if the account should be discoverable by phone number");
+        subparser.addArgument("--number-sharing")
+                .type(Boolean.class)
+                .help("Indicates if Signal should share its phone number when sending a message.");
 
         var mut = subparser.addMutuallyExclusiveGroup();
         mut.addArgument("-u", "--username").help("Specify a username that can then be used to contact this account.");
@@ -45,8 +51,10 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         final var deviceName = ns.getString("device-name");
         final var unrestrictedUnidentifiedSender = ns.getBoolean("unrestricted-unidentified-sender");
+        final var discoverableByNumber = ns.getBoolean("discoverable-by-number");
+        final var numberSharing = ns.getBoolean("number-sharing");
         try {
-            m.updateAccountAttributes(deviceName, unrestrictedUnidentifiedSender);
+            m.updateAccountAttributes(deviceName, unrestrictedUnidentifiedSender, discoverableByNumber, numberSharing);
         } catch (IOException e) {
             throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e);
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index a37fa3e3..f684871a 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -124,11 +124,16 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void updateAccountAttributes(
-            final String deviceName, final Boolean unrestrictedUnidentifiedSender
+            final String deviceName,
+            final Boolean unrestrictedUnidentifiedSender,
+            final Boolean discoverableByNumber,
+            final Boolean numberSharing
     ) throws IOException {
         if (deviceName != null) {
             final var devicePath = signal.getThisDevice();
             getRemoteObject(devicePath, Signal.Device.class).Set("org.asamk.Signal.Device", "Name", deviceName);
+        } else {
+            throw new UnsupportedOperationException();
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 80132f09..6db2ef63 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1187,7 +1187,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
                 throw new Error.Failure("Only the name of this device can be changed");
             }
             try {
-                m.updateAccountAttributes(name, null);
+                m.updateAccountAttributes(name, null, null, null);
                 // update device list
                 updateDevices();
             } catch (IOException e) {

From fd671576a4aef0e5f9ef795b1985930cf02bcb84 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 19:25:40 +0100
Subject: [PATCH 383/672] Fix issues with receiving message to PNI address

---
 .../helper/IncomingMessageHandler.java        | 22 +++++++++----------
 .../manager/internal/SignalDependencies.java  | 19 ++++++++--------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index f80b605c..f7b978ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -64,6 +64,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSy
 import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.internal.push.Envelope;
 import org.whispersystems.signalservice.internal.push.UnsupportedDataMessageException;
@@ -100,8 +101,10 @@ public final class IncomingMessageHandler {
         SignalServiceContent content = null;
         if (!envelope.isReceipt()) {
             account.getIdentityKeyStore().setRetryingDecryption(true);
+            final var destination = getDestination(envelope).serviceId();
             try {
-                final var cipherResult = dependencies.getCipher()
+                final var cipherResult = dependencies.getCipher(destination == null
+                                || destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
                         .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
                 content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
                 if (content == null) {
@@ -136,8 +139,10 @@ public final class IncomingMessageHandler {
                 // uuid in envelope is sent by server
                 .ifPresent(serviceId -> account.getRecipientResolver().resolveRecipient(serviceId));
         if (!envelope.isReceipt()) {
+            final var destination = getDestination(envelope).serviceId();
             try {
-                final var cipherResult = dependencies.getCipher()
+                final var cipherResult = dependencies.getCipher(destination == null
+                                || destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
                         .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
                 content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
                 if (content == null) {
@@ -173,7 +178,6 @@ public final class IncomingMessageHandler {
                                 .contains(Profile.Capability.senderKey);
                         final var isSelfSenderKeyCapable = selfProfile != null && selfProfile.getCapabilities()
                                 .contains(Profile.Capability.senderKey);
-                        final var destination = getDestination(envelope).serviceId();
                         if (!isSelf && isSenderSenderKeyCapable && isSelfSenderKeyCapable) {
                             logger.debug("Received invalid message, requesting message resend.");
                             actions.add(new SendRetryMessageRequestAction(sender, serviceId, e, envelope, destination));
@@ -953,16 +957,12 @@ public final class IncomingMessageHandler {
     }
 
     private DeviceAddress getDestination(SignalServiceEnvelope envelope) {
-        if (!envelope.hasDestinationUuid()) {
+        final var destination = envelope.getDestinationServiceId();
+        if (destination == null) {
             return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
         }
-        final var addressOptional = SignalServiceAddress.fromRaw(envelope.getDestinationServiceId(), null);
-        if (addressOptional.isEmpty()) {
-            return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
-        }
-        final var address = addressOptional.get();
-        return new DeviceAddress(account.getRecipientResolver().resolveRecipient(address),
-                address.getServiceId(),
+        return new DeviceAddress(account.getRecipientResolver().resolveRecipient(destination),
+                destination,
                 account.getDeviceId());
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 9fb7aff4..9488c75e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -14,6 +14,7 @@ import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
@@ -53,7 +54,6 @@ public class SignalDependencies {
 
     private List<SecureValueRecovery> secureValueRecoveryV2;
     private ProfileService profileService;
-    private SignalServiceCipher cipher;
 
     SignalDependencies(
             final ServiceEnvironmentConfig serviceEnvironmentConfig,
@@ -77,7 +77,6 @@ public class SignalDependencies {
             this.pushServiceSocket = null;
         }
         this.messageSender = null;
-        this.cipher = null;
         getSignalWebSocket().forceNewWebSockets();
     }
 
@@ -208,13 +207,15 @@ public class SignalDependencies {
                         getSignalWebSocket()));
     }
 
-    public SignalServiceCipher getCipher() {
-        return getOrCreate(() -> cipher, () -> {
-            final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.unidentifiedSenderTrustRoot());
-            final var address = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
-            final var deviceId = credentialsProvider.getDeviceId();
-            cipher = new SignalServiceCipher(address, deviceId, dataStore.aci(), sessionLock, certificateValidator);
-        });
+    public SignalServiceCipher getCipher(ServiceIdType serviceIdType) {
+        final var certificateValidator = new CertificateValidator(serviceEnvironmentConfig.unidentifiedSenderTrustRoot());
+        final var address = new SignalServiceAddress(credentialsProvider.getAci(), credentialsProvider.getE164());
+        final var deviceId = credentialsProvider.getDeviceId();
+        return new SignalServiceCipher(address,
+                deviceId,
+                serviceIdType == ServiceIdType.ACI ? dataStore.aci() : dataStore.pni(),
+                sessionLock,
+                certificateValidator);
     }
 
     private <T> T getOrCreate(Supplier<T> supplier, Callable creator) {

From 7206b4da258b5a9b17d3e2c1bc9cee354e9170e9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 20:48:01 +0100
Subject: [PATCH 384/672] Fix use of aci instead of serviceId

Fixes #1455
---
 .../signal/manager/storage/recipients/RecipientAddress.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 b655e067..d0bd033e 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
@@ -165,11 +165,11 @@ public record RecipientAddress(
     }
 
     public SignalServiceAddress toSignalServiceAddress() {
-        return new SignalServiceAddress(aci.orElse(ACI.UNKNOWN), number);
+        return new SignalServiceAddress(serviceId().orElse(ACI.UNKNOWN), number);
     }
 
     public org.asamk.signal.manager.api.RecipientAddress toApiRecipientAddress() {
-        return new org.asamk.signal.manager.api.RecipientAddress(aci().map(ServiceId::getRawUuid),
+        return new org.asamk.signal.manager.api.RecipientAddress(serviceId().map(ServiceId::getRawUuid),
                 number(),
                 username());
     }

From 2c0ad7feb7c2cfcacf40d7aa9192a654d11ab059 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 19:26:21 +0100
Subject: [PATCH 385/672] Fix issue with prekey update

---
 .../signal/manager/helper/AccountHelper.java  |  6 ++-
 .../signal/manager/helper/PreKeyHelper.java   | 50 +++++++++++++++----
 .../signal/manager/storage/SignalAccount.java |  4 +-
 3 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 2563494d..1f44e2a3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -90,7 +90,11 @@ public class AccountHelper {
         }
         try {
             updateAccountAttributes();
-            context.getPreKeyHelper().refreshPreKeysIfNecessary();
+            if (account.getPreviousStorageVersion() < 9) {
+                context.getPreKeyHelper().forceRefreshPreKeys();
+            } else {
+                context.getPreKeyHelper().refreshPreKeysIfNecessary();
+            }
             if (account.getAci() == null || account.getPni() == null) {
                 checkWhoAmiI();
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index f81623e4..a2b4ddde 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -41,6 +41,11 @@ public class PreKeyHelper {
         refreshPreKeysIfNecessary(ServiceIdType.PNI);
     }
 
+    public void forceRefreshPreKeys() throws IOException {
+        forceRefreshPreKeys(ServiceIdType.ACI);
+        forceRefreshPreKeys(ServiceIdType.PNI);
+    }
+
     public void refreshPreKeysIfNecessary(ServiceIdType serviceIdType) throws IOException {
         final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
         if (identityKeyPair == null) {
@@ -56,6 +61,22 @@ public class PreKeyHelper {
         }
     }
 
+    public void forceRefreshPreKeys(ServiceIdType serviceIdType) throws IOException {
+        final var identityKeyPair = account.getIdentityKeyPair(serviceIdType);
+        if (identityKeyPair == null) {
+            return;
+        }
+        final var accountId = account.getAccountId(serviceIdType);
+        if (accountId == null) {
+            return;
+        }
+
+        final var counts = new OneTimePreKeyCounts(0, 0);
+        if (refreshPreKeysIfNecessary(serviceIdType, identityKeyPair, counts, true)) {
+            refreshPreKeysIfNecessary(serviceIdType, identityKeyPair, counts, true);
+        }
+    }
+
     private boolean refreshPreKeysIfNecessary(
             final ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
     ) throws IOException {
@@ -67,8 +88,17 @@ public class PreKeyHelper {
             preKeyCounts = new OneTimePreKeyCounts(0, 0);
         }
 
+        return refreshPreKeysIfNecessary(serviceIdType, identityKeyPair, preKeyCounts, false);
+    }
+
+    private boolean refreshPreKeysIfNecessary(
+            final ServiceIdType serviceIdType,
+            final IdentityKeyPair identityKeyPair,
+            final OneTimePreKeyCounts preKeyCounts,
+            final boolean force
+    ) throws IOException {
         List<PreKeyRecord> preKeyRecords = null;
-        if (preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+        if (force || preKeyCounts.getEcCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
             logger.debug("Refreshing {} ec pre keys, because only {} of min {} pre keys remain",
                     serviceIdType,
                     preKeyCounts.getEcCount(),
@@ -77,13 +107,13 @@ public class PreKeyHelper {
         }
 
         SignedPreKeyRecord signedPreKeyRecord = null;
-        if (signedPreKeyNeedsRefresh(serviceIdType)) {
+        if (force || signedPreKeyNeedsRefresh(serviceIdType)) {
             logger.debug("Refreshing {} signed pre key.", serviceIdType);
             signedPreKeyRecord = generateSignedPreKey(serviceIdType, identityKeyPair);
         }
 
         List<KyberPreKeyRecord> kyberPreKeyRecords = null;
-        if (preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
+        if (force || preKeyCounts.getKyberCount() < ServiceConfig.PREKEY_MINIMUM_COUNT) {
             logger.debug("Refreshing {} kyber pre keys, because only {} of min {} pre keys remain",
                     serviceIdType,
                     preKeyCounts.getKyberCount(),
@@ -92,9 +122,11 @@ public class PreKeyHelper {
         }
 
         KyberPreKeyRecord lastResortKyberPreKeyRecord = null;
-        if (lastResortKyberPreKeyNeedsRefresh(serviceIdType)) {
+        if (force || lastResortKyberPreKeyNeedsRefresh(serviceIdType)) {
             logger.debug("Refreshing {} last resort kyber pre key.", serviceIdType);
-            lastResortKyberPreKeyRecord = generateLastResortKyberPreKey(serviceIdType, identityKeyPair);
+            lastResortKyberPreKeyRecord = generateLastResortKyberPreKey(serviceIdType,
+                    identityKeyPair,
+                    kyberPreKeyRecords == null ? 0 : kyberPreKeyRecords.size());
         }
 
         if (signedPreKeyRecord == null
@@ -157,9 +189,7 @@ public class PreKeyHelper {
         final var accountData = account.getAccountData(serviceIdType);
         final var offset = accountData.getPreKeyMetadata().getNextPreKeyId();
 
-        var records = KeyUtils.generatePreKeyRecords(offset);
-
-        return records;
+        return KeyUtils.generatePreKeyRecords(offset);
     }
 
     private boolean signedPreKeyNeedsRefresh(ServiceIdType serviceIdType) {
@@ -210,10 +240,10 @@ public class PreKeyHelper {
     }
 
     private KyberPreKeyRecord generateLastResortKyberPreKey(
-            ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair
+            ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair, final int offset
     ) {
         final var accountData = account.getAccountData(serviceIdType);
-        final var signedPreKeyId = accountData.getPreKeyMetadata().getNextKyberPreKeyId();
+        final var signedPreKeyId = accountData.getPreKeyMetadata().getNextKyberPreKeyId() + offset;
 
         return KeyUtils.generateKyberPreKeyRecord(signedPreKeyId, identityKeyPair.getPrivateKey());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 5f37c402..72725f5c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -114,7 +114,7 @@ public class SignalAccount implements Closeable {
     private static final Logger logger = LoggerFactory.getLogger(SignalAccount.class);
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
-    private static final int CURRENT_STORAGE_VERSION = 8;
+    private static final int CURRENT_STORAGE_VERSION = 9;
 
     private final Object LOCK = new Object();
 
@@ -1111,7 +1111,7 @@ public class SignalAccount implements Closeable {
                 serviceIdType,
                 preKeyMetadata.nextKyberPreKeyId);
         accountData.getSignalServiceAccountDataStore()
-                .markAllOneTimeEcPreKeysStaleIfNecessary(System.currentTimeMillis());
+                .markAllOneTimeKyberPreKeysStaleIfNecessary(System.currentTimeMillis());
         for (var record : records) {
             if (preKeyMetadata.nextKyberPreKeyId != record.getId()) {
                 logger.error("Invalid kyber pre key id {}, expected {}",

From d84362eb0f022d8bd22321afb5f082b3881f316c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 20:37:20 +0100
Subject: [PATCH 386/672] Add sendMessageRequestResponse command

---
 client/src/cli.rs                             | 15 ++++++
 client/src/jsonrpc.rs                         |  9 ++++
 client/src/main.rs                            | 17 +++++++
 .../org/asamk/signal/manager/Manager.java     |  4 ++
 .../signal/manager/helper/SyncHelper.java     | 34 +++++++++++++
 .../signal/manager/internal/ManagerImpl.java  | 44 +++++++++++++++++
 man/signal-cli.1.adoc                         | 13 +++++
 .../org/asamk/signal/commands/Commands.java   |  1 +
 .../commands/MessageRequestResponseType.java  | 16 ++++++
 .../SendMessageRequestResponseCommand.java    | 49 +++++++++++++++++++
 .../asamk/signal/dbus/DbusManagerImpl.java    |  8 +++
 11 files changed, 210 insertions(+)
 create mode 100644 src/main/java/org/asamk/signal/commands/MessageRequestResponseType.java
 create mode 100644 src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java

diff --git a/client/src/cli.rs b/client/src/cli.rs
index e5a5a878..a64ab511 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -277,6 +277,14 @@ pub enum CliCommands {
         #[arg(short = 's', long)]
         stop: bool,
     },
+    SendMessageRequestResponse {
+        recipient: Vec<String>,
+
+        #[arg(short = 'g', long = "group-id")]
+        group_id: Vec<String>,
+
+        r#type: MessageRequestResponseType,
+    },
     SetPin {
         pin: String,
     },
@@ -447,3 +455,10 @@ pub enum GroupPermission {
     EveryMember,
     OnlyAdmins,
 }
+
+#[derive(ValueEnum, Clone, Debug)]
+#[value(rename_all = "kebab-case")]
+pub enum MessageRequestResponseType {
+    Accept,
+    Delete,
+}
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 266047c2..b085cde5 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -247,6 +247,15 @@ pub trait Rpc {
         stop: bool,
     ) -> Result<Value, ErrorObjectOwned>;
 
+    #[method(name = "sendMessageRequestResponse", param_kind = map)]
+    fn send_message_request_response(
+        &self,
+        account: Option<String>,
+        recipients: Vec<String>,
+        #[allow(non_snake_case)] groupIds: Vec<String>,
+        r#type: String,
+    ) -> Result<Value, ErrorObjectOwned>;
+
     #[method(name = "setPin", param_kind = map)]
     fn set_pin(&self, account: Option<String>, pin: String) -> Result<Value, ErrorObjectOwned>;
 
diff --git a/client/src/main.rs b/client/src/main.rs
index d934f800..71903e1d 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -437,6 +437,23 @@ async fn handle_command(
                 .start_change_number(cli.account, number, voice, captcha)
                 .await
         }
+        CliCommands::SendMessageRequestResponse {
+            recipient,
+            group_id,
+            r#type,
+        } => {
+            client
+                .send_message_request_response(
+                    cli.account,
+                    recipient,
+                    group_id,
+                    match r#type {
+                        cli::MessageRequestResponseType::Accept => "accept".to_owned(),
+                        cli::MessageRequestResponseType::Delete => "delete".to_owned(),
+                    },
+                )
+                .await
+        }
     }
 }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 52d0aaff..f4d330a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -204,6 +204,10 @@ public interface Manager extends Closeable {
 
     SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException;
 
+    SendMessageResults sendMessageRequestResponse(
+            MessageEnvelope.Sync.MessageRequestResponse.Type type, Set<RecipientIdentifier> recipientIdentifiers
+    );
+
     void hideRecipient(RecipientIdentifier.Single recipient);
 
     void deleteRecipient(RecipientIdentifier.Single recipient);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 9fd5076d..4d218003 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
@@ -28,6 +29,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroup;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.MessageRequestResponseMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
@@ -365,6 +367,25 @@ public class SyncHelper {
         }
     }
 
+    public SendMessageResult sendMessageRequestResponse(
+            final MessageEnvelope.Sync.MessageRequestResponse.Type type, final GroupId groupId
+    ) {
+        final var response = MessageRequestResponseMessage.forGroup(groupId.serialize(), localToRemoteType(type));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response));
+    }
+
+    public SendMessageResult sendMessageRequestResponse(
+            final MessageEnvelope.Sync.MessageRequestResponse.Type type, final RecipientId recipientId
+    ) {
+        final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+        if (address.serviceId().isEmpty()) {
+            return null;
+        }
+        final var response = MessageRequestResponseMessage.forIndividual(address.serviceId().get(),
+                localToRemoteType(type));
+        return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response));
+    }
+
     private SendMessageResult requestSyncData(final SyncMessage.Request.Type type) {
         var r = new SyncMessage.Request.Builder().type(type).build();
         var message = SignalServiceSyncMessage.forRequest(new RequestMessage(r));
@@ -389,4 +410,17 @@ public class SyncHelper {
             logger.warn("Failed to download avatar for contact {}, ignoring: {}", address, e.getMessage());
         }
     }
+
+    private MessageRequestResponseMessage.Type localToRemoteType(final MessageEnvelope.Sync.MessageRequestResponse.Type type) {
+        return switch (type) {
+            case UNKNOWN -> MessageRequestResponseMessage.Type.UNKNOWN;
+            case ACCEPT -> MessageRequestResponseMessage.Type.ACCEPT;
+            case DELETE -> MessageRequestResponseMessage.Type.DELETE;
+            case BLOCK -> MessageRequestResponseMessage.Type.BLOCK;
+            case BLOCK_AND_DELETE -> MessageRequestResponseMessage.Type.BLOCK_AND_DELETE;
+            case UNBLOCK_AND_ACCEPT -> MessageRequestResponseMessage.Type.UNBLOCK_AND_ACCEPT;
+            case SPAM -> MessageRequestResponseMessage.Type.SPAM;
+            case BLOCK_AND_SPAM -> MessageRequestResponseMessage.Type.BLOCK_AND_SPAM;
+        };
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index bd484bb7..a25c92c0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -38,6 +38,7 @@ import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.LastGroupAdminException;
 import org.asamk.signal.manager.api.Message;
 import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.MessageEnvelope.Sync.MessageRequestResponse;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
@@ -874,6 +875,41 @@ public class ManagerImpl implements Manager {
         }
     }
 
+    @Override
+    public SendMessageResults sendMessageRequestResponse(
+            final MessageRequestResponse.Type type, final Set<RecipientIdentifier> recipients
+    ) {
+        var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
+        for (final var recipient : recipients) {
+            if (recipient instanceof RecipientIdentifier.NoteToSelf || (
+                    recipient instanceof RecipientIdentifier.Single single
+                            && new RecipientAddress(single.toPartialRecipientAddress()).matches(account.getSelfRecipientAddress())
+            )) {
+                final var result = context.getSyncHelper()
+                        .sendMessageRequestResponse(type, account.getSelfRecipientId());
+                if (result != null) {
+                    results.put(recipient, List.of(toSendMessageResult(result)));
+                }
+                results.put(recipient, List.of(toSendMessageResult(result)));
+            } else if (recipient instanceof RecipientIdentifier.Single single) {
+                try {
+                    final var recipientId = context.getRecipientHelper().resolveRecipient(single);
+                    final var result = context.getSyncHelper().sendMessageRequestResponse(type, recipientId);
+                    if (result != null) {
+                        results.put(recipient, List.of(toSendMessageResult(result)));
+                    }
+                } catch (UnregisteredRecipientException e) {
+                    results.put(recipient,
+                            List.of(SendMessageResult.unregisteredFailure(single.toPartialRecipientAddress())));
+                }
+            } else if (recipient instanceof RecipientIdentifier.Group group) {
+                final var result = context.getSyncHelper().sendMessageRequestResponse(type, group.groupId());
+                results.put(recipient, List.of(toSendMessageResult(result)));
+            }
+        }
+        return new SendMessageResults(0, results);
+    }
+
     @Override
     public void hideRecipient(final RecipientIdentifier.Single recipient) {
         final var recipientIdOptional = context.getRecipientHelper().resolveRecipientOptional(recipient);
@@ -929,6 +965,10 @@ public class ManagerImpl implements Manager {
                 continue;
             }
             context.getContactHelper().setContactBlocked(recipientId, blocked);
+            context.getSyncHelper()
+                    .sendMessageRequestResponse(blocked
+                            ? MessageRequestResponse.Type.BLOCK
+                            : MessageRequestResponse.Type.UNBLOCK_AND_ACCEPT, recipientId);
             // if we don't have a common group with the blocked contact we need to rotate the profile key
             shouldRotateProfileKey = blocked && (
                     shouldRotateProfileKey || account.getGroupStore()
@@ -957,6 +997,10 @@ public class ManagerImpl implements Manager {
                 continue;
             }
             context.getGroupHelper().setGroupBlocked(groupId, blocked);
+            context.getSyncHelper()
+                    .sendMessageRequestResponse(blocked
+                            ? MessageRequestResponse.Type.BLOCK
+                            : MessageRequestResponse.Type.UNBLOCK_AND_ACCEPT, groupId);
             shouldRotateProfileKey = blocked;
         }
         if (shouldRotateProfileKey) {
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index d718571c..712d4976 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -346,6 +346,19 @@ Clear session state and send end session message.
 *--edit-timestamp*::
 Specify the timestamp of a previous message with the recipient or group to send an edited message.
 
+=== sendMessageRequestResponse
+
+Send response to a message request to linked devices.
+
+RECIPIENT::
+Specify the recipients’ phone number.
+
+*-g* GROUP, *--group-id* GROUP::
+Specify the recipient group ID in base64 encoding.
+
+*--type* TYPE::
+Type of message request response (accept, delete)
+
 === sendPaymentNotification
 
 Send a payment notification.
diff --git a/src/main/java/org/asamk/signal/commands/Commands.java b/src/main/java/org/asamk/signal/commands/Commands.java
index a963ce4e..51620a7f 100644
--- a/src/main/java/org/asamk/signal/commands/Commands.java
+++ b/src/main/java/org/asamk/signal/commands/Commands.java
@@ -39,6 +39,7 @@ public class Commands {
         addCommand(new RemoteDeleteCommand());
         addCommand(new SendCommand());
         addCommand(new SendContactsCommand());
+        addCommand(new SendMessageRequestResponseCommand());
         addCommand(new SendPaymentNotificationCommand());
         addCommand(new SendReactionCommand());
         addCommand(new SendReceiptCommand());
diff --git a/src/main/java/org/asamk/signal/commands/MessageRequestResponseType.java b/src/main/java/org/asamk/signal/commands/MessageRequestResponseType.java
new file mode 100644
index 00000000..280a1767
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/MessageRequestResponseType.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.commands;
+
+enum MessageRequestResponseType {
+    ACCEPT {
+        @Override
+        public String toString() {
+            return "accept";
+        }
+    },
+    DELETE {
+        @Override
+        public String toString() {
+            return "delete";
+        }
+    }
+}
diff --git a/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
new file mode 100644
index 00000000..146ebaf2
--- /dev/null
+++ b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
@@ -0,0 +1,49 @@
+package org.asamk.signal.commands;
+
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.MessageEnvelope.Sync.MessageRequestResponse.Type;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.util.CommandUtil;
+
+public class SendMessageRequestResponseCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "sendMessageRequestResponse";
+    }
+
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Send response to a message request to linked devices.");
+        subparser.addArgument("-g", "--group-id", "--group").help("Specify the recipient group ID.").nargs("*");
+        subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
+        subparser.addArgument("-u", "--username").help("Specify the recipient username or username link.").nargs("*");
+        subparser.addArgument("--type")
+                .help("Type of message request response")
+                .type(Arguments.enumStringType(MessageRequestResponseType.class))
+                .required(true);
+    }
+
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var recipientStrings = ns.<String>getList("recipient");
+        final var groupIdStrings = ns.<String>getList("group-id");
+        final var usernameStrings = ns.<String>getList("username");
+        final var type = ns.<MessageRequestResponseType>get("type");
+
+        final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
+                false,
+                recipientStrings,
+                groupIdStrings,
+                usernameStrings);
+        m.sendMessageRequestResponse(type == MessageRequestResponseType.ACCEPT ? Type.ACCEPT : Type.DELETE,
+                recipientIdentifiers);
+    }
+}
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index f684871a..522bb3f6 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -472,6 +472,14 @@ public class DbusManagerImpl implements Manager {
         return new SendMessageResults(0, Map.of());
     }
 
+    @Override
+    public SendMessageResults sendMessageRequestResponse(
+            final MessageEnvelope.Sync.MessageRequestResponse.Type type,
+            final Set<RecipientIdentifier> recipientIdentifiers
+    ) {
+        throw new UnsupportedOperationException();
+    }
+
     public void hideRecipient(final RecipientIdentifier.Single recipient) {
         throw new UnsupportedOperationException();
     }

From ed40d116b70f17950f58e66005cb7a00d619c635 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 20:58:55 +0100
Subject: [PATCH 387/672] Fix sending to username

---
 graalvm-config-dir/reflect-config.json                     | 7 +++++++
 .../org/asamk/signal/manager/api/RecipientAddress.java     | 2 +-
 .../manager/storage/recipients/RecipientAddress.java       | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

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!");
         }
     }
 

From fb99ff5284de467b42b80191c072b66c2221889a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 21:04:50 +0100
Subject: [PATCH 388/672] Document creating and sending to usernames

---
 man/signal-cli.1.adoc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 712d4976..a626ab61 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -151,6 +151,13 @@ Can fix problems with receiving messages.
 *-n* NAME, *--device-name* NAME::
 Set a new device name for the primary or linked device
 
+*--username* NAME::
+Specify a username that can then be used to contact this account.
+Returns the new username with discriminator and the username link.
+
+*--delete-username*::
+Delete the username associated with this account.
+
 *--unrestricted-unidentified-sender* {true,false}::
 Enable if anyone should be able to send you unidentified sender messages.
 
@@ -275,6 +282,9 @@ Send the message to self without notification.
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
 
+*-u* USERNAME, *--username* USERNAME::
+Specify the recipient username or username link.
+
 *-m* MESSAGE, *--message* MESSAGE::
 Specify the message.
 
@@ -356,6 +366,9 @@ Specify the recipients’ phone number.
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
 
+*-u* USERNAME, *--username* USERNAME::
+Specify the recipient username or username link.
+
 *--type* TYPE::
 Type of message request response (accept, delete)
 
@@ -382,6 +395,9 @@ Specify the recipients’ phone number.
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
 
+*-u* USERNAME, *--username* USERNAME::
+Specify the recipient username or username link.
+
 *-e* EMOJI, *--emoji* EMOJI::
 Specify the emoji, should be a single unicode grapheme cluster.
 
@@ -434,6 +450,9 @@ Specify the recipients’ phone number.
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
 
+*-u* USERNAME, *--username* USERNAME::
+Specify the recipient username or username link.
+
 *-t* TIMESTAMP, *--target-timestamp* TIMESTAMP::
 Specify the timestamp of the message to delete.
 

From 3b3377e6e980dd8da091e336631fb36fd3d4998c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 21:06:17 +0100
Subject: [PATCH 389/672] Update CHANGELOG

---
 CHANGELOG.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 183503e1..b3e9c17d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 **Attention**: Now requires Java 21 and libsignal-client version 0.39.2
 
 ### Breaking changes
+
 - Sending to the self number (+XXXX) now behaves the same as the `--note-to-self` parameter. To get the previous
   behavior with notification, the `--notify-self` parameter can be added.
 
@@ -13,15 +14,22 @@
 - New `--hidden` parameter for `removeContact` command
 - New `--notify-self` parameter for `send` command, for sending a non-sync message when self is part of the recipients
   or groups.
-- New `--unrestricted-unidentified-sender` parameter for `updateAccount command`
+- New `--unrestricted-unidentified-sender`, `--discoverable-by-number`, `--number-sharing`, `--username`
+  and `--delete-username` parameter for `updateAccount` command
 - New `--bus-name` parameter for `daemon` command to use another D-Bus bus name
 - New `getAvatar` and `getSticker` commands to get avatar and sticker images
+- New `sendMessageRequestResponse` command to accept/delete message requests
+
+### Fixed
+
+- Improve issue with stale prekeys and receiving messages to PNI address
 
 ### Improved
 
 - Better shutdown handling after Ctrl+C and SIGTERM
 - Implemented full remote storage sync.
   Provides better contact and settings sync for linked devices.
+- `listContacts` doesn't list unregistered users anymore
 
 ## [0.12.8] - 2024-02-06
 

From 9051f68ba64163690c6c0e7bc4214cb2a2f37002 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 21:26:36 +0100
Subject: [PATCH 390/672] Enable profile sharing when accepting message request

---
 .../asamk/signal/manager/helper/ContactHelper.java   |  7 +++++++
 .../org/asamk/signal/manager/helper/SyncHelper.java  | 12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index 609c2bcf..f9af27f1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -49,6 +49,13 @@ public class ContactHelper {
         account.getContactStore().storeContact(recipientId, builder.withIsBlocked(blocked).build());
     }
 
+    public void setContactProfileSharing(RecipientId recipientId, boolean profileSharing) {
+        var contact = account.getContactStore().getContact(recipientId);
+        final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        builder.withIsProfileSharingEnabled(profileSharing);
+        account.getContactStore().storeContact(recipientId, builder.build());
+    }
+
     public void setContactHidden(RecipientId recipientId, boolean hidden) {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 4d218003..4789790e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -2,7 +2,7 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.GroupId;
-import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.MessageEnvelope.Sync.MessageRequestResponse;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
@@ -368,19 +368,23 @@ public class SyncHelper {
     }
 
     public SendMessageResult sendMessageRequestResponse(
-            final MessageEnvelope.Sync.MessageRequestResponse.Type type, final GroupId groupId
+            final MessageRequestResponse.Type type, final GroupId groupId
     ) {
         final var response = MessageRequestResponseMessage.forGroup(groupId.serialize(), localToRemoteType(type));
         return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response));
     }
 
     public SendMessageResult sendMessageRequestResponse(
-            final MessageEnvelope.Sync.MessageRequestResponse.Type type, final RecipientId recipientId
+            final MessageRequestResponse.Type type, final RecipientId recipientId
     ) {
         final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
         if (address.serviceId().isEmpty()) {
             return null;
         }
+        context.getContactHelper()
+                .setContactProfileSharing(recipientId,
+                        type == MessageRequestResponse.Type.ACCEPT
+                                || type == MessageRequestResponse.Type.UNBLOCK_AND_ACCEPT);
         final var response = MessageRequestResponseMessage.forIndividual(address.serviceId().get(),
                 localToRemoteType(type));
         return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response));
@@ -411,7 +415,7 @@ public class SyncHelper {
         }
     }
 
-    private MessageRequestResponseMessage.Type localToRemoteType(final MessageEnvelope.Sync.MessageRequestResponse.Type type) {
+    private MessageRequestResponseMessage.Type localToRemoteType(final MessageRequestResponse.Type type) {
         return switch (type) {
             case UNKNOWN -> MessageRequestResponseMessage.Type.UNKNOWN;
             case ACCEPT -> MessageRequestResponseMessage.Type.ACCEPT;

From 67fd10b978de305658cf79e4238fd6294ec664b3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 21:43:02 +0100
Subject: [PATCH 391/672] Update dependencies

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4cd47c4e..1fcc646a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -13,7 +13,7 @@ dependencyResolutionManagement {
             version("slf4j", "2.0.12")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.4.14")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.5.0")
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_96")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")

From cd88e896fa3467209febe7d89487a5e2c16a1dc8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 22:01:31 +0100
Subject: [PATCH 392/672] Fix missing unique constraint on storage_id table

---
 .../org/asamk/signal/manager/storage/AccountDatabase.java    | 2 +-
 .../asamk/signal/manager/storage/UnknownStorageIdStore.java  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 6cf725a0..014009c4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -495,7 +495,7 @@ public class AccountDatabase extends Database {
                                         CREATE TABLE storage_id (
                                           _id INTEGER PRIMARY KEY,
                                           type INTEGER NOT NULL,
-                                          storage_id BLOB NOT NULL
+                                          storage_id BLOB UNIQUE NOT NULL
                                         ) STRICT;
                                         ALTER TABLE group_v1 ADD COLUMN storage_id BLOB;
                                         ALTER TABLE group_v1 ADD COLUMN storage_record BLOB;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
index 6e00ad75..75389751 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
@@ -7,6 +7,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 public class UnknownStorageIdStore {
@@ -26,7 +27,7 @@ public class UnknownStorageIdStore {
         }
     }
 
-    public Collection<StorageId> getUnknownStorageIds(Connection connection) throws SQLException {
+    public Set<StorageId> getUnknownStorageIds(Connection connection) throws SQLException {
         final var sql = (
                 """
                 SELECT s.type, s.storage_id
@@ -35,7 +36,7 @@ public class UnknownStorageIdStore {
         ).formatted(TABLE_STORAGE_ID);
         try (final var statement = connection.prepareStatement(sql)) {
             try (var result = Utils.executeQueryForStream(statement, this::getStorageIdFromResultSet)) {
-                return result.toList();
+                return result.collect(Collectors.toSet());
             }
         }
     }

From 782181542956130bc853759e23c76b35a8b9c077 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 21:46:33 +0100
Subject: [PATCH 393/672] Bump version to 0.13.0

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3e9c17d..3e7db200 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+## [0.13.0] - 2024-02-18
+
 **Attention**: Now requires Java 21 and libsignal-client version 0.39.2
 
 ### Breaking changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 9214ae91..7acc5ced 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.0"
 }
 
-version = "0.12.9-SNAPSHOT"
+version = "0.13.0"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From db9acaf4ff31540b954f67504b893e4113a4529a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 18 Feb 2024 22:14:09 +0100
Subject: [PATCH 394/672] Set snapshot version

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7acc5ced..cc3f0258 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.0"
 }
 
-version = "0.13.0"
+version = "0.13.1-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 6f407ab5094a1d492d7fd54d2988606f12b7f7e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Mon, 19 Feb 2024 08:20:24 +0100
Subject: [PATCH 395/672] Fix typos (#1459)

---
 CHANGELOG.md                                                  | 2 +-
 README.md                                                     | 2 +-
 .../signal/manager/internal/SignalWebSocketHealthMonitor.java | 2 +-
 .../org/asamk/signal/manager/storage/groups/GroupStore.java   | 4 ++--
 src/main/java/org/asamk/signal/commands/TrustCommand.java     | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e7db200..ecaead9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -471,7 +471,7 @@
 - Improve exit code for message sending.
   Exit with 0 status code if the message was sent successfully to at least
   one recipient, otherwise exit with status code 2 or 4 (for untrusted).
-- Download profiles in parallel for improved perfomance
+- Download profiles in parallel for improved performance
 - `--verbose` flag can be specified multiple times for additional log output
 - Enable more security options for systemd service file
 - Rename sandbox to staging environment, to match the upstream name.
diff --git a/README.md b/README.md
index 6b87a745..a4d6cc53 100644
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ version installed, you can replace `./gradlew` with `gradle` in the following st
 It is possible to build a native binary with [GraalVM](https://www.graalvm.org). This is still experimental and will not
 work in all situations.
 
-1. [Install GraalVM and setup the enviroment](https://www.graalvm.org/docs/getting-started/#install-graalvm)
+1. [Install GraalVM and setup the environment](https://www.graalvm.org/docs/getting-started/#install-graalvm)
 2. Execute Gradle:
 
        ./gradlew nativeCompile
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index 02bdd49e..3ebbe4f3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -147,7 +147,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
                         }
                     }
                 } catch (Throwable e) {
-                    logger.warn("Error occured in KeepAliveSender, ignoring ...", e);
+                    logger.warn("Error occurred in KeepAliveSender, ignoring ...", e);
                 }
             }
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 5ebac9c5..e24816bc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -733,7 +733,7 @@ public class GroupStore {
         final var expirationTime = resultSet.getInt("expiration_time");
         final var blocked = resultSet.getBoolean("blocked");
         final var archived = resultSet.getBoolean("archived");
-        final var storagRecord = resultSet.getBytes("storage_record");
+        final var storageRecord = resultSet.getBytes("storage_record");
         return new GroupInfoV1(GroupId.v1(groupId),
                 groupIdV2 == null ? null : GroupId.v2(groupIdV2),
                 name,
@@ -742,7 +742,7 @@ public class GroupStore {
                 expirationTime,
                 blocked,
                 archived,
-                storagRecord);
+                storageRecord);
     }
 
     private GroupInfoV2 getGroupV2ByV1Id(final Connection connection, final GroupIdV1 groupId) throws SQLException {
diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index 9b9735d3..a130c03c 100644
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -35,8 +35,8 @@ public class TrustCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
-        var recipentString = ns.getString("recipient");
-        var recipient = CommandUtil.getSingleRecipientIdentifier(recipentString, m.getSelfNumber());
+        var recipientString = ns.getString("recipient");
+        var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
         if (Boolean.TRUE.equals(ns.getBoolean("trust-all-known-keys"))) {
             try {
                 final var res = m.trustIdentityAllKeys(recipient);

From 7bc7242f08a8ff558d9fa5bb0df06321df386819 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 20 Feb 2024 11:03:15 +0100
Subject: [PATCH 396/672] Add uniqueness check to db migration

---
 .../java/org/asamk/signal/manager/storage/AccountDatabase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 014009c4..b1672f01 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -556,7 +556,7 @@ public class AccountDatabase extends Database {
                                           profile_capabilities TEXT
                                         ) STRICT;
                                         INSERT INTO recipient2 (_id, aci, pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities)
-                                          SELECT r._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.uuid AND t.address not like 'PNI:%') aci, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.pni AND t.address like 'PNI:%') pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities
+                                          SELECT r._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.uuid AND t.address not like 'PNI:%') aci, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.pni AND t.address like 'PNI:%' AND t.address NOT IN (SELECT pni FROM recipient2)) pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities
                                           FROM recipient r;
                                         DROP TABLE recipient;
                                         ALTER TABLE recipient2 RENAME TO recipient;

From f1e3b5c9ccef84c08f20138a160c7778fe52c4da Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 20 Feb 2024 17:05:56 +0100
Subject: [PATCH 397/672] Add uniqueness check to db migration

---
 .../java/org/asamk/signal/manager/storage/AccountDatabase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index b1672f01..af498359 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -556,7 +556,7 @@ public class AccountDatabase extends Database {
                                           profile_capabilities TEXT
                                         ) STRICT;
                                         INSERT INTO recipient2 (_id, aci, pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities)
-                                          SELECT r._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.uuid AND t.address not like 'PNI:%') aci, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.pni AND t.address like 'PNI:%' AND t.address NOT IN (SELECT pni FROM recipient2)) pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities
+                                          SELECT r._id, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.uuid AND t.address not like 'PNI:%') aci, (SELECT t.address FROM tmp_mapping_table t WHERE t.uuid = r.pni AND t.address like 'PNI:%' AND (SELECT COUNT(pni) FROM recipient WHERE pni = r.pni) = 1) pni, storage_id, storage_record, number, username, unregistered_timestamp, profile_key, profile_key_credential, given_name, family_name, color, expiration_time, blocked, archived, profile_sharing, hidden, profile_last_update_timestamp, profile_given_name, profile_family_name, profile_about, profile_about_emoji, profile_avatar_url_path, profile_mobile_coin_address, profile_unidentified_access_mode, profile_capabilities
                                           FROM recipient r;
                                         DROP TABLE recipient;
                                         ALTER TABLE recipient2 RENAME TO recipient;

From 59c1f4eed23d695cb701b26339e4006f99b3d2c2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 20 Feb 2024 17:37:31 +0100
Subject: [PATCH 398/672] Show information when requesting voice verification
 without SMS verification

Fixes #1373
---
 lib/src/main/java/org/asamk/signal/manager/Manager.java   | 3 ++-
 .../org/asamk/signal/manager/RegistrationManager.java     | 3 ++-
 .../api/VerificationMethoNotAvailableException.java       | 8 ++++++++
 .../org/asamk/signal/manager/helper/AccountHelper.java    | 3 ++-
 .../org/asamk/signal/manager/internal/ManagerImpl.java    | 3 ++-
 .../signal/manager/internal/RegistrationManagerImpl.java  | 3 ++-
 .../signal/manager/util/NumberVerificationUtils.java      | 7 +++++--
 .../java/org/asamk/signal/commands/RegisterCommand.java   | 7 +++++++
 .../asamk/signal/commands/StartChangeNumberCommand.java   | 7 +++++++
 .../java/org/asamk/signal/dbus/DbusSignalControlImpl.java | 3 ++-
 10 files changed, 39 insertions(+), 8 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/VerificationMethoNotAvailableException.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index f4d330a4..76b6a85c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -43,6 +43,7 @@ import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
@@ -125,7 +126,7 @@ public interface Manager extends Closeable {
 
     void startChangeNumber(
             String newNumber, boolean voiceVerification, String captcha
-    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException;
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethoNotAvailableException;
 
     void finishChangeNumber(
             String newNumber, String verificationCode, String pin
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index 8ba2bf70..365dd399 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -5,6 +5,7 @@ import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -13,7 +14,7 @@ public interface RegistrationManager extends Closeable {
 
     void register(
             boolean voiceVerification, String captcha
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException;
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethoNotAvailableException;
 
     void verifyAccount(
             String verificationCode, String pin
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethoNotAvailableException.java b/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethoNotAvailableException.java
new file mode 100644
index 00000000..172e44e4
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethoNotAvailableException.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.api;
+
+public class VerificationMethoNotAvailableException extends Exception {
+
+    public VerificationMethoNotAvailableException() {
+        super("Invalid verification method");
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 1f44e2a3..06b1fe80 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -7,6 +7,7 @@ import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.SignalAccount;
@@ -164,7 +165,7 @@ public class AccountHelper {
 
     public void startChangeNumber(
             String newNumber, boolean voiceVerification, String captcha
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException {
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethoNotAvailableException {
         final var accountManager = dependencies.createUnauthenticatedAccountManager(newNumber, account.getPassword());
         String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
                 account.getSessionId(newNumber),
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index a25c92c0..2caffc38 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -64,6 +64,7 @@ import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
@@ -374,7 +375,7 @@ public class ManagerImpl implements Manager {
     @Override
     public void startChangeNumber(
             String newNumber, boolean voiceVerification, String captcha
-    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException {
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethoNotAvailableException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 4518fb01..2df7ff4b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -24,6 +24,7 @@ import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UpdateProfile;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
@@ -104,7 +105,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
     @Override
     public void register(
             boolean voiceVerification, String captcha
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException {
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethoNotAvailableException {
         if (account.isRegistered()
                 && account.getServiceEnvironment() != null
                 && account.getServiceEnvironment() != serviceEnvironmentConfig.type()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index a5c91f5b..9eb01cdb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 import org.asamk.signal.manager.helper.PinHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +35,7 @@ public class NumberVerificationUtils {
             Consumer<String> sessionIdSaver,
             boolean voiceVerification,
             String captcha
-    ) throws CaptchaRequiredException, IOException, RateLimitException {
+    ) throws CaptchaRequiredException, IOException, RateLimitException, VerificationMethoNotAvailableException {
         RegistrationSessionMetadataResponse sessionResponse;
         try {
             sessionResponse = getValidSession(accountManager, sessionId);
@@ -61,7 +62,9 @@ public class NumberVerificationUtils {
         final var nextAttempt = voiceVerification
                 ? sessionResponse.getBody().getNextCall()
                 : sessionResponse.getBody().getNextSms();
-        if (nextAttempt != null && nextAttempt > 0) {
+        if (nextAttempt == null) {
+            throw new VerificationMethoNotAvailableException();
+        } else if (nextAttempt > 0) {
             final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextAttempt * 1000;
             throw new RateLimitException(timestamp);
         }
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 876d1a8a..4776ac6e 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -15,6 +15,7 @@ import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.util.CommandUtil;
 
@@ -79,6 +80,12 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
         } catch (IOException e) {
             throw new IOErrorException("Failed to register: %s (%s)".formatted(e.getMessage(),
                     e.getClass().getSimpleName()), e);
+        } catch (VerificationMethoNotAvailableException e) {
+            throw new UserErrorException("Failed to register: " + e.getMessage() + (
+                    voiceVerification
+                            ? ": Before requesting voice verification you need to request SMS verification and wait a minute."
+                            : ""
+            ), e);
         }
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
index 7b18dbf0..823a0c92 100644
--- a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
+++ b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
@@ -13,6 +13,7 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.RateLimitException;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
@@ -59,6 +60,12 @@ public class StartChangeNumberCommand implements JsonRpcLocalCommand {
         } catch (IOException e) {
             throw new IOErrorException("Failed to change number: %s (%s)".formatted(e.getMessage(),
                     e.getClass().getSimpleName()), e);
+        } catch (VerificationMethoNotAvailableException e) {
+            throw new UserErrorException("Failed to register: " + e.getMessage() + (
+                    voiceVerification
+                            ? ": Before requesting voice verification you need to request SMS verification and wait a minute."
+                            : ""
+            ), e);
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index f21dd40d..d8465d26 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -13,6 +13,7 @@ import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
+import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
 import org.freedesktop.dbus.DBusPath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,7 +74,7 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
             throw new Error.InvalidNumber(e.getMessage());
         } catch (OverlappingFileLockException e) {
             throw new SignalControl.Error.Failure("Account is already in use");
-        } catch (IOException e) {
+        } catch (IOException | VerificationMethoNotAvailableException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
     }

From 08ba774b7135f83bf50d513214f305a4b0db2181 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 20 Feb 2024 17:37:59 +0100
Subject: [PATCH 399/672] Update graalvm buildtools

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index cc3f0258..f07d250b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.10.0"
+    id("org.graalvm.buildtools.native") version "0.10.1"
 }
 
 version = "0.13.1-SNAPSHOT"

From 0bb2a64781ccb26f7ddc85e85f434066a97bad23 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 22 Feb 2024 19:59:54 +0100
Subject: [PATCH 400/672] Add missing field handling in account record
 processor

---
 .../signal/manager/syncStorage/AccountRecordProcessor.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index acce82e6..897f4291 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -102,6 +102,8 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var storiesDisabled = remote.isStoriesDisabled();
         final var hasSeenGroupStoryEducation = remote.hasSeenGroupStoryEducationSheet()
                 || local.hasSeenGroupStoryEducationSheet();
+        boolean hasSeenUsernameOnboarding = remote.hasCompletedUsernameOnboarding()
+                || local.hasCompletedUsernameOnboarding();
         final var username = remote.getUsername();
         final var usernameLink = remote.getUsernameLink();
 
@@ -131,6 +133,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .setHasViewedOnboardingStory(hasViewedOnboardingStory)
                 .setStoriesDisabled(storiesDisabled)
                 .setHasSeenGroupStoryEducationSheet(hasSeenGroupStoryEducation)
+                .setHasCompletedUsernameOnboarding(hasSeenUsernameOnboarding)
                 .setStoryViewReceiptsState(storyViewReceiptsState)
                 .setUsername(username)
                 .setUsernameLink(usernameLink)

From 83d471818d23626aa47a7180e0c59c43c89dafaa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 22 Feb 2024 19:59:19 +0100
Subject: [PATCH 401/672] Allow setting a username with explicit descriminator

Fixes #1469
---
 graalvm-config-dir/jni-config.json            |  4 +++
 .../signal/manager/helper/AccountHelper.java  | 25 +++++++++++++++++--
 .../signal/manager/internal/ManagerImpl.java  |  6 ++++-
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 5b47a7b6..b79debed 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -165,6 +165,10 @@
 {
   "name":"org.signal.libsignal.protocol.state.SignedPreKeyStore"
 },
+{
+  "name":"org.signal.libsignal.usernames.BadDiscriminatorCharacterException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.signal.libsignal.usernames.BadNicknameCharacterException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 06b1fe80..5abac1e7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -321,21 +321,42 @@ public class AccountHelper {
     public static final int USERNAME_MIN_LENGTH = 3;
     public static final int USERNAME_MAX_LENGTH = 32;
 
-    public void reserveUsername(String nickname) throws IOException, BaseUsernameException {
+    public void reserveUsernameFromNickname(String nickname) throws IOException, BaseUsernameException {
         final var currentUsername = account.getUsername();
         if (currentUsername != null) {
             final var currentNickname = currentUsername.substring(0, currentUsername.indexOf('.'));
             if (currentNickname.equals(nickname)) {
                 try {
                     refreshCurrentUsername();
+                    return;
                 } catch (IOException | BaseUsernameException e) {
                     logger.warn("[reserveUsername] Failed to refresh current username, trying to claim new username");
                 }
-                return;
             }
         }
 
         final var candidates = Username.candidatesFrom(nickname, USERNAME_MIN_LENGTH, USERNAME_MAX_LENGTH);
+        reserveUsername(candidates);
+    }
+
+    public void reserveExactUsername(String username) throws IOException, BaseUsernameException {
+        final var currentUsername = account.getUsername();
+        if (currentUsername != null) {
+            if (currentUsername.equals(username)) {
+                try {
+                    refreshCurrentUsername();
+                    return;
+                } catch (IOException | BaseUsernameException e) {
+                    logger.warn("[reserveUsername] Failed to refresh current username, trying to claim new username");
+                }
+            }
+        }
+
+        final var candidates = List.of(new Username(username));
+        reserveUsername(candidates);
+    }
+
+    private void reserveUsername(final List<Username> candidates) throws IOException {
         final var candidateHashes = new ArrayList<String>();
         for (final var candidate : candidates) {
             candidateHashes.add(Base64.encodeUrlSafeWithoutPadding(candidate.getHash()));
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 2caffc38..51a0e5ac 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -361,7 +361,11 @@ public class ManagerImpl implements Manager {
     @Override
     public void setUsername(final String username) throws IOException, InvalidUsernameException {
         try {
-            context.getAccountHelper().reserveUsername(username);
+            if (username.contains(".")) {
+                context.getAccountHelper().reserveExactUsername(username);
+            } else {
+                context.getAccountHelper().reserveUsernameFromNickname(username);
+            }
         } catch (BaseUsernameException e) {
             throw new InvalidUsernameException(e.getMessage() + " (" + e.getClass().getSimpleName() + ")", e);
         }

From c9002d94811c487dcba4ab06849d010a87fd767c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 25 Feb 2024 17:46:09 +0100
Subject: [PATCH 402/672] Ignore failure when uploading PNI prekeys

Can happen if PNI identity key hasn't been sent to the server yet.
---
 .../java/org/asamk/signal/manager/helper/PreKeyHelper.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index a2b4ddde..59ecf160 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.PreKeyUpload;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts;
 
 import java.io.IOException;
@@ -171,6 +172,11 @@ public class PreKeyHelper {
         } catch (AuthorizationFailedException e) {
             // This can happen when the primary device has changed phone number
             logger.warn("Failed to updated pre keys: {}", e.getMessage());
+        } catch (NonSuccessfulResponseCodeException e) {
+            if (serviceIdType != ServiceIdType.PNI || e.getCode() != 422) {
+                throw e;
+            }
+            logger.warn("Failed to update PNI pre keys, ignoring.");
         }
         return needsReset;
     }

From 2f3c064462a0e8f0ddec931d02203003a5e5ebdb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 25 Feb 2024 17:46:27 +0100
Subject: [PATCH 403/672] Update documentation

---
 man/signal-cli.1.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index a626ab61..4b59c754 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -151,8 +151,9 @@ Can fix problems with receiving messages.
 *-n* NAME, *--device-name* NAME::
 Set a new device name for the primary or linked device
 
-*--username* NAME::
+*-u* NAME *--username* NAME::
 Specify a username that can then be used to contact this account.
+This can either be just the nickname (e.g. test) or the complete username with discriminator (e.g. test.000).
 Returns the new username with discriminator and the username link.
 
 *--delete-username*::

From b76964f219a388ab46ecd0f6cb1f5482ba2e9eda Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 25 Feb 2024 17:54:18 +0100
Subject: [PATCH 404/672] Improve warning message

---
 .../main/java/org/asamk/signal/manager/helper/PreKeyHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 59ecf160..864ef656 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -176,7 +176,7 @@ public class PreKeyHelper {
             if (serviceIdType != ServiceIdType.PNI || e.getCode() != 422) {
                 throw e;
             }
-            logger.warn("Failed to update PNI pre keys, ignoring.");
+            logger.warn("Failed to set PNI pre keys, ignoring for now. Account needs to be reregistered to fix this.");
         }
         return needsReset;
     }

From 22ac3cb50f9367f3a4728a4e276c3962e3e72596 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 25 Feb 2024 18:12:36 +0100
Subject: [PATCH 405/672] Removing linked devices only works on the primary
 device

---
 lib/src/main/java/org/asamk/signal/manager/Manager.java      | 2 +-
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java  | 5 ++++-
 .../java/org/asamk/signal/commands/RemoveDeviceCommand.java  | 4 ++++
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java      | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 76b6a85c..7e0c1120 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -140,7 +140,7 @@ public interface Manager extends Closeable {
 
     List<Device> getLinkedDevices() throws IOException;
 
-    void removeLinkedDevices(int deviceId) throws IOException;
+    void removeLinkedDevices(int deviceId) throws IOException, NotPrimaryDeviceException;
 
     void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 51a0e5ac..5ef30db0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -436,7 +436,10 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void removeLinkedDevices(int deviceId) throws IOException {
+    public void removeLinkedDevices(int deviceId) throws IOException, NotPrimaryDeviceException {
+        if (!account.isPrimaryDevice()) {
+            throw new NotPrimaryDeviceException();
+        }
         context.getAccountHelper().removeLinkedDevices(deviceId);
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
index 24b3f81e..68a53616 100644
--- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
@@ -5,7 +5,9 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
@@ -33,6 +35,8 @@ public class RemoveDeviceCommand implements JsonRpcLocalCommand {
         try {
             final var deviceId = ns.getInt("device-id");
             m.removeLinkedDevices(deviceId);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (IOException e) {
             throw new IOErrorException("Error while removing device: " + e.getMessage(), e);
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 6db2ef63..257283fc 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1177,6 +1177,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
             try {
                 m.removeLinkedDevices(device.id());
                 updateDevices();
+            } catch (NotPrimaryDeviceException e) {
+                throw new Error.Failure("This command doesn't work on linked devices.");
             } catch (IOException e) {
                 throw new Error.Failure(e.getMessage());
             }

From 6c44662496376b97c8008722a8ae2a1210b87823 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 25 Feb 2024 18:27:20 +0100
Subject: [PATCH 406/672] Allow overriding user agent string

Not recommended, as it could lead to issues with newer Signal protocol changes.

Fixes #1476
---
 src/main/java/org/asamk/signal/BaseConfig.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 406c3fb1..9f8eead1 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -1,11 +1,14 @@
 package org.asamk.signal;
 
+import java.util.Optional;
+
 public class BaseConfig {
 
     public static final String PROJECT_NAME = BaseConfig.class.getPackage().getImplementationTitle();
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
-    static final String USER_AGENT_SIGNAL_ANDROID = "Signal-Android/6.46.0";
+    static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
+            .orElse("Signal-Android/6.46.0");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 57164ad7fb4db377699f056efd5e9305c614b759 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 25 Feb 2024 19:41:10 +0100
Subject: [PATCH 407/672] Prevent crash when receiving already migrated group
 v1 from storage

Fixes #1471
---
 .../manager/storage/groups/GroupStore.java    | 26 +++++++++++--------
 .../syncStorage/GroupV1RecordProcessor.java   | 18 +++++++------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index e24816bc..3dac4876 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -229,22 +229,26 @@ public class GroupStore {
 
     public GroupInfoV1 getOrCreateGroupV1(GroupIdV1 groupId) {
         try (final var connection = database.getConnection()) {
-            var group = getGroup(connection, groupId);
-
-            if (group != null) {
-                return group;
-            }
-
-            if (getGroupV2ByV1Id(connection, groupId) == null) {
-                return new GroupInfoV1(groupId);
-            }
-
-            return null;
+            return getOrCreateGroupV1(connection, groupId);
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from group store", e);
         }
     }
 
+    public GroupInfoV1 getOrCreateGroupV1(final Connection connection, final GroupIdV1 groupId) throws SQLException {
+        var group = getGroup(connection, groupId);
+
+        if (group != null) {
+            return group;
+        }
+
+        if (getGroupV2ByV1Id(connection, groupId) == null) {
+            return new GroupInfoV1(groupId);
+        }
+
+        return null;
+    }
+
     public GroupInfoV2 getGroupOrPartialMigrate(
             Connection connection, final GroupMasterKey groupMasterKey
     ) throws SQLException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
index be95591b..14d3c882 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
@@ -112,14 +112,16 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
         final var groupV1Record = update.newRecord();
         final var groupIdV1 = GroupId.v1(groupV1Record.getGroupId());
 
-        final var group = account.getGroupStore().getGroup(connection, groupIdV1);
-        group.setBlocked(groupV1Record.isBlocked());
-        account.getGroupStore().updateGroup(connection, group);
-        account.getGroupStore()
-                .storeStorageRecord(connection,
-                        group.getGroupId(),
-                        groupV1Record.getId(),
-                        groupV1Record.toProto().encode());
+        final var group = account.getGroupStore().getOrCreateGroupV1(connection, groupIdV1);
+        if (group != null) {
+            group.setBlocked(groupV1Record.isBlocked());
+            account.getGroupStore().updateGroup(connection, group);
+            account.getGroupStore()
+                    .storeStorageRecord(connection,
+                            group.getGroupId(),
+                            groupV1Record.getId(),
+                            groupV1Record.toProto().encode());
+        }
     }
 
     @Override

From fc2ae856d2ce80676a7bce190a02099a4019de81 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 25 Feb 2024 19:41:34 +0100
Subject: [PATCH 408/672] Adapt account record processor for linked devices

---
 .../signal/manager/syncStorage/AccountRecordProcessor.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 897f4291..31e7a90b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -90,7 +90,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var phoneNumberSharingMode = remote.getPhoneNumberSharingMode();
         final var preferContactAvatars = remote.isPreferContactAvatars();
         final var universalExpireTimer = remote.getUniversalExpireTimer();
-        final var e164 = local.getE164();
+        final var e164 = account.isPrimaryDevice() ? local.getE164() : remote.getE164();
         final var defaultReactions = !remote.getDefaultReactions().isEmpty()
                 ? remote.getDefaultReactions()
                 : local.getDefaultReactions();

From 378ac23c6c1c30ef459b3bf49c9e90f523ccc886 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 26 Feb 2024 18:23:37 +0100
Subject: [PATCH 409/672] Update account attributes after setting a pin

Ensures that the recovery password gets set immediately.

Related to #1447
---
 .../main/java/org/asamk/signal/manager/helper/AccountHelper.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 5abac1e7..0e21d8b5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -500,6 +500,7 @@ public class AccountHelper {
         dependencies.getAccountManager().enableRegistrationLock(masterKey);
 
         account.setRegistrationLockPin(pin);
+        updateAccountAttributes();
     }
 
     public void removeRegistrationPin() throws IOException {

From df76aa9919fd5f5292da2dc63bf18f8c69a7f19f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 26 Feb 2024 18:27:09 +0100
Subject: [PATCH 410/672] Default number sharing to NOBODY

Matches the official apps behavior.

Closes #1472
---
 graalvm-config-dir/reflect-config.json                |  4 ++++
 .../manager/helper/UnidentifiedAccessHelper.java      |  2 +-
 .../signal/manager/syncStorage/StorageSyncModels.java | 11 ++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 899c6dfc..96961e4c 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -436,6 +436,10 @@
   "name":"java.util.concurrent.atomic.Striped64",
   "fields":[{"name":"base"}, {"name":"cellsBusy"}]
 },
+{
+  "name":"java.util.concurrent.atomic.Striped64$Cell",
+  "fields":[{"name":"value"}]
+},
 {
   "name":"javax.security.auth.x500.X500Principal",
   "methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index 7c73c80f..dacc97ba 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -98,7 +98,7 @@ public class UnidentifiedAccessHelper {
 
     private byte[] getSenderCertificateFor(final RecipientId recipientId) {
         final var sharingMode = account.getConfigurationStore().getPhoneNumberSharingMode();
-        if (sharingMode == null || sharingMode == PhoneNumberSharingMode.EVERYBODY || (
+        if (sharingMode == PhoneNumberSharingMode.EVERYBODY || (
                 sharingMode == PhoneNumberSharingMode.CONTACTS
                         && account.getContactStore().getContact(recipientId) != null
         )) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index 8cf06048..92ea4222 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -16,7 +16,6 @@ import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
 import org.whispersystems.signalservice.internal.storage.protos.AccountRecord.UsernameLink;
-import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
 
 import java.util.Optional;
@@ -38,7 +37,8 @@ public final class StorageSyncModels {
     public static PhoneNumberSharingMode remoteToLocal(AccountRecord.PhoneNumberSharingMode phoneNumberPhoneNumberSharingMode) {
         return switch (phoneNumberPhoneNumberSharingMode) {
             case EVERYBODY -> PhoneNumberSharingMode.EVERYBODY;
-            case UNKNOWN, NOBODY -> PhoneNumberSharingMode.NOBODY;
+            case NOBODY -> PhoneNumberSharingMode.NOBODY;
+            case UNKNOWN -> null;
         };
     }
 
@@ -63,8 +63,9 @@ public final class StorageSyncModels {
                         .orElse(true))
                 .setLinkPreviewsEnabled(Optional.ofNullable(configStore.getLinkPreviews()).orElse(true))
                 .setUnlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted()).orElse(false))
-                .setPhoneNumberSharingMode(localToRemote(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
-                        .orElse(PhoneNumberSharingMode.EVERYBODY)))
+                .setPhoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
+                        .map(StorageSyncModels::localToRemote)
+                        .orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))
                 .setE164(self.getAddress().number().orElse(""))
                 .setUsername(self.getAddress().username().orElse(null));
         if (usernameLinkComponents != null) {
@@ -136,7 +137,7 @@ public final class StorageSyncModels {
         return SignalStorageRecord.forGroupV2(builder.build());
     }
 
-    public static TrustLevel remoteToLocal(ContactRecord.IdentityState identityState) {
+    public static TrustLevel remoteToLocal(IdentityState identityState) {
         return switch (identityState) {
             case DEFAULT -> TrustLevel.TRUSTED_UNVERIFIED;
             case UNVERIFIED -> TrustLevel.UNTRUSTED;

From e77d9e3d600cd783511eaaefca8c06c400258527 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 26 Feb 2024 22:07:36 +0100
Subject: [PATCH 411/672] Update libsignal-service

---
 settings.gradle.kts                            | 2 +-
 src/main/java/org/asamk/signal/BaseConfig.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 1fcc646a..a98ac404 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.0")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_96")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_97")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 9f8eead1..8132e719 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/6.46.0");
+            .orElse("Signal-Android/7.0.2");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 189b21dbde0b9981365ee6e39e3645b94d634ef6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 26 Feb 2024 22:13:57 +0100
Subject: [PATCH 412/672] Improve error message if captcha is rejected by
 server

Fixes #1328
---
 .../java/org/asamk/signal/manager/Manager.java   |  6 +++++-
 .../manager/api/CaptchaRejectedException.java    | 16 ++++++++++++++++
 .../signal/manager/internal/ManagerImpl.java     | 12 ++++++++++--
 .../SubmitRateLimitChallengeCommand.java         |  5 +++++
 .../org/asamk/signal/dbus/DbusSignalImpl.java    |  5 ++++-
 5 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/CaptchaRejectedException.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 7e0c1120..edc16285 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
@@ -136,7 +137,10 @@ public interface Manager extends Closeable {
 
     void deleteAccount() throws IOException;
 
-    void submitRateLimitRecaptchaChallenge(String challenge, String captcha) throws IOException;
+    void submitRateLimitRecaptchaChallenge(
+            String challenge,
+            String captcha
+    ) throws IOException, CaptchaRejectedException;
 
     List<Device> getLinkedDevices() throws IOException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRejectedException.java b/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRejectedException.java
new file mode 100644
index 00000000..a41a168e
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/CaptchaRejectedException.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.manager.api;
+
+public class CaptchaRejectedException extends Exception {
+
+    public CaptchaRejectedException() {
+        super("Captcha rejected");
+    }
+
+    public CaptchaRejectedException(final String message) {
+        super(message);
+    }
+
+    public CaptchaRejectedException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 5ef30db0..b7808fc6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -19,6 +19,7 @@ package org.asamk.signal.manager.internal;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
@@ -407,10 +408,17 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void submitRateLimitRecaptchaChallenge(String challenge, String captcha) throws IOException {
+    public void submitRateLimitRecaptchaChallenge(
+            String challenge,
+            String captcha
+    ) throws IOException, CaptchaRejectedException {
         captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
 
-        dependencies.getAccountManager().submitRateLimitRecaptchaChallenge(challenge, captcha);
+        try {
+            dependencies.getAccountManager().submitRateLimitRecaptchaChallenge(challenge, captcha);
+        } catch (org.whispersystems.signalservice.api.push.exceptions.CaptchaRejectedException ignored) {
+            throw new CaptchaRejectedException();
+        }
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
index a5e07627..91c6fc67 100644
--- a/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java
@@ -5,7 +5,9 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
 import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
@@ -38,6 +40,9 @@ public class SubmitRateLimitChallengeCommand implements JsonRpcLocalCommand {
             m.submitRateLimitRecaptchaChallenge(challenge, captcha);
         } catch (IOException e) {
             throw new IOErrorException("Submit challenge error: " + e.getMessage(), e);
+        } catch (CaptchaRejectedException e) {
+            throw new UserErrorException(
+                    "Captcha rejected, it may be outdated, already used or solved from a different IP address.");
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 257283fc..65c210fc 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -4,6 +4,7 @@ import org.asamk.Signal;
 import org.asamk.signal.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.CaptchaRejectedException;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
@@ -159,8 +160,10 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
             m.submitRateLimitRecaptchaChallenge(challenge, captcha);
         } catch (IOException e) {
             throw new Error.Failure("Submit challenge error: " + e.getMessage());
+        } catch (CaptchaRejectedException e) {
+            throw new Error.Failure(
+                    "Captcha rejected, it may be outdated, already used or solved from a different IP address.");
         }
-
     }
 
     @Override

From 2e4cd0eddc6e66bb47d2751006073c6ee828b183 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 27 Feb 2024 17:52:21 +0100
Subject: [PATCH 413/672] Only retry messages after identity was trusted

Fixes #1477
---
 .../signal/manager/helper/ReceiveHelper.java    | 15 +++++----------
 .../signal/manager/internal/ManagerImpl.java    |  5 ++---
 .../signal/manager/storage/SignalAccount.java   | 17 ++++++++++++++---
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index a66d6ff6..a40c134d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -41,7 +41,6 @@ public class ReceiveHelper {
     private final Context context;
 
     private ReceiveConfig receiveConfig = new ReceiveConfig(false, false, false);
-    private boolean needsToRetryFailedMessages = false;
     private boolean hasCaughtUpWithOldMessages = false;
     private boolean isWaitingForMessage = false;
     private boolean shouldStop = false;
@@ -59,10 +58,6 @@ public class ReceiveHelper {
         dependencies.setAllowStories(!receiveConfig.ignoreStories());
     }
 
-    public void setNeedsToRetryFailedMessages(final boolean needsToRetryFailedMessages) {
-        this.needsToRetryFailedMessages = needsToRetryFailedMessages;
-    }
-
     public void setAuthenticationFailureListener(final Callable authenticationFailureListener) {
         this.authenticationFailureListener = authenticationFailureListener;
     }
@@ -90,7 +85,7 @@ public class ReceiveHelper {
     public void receiveMessages(
             Duration timeout, boolean returnOnTimeout, Integer maxMessages, Manager.ReceiveMessageHandler handler
     ) throws IOException {
-        needsToRetryFailedMessages = true;
+        account.setNeedsToRetryFailedMessages(true);
         hasCaughtUpWithOldMessages = false;
 
         // Use a Map here because java Set doesn't have a get method ...
@@ -130,9 +125,8 @@ public class ReceiveHelper {
         isWaitingForMessage = false;
 
         while (!shouldStop && remainingMessages != 0) {
-            if (needsToRetryFailedMessages) {
+            if (account.getNeedsToRetryFailedMessages()) {
                 retryFailedReceivedMessages(handler);
-                needsToRetryFailedMessages = false;
             }
             SignalServiceEnvelope envelope;
             final CachedMessage[] cachedMessage = {null};
@@ -266,6 +260,7 @@ public class ReceiveHelper {
             }
         }
         handleQueuedActions(queuedActions);
+        account.setNeedsToRetryFailedMessages(false);
     }
 
     private List<HandleAction> retryFailedReceivedMessage(
@@ -282,8 +277,8 @@ public class ReceiveHelper {
         final var exception = result.second();
 
         if (exception instanceof UntrustedIdentityException) {
-            if (System.currentTimeMillis() - envelope.getServerDeliveredTimestamp() > 1000L * 60 * 60 * 24 * 30) {
-                // Envelope is more than a month old, cleaning up.
+            if (System.currentTimeMillis() - envelope.getServerDeliveredTimestamp() > 1000L * 60 * 60 * 24 * 14) {
+                // Envelope is more than two weeks old, cleaning up.
                 cachedMessage.delete();
                 return null;
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index b7808fc6..35ad4d3c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -409,8 +409,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void submitRateLimitRecaptchaChallenge(
-            String challenge,
-            String captcha
+            String challenge, String captcha
     ) throws IOException, CaptchaRejectedException {
         captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
 
@@ -1389,7 +1388,7 @@ public class ManagerImpl implements Manager {
         final var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
         final var updated = trustMethod.apply(recipientId);
         if (updated && this.isReceiving()) {
-            context.getReceiveHelper().setNeedsToRetryFailedMessages(true);
+            account.setNeedsToRetryFailedMessages(true);
         }
         return updated;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 72725f5c..e8f2db45 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -149,6 +149,9 @@ public class SignalAccount implements Closeable {
     private final KeyValueEntry<Long> lastReceiveTimestamp = new KeyValueEntry<>("last-receive-timestamp",
             long.class,
             0L);
+    private final KeyValueEntry<Boolean> needsToRetryFailedMessages = new KeyValueEntry<>("retry-failed-messages",
+            Boolean.class,
+            true);
     private final KeyValueEntry<byte[]> cdsiToken = new KeyValueEntry<>("cdsi-token", byte[].class);
     private final KeyValueEntry<Long> lastRecipientsRefresh = new KeyValueEntry<>("last-recipients-refresh",
             long.class);
@@ -297,7 +300,7 @@ public class SignalAccount implements Closeable {
         this.pniAccountData.setIdentityKeyPair(pniIdentity);
         this.registered = false;
         this.isMultiDevice = true;
-        getKeyValueStore().storeEntry(lastReceiveTimestamp, 0L);
+        setLastReceiveTimestamp(0L);
         this.pinMasterKey = masterKey;
         getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
@@ -342,7 +345,7 @@ public class SignalAccount implements Closeable {
         this.pniAccountData.setServiceId(pni);
         init();
         this.registrationLockPin = pin;
-        getKeyValueStore().storeEntry(lastReceiveTimestamp, 0L);
+        setLastReceiveTimestamp(0L);
         save();
 
         setPreKeys(ServiceIdType.ACI, aciPreKeys);
@@ -590,7 +593,7 @@ public class SignalAccount implements Closeable {
             isMultiDevice = rootNode.get("isMultiDevice").asBoolean();
         }
         if (rootNode.hasNonNull("lastReceiveTimestamp")) {
-            getKeyValueStore().storeEntry(lastReceiveTimestamp, rootNode.get("lastReceiveTimestamp").asLong());
+            setLastReceiveTimestamp(rootNode.get("lastReceiveTimestamp").asLong());
         }
         int registrationId = 0;
         if (rootNode.hasNonNull("registrationId")) {
@@ -1650,6 +1653,14 @@ public class SignalAccount implements Closeable {
         getKeyValueStore().storeEntry(lastReceiveTimestamp, value);
     }
 
+    public void setNeedsToRetryFailedMessages(final boolean value) {
+        getKeyValueStore().storeEntry(needsToRetryFailedMessages, value);
+    }
+
+    public boolean getNeedsToRetryFailedMessages() {
+        return getKeyValueStore().getEntry(needsToRetryFailedMessages);
+    }
+
     public boolean isUnrestrictedUnidentifiedAccess() {
         return Boolean.TRUE.equals(getKeyValueStore().getEntry(unrestrictedUnidentifiedAccess));
     }

From 2424fc1f531e968da95d18b3954215c897cc2452 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 27 Feb 2024 18:12:43 +0100
Subject: [PATCH 414/672] Add register parameter to force reregistration

---
 .../signal/manager/RegistrationManager.java     |  2 +-
 .../internal/RegistrationManagerImpl.java       | 17 ++++++++++++-----
 man/signal-cli.1.adoc                           |  5 ++++-
 .../asamk/signal/commands/RegisterCommand.java  | 14 +++++++++-----
 .../dbus/DbusRegistrationManagerImpl.java       |  5 ++++-
 .../signal/dbus/DbusSignalControlImpl.java      |  2 +-
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index 365dd399..75a91dc9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 public interface RegistrationManager extends Closeable {
 
     void register(
-            boolean voiceVerification, String captcha
+            boolean voiceVerification, String captcha, final boolean forceRegister
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethoNotAvailableException;
 
     void verifyAccount(
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 2df7ff4b..b0725cbd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -104,7 +104,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
     @Override
     public void register(
-            boolean voiceVerification, String captcha
+            boolean voiceVerification, String captcha, final boolean forceRegister
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethoNotAvailableException {
         if (account.isRegistered()
                 && account.getServiceEnvironment() != null
@@ -113,12 +113,18 @@ public class RegistrationManagerImpl implements RegistrationManager {
         }
 
         try {
-            final var recoveryPassword = account.getRecoveryPassword();
-            if (recoveryPassword != null && account.isPrimaryDevice() && attemptReregisterAccount(recoveryPassword)) {
-                return;
+            if (!forceRegister) {
+                if (account.isRegistered()) {
+                    throw new IOException("Account is already registered");
+                }
+
+                if (account.getAci() != null && attemptReactivateAccount()) {
+                    return;
+                }
             }
 
-            if (account.getAci() != null && attemptReactivateAccount()) {
+            final var recoveryPassword = account.getRecoveryPassword();
+            if (recoveryPassword != null && account.isPrimaryDevice() && attemptReregisterAccount(recoveryPassword)) {
                 return;
             }
 
@@ -128,6 +134,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
                     voiceVerification,
                     captcha);
             NumberVerificationUtils.requestVerificationCode(accountManager, sessionId, voiceVerification);
+            account.setRegistered(false);
         } catch (DeprecatedVersionException e) {
             logger.debug("Signal-Server returned deprecated version exception", e);
             throw e;
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 4b59c754..80d4c37e 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -102,12 +102,15 @@ If the account was deleted (with --delete-account) it cannot be reactivated.
 The verification should be done over voice, not SMS.
 Voice verification only works if an SMS verification has been attempted before.
 
-*--captcha*::
+*--captcha* CAPTCHA::
 The captcha token, required if registration failed with a captcha required error.
 To get the token, go to https://signalcaptchas.org/registration/generate.html
 For the staging environment, use: https://signalcaptchas.org/staging/registration/generate.html
 After solving the captcha, right-click on the "Open Signal" link and copy the link.
 
+*--reregister*::
+Register even if account is already registered.
+
 === verify
 
 Verify the number using the code received via SMS or voice.
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 4776ac6e..2f03cbb3 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -37,14 +37,18 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
                 .action(Arguments.storeTrue());
         subparser.addArgument("--captcha")
                 .help("The captcha token, required if registration failed with a captcha required error.");
+        subparser.addArgument("--reregister")
+                .action(Arguments.storeTrue())
+                .help("Register even if account is already registered");
     }
 
     @Override
     public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {
         final boolean voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice"));
         final var captcha = ns.getString("captcha");
+        final var reregister = Boolean.TRUE.equals(ns.getBoolean("reregister"));
 
-        register(m, voiceVerification, captcha);
+        register(m, voiceVerification, captcha, reregister);
     }
 
     @Override
@@ -61,14 +65,14 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
     public void handleCommand(
             final RegistrationParams request, final RegistrationManager m, final JsonWriter jsonWriter
     ) throws CommandException {
-        register(m, Boolean.TRUE.equals(request.voice()), request.captcha());
+        register(m, Boolean.TRUE.equals(request.voice()), request.captcha(), Boolean.TRUE.equals(request.reregister()));
     }
 
     private void register(
-            final RegistrationManager m, final boolean voiceVerification, final String captcha
+            final RegistrationManager m, final boolean voiceVerification, final String captcha, final boolean reregister
     ) throws CommandException {
         try {
-            m.register(voiceVerification, captcha);
+            m.register(voiceVerification, captcha, reregister);
         } catch (RateLimitException e) {
             final var message = CommandUtil.getRateLimitMessage(e);
             throw new RateLimitErrorException(message, e);
@@ -89,5 +93,5 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
         }
     }
 
-    public record RegistrationParams(Boolean voice, String captcha) {}
+    public record RegistrationParams(Boolean voice, String captcha, Boolean reregister) {}
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
index 4d43b98c..788e0c91 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
@@ -27,8 +27,11 @@ public class DbusRegistrationManagerImpl implements RegistrationManager {
 
     @Override
     public void register(
-            final boolean voiceVerification, final String captcha
+            final boolean voiceVerification, final String captcha, final boolean forceRegister
     ) throws IOException, CaptchaRequiredException {
+        if (forceRegister) {
+            throw new UnsupportedOperationException();
+        }
         if (captcha == null) {
             signalControl.register(number, voiceVerification);
         } else {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index d8465d26..ddf25cd1 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -63,7 +63,7 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
                     "Invalid account (phone number), make sure you include the country code.");
         }
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
-            registrationManager.register(voiceVerification, captcha);
+            registrationManager.register(voiceVerification, captcha, false);
         } catch (RateLimitException e) {
             String message = "Rate limit reached";
             throw new SignalControl.Error.Failure(message);

From 0cc2da690aafa0b821c09dcf9e7166361f15b01a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 27 Feb 2024 18:18:30 +0100
Subject: [PATCH 415/672] Bump version to 0.13.1

---
 CHANGELOG.md     | 22 +++++++++++++++++++++-
 build.gradle.kts |  2 +-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecaead9a..2f15faf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,26 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.1] - 2024-02-27
+
+### Added
+
+- Add `--reregister` parameter to force registration of an already registered account
+
+### Fixed
+
+- Fixed rare issue with duplicate PNIs during migration
+
+### Improved
+
+- Show information when requesting voice verification without prior SMS verification
+- Username can now be set with an explicit discriminator (e.g. testname.000)
+- Improve behavior when PNI prekeys upload fails
+- Improve `submitRateLimitChallenge` error message if captcha is rejected by server
+- Only retry messages after an identity was trusted
+
+### Changed
+
+- Default number sharing to NOBODY, to match the official apps behavior.
 
 ## [0.13.0] - 2024-02-18
 
diff --git a/build.gradle.kts b/build.gradle.kts
index f07d250b..e9f54923 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.1"
 }
 
-version = "0.13.1-SNAPSHOT"
+version = "0.13.1"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From aebe64571da275068effd505c070b2393a609cad Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 27 Feb 2024 18:20:21 +0100
Subject: [PATCH 416/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f15faf4..50f45f28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.1] - 2024-02-27
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index e9f54923..0d4ebe84 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.1"
 }
 
-version = "0.13.1"
+version = "0.13.2-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 5e17fe8414b632246bdbd6a9051e6ee98296b2a0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 27 Feb 2024 19:35:38 +0100
Subject: [PATCH 417/672] Fix typo

---
 lib/src/main/java/org/asamk/signal/manager/Manager.java   | 7 +++----
 .../org/asamk/signal/manager/RegistrationManager.java     | 4 ++--
 .../api/VerificationMethoNotAvailableException.java       | 8 --------
 .../api/VerificationMethodNotAvailableException.java      | 8 ++++++++
 .../org/asamk/signal/manager/helper/AccountHelper.java    | 4 ++--
 .../org/asamk/signal/manager/internal/ManagerImpl.java    | 4 ++--
 .../signal/manager/internal/RegistrationManagerImpl.java  | 4 ++--
 .../signal/manager/util/NumberVerificationUtils.java      | 6 +++---
 .../java/org/asamk/signal/commands/RegisterCommand.java   | 4 ++--
 .../asamk/signal/commands/StartChangeNumberCommand.java   | 4 ++--
 .../java/org/asamk/signal/dbus/DbusSignalControlImpl.java | 4 ++--
 11 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 lib/src/main/java/org/asamk/signal/manager/api/VerificationMethoNotAvailableException.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/VerificationMethodNotAvailableException.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index edc16285..d6cf01d8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -44,7 +44,7 @@ import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
@@ -127,7 +127,7 @@ public interface Manager extends Closeable {
 
     void startChangeNumber(
             String newNumber, boolean voiceVerification, String captcha
-    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethoNotAvailableException;
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException;
 
     void finishChangeNumber(
             String newNumber, String verificationCode, String pin
@@ -138,8 +138,7 @@ public interface Manager extends Closeable {
     void deleteAccount() throws IOException;
 
     void submitRateLimitRecaptchaChallenge(
-            String challenge,
-            String captcha
+            String challenge, String captcha
     ) throws IOException, CaptchaRejectedException;
 
     List<Device> getLinkedDevices() throws IOException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index 75a91dc9..5660bb13 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -5,7 +5,7 @@ import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -14,7 +14,7 @@ public interface RegistrationManager extends Closeable {
 
     void register(
             boolean voiceVerification, String captcha, final boolean forceRegister
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethoNotAvailableException;
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException;
 
     void verifyAccount(
             String verificationCode, String pin
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethoNotAvailableException.java b/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethoNotAvailableException.java
deleted file mode 100644
index 172e44e4..00000000
--- a/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethoNotAvailableException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.asamk.signal.manager.api;
-
-public class VerificationMethoNotAvailableException extends Exception {
-
-    public VerificationMethoNotAvailableException() {
-        super("Invalid verification method");
-    }
-}
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethodNotAvailableException.java b/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethodNotAvailableException.java
new file mode 100644
index 00000000..9ffdb68f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/VerificationMethodNotAvailableException.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.api;
+
+public class VerificationMethodNotAvailableException extends Exception {
+
+    public VerificationMethodNotAvailableException() {
+        super("Invalid verification method");
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 0e21d8b5..299ce4d3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -7,7 +7,7 @@ import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.jobs.SyncStorageJob;
 import org.asamk.signal.manager.storage.SignalAccount;
@@ -165,7 +165,7 @@ public class AccountHelper {
 
     public void startChangeNumber(
             String newNumber, boolean voiceVerification, String captcha
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethoNotAvailableException {
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException {
         final var accountManager = dependencies.createUnauthenticatedAccountManager(newNumber, account.getPassword());
         String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
                 account.getSessionId(newNumber),
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 35ad4d3c..47a5bc03 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -65,7 +65,7 @@ import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
@@ -380,7 +380,7 @@ public class ManagerImpl implements Manager {
     @Override
     public void startChangeNumber(
             String newNumber, boolean voiceVerification, String captcha
-    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethoNotAvailableException {
+    ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index b0725cbd..597b15c0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -24,7 +24,7 @@ import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UpdateProfile;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
@@ -105,7 +105,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
     @Override
     public void register(
             boolean voiceVerification, String captcha, final boolean forceRegister
-    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethoNotAvailableException {
+    ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException {
         if (account.isRegistered()
                 && account.getServiceEnvironment() != null
                 && account.getServiceEnvironment() != serviceEnvironmentConfig.type()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 9eb01cdb..f96e79d3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -6,7 +6,7 @@ import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.helper.PinHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,7 +35,7 @@ public class NumberVerificationUtils {
             Consumer<String> sessionIdSaver,
             boolean voiceVerification,
             String captcha
-    ) throws CaptchaRequiredException, IOException, RateLimitException, VerificationMethoNotAvailableException {
+    ) throws CaptchaRequiredException, IOException, RateLimitException, VerificationMethodNotAvailableException {
         RegistrationSessionMetadataResponse sessionResponse;
         try {
             sessionResponse = getValidSession(accountManager, sessionId);
@@ -63,7 +63,7 @@ public class NumberVerificationUtils {
                 ? sessionResponse.getBody().getNextCall()
                 : sessionResponse.getBody().getNextSms();
         if (nextAttempt == null) {
-            throw new VerificationMethoNotAvailableException();
+            throw new VerificationMethodNotAvailableException();
         } else if (nextAttempt > 0) {
             final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextAttempt * 1000;
             throw new RateLimitException(timestamp);
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 2f03cbb3..cd361218 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -15,7 +15,7 @@ import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.RateLimitException;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.util.CommandUtil;
 
@@ -84,7 +84,7 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
         } catch (IOException e) {
             throw new IOErrorException("Failed to register: %s (%s)".formatted(e.getMessage(),
                     e.getClass().getSimpleName()), e);
-        } catch (VerificationMethoNotAvailableException e) {
+        } catch (VerificationMethodNotAvailableException e) {
             throw new UserErrorException("Failed to register: " + e.getMessage() + (
                     voiceVerification
                             ? ": Before requesting voice verification you need to request SMS verification and wait a minute."
diff --git a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
index 823a0c92..84fcf527 100644
--- a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
+++ b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
@@ -13,7 +13,7 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.RateLimitException;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
 
@@ -60,7 +60,7 @@ public class StartChangeNumberCommand implements JsonRpcLocalCommand {
         } catch (IOException e) {
             throw new IOErrorException("Failed to change number: %s (%s)".formatted(e.getMessage(),
                     e.getClass().getSimpleName()), e);
-        } catch (VerificationMethoNotAvailableException e) {
+        } catch (VerificationMethodNotAvailableException e) {
             throw new UserErrorException("Failed to register: " + e.getMessage() + (
                     voiceVerification
                             ? ": Before requesting voice verification you need to request SMS verification and wait a minute."
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index ddf25cd1..def343a9 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -13,7 +13,7 @@ import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
-import org.asamk.signal.manager.api.VerificationMethoNotAvailableException;
+import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.freedesktop.dbus.DBusPath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
             throw new Error.InvalidNumber(e.getMessage());
         } catch (OverlappingFileLockException e) {
             throw new SignalControl.Error.Failure("Account is already in use");
-        } catch (IOException | VerificationMethoNotAvailableException e) {
+        } catch (IOException | VerificationMethodNotAvailableException e) {
             throw new SignalControl.Error.Failure(e.getClass().getSimpleName() + " " + e.getMessage());
         }
     }

From ee39733978159646a087846cd064bc31506d6dd0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 7 Mar 2024 17:44:19 +0100
Subject: [PATCH 418/672] Update libsignal-service

---
 .../org/asamk/signal/manager/api/Profile.java    |  5 +----
 .../asamk/signal/manager/config/LiveConfig.java  |  7 +++++--
 .../manager/config/ServiceEnvironmentConfig.java |  2 ++
 .../signal/manager/config/StagingConfig.java     |  7 +++++--
 .../manager/helper/IncomingMessageHandler.java   | 16 +---------------
 .../signal/manager/helper/RecipientHelper.java   |  1 +
 .../asamk/signal/manager/helper/SendHelper.java  | 12 ------------
 .../manager/internal/SignalDependencies.java     |  3 ++-
 .../signal/manager/storage/SignalAccount.java    |  3 ---
 .../storage/profiles/LegacySignalProfile.java    |  2 +-
 .../asamk/signal/manager/util/ProfileUtils.java  |  9 ---------
 settings.gradle.kts                              |  2 +-
 12 files changed, 19 insertions(+), 50 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Profile.java b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
index 3eb58a55..33117188 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
@@ -152,10 +152,7 @@ public class Profile {
     }
 
     public enum Capability {
-        storage,
-        gv1Migration,
-        senderKey,
-        announcementGroup;
+        storage;
 
         public static Capability valueOfOrNull(String value) {
             try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 3c477299..2bbdfe19 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -1,5 +1,6 @@
 package org.asamk.signal.manager.config;
 
+import org.signal.libsignal.net.Network.Environment;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
@@ -28,7 +29,6 @@ class LiveConfig {
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
     private static final String SVR2_MRENCLAVE = "a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97";
-    private static final String SVR2_MRENCLAVE_DEPRECATED = "6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094";
 
     private static final String URL = "https://chat.signal.org";
     private static final String CDN_URL = "https://cdn.signal.org";
@@ -49,6 +49,8 @@ class LiveConfig {
     private static final byte[] backupServerPublicParams = Base64.getDecoder()
             .decode("AJwNSU55fsFCbgaxGRD11wO1juAs8Yr5GF8FPlGzzvdJJIKH5/4CC7ZJSOe3yL2vturVaRU2Cx0n751Vt8wkj1bozK3CBV1UokxV09GWf+hdVImLGjXGYLLhnI1J2TWEe7iWHyb553EEnRb5oxr9n3lUbNAJuRmFM7hrr0Al0F0wrDD4S8lo2mGaXe0MJCOM166F8oYRQqpFeEHfiLnxA1O8ZLh7vMdv4g9jI5phpRBTsJ5IjiJrWeP0zdIGHEssUeprDZ9OUJ14m0v61eYJMKsf59Bn+mAT2a7YfB+Don9O");
 
+    private static Environment LIBSIGNAL_NET_ENV = Environment.PRODUCTION;
+
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
     ) {
@@ -78,10 +80,11 @@ class LiveConfig {
 
     static ServiceEnvironmentConfig getServiceEnvironmentConfig(List<Interceptor> interceptors) {
         return new ServiceEnvironmentConfig(LIVE,
+                LIBSIGNAL_NET_ENV,
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_DEPRECATED));
+                List.of(SVR2_MRENCLAVE));
     }
 
     private LiveConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
index f4622064..8f9f8ce3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager.config;
 
 import org.asamk.signal.manager.api.ServiceEnvironment;
+import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
@@ -8,6 +9,7 @@ import java.util.List;
 
 public record ServiceEnvironmentConfig(
         ServiceEnvironment type,
+        Network.Environment netEnvironment,
         SignalServiceConfiguration signalServiceConfiguration,
         ECPublicKey unidentifiedSenderTrustRoot,
         String cdsiMrenclave,
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 83bb7be6..e99b049c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -1,5 +1,6 @@
 package org.asamk.signal.manager.config;
 
+import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
@@ -28,7 +29,6 @@ class StagingConfig {
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
     private static final String SVR2_MRENCLAVE = "acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482";
-    private static final String SVR2_MRENCLAVE_DEPRECATED = "a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95";
 
     private static final String URL = "https://chat.staging.signal.org";
     private static final String CDN_URL = "https://cdn-staging.signal.org";
@@ -49,6 +49,8 @@ class StagingConfig {
     private static final byte[] backupServerPublicParams = Base64.getDecoder()
             .decode("AHYrGb9IfugAAJiPKp+mdXUx+OL9zBolPYHYQz6GI1gWjpEu5me3zVNSvmYY4zWboZHif+HG1sDHSuvwFd0QszSwuSF4X4kRP3fJREdTZ5MCR0n55zUppTwfHRW2S4sdQ0JGz7YDQIJCufYSKh0pGNEHL6hv79Agrdnr4momr3oXdnkpVBIp3HWAQ6IbXQVSG18X36GaicI1vdT0UFmTwU2KTneluC2eyL9c5ff8PcmiS+YcLzh0OKYQXB5ZfQ06d6DiINvDQLy75zcfUOniLAj0lGJiHxGczin/RXisKSR8");
 
+    private static Network.Environment LIBSIGNAL_NET_ENV = Network.Environment.STAGING;
+
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
     ) {
@@ -78,10 +80,11 @@ class StagingConfig {
 
     static ServiceEnvironmentConfig getServiceEnvironmentConfig(List<Interceptor> interceptors) {
         return new ServiceEnvironmentConfig(STAGING,
+                LIBSIGNAL_NET_ENV,
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_DEPRECATED));
+                List.of(SVR2_MRENCLAVE));
     }
 
     private StagingConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index f7b978ab..fbd719b9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -22,7 +22,6 @@ import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.Pair;
-import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.ReceiveConfig;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.TrustLevel;
@@ -161,24 +160,11 @@ public final class IncomingMessageHandler {
                 if (context.getContactHelper().isContactBlocked(sender)) {
                     logger.debug("Received invalid message from blocked contact, ignoring.");
                 } else {
-                    final var senderProfile = context.getProfileHelper().getRecipientProfile(sender);
-                    final var selfProfile = context.getProfileHelper().getSelfProfile();
                     var serviceId = ServiceId.parseOrNull(e.getSender());
-                    if (serviceId == null) {
-                        // Workaround for libsignal-client issue #492
-                        serviceId = account.getRecipientAddressResolver()
-                                .resolveRecipientAddress(sender)
-                                .serviceId()
-                                .orElse(null);
-                    }
                     if (serviceId != null) {
                         final var isSelf = sender.equals(account.getSelfRecipientId())
                                 && e.getSenderDevice() == account.getDeviceId();
-                        final var isSenderSenderKeyCapable = senderProfile != null && senderProfile.getCapabilities()
-                                .contains(Profile.Capability.senderKey);
-                        final var isSelfSenderKeyCapable = selfProfile != null && selfProfile.getCapabilities()
-                                .contains(Profile.Capability.senderKey);
-                        if (!isSelf && isSenderSenderKeyCapable && isSelfSenderKeyCapable) {
+                        if (!isSelf) {
                             logger.debug("Received invalid message, requesting message resend.");
                             actions.add(new SendRetryMessageRequestAction(sender, serviceId, e, envelope, destination));
                         } else {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 947c251b..905bbd5a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -213,6 +213,7 @@ public class RecipientHelper {
                             token,
                             serviceEnvironmentConfig.cdsiMrenclave(),
                             null,
+                            dependencies.getServiceEnvironmentConfig().netEnvironment(),
                             newToken -> {
                                 if (isPartialRefresh) {
                                     account.getCdsiStore().updateAfterPartialCdsQuery(newNumbers);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index d3068fc4..a066c851 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -523,21 +523,9 @@ public class SendHelper {
     }
 
     private Set<RecipientId> getSenderKeyCapableRecipientIds(final Set<RecipientId> recipientIds) {
-        final var selfProfile = context.getProfileHelper().getSelfProfile();
-        if (selfProfile == null || !selfProfile.getCapabilities().contains(Profile.Capability.senderKey)) {
-            logger.debug("Not all of our devices support sender key. Using legacy.");
-            return Set.of();
-        }
-
         final var senderKeyTargets = new HashSet<RecipientId>();
         final var recipientList = new ArrayList<>(recipientIds);
-        final var profiles = context.getProfileHelper().getRecipientProfiles(recipientList).iterator();
         for (final var recipientId : recipientList) {
-            final var profile = profiles.next();
-            if (profile == null || !profile.getCapabilities().contains(Profile.Capability.senderKey)) {
-                continue;
-            }
-
             final var access = context.getUnidentifiedAccessHelper().getAccessFor(recipientId);
             if (access.isEmpty() || access.get().getTargetUnidentifiedAccess().isEmpty()) {
                 continue;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 9488c75e..561534c5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -189,7 +189,8 @@ public class SignalDependencies {
                         Optional.empty(),
                         executor,
                         ServiceConfig.MAX_ENVELOPE_SIZE,
-                        pushServiceSocket));
+                        pushServiceSocket,
+                        false));
     }
 
     public List<SecureValueRecovery> getSecureValueRecoveryV2() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index e8f2db45..0076f314 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -895,9 +895,6 @@ public class SignalAccount implements Closeable {
                 if (profile != null) {
                     final var capabilities = new HashSet<Profile.Capability>();
                     if (profile.getCapabilities() != null) {
-                        if (profile.getCapabilities().gv1Migration) {
-                            capabilities.add(Profile.Capability.gv1Migration);
-                        }
                         if (profile.getCapabilities().storage) {
                             capabilities.add(Profile.Capability.storage);
                         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
index e3e18b1e..4114df60 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfile.java
@@ -94,7 +94,7 @@ public class LegacySignalProfile {
         @JsonProperty
         public boolean storage;
 
-        @JsonProperty
+        @JsonIgnore
         public boolean gv1Migration;
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 85c9fdd6..82ffc861 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -76,18 +76,9 @@ public class ProfileUtils {
 
     public static HashSet<Profile.Capability> getCapabilities(final SignalServiceProfile encryptedProfile) {
         final var capabilities = new HashSet<Profile.Capability>();
-        if (encryptedProfile.getCapabilities().isGv1Migration()) {
-            capabilities.add(Profile.Capability.gv1Migration);
-        }
         if (encryptedProfile.getCapabilities().isStorage()) {
             capabilities.add(Profile.Capability.storage);
         }
-        if (encryptedProfile.getCapabilities().isSenderKey()) {
-            capabilities.add(Profile.Capability.senderKey);
-        }
-        if (encryptedProfile.getCapabilities().isAnnouncementGroup()) {
-            capabilities.add(Profile.Capability.announcementGroup);
-        }
 
         return capabilities;
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a98ac404..b219a1ea 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.0")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_97")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_98")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")

From 3372992dc20291f77bbaa704f267cdef51472071 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 9 Mar 2024 11:33:32 +0100
Subject: [PATCH 419/672] Add appstream metainfo file

---
 data/org.asamk.SignalCli.metainfo.xml      | 55 ++++++++++++++++++++++
 data/{icon.svg => org.asamk.SignalCli.svg} |  0
 2 files changed, 55 insertions(+)
 create mode 100644 data/org.asamk.SignalCli.metainfo.xml
 rename data/{icon.svg => org.asamk.SignalCli.svg} (100%)

diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
new file mode 100644
index 00000000..f61b0224
--- /dev/null
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="console-application">
+  <id>org.asamk.SignalCli</id>
+
+  <name>signal-cli</name>
+  <summary>Use Signal messenger in terminal</summary>
+  <developer id="org.asamk">
+    <name>AsamK</name>
+  </developer>
+  <icon type="stock">org.asamk.SignalCli</icon>
+
+  <url type="bugtracker">https://github.com/AsamK/signal-cli/issues</url>
+  <url type="homepage">https://github.com/AsamK/signal-cli</url>
+  <url type="donation">https://github.com/sponsors/AsamK</url>
+  <url type="faq">https://github.com/AsamK/signal-cli/discussions</url>
+  <url type="vcs-browser">https://github.com/AsamK/signal-cli</url>
+
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0-only</project_license>
+
+  <description>
+    <p>
+	    signal-cli is an unofficial commandline interface for the Signal Messenger.
+	    It supports many Signal functions, including registering, verifying, sending and receiving messages.
+	    For registering you need a phone number where you can receive SMS or incoming calls.
+	    Alternatively signal-cli can be linked to an existing App account.
+    </p>
+  </description>
+
+  <categories>
+    <category>Utility</category>
+    <category>Java</category>
+  </categories>
+
+  <provides>
+    <binary>signal-cli</binary>
+  </provides>
+  <content_rating type="oars-1.1">
+    <content_attribute id="social-chat">intense</content_attribute>
+  </content_rating>
+  <releases>
+    <release version="0.13.1" date="2024-02-27">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.1</url>
+    </release>
+    <release version="0.13.0" date="2024-02-18">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.0</url>
+    </release>
+    <release version="0.12.8" date="2024-02-08">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.8</url>
+    </release>
+    <release version="0.12.7" date="2023-12-15">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.7</url>
+    </release>
+  </releases>
+</component>
diff --git a/data/icon.svg b/data/org.asamk.SignalCli.svg
similarity index 100%
rename from data/icon.svg
rename to data/org.asamk.SignalCli.svg

From 323a8016000f436ff05b7431b126216cc8c00a73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Mar 2024 13:08:46 +0100
Subject: [PATCH 420/672] Bump mio from 0.8.10 to 0.8.11 in /client (#1488)

Bumps [mio](https://github.com/tokio-rs/mio) from 0.8.10 to 0.8.11.
- [Release notes](https://github.com/tokio-rs/mio/releases)
- [Changelog](https://github.com/tokio-rs/mio/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tokio-rs/mio/compare/v0.8.10...v0.8.11)

---
updated-dependencies:
- dependency-name: mio
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 client/Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 642559a1..7b642387 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -623,9 +623,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi",

From 8b4f377cf18b6f529ee825c53a257819d9410723 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 22 Mar 2024 10:04:57 +0100
Subject: [PATCH 421/672] Update dependencies

---
 graalvm-config-dir/jni-config.json | 30 ++++++++++++++++++++++++++++++
 settings.gradle.kts                |  6 +++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index b79debed..d7667b09 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -18,6 +18,9 @@
   "name":"java.lang.ClassLoader",
   "methods":[{"name":"getPlatformClassLoader","parameterTypes":[] }, {"name":"loadClass","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"java.lang.ClassNotFoundException"
+},
 {
   "name":"java.lang.IllegalArgumentException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
@@ -26,6 +29,13 @@
   "name":"java.lang.IllegalStateException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"java.lang.Long",
+  "methods":[{"name":"<init>","parameterTypes":["long"] }]
+},
+{
+  "name":"java.lang.NoClassDefFoundError"
+},
 {
   "name":"java.lang.NoSuchMethodError"
 },
@@ -40,6 +50,14 @@
   "name":"java.lang.UnsatisfiedLinkError",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"java.util.HashMap",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"java.util.Map",
+  "methods":[{"name":"get","parameterTypes":["java.lang.Object"] }, {"name":"put","parameterTypes":["java.lang.Object","java.lang.Object"] }, {"name":"remove","parameterTypes":["java.lang.Object"] }]
+},
 {
   "name":"java.util.UUID",
   "methods":[{"name":"<init>","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }]
@@ -59,6 +77,18 @@
   "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints",
   "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }]
 },
+{
+  "name":"org.signal.libsignal.internal.CompletableFuture",
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }]
+},
+{
+  "name":"org.signal.libsignal.net.CdsiLookupResponse",
+  "methods":[{"name":"<init>","parameterTypes":["java.util.Map","int"] }]
+},
+{
+  "name":"org.signal.libsignal.net.CdsiLookupResponse$Entry",
+  "methods":[{"name":"<init>","parameterTypes":["byte[]","byte[]"] }]
+},
 {
   "name":"org.signal.libsignal.protocol.DuplicateMessageException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b219a1ea..125c2642 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,16 +7,16 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.77")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.16.1")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.0")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
             version("slf4j", "2.0.12")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.5.0")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.5.3")
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_98")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.1.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.2.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
             library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.2")

From d356d92b5eb24f7340055f766455b943c274bc50 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 22 Mar 2024 10:54:42 +0100
Subject: [PATCH 422/672] Extend getUserStatus command for usernames

---
 graalvm-config-dir/reflect-config.json        |  2 +-
 .../org/asamk/signal/manager/Manager.java     |  3 +
 .../signal/manager/api/UsernameStatus.java    |  5 ++
 .../manager/helper/RecipientHelper.java       | 67 ++++++++++++-------
 .../signal/manager/internal/ManagerImpl.java  | 28 ++++++++
 man/signal-cli.1.adoc                         |  5 +-
 .../signal/commands/GetUserStatusCommand.java | 40 +++++++++--
 .../asamk/signal/dbus/DbusManagerImpl.java    |  6 ++
 8 files changed, 126 insertions(+), 30 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/UsernameStatus.java

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 96961e4c..e3b47e86 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -693,7 +693,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"isRegistered","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"recipient","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
+  "methods":[{"name":"isRegistered","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"recipient","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.commands.ListAccountsCommand$JsonAccount",
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index d6cf01d8..736f4e08 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -44,6 +44,7 @@ import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,6 +93,8 @@ public interface Manager extends Closeable {
      */
     Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException;
 
+    Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames);
+
     void updateAccountAttributes(
             String deviceName,
             Boolean unrestrictedUnidentifiedSender,
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UsernameStatus.java b/lib/src/main/java/org/asamk/signal/manager/api/UsernameStatus.java
new file mode 100644
index 00000000..570d5511
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UsernameStatus.java
@@ -0,0 +1,5 @@
+package org.asamk.signal.manager.api;
+
+import java.util.UUID;
+
+public record UsernameStatus(String username, UUID uuid, boolean unrestrictedUnidentifiedAccess) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 905bbd5a..1581c1a5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -91,30 +91,53 @@ public class RecipientHelper {
             });
         } else if (recipient instanceof RecipientIdentifier.Username usernameRecipient) {
             var username = usernameRecipient.username();
-            try {
-                UsernameLinkUrl usernameLinkUrl = UsernameLinkUrl.fromUri(username);
-                final var components = usernameLinkUrl.getComponents();
-                final var encryptedUsername = dependencies.getAccountManager()
-                        .getEncryptedUsernameFromLinkServerId(components.getServerId());
-                final var link = new Username.UsernameLink(components.getEntropy(), encryptedUsername);
-
-                username = Username.fromLink(link).getUsername();
-            } catch (UsernameLinkUrl.InvalidUsernameLinkException e) {
-            } catch (IOException | BaseUsernameException e) {
-                throw new RuntimeException(e);
-            }
-            final String finalUsername = username;
-            return account.getRecipientStore().resolveRecipientByUsername(finalUsername, () -> {
-                try {
-                    return getRegisteredUserByUsername(finalUsername);
-                } catch (Exception e) {
-                    return null;
-                }
-            });
+            return resolveRecipientByUsernameOrLink(username, false);
         }
         throw new AssertionError("Unexpected RecipientIdentifier: " + recipient);
     }
 
+    public RecipientId resolveRecipientByUsernameOrLink(
+            String username, boolean forceRefresh
+    ) throws UnregisteredRecipientException {
+        final Username finalUsername;
+        try {
+            finalUsername = getUsernameFromUsernameOrLink(username);
+        } catch (IOException | BaseUsernameException e) {
+            throw new RuntimeException(e);
+        }
+        if (forceRefresh) {
+            try {
+                final var aci = dependencies.getAccountManager().getAciByUsername(finalUsername);
+                return account.getRecipientStore().resolveRecipientTrusted(aci, finalUsername.getUsername());
+            } catch (IOException e) {
+                throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
+                        null,
+                        username));
+            }
+        }
+        return account.getRecipientStore().resolveRecipientByUsername(finalUsername.getUsername(), () -> {
+            try {
+                return dependencies.getAccountManager().getAciByUsername(finalUsername);
+            } catch (Exception e) {
+                return null;
+            }
+        });
+    }
+
+    private Username getUsernameFromUsernameOrLink(String username) throws BaseUsernameException, IOException {
+        try {
+            final var usernameLinkUrl = UsernameLinkUrl.fromUri(username);
+            final var components = usernameLinkUrl.getComponents();
+            final var encryptedUsername = dependencies.getAccountManager()
+                    .getEncryptedUsernameFromLinkServerId(components.getServerId());
+            final var link = new Username.UsernameLink(components.getEntropy(), encryptedUsername);
+
+            return Username.fromLink(link);
+        } catch (UsernameLinkUrl.InvalidUsernameLinkException e) {
+            return new Username(username);
+        }
+    }
+
     public Optional<RecipientId> resolveRecipientOptional(final RecipientIdentifier.Single recipient) {
         try {
             return Optional.of(resolveRecipient(recipient));
@@ -246,10 +269,6 @@ public class RecipientHelper {
         return registeredUsers;
     }
 
-    private ACI getRegisteredUserByUsername(String username) throws IOException, BaseUsernameException {
-        return dependencies.getAccountManager().getAciByUsername(new Username(username));
-    }
-
     public record RegisteredUser(Optional<ACI> aci, Optional<PNI> pni) {
 
         public RegisteredUser {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 47a5bc03..3f99d8e6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -65,6 +65,7 @@ import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
@@ -280,6 +281,33 @@ public class ManagerImpl implements Manager {
         }));
     }
 
+    @Override
+    public Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames) {
+        final var registeredUsers = new HashMap<String, RecipientAddress>();
+        for (final var username : usernames) {
+            try {
+                final var recipientId = context.getRecipientHelper().resolveRecipientByUsernameOrLink(username, true);
+                final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
+                registeredUsers.put(username, address);
+            } catch (UnregisteredRecipientException e) {
+                // ignore
+            }
+        }
+
+        return usernames.stream().collect(Collectors.toMap(n -> n, username -> {
+            final var user = registeredUsers.get(username);
+            final var serviceId = user == null ? null : user.serviceId().orElse(null);
+            final var profile = serviceId == null
+                    ? null
+                    : context.getProfileHelper()
+                            .getRecipientProfile(account.getRecipientResolver().resolveRecipient(serviceId));
+            return new UsernameStatus(username,
+                    serviceId == null ? null : serviceId.getRawUuid(),
+                    profile != null
+                            && profile.getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNRESTRICTED);
+        }));
+    }
+
     @Override
     public void updateAccountAttributes(
             String deviceName,
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 80d4c37e..8739e493 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -266,13 +266,16 @@ Use listDevices to see the deviceIds.
 
 === getUserStatus
 
-Uses a list of phone numbers to determine the statuses of those users.
+Uses a list of phone numbers or usernames to determine the statuses of those users.
 Shows if they are registered on the Signal Servers or not.
 In json mode this is outputted as a list of objects.
 
 [NUMBER [NUMBER ...]]::
 One or more numbers to check.
 
+[--username [USERNAME ...]]::
+One or more usernames to check.
+
 === send
 
 Send a message to another user or group.
diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 7cf78ec8..1691fac8 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.commands;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
@@ -9,6 +11,7 @@ import org.asamk.signal.commands.exceptions.RateLimitErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
@@ -19,6 +22,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.stream.Stream;
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
@@ -32,7 +36,8 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Check if the specified phone number/s have been registered");
-        subparser.addArgument("recipient").help("Phone number").nargs("+");
+        subparser.addArgument("recipient").help("Phone number").nargs("*");
+        subparser.addArgument("--username").help("Specify the recipient username or username link.").nargs("*");
     }
 
     @Override
@@ -54,17 +59,31 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
                     + ")", e);
         }
 
+        final var usernames = ns.<String>getList("username");
+        final var registeredUsernames = usernames == null
+                ? Map.<String, UsernameStatus>of()
+                : m.getUsernameStatus(new HashSet<>(usernames));
+
         // Output
         switch (outputWriter) {
             case JsonWriter writer -> {
-                var jsonUserStatuses = registered.entrySet().stream().map(entry -> {
+                var jsonUserStatuses = Stream.concat(registered.entrySet().stream().map(entry -> {
                     final var number = entry.getValue().number();
                     final var uuid = entry.getValue().uuid();
                     return new JsonUserStatus(entry.getKey(),
                             number,
+                            null,
                             uuid == null ? null : uuid.toString(),
                             uuid != null);
-                }).toList();
+                }), registeredUsernames.entrySet().stream().map(entry -> {
+                    final var username = entry.getValue().username();
+                    final var uuid = entry.getValue().uuid();
+                    return new JsonUserStatus(entry.getKey(),
+                            null,
+                            username,
+                            uuid == null ? null : uuid.toString(),
+                            uuid != null);
+                })).toList();
                 writer.write(jsonUserStatuses);
             }
             case PlainTextWriter writer -> {
@@ -75,9 +94,22 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
                             userStatus.uuid() != null,
                             userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
                 }
+                for (var entry : registeredUsernames.entrySet()) {
+                    final var userStatus = entry.getValue();
+                    writer.println("{}: {}{}",
+                            entry.getKey(),
+                            userStatus.uuid() != null,
+                            userStatus.unrestrictedUnidentifiedAccess() ? " (unrestricted sealed sender)" : "");
+                }
             }
         }
     }
 
-    private record JsonUserStatus(String recipient, String number, String uuid, boolean isRegistered) {}
+    private record JsonUserStatus(
+            String recipient,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String number,
+            @JsonInclude(JsonInclude.Include.NON_NULL) String username,
+            String uuid,
+            boolean isRegistered
+    ) {}
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 522bb3f6..cd65be51 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -47,6 +47,7 @@ import org.asamk.signal.manager.api.UpdateGroup;
 import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;
 import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -122,6 +123,11 @@ public class DbusManagerImpl implements Manager {
         return result;
     }
 
+    @Override
+    public Map<String, UsernameStatus> getUsernameStatus(final Set<String> usernames) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void updateAccountAttributes(
             final String deviceName,

From abddf24752218ff88cd0eca0a8c367ab5c0f2dfc Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Mar 2024 09:50:54 +0100
Subject: [PATCH 423/672] Update user agent

---
 src/main/java/org/asamk/signal/BaseConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 8132e719..84d7f104 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.0.2");
+            .orElse("Signal-Android/7.1.3");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 95e70b9d153f1f3ec668c8e91a17f89b25ecf3ce Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Mar 2024 09:33:37 +0100
Subject: [PATCH 424/672] Add Java 22 to CI

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1c6bb3c0..df7a6c79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21' ]
+        java: [ '21', '22' ]
 
     steps:
       - uses: actions/checkout@v4

From dda23e76ac4ed8d88f23c9f39b7110460a8a1ed5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Mar 2024 09:57:15 +0100
Subject: [PATCH 425/672] Bump version to 0.13.2

---
 CHANGELOG.md                          | 10 +++++++++-
 build.gradle.kts                      |  2 +-
 data/org.asamk.SignalCli.metainfo.xml |  3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50f45f28..c845502d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.2] - 2024-03-23
+
+### Added
+
+- Add `--username` parameter to `getUserStatus` command
+
+### Fixed
+
+- Fixed setting and retrieving PIN after server changes
 
 ## [0.13.1] - 2024-02-27
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 0d4ebe84..48606a8d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.1"
 }
 
-version = "0.13.2-SNAPSHOT"
+version = "0.13.2"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index f61b0224..0fe85fa9 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -39,6 +39,9 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="0.13.2" date="2024-03-23">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.2</url>
+    </release>
     <release version="0.13.1" date="2024-02-27">
       <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.1</url>
     </release>

From c85c995fef7580ef135a03c121617eaeec49b3e4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 27 Feb 2024 18:20:21 +0100
Subject: [PATCH 426/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c845502d..5b7e2b78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.2] - 2024-03-23
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 48606a8d..f7a3737b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.1"
 }
 
-version = "0.13.2"
+version = "0.13.3-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 49cc9cd9f8db71db9dc5076be25b1977400cedfa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Mar 2024 15:00:02 +0100
Subject: [PATCH 427/672] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b7e2b78..d9e4501f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ## [0.13.2] - 2024-03-23
 
+**Attention**: Now requires libsignal-client version 0.40.1
+
 ### Added
 
 - Add `--username` parameter to `getUserStatus` command

From be0e8ddd8aa5fd8d1835ba6a16675c66e1b77f82 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 27 Mar 2024 22:58:00 +0100
Subject: [PATCH 428/672] Add reregister to tests

---
 run_tests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/run_tests.sh b/run_tests.sh
index 6a7c8358..0e5ff4be 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -160,6 +160,7 @@ wait
 fi
 
 run_main -a "$NUMBER_1" setPin "$TEST_PIN_1"
+run_main -a "$NUMBER_1" register --reregister
 run_main -a "$NUMBER_2" removePin
 
 ## Contacts

From 17c24b3ff22ca00d9fa26e976b4f1de64eb4a689 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 27 Mar 2024 22:54:15 +0100
Subject: [PATCH 429/672] Update libsignal-service-java

---
 CHANGELOG.md                                  |  2 ++
 .../manager/api/ProofRequiredException.java   |  5 ++--
 .../signal/manager/config/LiveConfig.java     |  2 +-
 .../signal/manager/config/StagingConfig.java  |  2 +-
 .../signal/manager/helper/SyncHelper.java     |  2 --
 .../signal/manager/internal/ManagerImpl.java  |  2 +-
 .../syncStorage/ContactRecordProcessor.java   | 23 ++++++++++++++++++-
 settings.gradle.kts                           |  2 +-
 .../java/org/asamk/signal/BaseConfig.java     |  2 +-
 .../signal/util/SendMessageResultUtils.java   |  2 +-
 10 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9e4501f..7a96d412 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+**Attention**: Now requires libsignal-client version 0.42.0
+
 ## [0.13.2] - 2024-03-23
 
 **Attention**: Now requires libsignal-client version 0.40.1
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java b/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
index 949dc4eb..277406cb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
@@ -31,12 +31,13 @@ public class ProofRequiredException extends Exception {
     }
 
     public enum Option {
-        RECAPTCHA,
+        CAPTCHA,
         PUSH_CHALLENGE;
 
         static Option from(org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException.Option option) {
             return switch (option) {
-                case RECAPTCHA -> RECAPTCHA;
+                case RECAPTCHA -> CAPTCHA;
+                case CAPTCHA -> CAPTCHA;
                 case PUSH_CHALLENGE -> PUSH_CHALLENGE;
             };
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 2bbdfe19..c86e650b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -42,7 +42,7 @@ class LiveConfig {
     private static final Optional<SignalProxy> proxy = Optional.empty();
 
     private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
-            .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0I=");
+            .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0LUlT9vALgh/f2DPVOOmR0RW6bgRvc7DSF20V/omg+YBw==");
     private static final byte[] genericServerPublicParams = Base64.getDecoder()
             .decode("AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN");
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index e99b049c..c4d87cc3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -42,7 +42,7 @@ class StagingConfig {
     private static final Optional<SignalProxy> proxy = Optional.empty();
 
     private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
-            .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCM=");
+            .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCNWI+wwkyFCqNDXz/qxl1gAntuCJtSfq9OC3NkdhQlgYQ==");
     private static final byte[] genericServerPublicParams = Base64.getDecoder()
             .decode("AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N");
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 4789790e..0d516eb6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -201,7 +201,6 @@ public class SyncHelper {
                 Optional.ofNullable(contact == null ? null : contact.color()),
                 Optional.ofNullable(verifiedMessage),
                 Optional.ofNullable(profileKey),
-                contact != null && contact.isBlocked(),
                 Optional.ofNullable(contact == null ? null : contact.messageExpirationTime()),
                 Optional.empty(),
                 contact != null && contact.isArchived());
@@ -357,7 +356,6 @@ public class SyncHelper {
             if (c.getExpirationTimer().isPresent()) {
                 builder.withMessageExpirationTime(c.getExpirationTimer().get());
             }
-            builder.withIsBlocked(c.isBlocked());
             builder.withIsArchived(c.isArchived());
             account.getContactStore().storeContact(recipientId, builder.build());
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 3f99d8e6..b43dfba4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -443,7 +443,7 @@ public class ManagerImpl implements Manager {
 
         try {
             dependencies.getAccountManager().submitRateLimitRecaptchaChallenge(challenge, captcha);
-        } catch (org.whispersystems.signalservice.api.push.exceptions.CaptchaRejectedException ignored) {
+        } catch (org.whispersystems.signalservice.internal.push.exceptions.CaptchaRejectedException ignored) {
             throw new CaptchaRejectedException();
         }
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 5bae64c8..28e7b663 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -104,6 +104,23 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
             profileFamilyName = local.getProfileFamilyName().orElse("");
         }
 
+        String nicknameGivenName;
+        String nicknameFamilyName;
+        if (remote.getNicknameGivenName().isPresent()) {
+            nicknameGivenName = remote.getNicknameGivenName().orElse("");
+            nicknameFamilyName = remote.getNicknameFamilyName().orElse("");
+        } else {
+            nicknameGivenName = local.getNicknameGivenName().orElse("");
+            nicknameFamilyName = local.getNicknameFamilyName().orElse("");
+        }
+
+        if (nicknameGivenName.isBlank() && !nicknameFamilyName.isBlank()) {
+            logger.debug("Processed invalid nickname. Missing given name.");
+
+            nicknameGivenName = "";
+            nicknameFamilyName = "";
+        }
+
         IdentityState identityState;
         byte[] identityKey;
         if (remote.getIdentityKey().isPresent() && (
@@ -181,6 +198,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 : remote.getSystemFamilyName().orElse("");
         final var systemNickname = remote.getSystemNickname().orElse("");
         final var pniSignatureVerified = remote.isPniSignatureVerified() || local.isPniSignatureVerified();
+        final var note = remote.getNote().or(local::getNote).orElse("");
 
         final var mergedBuilder = new SignalContactRecord.Builder(remote.getId().getRaw(), aci, unknownFields).setE164(
                         e164)
@@ -202,7 +220,10 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .setHideStory(hideStory)
                 .setUnregisteredTimestamp(unregisteredTimestamp)
                 .setHidden(hidden)
-                .setPniSignatureVerified(pniSignatureVerified);
+                .setPniSignatureVerified(pniSignatureVerified)
+                .setNicknameGivenName(nicknameGivenName)
+                .setNicknameFamilyName(nicknameFamilyName)
+                .setNote(note);
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 125c2642..ad9d632b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.3")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_98")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_99")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.2.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 84d7f104..8a0ddc06 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.1.3");
+            .orElse("Signal-Android/7.2.0");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;
diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
index 108142e3..76932402 100644
--- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
+++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
@@ -91,7 +91,7 @@ public class SendMessageResultUtils {
             return String.format(
                     "CAPTCHA proof required for sending to \"%s\", available options \"%s\" with challenge token \"%s\", or wait \"%d\" seconds.\n"
                             + (
-                            failure.getOptions().contains(ProofRequiredException.Option.RECAPTCHA)
+                            failure.getOptions().contains(ProofRequiredException.Option.CAPTCHA)
                                     ? """
                                       To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html
                                       After solving the captcha, right-click on the "Open Signal" link and copy the link.

From 95d4b7d0128a836ba607ae86ab661ea00eec7772 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 6 Apr 2024 12:34:55 +0200
Subject: [PATCH 430/672] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43462 -> 43453 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd4917707c1f8861d8cb53dd15194d4248596..e6441136f3d4ba8a0da8d277868979cfbc8ad796 100644
GIT binary patch
delta 34118
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

delta 34176
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
SGW6ptSs!X7{rG*o_g?|vpSEZK

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a80b22ce..b82aa23a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 95f9e18de2228e8bececd7856e8cee836edaafcd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Apr 2024 14:04:48 +0200
Subject: [PATCH 431/672] Bump h2 from 0.3.24 to 0.3.26 in /client (#1501)

Bumps [h2](https://github.com/hyperium/h2) from 0.3.24 to 0.3.26.
- [Release notes](https://github.com/hyperium/h2/releases)
- [Changelog](https://github.com/hyperium/h2/blob/v0.3.26/CHANGELOG.md)
- [Commits](https://github.com/hyperium/h2/compare/v0.3.24...v0.3.26)

---
updated-dependencies:
- dependency-name: h2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 client/Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 7b642387..11c9659c 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -370,9 +370,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",

From edce33ae1535cb345bb8c90e110314a0a320df0c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 6 Apr 2024 13:54:47 +0200
Subject: [PATCH 432/672] Disable java 22 until gradle supports it

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df7a6c79..1c6bb3c0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21', '22' ]
+        java: [ '21' ]
 
     steps:
       - uses: actions/checkout@v4

From d4e1f9b7f182dce311c07b0c0ab647e639c04d34 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 6 Apr 2024 13:55:40 +0200
Subject: [PATCH 433/672] Remove unnecessary config field

---
 .../org/asamk/signal/manager/helper/RecipientHelper.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 1581c1a5..ab87996d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -3,7 +3,6 @@ package org.asamk.signal.manager.helper;
 import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
-import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
@@ -34,12 +33,10 @@ public class RecipientHelper {
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
-    private final ServiceEnvironmentConfig serviceEnvironmentConfig;
 
     public RecipientHelper(final Context context) {
         this.account = context.getAccount();
         this.dependencies = context.getDependencies();
-        this.serviceEnvironmentConfig = dependencies.getServiceEnvironmentConfig();
     }
 
     public SignalServiceAddress resolveSignalServiceAddress(RecipientId recipientId) {
@@ -234,7 +231,7 @@ public class RecipientHelper {
                             newNumbers,
                             account.getRecipientStore().getServiceIdToProfileKeyMap(),
                             token,
-                            serviceEnvironmentConfig.cdsiMrenclave(),
+                            dependencies.getServiceEnvironmentConfig().cdsiMrenclave(),
                             null,
                             dependencies.getServiceEnvironmentConfig().netEnvironment(),
                             newToken -> {

From 419beee29a495fef141f87c95185407d42cf495f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 6 Apr 2024 13:56:25 +0200
Subject: [PATCH 434/672] Update libsignal-service-java

---
 graalvm-config-dir/reflect-config.json        |  8 ++++++++
 .../manager/helper/RecipientHelper.java       |  2 +-
 .../manager/internal/SignalDependencies.java  |  7 +++++++
 .../syncStorage/ContactRecordProcessor.java   | 19 ++-----------------
 settings.gradle.kts                           |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index e3b47e86..252839b2 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1384,6 +1384,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.COMPOSITE$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.CompositeSignatures$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.DH$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -2748,6 +2752,10 @@
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true
 },
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$Name",
+  "allDeclaredFields":true
+},
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV1Record",
   "allDeclaredFields":true
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index ab87996d..deb4e01b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -233,7 +233,7 @@ public class RecipientHelper {
                             token,
                             dependencies.getServiceEnvironmentConfig().cdsiMrenclave(),
                             null,
-                            dependencies.getServiceEnvironmentConfig().netEnvironment(),
+                            dependencies.getLibSignalNetwork(),
                             newToken -> {
                                 if (isPartialRefresh) {
                                     account.getCdsiStore().updateAfterPartialCdsQuery(newNumbers);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 561534c5..b715611e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -3,6 +3,7 @@ package org.asamk.signal.manager.internal;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
+import org.signal.libsignal.net.Network;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
@@ -48,6 +49,7 @@ public class SignalDependencies {
     private ClientZkOperations clientZkOperations;
 
     private PushServiceSocket pushServiceSocket;
+    private Network libSignalNetwork;
     private SignalWebSocket signalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
@@ -104,6 +106,11 @@ public class SignalDependencies {
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
+    public Network getLibSignalNetwork() {
+        return getOrCreate(() -> libSignalNetwork,
+                () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment()));
+    }
+
     public SignalServiceAccountManager getAccountManager() {
         return getOrCreate(() -> accountManager,
                 () -> accountManager = new SignalServiceAccountManager(getPushServiceSocket(),
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 28e7b663..cd1e107c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -104,23 +104,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
             profileFamilyName = local.getProfileFamilyName().orElse("");
         }
 
-        String nicknameGivenName;
-        String nicknameFamilyName;
-        if (remote.getNicknameGivenName().isPresent()) {
-            nicknameGivenName = remote.getNicknameGivenName().orElse("");
-            nicknameFamilyName = remote.getNicknameFamilyName().orElse("");
-        } else {
-            nicknameGivenName = local.getNicknameGivenName().orElse("");
-            nicknameFamilyName = local.getNicknameFamilyName().orElse("");
-        }
-
-        if (nicknameGivenName.isBlank() && !nicknameFamilyName.isBlank()) {
-            logger.debug("Processed invalid nickname. Missing given name.");
-
-            nicknameGivenName = "";
-            nicknameFamilyName = "";
-        }
-
         IdentityState identityState;
         byte[] identityKey;
         if (remote.getIdentityKey().isPresent() && (
@@ -197,6 +180,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 ? local.getSystemFamilyName().orElse("")
                 : remote.getSystemFamilyName().orElse("");
         final var systemNickname = remote.getSystemNickname().orElse("");
+        final var nicknameGivenName = remote.getNicknameGivenName().orElse("");
+        final var nicknameFamilyName = remote.getNicknameFamilyName().orElse("");
         final var pniSignatureVerified = remote.isPniSignatureVerified() || local.isPniSignatureVerified();
         final var note = remote.getNote().or(local::getNote).orElse("");
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ad9d632b..8ef7a6e9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("libs") {
-            library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.77")
+            library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78")
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.0")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.3")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_99")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_100")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.2.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")

From e5ebb732cbda9fccc3eeb3a964d7c48202113a8a Mon Sep 17 00:00:00 2001
From: Stephen Brennan <brenns10@gmail.com>
Date: Sat, 13 Apr 2024 11:26:15 -0700
Subject: [PATCH 435/672] Document the unit of "start" and "length" for
 mentions and text styles (#1505)

The unit of UTF-16 code units is not necessarily obvious for users of
languages that index strings by Unicode code points. Provide a pointer
to an FAQ entry as well:

https://github.com/AsamK/signal-cli/wiki/FAQ#string-indexing-units

Closes #1504

Signed-off-by: Stephen Brennan <stephen@brennan.io>
---
 man/signal-cli.1.adoc                                    | 3 ++-
 src/main/java/org/asamk/signal/commands/SendCommand.java | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 8739e493..31bc5499 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -312,10 +312,11 @@ e.g.: `--sticker 00abac3bc18d7f599bff2325dc306d43:2`
 
 *--mention*::
 Mention another group member (syntax: start:length:recipientNumber) In the apps the mention replaces part of the message text, which is specified by the start and length values.
+The units of start and length should be UTF-16 code units, NOT Unicode code points. For more information, see https://github.com/AsamK/signal-cli/wiki/FAQ#string-indexing-units
 e.g.: `-m "Hi X!" --mention "3:1:+123456789"`
 
 *--text-style*::
-Style parts of the message text (syntax: start:length:STYLE).
+Style parts of the message text (syntax: start:length:STYLE). Like `--mention`, the units are UTF-16 code units.
 Where STYLE is one of: BOLD, ITALIC, SPOILER, STRIKETHROUGH, MONOSPACE
 
 e.g.: `-m "Something BIG!" --text-style "10:3:BOLD"` or for a mixed text style `-m "Something BIG!" --text-style "0:9:ITALIC" "10:3:BOLD"`
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 0c38cf7d..004ba506 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -71,10 +71,12 @@ public class SendCommand implements JsonRpcLocalCommand {
                 .action(Arguments.storeTrue());
         subparser.addArgument("--mention")
                 .nargs("*")
-                .help("Mention another group member (syntax: start:length:recipientNumber)");
+                .help("Mention another group member (syntax: start:length:recipientNumber). "
+                        + "Unit of start and length is UTF-16 code units, NOT Unicode code points.");
         subparser.addArgument("--text-style")
                 .nargs("*")
-                .help("Style parts of the message text (syntax: start:length:STYLE)");
+                .help("Style parts of the message text (syntax: start:length:STYLE). "
+                        + "Unit of start and length is UTF-16 code units, NOT Unicode code points.");
         subparser.addArgument("--quote-timestamp")
                 .type(long.class)
                 .help("Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.");

From e0cd5b987e151222c7486c14d5cebeebc2ac7740 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 12 Apr 2024 16:57:20 +0200
Subject: [PATCH 436/672] Add handling for new nickname and note fields

---
 .../org/asamk/signal/manager/api/Contact.java | 24 +++++++++++++++++++
 .../manager/storage/AccountDatabase.java      | 12 +++++++++-
 .../signal/manager/storage/SignalAccount.java |  3 +++
 .../recipients/LegacyRecipientStore2.java     |  3 +++
 .../storage/recipients/RecipientStore.java    |  6 +++++
 .../syncStorage/ContactRecordProcessor.java   |  3 +++
 .../syncStorage/StorageSyncModels.java        |  3 +++
 .../asamk/signal/dbus/DbusManagerImpl.java    |  3 +++
 8 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
index cfe3f894..3605b7c5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -6,6 +6,9 @@ public record Contact(
         String givenName,
         String familyName,
         String nickName,
+        String nickNameGivenName,
+        String nickNameFamilyName,
+        String note,
         String color,
         int messageExpirationTime,
         long muteUntil,
@@ -21,6 +24,9 @@ public record Contact(
         this(builder.givenName,
                 builder.familyName,
                 builder.nickName,
+                builder.nickNameGivenName,
+                builder.nickNameFamilyName,
+                builder.note,
                 builder.color,
                 builder.messageExpirationTime,
                 builder.muteUntil,
@@ -73,6 +79,9 @@ public record Contact(
         private String givenName;
         private String familyName;
         private String nickName;
+        private String nickNameGivenName;
+        private String nickNameFamilyName;
+        private String note;
         private String color;
         private int messageExpirationTime;
         private long muteUntil;
@@ -105,6 +114,21 @@ public record Contact(
             return this;
         }
 
+        public Builder withNickNameGivenName(final String val) {
+            nickNameGivenName = val;
+            return this;
+        }
+
+        public Builder withNickNameFamilyName(final String val) {
+            nickNameFamilyName = val;
+            return this;
+        }
+
+        public Builder withNote(final String val) {
+            note = val;
+            return this;
+        }
+
         public Builder withColor(final String val) {
             color = val;
             return this;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index af498359..bf751fbc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -33,7 +33,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 24;
+    private static final long DATABASE_VERSION = 25;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -581,6 +581,16 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 25) {
+            logger.debug("Updating database: Create nick_name and note columns");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD nick_name_given_name TEXT;
+                                        ALTER TABLE recipient ADD nick_name_family_name TEXT;
+                                        ALTER TABLE recipient ADD note TEXT;
+                                        """);
+            }
+        }
     }
 
     private static void createUuidMappingTable(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 0076f314..a3a98c6c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -857,6 +857,9 @@ public class SignalAccount implements Closeable {
                 final var recipientId = getRecipientStore().resolveRecipientTrusted(contact.getAddress());
                 getContactStore().storeContact(recipientId,
                         new Contact(contact.name,
+                                null,
+                                null,
+                                null,
                                 null,
                                 null,
                                 contact.color,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index 17f136ec..186ac517 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -39,6 +39,9 @@ public class LegacyRecipientStore2 {
                 Contact contact = null;
                 if (r.contact != null) {
                     contact = new Contact(r.contact.name,
+                            null,
+                            null,
+                            null,
                             null,
                             null,
                             r.contact.color,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 7d47839b..c291342e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -71,6 +71,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       given_name TEXT,
                                       family_name TEXT,
                                       nick_name TEXT,
+                                      nick_name_given_name TEXT,
+                                      nick_name_family_name TEXT,
+                                      note TEXT,
                                       color TEXT,
 
                                       expiration_time INTEGER NOT NULL DEFAULT 0,
@@ -1436,6 +1439,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         return new Contact(resultSet.getString("given_name"),
                 resultSet.getString("family_name"),
                 resultSet.getString("nick_name"),
+                resultSet.getString("nick_name_given_name"),
+                resultSet.getString("nick_name_family_name"),
+                resultSet.getString("note"),
                 resultSet.getString("color"),
                 resultSet.getInt("expiration_time"),
                 resultSet.getLong("mute_until"),
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index cd1e107c..a087553b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -271,6 +271,9 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                     .withGivenName(contactRecord.getSystemGivenName().orElse(null))
                     .withFamilyName(contactRecord.getSystemFamilyName().orElse(null))
                     .withNickName(contactRecord.getSystemNickname().orElse(null))
+                    .withNickNameGivenName(contactRecord.getNicknameGivenName().orElse(null))
+                    .withNickNameFamilyName(contactRecord.getNicknameFamilyName().orElse(null))
+                    .withNote(contactRecord.getNote().orElse(null))
                     .withUnregisteredTimestamp(contactRecord.getUnregisteredTimestamp() == 0
                             ? null
                             : contactRecord.getUnregisteredTimestamp());
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index 92ea4222..16733bee 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -97,6 +97,9 @@ public final class StorageSyncModels {
             builder.setSystemGivenName(recipient.getContact().givenName())
                     .setSystemFamilyName(recipient.getContact().familyName())
                     .setSystemNickname(recipient.getContact().nickName())
+                    .setNicknameGivenName(recipient.getContact().nickNameGivenName())
+                    .setNicknameFamilyName(recipient.getContact().nickNameFamilyName())
+                    .setNote(recipient.getContact().note())
                     .setBlocked(recipient.getContact().isBlocked())
                     .setProfileSharingEnabled(recipient.getContact().isProfileSharingEnabled())
                     .setMuteUntil(recipient.getContact().muteUntil())
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index cd65be51..b428fb32 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -692,6 +692,9 @@ public class DbusManagerImpl implements Manager {
             return Recipient.newBuilder()
                     .withAddress(new RecipientAddress(null, n))
                     .withContact(new Contact(contactName,
+                            null,
+                            null,
+                            null,
                             null,
                             null,
                             null,

From e456d06cb0d11e08d3d23595087271c8d2172bfa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 13 Apr 2024 21:29:45 +0200
Subject: [PATCH 437/672] Add aci,pni to API RecipientAddress

---
 .../signal/manager/api/RecipientAddress.java  | 55 ++++++++++---------
 .../manager/api/RecipientIdentifier.java      |  8 +--
 .../signal/manager/helper/ReceiveHelper.java  |  4 +-
 .../manager/helper/RecipientHelper.java       |  5 +-
 .../storage/recipients/RecipientAddress.java  |  8 ++-
 .../storage/recipients/RecipientStore.java    |  4 +-
 .../asamk/signal/dbus/DbusManagerImpl.java    | 28 ++++------
 7 files changed, 59 insertions(+), 53 deletions(-)

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 c94a21ac..dd8a6f3c 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
@@ -1,49 +1,55 @@
 package org.asamk.signal.manager.api;
 
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.util.Optional;
 import java.util.UUID;
 
-public record RecipientAddress(Optional<UUID> uuid, Optional<String> number, Optional<String> username) {
+public record RecipientAddress(
+        Optional<String> aci, Optional<String> pni, Optional<String> number, Optional<String> username
+) {
 
     public static final UUID UNKNOWN_UUID = UuidUtil.UNKNOWN_UUID;
 
     /**
      * Construct a RecipientAddress.
      *
-     * @param uuid   The UUID of the user, if available.
+     * @param aci    The ACI of the user, if available.
+     * @param pni    The PNI of the user, if available.
      * @param number The phone number of the user, if available.
      */
     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, username or E164 number!");
+        if (aci.isEmpty() && pni.isEmpty() && number.isEmpty() && username.isEmpty()) {
+            throw new AssertionError("Must have either a ACI, PNI, username or E164 number!");
         }
     }
 
-    public RecipientAddress(UUID uuid, String e164) {
-        this(Optional.ofNullable(uuid), Optional.ofNullable(e164), Optional.empty());
-    }
-
-    public RecipientAddress(UUID uuid, String e164, String username) {
-        this(Optional.ofNullable(uuid), Optional.ofNullable(e164), Optional.ofNullable(username));
-    }
-
-    public RecipientAddress(SignalServiceAddress address) {
-        this(Optional.of(address.getServiceId().getRawUuid()), address.getNumber(), Optional.empty());
+    public RecipientAddress(String e164) {
+        this(null, null, e164, null);
     }
 
     public RecipientAddress(UUID uuid) {
-        this(Optional.of(uuid), Optional.empty(), Optional.empty());
+        this(uuid.toString(), null, null, null);
+    }
+
+    public RecipientAddress(String aci, String pni, String e164, String username) {
+        this(Optional.ofNullable(aci),
+                Optional.ofNullable(pni),
+                Optional.ofNullable(e164),
+                Optional.ofNullable(username));
+    }
+
+    public Optional<UUID> uuid() {
+        return aci.map(UUID::fromString);
     }
 
     public String getIdentifier() {
-        if (uuid.isPresent()) {
-            return uuid.get().toString();
+        if (aci.isPresent()) {
+            return aci.get();
         } else if (number.isPresent()) {
             return number.get();
+        } else if (pni.isPresent()) {
+            return pni.get();
         } else if (username.isPresent()) {
             return username.get();
         } else {
@@ -54,17 +60,16 @@ public record RecipientAddress(Optional<UUID> uuid, Optional<String> number, Opt
     public String getLegacyIdentifier() {
         if (number.isPresent()) {
             return number.get();
-        } else if (uuid.isPresent()) {
-            return uuid.get().toString();
-        } else if (username.isPresent()) {
-            return username.get();
         } else {
-            throw new AssertionError("Given the checks in the constructor, this should not be possible.");
+            return getIdentifier();
         }
     }
 
     public boolean matches(RecipientAddress other) {
-        return (uuid.isPresent() && other.uuid.isPresent() && uuid.get().equals(other.uuid.get()))
+        return (aci.isPresent() && other.aci.isPresent() && aci.get().equals(other.aci.get()))
+                || (
+                pni.isPresent() && other.pni.isPresent() && pni.get().equals(other.pni.get())
+        )
                 || (number.isPresent() && other.number.isPresent() && number.get().equals(other.number.get()))
                 || (username.isPresent() && other.username.isPresent() && username.get().equals(other.username.get()));
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
index fc822058..823881c7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
@@ -47,8 +47,8 @@ public sealed interface RecipientIdentifier {
         static Single fromAddress(RecipientAddress address) {
             if (address.number().isPresent()) {
                 return new Number(address.number().get());
-            } else if (address.uuid().isPresent()) {
-                return new Uuid(address.uuid().get());
+            } else if (address.aci().isPresent()) {
+                return new Uuid(UUID.fromString(address.aci().get()));
             } else if (address.username().isPresent()) {
                 return new Username(address.username().get());
             }
@@ -80,7 +80,7 @@ public sealed interface RecipientIdentifier {
 
         @Override
         public RecipientAddress toPartialRecipientAddress() {
-            return new RecipientAddress(null, number);
+            return new RecipientAddress(number);
         }
     }
 
@@ -93,7 +93,7 @@ public sealed interface RecipientIdentifier {
 
         @Override
         public RecipientAddress toPartialRecipientAddress() {
-            return new RecipientAddress(null, null, username);
+            return new RecipientAddress(null, null, null, username);
         }
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index a40c134d..baa0d583 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -229,9 +229,9 @@ public class ReceiveHelper {
                     if (exception instanceof UntrustedIdentityException) {
                         logger.debug("Keeping message with untrusted identity in message cache");
                         final var address = ((UntrustedIdentityException) exception).getSender();
-                        if (envelope.getSourceServiceId().isEmpty() && address.uuid().isPresent()) {
+                        if (envelope.getSourceServiceId().isEmpty() && address.aci().isPresent()) {
                             final var recipientId = account.getRecipientResolver()
-                                    .resolveRecipient(ACI.from(address.uuid().get()));
+                                    .resolveRecipient(ACI.parseOrThrow(address.aci().get()));
                             try {
                                 cachedMessage[0] = account.getMessageCache()
                                         .replaceSender(cachedMessage[0], recipientId);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index deb4e01b..3bdd8227 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -108,6 +108,7 @@ public class RecipientHelper {
                 return account.getRecipientStore().resolveRecipientTrusted(aci, finalUsername.getUsername());
             } catch (IOException e) {
                 throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
+                        null,
                         null,
                         username));
             }
@@ -196,11 +197,11 @@ public class RecipientHelper {
         try {
             aciMap = getRegisteredUsers(Set.of(number), true);
         } catch (NumberFormatException e) {
-            throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null, number));
+            throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(number));
         }
         final var user = aciMap.get(number);
         if (user == null) {
-            throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null, number));
+            throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(number));
         }
         return user.getServiceId();
     }
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 7eacb6a4..56adb0a6 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
@@ -69,7 +69,10 @@ public record RecipientAddress(
     }
 
     public RecipientAddress(org.asamk.signal.manager.api.RecipientAddress address) {
-        this(address.uuid().map(ACI::from), Optional.empty(), address.number(), address.username());
+        this(address.aci().map(ACI::parseOrNull),
+                address.pni().map(PNI::parseOrNull),
+                address.number(),
+                address.username());
     }
 
     public RecipientAddress(ServiceId serviceId) {
@@ -169,7 +172,8 @@ public record RecipientAddress(
     }
 
     public org.asamk.signal.manager.api.RecipientAddress toApiRecipientAddress() {
-        return new org.asamk.signal.manager.api.RecipientAddress(serviceId().map(ServiceId::getRawUuid),
+        return new org.asamk.signal.manager.api.RecipientAddress(aci().map(ServiceId::toString),
+                pni().map(ServiceId::toString),
                 number(),
                 username());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index c291342e..5c12a1ec 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -215,8 +215,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         if (byNumber.isEmpty() || byNumber.get().address().serviceId().isEmpty()) {
             final var serviceId = serviceIdSupplier.get();
             if (serviceId == null) {
-                throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
-                        number));
+                throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(number));
             }
 
             return resolveRecipient(serviceId);
@@ -247,6 +246,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final var aci = aciSupplier.get();
             if (aci == null) {
                 throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
+                        null,
                         null,
                         username));
             }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index b428fb32..4573b861 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -690,7 +690,7 @@ public class DbusManagerImpl implements Manager {
                 return null;
             }
             return Recipient.newBuilder()
-                    .withAddress(new RecipientAddress(null, n))
+                    .withAddress(new RecipientAddress(n))
                     .withContact(new Contact(contactName,
                             null,
                             null,
@@ -731,19 +731,19 @@ public class DbusManagerImpl implements Manager {
                     (String) group.get("Description").getValue(),
                     GroupInviteLinkUrl.fromUri((String) group.get("GroupInviteLink").getValue()),
                     ((List<String>) group.get("Members").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("PendingMembers").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("RequestingMembers").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Admins").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Banned").getValue()).stream()
-                            .map(m -> new RecipientAddress(null, m))
+                            .map(m -> new RecipientAddress(m))
                             .collect(Collectors.toSet()),
                     (boolean) group.get("IsBlocked").getValue(),
                     (int) group.get("MessageExpirationTimer").getValue(),
@@ -854,8 +854,7 @@ public class DbusManagerImpl implements Manager {
         try {
             this.dbusMsgHandler = messageReceived -> {
                 final var extras = messageReceived.getExtras();
-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        messageReceived.getSender())),
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(messageReceived.getSender())),
                         0,
                         messageReceived.getTimestamp(),
                         0,
@@ -896,8 +895,7 @@ public class DbusManagerImpl implements Manager {
             connection.addSigHandler(Signal.MessageReceivedV2.class, signal, this.dbusMsgHandler);
             this.dbusEditMsgHandler = messageReceived -> {
                 final var extras = messageReceived.getExtras();
-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        messageReceived.getSender())),
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(messageReceived.getSender())),
                         0,
                         messageReceived.getTimestamp(),
                         0,
@@ -945,8 +943,7 @@ public class DbusManagerImpl implements Manager {
                     case "delivery" -> MessageEnvelope.Receipt.Type.DELIVERY;
                     default -> MessageEnvelope.Receipt.Type.UNKNOWN;
                 };
-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        receiptReceived.getSender())),
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(receiptReceived.getSender())),
                         0,
                         receiptReceived.getTimestamp(),
                         0,
@@ -967,8 +964,7 @@ public class DbusManagerImpl implements Manager {
 
             this.dbusSyncHandler = syncReceived -> {
                 final var extras = syncReceived.getExtras();
-                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(null,
-                        syncReceived.getSource())),
+                final var envelope = new MessageEnvelope(Optional.of(new RecipientAddress(syncReceived.getSource())),
                         0,
                         syncReceived.getTimestamp(),
                         0,
@@ -982,7 +978,7 @@ public class DbusManagerImpl implements Manager {
                                 syncReceived.getTimestamp(),
                                 syncReceived.getDestination().isEmpty()
                                         ? Optional.empty()
-                                        : Optional.of(new RecipientAddress(null, syncReceived.getDestination())),
+                                        : Optional.of(new RecipientAddress(syncReceived.getDestination())),
                                 Set.of(),
                                 Optional.of(new MessageEnvelope.Data(syncReceived.getTimestamp(),
                                         syncReceived.getGroupId().length > 0
@@ -1081,7 +1077,7 @@ public class DbusManagerImpl implements Manager {
 
         final List<DBusMap<String, Variant<?>>> mentions = getValue(extras, "mentions");
         return mentions.stream()
-                .map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(null, getValue(a, "recipient")),
+                .map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(this.<String>getValue(a, "recipient")),
                         getValue(a, "start"),
                         getValue(a, "length")))
                 .toList();

From 71de8e63cce8633b020ee49ed62baf0cf838ca54 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 15 Apr 2024 19:23:41 +0200
Subject: [PATCH 438/672] Cache newly created session record

Fixes #1481
---
 .../signal/manager/storage/sessions/SessionStore.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index 3f3ba4d6..067dc5d3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -59,8 +59,11 @@ public class SessionStore implements SignalServiceSessionStore {
     public SessionRecord loadSession(SignalProtocolAddress address) {
         final var key = getKey(address);
         try (final var connection = database.getConnection()) {
-            final var session = loadSession(connection, key);
-            return Objects.requireNonNullElseGet(session, SessionRecord::new);
+            final var sessionRecord = Objects.requireNonNullElseGet(loadSession(connection, key), SessionRecord::new);
+            synchronized (cachedSessions) {
+                cachedSessions.put(key, sessionRecord);
+            }
+            return sessionRecord;
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from session store", e);
         }
@@ -148,7 +151,9 @@ public class SessionStore implements SignalServiceSessionStore {
 
         try (final var connection = database.getConnection()) {
             final var session = loadSession(connection, key);
-            return isActive(session);
+            final var active = isActive(session);
+            logger.trace("Contains session {}: {} (active: {})", address, session != null, active);
+            return active;
         } catch (SQLException e) {
             throw new RuntimeException("Failed read from session store", e);
         }

From 7e0d4c9b8944b43f140e3b5dbf0ec5c33f19b92d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 16 Apr 2024 21:55:50 +0200
Subject: [PATCH 439/672] Store profile phone number sharing mode and
 discoverable state

---
 .../manager/api/PhoneNumberSharingMode.java   |  13 ++-
 .../org/asamk/signal/manager/api/Profile.java |  17 ++-
 .../asamk/signal/manager/api/Recipient.java   |  25 +++-
 .../signal/manager/helper/ProfileHelper.java  |   5 +
 .../manager/helper/RecipientHelper.java       |   3 +-
 .../signal/manager/internal/ManagerImpl.java  |   3 +-
 .../manager/storage/AccountDatabase.java      |  11 +-
 .../signal/manager/storage/SignalAccount.java |   3 +-
 .../recipients/LegacyRecipientStore2.java     |   4 +-
 .../manager/storage/recipients/Recipient.java |  15 +++
 .../storage/recipients/RecipientStore.java    | 107 +++++++++++++++---
 .../signal/manager/util/ProfileUtils.java     |  43 ++++---
 12 files changed, 202 insertions(+), 47 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/PhoneNumberSharingMode.java b/lib/src/main/java/org/asamk/signal/manager/api/PhoneNumberSharingMode.java
index 9efa01be..fce56305 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/PhoneNumberSharingMode.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/PhoneNumberSharingMode.java
@@ -3,5 +3,16 @@ package org.asamk.signal.manager.api;
 public enum PhoneNumberSharingMode {
     EVERYBODY,
     CONTACTS,
-    NOBODY,
+    NOBODY;
+
+    public static PhoneNumberSharingMode valueOfOrNull(String value) {
+        if (value == null) {
+            return null;
+        }
+        try {
+            return valueOf(value);
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+    }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Profile.java b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
index 33117188..5b1ecf3a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
@@ -26,6 +26,8 @@ public class Profile {
 
     private final Set<Capability> capabilities;
 
+    private final PhoneNumberSharingMode phoneNumberSharingMode;
+
     public Profile(
             final long lastUpdateTimestamp,
             final String givenName,
@@ -35,7 +37,8 @@ public class Profile {
             final String avatarUrlPath,
             final byte[] mobileCoinAddress,
             final UnidentifiedAccessMode unidentifiedAccessMode,
-            final Set<Capability> capabilities
+            final Set<Capability> capabilities,
+            final PhoneNumberSharingMode phoneNumberSharingMode
     ) {
         this.lastUpdateTimestamp = lastUpdateTimestamp;
         this.givenName = givenName;
@@ -46,6 +49,7 @@ public class Profile {
         this.mobileCoinAddress = mobileCoinAddress;
         this.unidentifiedAccessMode = unidentifiedAccessMode;
         this.capabilities = capabilities;
+        this.phoneNumberSharingMode = phoneNumberSharingMode;
     }
 
     private Profile(final Builder builder) {
@@ -58,6 +62,7 @@ public class Profile {
         mobileCoinAddress = builder.mobileCoinAddress;
         unidentifiedAccessMode = builder.unidentifiedAccessMode;
         capabilities = builder.capabilities;
+        phoneNumberSharingMode = builder.phoneNumberSharingMode;
     }
 
     public static Builder newBuilder() {
@@ -136,6 +141,10 @@ public class Profile {
         return capabilities;
     }
 
+    public PhoneNumberSharingMode getPhoneNumberSharingMode() {
+        return phoneNumberSharingMode;
+    }
+
     public enum UnidentifiedAccessMode {
         UNKNOWN,
         DISABLED,
@@ -200,6 +209,7 @@ public class Profile {
         private byte[] mobileCoinAddress;
         private UnidentifiedAccessMode unidentifiedAccessMode = UnidentifiedAccessMode.UNKNOWN;
         private Set<Capability> capabilities = Collections.emptySet();
+        private PhoneNumberSharingMode phoneNumberSharingMode;
         private long lastUpdateTimestamp = 0;
 
         private Builder() {
@@ -240,6 +250,11 @@ public class Profile {
             return this;
         }
 
+        public Builder withPhoneNumberSharingMode(final PhoneNumberSharingMode val) {
+            phoneNumberSharingMode = val;
+            return this;
+        }
+
         public Profile build() {
             return new Profile(this);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java b/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java
index 52b68e58..9685bcab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Recipient.java
@@ -20,13 +20,16 @@ public class Recipient {
 
     private final Profile profile;
 
+    private final Boolean discoverable;
+
     public Recipient(
             final RecipientId recipientId,
             final RecipientAddress address,
             final Contact contact,
             final ProfileKey profileKey,
             final ExpiringProfileKeyCredential expiringProfileKeyCredential,
-            final Profile profile
+            final Profile profile,
+            final Boolean discoverable
     ) {
         this.recipientId = recipientId;
         this.address = address;
@@ -34,6 +37,7 @@ public class Recipient {
         this.profileKey = profileKey;
         this.expiringProfileKeyCredential = expiringProfileKeyCredential;
         this.profile = profile;
+        this.discoverable = discoverable;
     }
 
     private Recipient(final Builder builder) {
@@ -41,8 +45,9 @@ public class Recipient {
         address = builder.address;
         contact = builder.contact;
         profileKey = builder.profileKey;
-        expiringProfileKeyCredential = builder.expiringProfileKeyCredential1;
+        expiringProfileKeyCredential = builder.expiringProfileKeyCredential;
         profile = builder.profile;
+        discoverable = builder.discoverable;
     }
 
     public static Builder newBuilder() {
@@ -55,7 +60,7 @@ public class Recipient {
         builder.address = copy.getAddress();
         builder.contact = copy.getContact();
         builder.profileKey = copy.getProfileKey();
-        builder.expiringProfileKeyCredential1 = copy.getExpiringProfileKeyCredential();
+        builder.expiringProfileKeyCredential = copy.getExpiringProfileKeyCredential();
         builder.profile = copy.getProfile();
         return builder;
     }
@@ -84,6 +89,10 @@ public class Recipient {
         return profile;
     }
 
+    public Boolean getDiscoverable() {
+        return discoverable;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
@@ -108,8 +117,9 @@ public class Recipient {
         private RecipientAddress address;
         private Contact contact;
         private ProfileKey profileKey;
-        private ExpiringProfileKeyCredential expiringProfileKeyCredential1;
+        private ExpiringProfileKeyCredential expiringProfileKeyCredential;
         private Profile profile;
+        private Boolean discoverable;
 
         private Builder() {
         }
@@ -135,7 +145,7 @@ public class Recipient {
         }
 
         public Builder withExpiringProfileKeyCredential(final ExpiringProfileKeyCredential val) {
-            expiringProfileKeyCredential1 = val;
+            expiringProfileKeyCredential = val;
             return this;
         }
 
@@ -144,6 +154,11 @@ public class Recipient {
             return this;
         }
 
+        public Builder withDiscoverable(final Boolean val) {
+            discoverable = val;
+            return this;
+        }
+
         public Recipient build() {
             return new Recipient(this);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 5d6b90d4..4a2b79bd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -363,6 +363,7 @@ public final class ProfileHelper {
 
             logger.trace("Storing profile");
             account.getProfileStore().storeProfile(recipientId, newProfile);
+            account.getRecipientStore().markRegistered(recipientId, true);
 
             logger.trace("Done handling retrieved profile");
         }).doOnError(e -> {
@@ -374,6 +375,10 @@ public final class ProfileHelper {
                     .withUnidentifiedAccessMode(Profile.UnidentifiedAccessMode.UNKNOWN)
                     .withCapabilities(Set.of())
                     .build();
+            if (e instanceof NotFoundException) {
+                logger.debug("Marking recipient {} as unregistered after 404 profile fetch.", recipientId);
+                account.getRecipientStore().markRegistered(recipientId, false);
+            }
 
             account.getProfileStore().storeProfile(recipientId, newProfile);
         });
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 3bdd8227..092cff6f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -187,7 +187,8 @@ public class RecipientHelper {
 
         final var unregisteredUsers = new HashSet<>(numbers);
         unregisteredUsers.removeAll(registeredUsers.keySet());
-        account.getRecipientStore().markUnregistered(unregisteredUsers);
+        account.getRecipientStore().markUndiscoverablePossiblyUnregistered(unregisteredUsers);
+        account.getRecipientStore().markDiscoverable(registeredUsers.keySet());
 
         return registeredUsers;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index b43dfba4..8b32b19b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1310,7 +1310,8 @@ public class ManagerImpl implements Manager {
                         s.getContact(),
                         s.getProfileKey(),
                         s.getExpiringProfileKeyCredential(),
-                        s.getProfile()))
+                        s.getProfile(),
+                        s.getDiscoverable()))
                 .toList();
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index bf751fbc..3d9fad9c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -33,7 +33,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 25;
+    private static final long DATABASE_VERSION = 26;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -591,6 +591,15 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 26) {
+            logger.debug("Updating database: Create discoverabel and profile_phone_number_sharing columns");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD discoverable INTEGER;
+                                        ALTER TABLE recipient ADD profile_phone_number_sharing TEXT;
+                                        """);
+            }
+        }
     }
 
     private static void createUuidMappingTable(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index a3a98c6c..a65d157d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -914,7 +914,8 @@ public class SignalAccount implements Closeable {
                                     : profile.getUnidentifiedAccess() != null
                                             ? Profile.UnidentifiedAccessMode.ENABLED
                                             : Profile.UnidentifiedAccessMode.DISABLED,
-                            capabilities);
+                            capabilities,
+                            null);
                     getProfileStore().storeProfile(recipientId, newProfile);
                 }
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index 186ac517..e7aff640 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -87,7 +87,8 @@ public class LegacyRecipientStore2 {
                             r.profile.capabilities.stream()
                                     .map(Profile.Capability::valueOfOrNull)
                                     .filter(Objects::nonNull)
-                                    .collect(Collectors.toSet()));
+                                    .collect(Collectors.toSet()),
+                            null);
                 }
 
                 return new Recipient(recipientId,
@@ -96,6 +97,7 @@ public class LegacyRecipientStore2 {
                         profileKey,
                         expiringProfileKeyCredential,
                         profile,
+                        null,
                         null);
             }).collect(Collectors.toMap(Recipient::getRecipientId, r -> r));
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
index 1d5fb9c8..c5e1181b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java
@@ -21,6 +21,8 @@ public class Recipient {
 
     private final Profile profile;
 
+    private final Boolean discoverable;
+
     private final byte[] storageRecord;
 
     public Recipient(
@@ -30,6 +32,7 @@ public class Recipient {
             final ProfileKey profileKey,
             final ExpiringProfileKeyCredential expiringProfileKeyCredential,
             final Profile profile,
+            final Boolean discoverable,
             final byte[] storageRecord
     ) {
         this.recipientId = recipientId;
@@ -38,6 +41,7 @@ public class Recipient {
         this.profileKey = profileKey;
         this.expiringProfileKeyCredential = expiringProfileKeyCredential;
         this.profile = profile;
+        this.discoverable = discoverable;
         this.storageRecord = storageRecord;
     }
 
@@ -48,6 +52,7 @@ public class Recipient {
         profileKey = builder.profileKey;
         expiringProfileKeyCredential = builder.expiringProfileKeyCredential;
         profile = builder.profile;
+        discoverable = builder.discoverable;
         storageRecord = builder.storageRecord;
     }
 
@@ -91,6 +96,10 @@ public class Recipient {
         return profile;
     }
 
+    public Boolean getDiscoverable() {
+        return discoverable;
+    }
+
     public byte[] getStorageRecord() {
         return storageRecord;
     }
@@ -121,6 +130,7 @@ public class Recipient {
         private ProfileKey profileKey;
         private ExpiringProfileKeyCredential expiringProfileKeyCredential;
         private Profile profile;
+        private Boolean discoverable;
         private byte[] storageRecord;
 
         private Builder() {
@@ -156,6 +166,11 @@ public class Recipient {
             return this;
         }
 
+        public Builder withDiscoverable(final Boolean val) {
+            discoverable = val;
+            return this;
+        }
+
         public Builder withStorageRecord(final byte[] val) {
             storageRecord = val;
             return this;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 5c12a1ec..6428d202 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager.storage.recipients;
 
 import org.asamk.signal.manager.api.Contact;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.storage.Database;
@@ -64,6 +65,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       aci TEXT UNIQUE,
                                       pni TEXT UNIQUE,
                                       unregistered_timestamp INTEGER,
+                                      discoverable INTEGER,
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
                                       needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,
@@ -92,7 +94,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       profile_avatar_url_path TEXT,
                                       profile_mobile_coin_address BLOB,
                                       profile_unidentified_access_mode TEXT,
-                                      profile_capabilities TEXT
+                                      profile_capabilities TEXT,
+                                      profile_phone_number_sharing TEXT
                                     ) STRICT;
                                     """);
         }
@@ -354,7 +357,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
                        r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
-                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
+                       r.discoverable,
                        r.storage_record
                 FROM %s r
                 WHERE r._id = ?
@@ -373,7 +377,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
                        r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
-                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
+                       r.discoverable,
                        r.storage_record
                 FROM %s r
                 WHERE r.storage_id = ?
@@ -409,7 +414,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
                        r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
-                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities,
+                       r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
+                       r.discoverable,
                        r.storage_record
                 FROM %s r
                 WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s
@@ -898,15 +904,19 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    public void markUnregistered(final Set<String> unregisteredUsers) {
-        logger.debug("Marking {} numbers as unregistered", unregisteredUsers.size());
+    public void markUndiscoverablePossiblyUnregistered(final Set<String> numbers) {
+        logger.debug("Marking {} numbers as unregistered", numbers.size());
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
-            for (final var number : unregisteredUsers) {
-                final var recipient = findByNumber(connection, number);
-                if (recipient.isPresent()) {
-                    final var recipientId = recipient.get().id();
-                    markUnregisteredAndSplitIfNecessary(connection, recipientId);
+            for (final var number : numbers) {
+                final var recipientAddress = findByNumber(connection, number);
+                if (recipientAddress.isPresent()) {
+                    final var recipientId = recipientAddress.get().id();
+                    markDiscoverable(connection, recipientId, false);
+                    final var contact = getContact(connection, recipientId);
+                    if (recipientAddress.get().address().aci().isEmpty() || contact.unregisteredTimestamp() != null) {
+                        markUnregisteredAndSplitIfNecessary(connection, recipientId);
+                    }
                 }
             }
             connection.commit();
@@ -915,6 +925,38 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    public void markDiscoverable(final Set<String> numbers) {
+        logger.debug("Marking {} numbers as discoverable", numbers.size());
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            for (final var number : numbers) {
+                final var recipientAddress = findByNumber(connection, number);
+                if (recipientAddress.isPresent()) {
+                    final var recipientId = recipientAddress.get().id();
+                    markDiscoverable(connection, recipientId, true);
+                }
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
+    public void markRegistered(final RecipientId recipientId, final boolean registered) {
+        logger.debug("Marking {} as registered={}", recipientId, registered);
+        try (final var connection = database.getConnection()) {
+            connection.setAutoCommit(false);
+            if (registered) {
+                markRegistered(connection, recipientId);
+            } else {
+                markUnregistered(connection, recipientId);
+            }
+            connection.commit();
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed update recipient store", e);
+        }
+    }
+
     private void markUnregisteredAndSplitIfNecessary(
             final Connection connection, final RecipientId recipientId
     ) throws SQLException {
@@ -927,6 +969,23 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
+    private void markDiscoverable(
+            final Connection connection, final RecipientId recipientId, final boolean discoverable
+    ) throws SQLException {
+        final var sql = (
+                """
+                UPDATE %s
+                SET discoverable = ?
+                WHERE _id = ?
+                """
+        ).formatted(TABLE_RECIPIENT);
+        try (final var statement = connection.prepareStatement(sql)) {
+            statement.setBoolean(1, discoverable);
+            statement.setLong(2, recipientId.id());
+            statement.executeUpdate();
+        }
+    }
+
     private void markRegistered(
             final Connection connection, final RecipientId recipientId
     ) throws SQLException {
@@ -949,8 +1008,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET unregistered_timestamp = ?
-                WHERE _id = ? AND unregistered_timestamp IS NULL
+                SET unregistered_timestamp = ?, discoverable = FALSE
+                WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
@@ -985,7 +1044,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET profile_last_update_timestamp = ?, profile_given_name = ?, profile_family_name = ?, profile_about = ?, profile_about_emoji = ?, profile_avatar_url_path = ?, profile_mobile_coin_address = ?, profile_unidentified_access_mode = ?, profile_capabilities = ?
+                SET profile_last_update_timestamp = ?, profile_given_name = ?, profile_family_name = ?, profile_about = ?, profile_about_emoji = ?, profile_avatar_url_path = ?, profile_mobile_coin_address = ?, profile_unidentified_access_mode = ?, profile_capabilities = ?, profile_phone_number_sharing = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -1002,7 +1061,11 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                     profile == null
                             ? null
                             : profile.getCapabilities().stream().map(Enum::name).collect(Collectors.joining(",")));
-            statement.setLong(10, recipientId.id());
+            statement.setString(10,
+                    profile == null || profile.getPhoneNumberSharingMode() == null
+                            ? null
+                            : profile.getPhoneNumberSharingMode().name());
+            statement.setLong(11, recipientId.id());
             statement.executeUpdate();
         }
         rotateStorageId(connection, recipientId);
@@ -1396,7 +1459,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public Profile getProfile(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
-                SELECT r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities
+                SELECT r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing
                 FROM %s r
                 WHERE r._id = ? AND r.profile_capabilities IS NOT NULL
                 """
@@ -1431,6 +1494,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 getProfileKeyFromResultSet(resultSet),
                 getExpiringProfileKeyCredentialFromResultSet(resultSet),
                 getProfileFromResultSet(resultSet),
+                getDiscoverableFromResultSet(resultSet),
                 getStorageRecordFromResultSet(resultSet));
     }
 
@@ -1453,6 +1517,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 unregisteredTimestamp == 0 ? null : unregisteredTimestamp);
     }
 
+    private static Boolean getDiscoverableFromResultSet(final ResultSet resultSet) throws SQLException {
+        final var discoverable = resultSet.getBoolean("discoverable");
+        if (resultSet.wasNull()) {
+            return null;
+        }
+        return discoverable;
+    }
+
     private Profile getProfileFromResultSet(ResultSet resultSet) throws SQLException {
         final var profileCapabilities = resultSet.getString("profile_capabilities");
         final var profileUnidentifiedAccessMode = resultSet.getString("profile_unidentified_access_mode");
@@ -1471,7 +1543,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                         : Arrays.stream(profileCapabilities.split(","))
                                 .map(Profile.Capability::valueOfOrNull)
                                 .filter(Objects::nonNull)
-                                .collect(Collectors.toSet()));
+                                .collect(Collectors.toSet()),
+                PhoneNumberSharingMode.valueOfOrNull(resultSet.getString("profile_phone_number_sharing")));
     }
 
     private ProfileKey getProfileKeyFromResultSet(ResultSet resultSet) throws SQLException {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 82ffc861..17e26ee8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager.util;
 
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.api.Profile;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
@@ -16,6 +17,7 @@ import org.whispersystems.signalservice.internal.push.PaymentAddress;
 import java.io.IOException;
 import java.util.Base64;
 import java.util.HashSet;
+import java.util.Optional;
 
 public class ProfileUtils {
 
@@ -33,11 +35,14 @@ public class ProfileUtils {
         }
 
         try {
-            var name = decrypt(encryptedProfile.getName(), profileCipher);
-            var about = trimZeros(decrypt(encryptedProfile.getAbout(), profileCipher));
-            var aboutEmoji = trimZeros(decrypt(encryptedProfile.getAboutEmoji(), profileCipher));
+            var name = decryptString(encryptedProfile.getName(), profileCipher);
+            var about = decryptString(encryptedProfile.getAbout(), profileCipher);
+            var aboutEmoji = decryptString(encryptedProfile.getAboutEmoji(), profileCipher);
 
             final var nameParts = splitName(name);
+            final var remotePhoneNumberSharing = decryptBoolean(encryptedProfile.getPhoneNumberSharing(),
+                    profileCipher).map(v -> v ? PhoneNumberSharingMode.EVERYBODY : PhoneNumberSharingMode.NOBODY)
+                    .orElse(null);
             return new Profile(System.currentTimeMillis(),
                     nameParts.first(),
                     nameParts.second(),
@@ -50,7 +55,8 @@ public class ProfileUtils {
                                     profileCipher,
                                     identityKey.getPublicKey()),
                     getUnidentifiedAccessMode(encryptedProfile, profileCipher),
-                    getCapabilities(encryptedProfile));
+                    getCapabilities(encryptedProfile),
+                    remotePhoneNumberSharing);
         } catch (InvalidCiphertextException e) {
             logger.debug("Failed to decrypt profile for {}", encryptedProfile.getServiceId(), e);
             return null;
@@ -83,18 +89,28 @@ public class ProfileUtils {
         return capabilities;
     }
 
-    private static String decrypt(
-            final String encryptedName, final ProfileCipher profileCipher
+    private static String decryptString(
+            final String encrypted, final ProfileCipher profileCipher
     ) throws InvalidCiphertextException {
         try {
-            return encryptedName == null
-                    ? null
-                    : new String(profileCipher.decrypt(Base64.getDecoder().decode(encryptedName)));
+            return encrypted == null ? null : profileCipher.decryptString(Base64.getDecoder().decode(encrypted));
         } catch (IllegalArgumentException e) {
             return null;
         }
     }
 
+    private static Optional<Boolean> decryptBoolean(
+            final String encrypted, final ProfileCipher profileCipher
+    ) throws InvalidCiphertextException {
+        try {
+            return encrypted == null
+                    ? Optional.empty()
+                    : profileCipher.decryptBoolean(Base64.getDecoder().decode(encrypted));
+        } catch (IllegalArgumentException e) {
+            return Optional.empty();
+        }
+    }
+
     private static byte[] decryptAndVerifyMobileCoinAddress(
             final byte[] encryptedPaymentAddress, final ProfileCipher profileCipher, final ECPublicKey publicKey
     ) throws InvalidCiphertextException {
@@ -129,13 +145,4 @@ public class ProfileUtils {
             default -> new Pair<>(parts[0], parts[1]);
         };
     }
-
-    static String trimZeros(String str) {
-        if (str == null) {
-            return null;
-        }
-
-        int pos = str.indexOf(0);
-        return pos == -1 ? str : str.substring(0, pos);
-    }
 }

From 8aeaf927e61b3eb2d0e2ac5cddf3a1ffa4ea98ff Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 17 Apr 2024 20:50:03 +0200
Subject: [PATCH 440/672] Add missing parts for new nick name and note columns

---
 .../storage/recipients/RecipientStore.java    | 19 +++++++++++--------
 .../syncStorage/ContactRecordProcessor.java   |  8 +++++++-
 .../syncStorage/StorageSyncModels.java        |  8 ++++++--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 6428d202..31a5a963 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -41,7 +41,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private static final Logger logger = LoggerFactory.getLogger(RecipientStore.class);
     private static final String TABLE_RECIPIENT = "recipient";
-    private static final String SQL_IS_CONTACT = "r.given_name IS NOT NULL OR r.family_name IS NOT NULL OR r.nick_name IS NOT NULL OR r.expiration_time > 0 OR r.profile_sharing = TRUE OR r.color IS NOT NULL OR r.blocked = TRUE OR r.archived = TRUE";
+    private static final String SQL_IS_CONTACT = "r.given_name IS NOT NULL OR r.family_name IS NOT NULL OR r.nick_name IS NOT NULL OR r.nick_name_given_name IS NOT NULL OR r.nick_name_family_name IS NOT NULL OR r.note IS NOT NULL OR r.expiration_time > 0 OR r.profile_sharing = TRUE OR r.color IS NOT NULL OR r.blocked = TRUE OR r.archived = TRUE";
 
     private final RecipientMergeHandler recipientMergeHandler;
     private final SelfAddressProvider selfAddressProvider;
@@ -332,7 +332,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public List<Pair<RecipientId, Contact>> getContacts() {
         final var sql = (
                 """
-                SELECT r._id, r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
+                SELECT r._id, r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                 FROM %s r
                 WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
                 """
@@ -356,7 +356,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 SELECT r._id,
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                        r.discoverable,
                        r.storage_record
@@ -376,7 +376,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 SELECT r._id,
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                        r.discoverable,
                        r.storage_record
@@ -413,7 +413,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 SELECT r._id,
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                        r.discoverable,
                        r.storage_record
@@ -817,7 +817,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, archived = ?, unregistered_timestamp = ?
+                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, archived = ?, unregistered_timestamp = ?, nick_name_given_name = ?, nick_name_family_name = ?, note = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -837,7 +837,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             } else {
                 statement.setLong(11, contact.unregisteredTimestamp());
             }
-            statement.setLong(12, recipientId.id());
+            statement.setString(12, contact == null ? null : contact.nickNameGivenName());
+            statement.setString(13, contact == null ? null : contact.nickNameFamilyName());
+            statement.setString(14, contact == null ? null : contact.note());
+            statement.setLong(15, recipientId.id());
             statement.executeUpdate();
         }
         if (contact != null && contact.unregisteredTimestamp() != null) {
@@ -1410,7 +1413,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     private Contact getContact(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
-                SELECT r.given_name, r.family_name, r.nick_name, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
+                SELECT r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                 FROM %s r
                 WHERE r._id = ? AND (%s)
                 """
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index a087553b..72ee4163 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -250,6 +250,9 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var contactGivenName = contact == null ? null : contact.givenName();
         final var contactFamilyName = contact == null ? null : contact.familyName();
         final var contactNickName = contact == null ? null : contact.nickName();
+        final var contactNickGivenName = contact == null ? null : contact.nickNameGivenName();
+        final var contactNickFamilyName = contact == null ? null : contact.nickNameFamilyName();
+        final var contactNote = contact == null ? null : contact.note();
         if (blocked != contactRecord.isBlocked()
                 || profileShared != contactRecord.isProfileSharingEnabled()
                 || archived != contactRecord.isArchived()
@@ -259,7 +262,10 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 || unregisteredTimestamp != contactRecord.getUnregisteredTimestamp()
                 || !Objects.equals(contactRecord.getSystemGivenName().orElse(null), contactGivenName)
                 || !Objects.equals(contactRecord.getSystemFamilyName().orElse(null), contactFamilyName)
-                || !Objects.equals(contactRecord.getSystemNickname().orElse(null), contactNickName)) {
+                || !Objects.equals(contactRecord.getSystemNickname().orElse(null), contactNickName)
+                || !Objects.equals(contactRecord.getNicknameGivenName().orElse(null), contactNickGivenName)
+                || !Objects.equals(contactRecord.getNicknameFamilyName().orElse(null), contactNickFamilyName)
+                || !Objects.equals(contactRecord.getNote().orElse(null), contactNote)) {
             logger.debug("Storing new or updated contact {}", recipientId);
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
             final var newContact = contactBuilder.withIsBlocked(contactRecord.isBlocked())
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index 16733bee..ecb97bdf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -97,8 +97,12 @@ public final class StorageSyncModels {
             builder.setSystemGivenName(recipient.getContact().givenName())
                     .setSystemFamilyName(recipient.getContact().familyName())
                     .setSystemNickname(recipient.getContact().nickName())
-                    .setNicknameGivenName(recipient.getContact().nickNameGivenName())
-                    .setNicknameFamilyName(recipient.getContact().nickNameFamilyName())
+                    .setNicknameGivenName(recipient.getContact().nickNameGivenName() == null
+                            ? ""
+                            : recipient.getContact().nickNameGivenName())
+                    .setNicknameFamilyName(recipient.getContact().nickNameFamilyName() == null
+                            ? ""
+                            : recipient.getContact().nickNameFamilyName())
                     .setNote(recipient.getContact().note())
                     .setBlocked(recipient.getContact().isBlocked())
                     .setProfileSharingEnabled(recipient.getContact().isProfileSharingEnabled())

From e4c5144fbf46cc91a38f5011118e6008db894a80 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 17 Apr 2024 21:26:16 +0200
Subject: [PATCH 441/672] Add more details to listContacts command

Fixes #1502
---
 graalvm-config-dir/reflect-config.json        |  18 ++++
 man/signal-cli.1.adoc                         |   6 ++
 .../signal/commands/ListContactsCommand.java  | 100 +++++++++++++-----
 .../org/asamk/signal/json/JsonContact.java    |  44 ++++++++
 4 files changed, 143 insertions(+), 25 deletions(-)
 create mode 100644 src/main/java/org/asamk/signal/json/JsonContact.java

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 252839b2..c6e85760 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -849,6 +849,24 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"id","parameterTypes":[] }, {"name":"opaque","parameterTypes":[] }, {"name":"sdp","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.json.JsonContact",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"color","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"internal","parameterTypes":[] }, {"name":"isBlocked","parameterTypes":[] }, {"name":"isHidden","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"nickFamilyName","parameterTypes":[] }, {"name":"nickGivenName","parameterTypes":[] }, {"name":"nickName","parameterTypes":[] }, {"name":"note","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"profile","parameterTypes":[] }, {"name":"profileSharing","parameterTypes":[] }, {"name":"unregistered","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonContact$JsonInternal",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"capabilities","parameterTypes":[] }, {"name":"discoverableByPhonenumber","parameterTypes":[] }, {"name":"sharesPhoneNumber","parameterTypes":[] }, {"name":"unidentifiedAccessMode","parameterTypes":[] }]
+},
+{
+  "name":"org.asamk.signal.json.JsonContact$JsonProfile",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "methods":[{"name":"about","parameterTypes":[] }, {"name":"aboutEmoji","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"hasAvatar","parameterTypes":[] }, {"name":"lastUpdateTimestamp","parameterTypes":[] }, {"name":"mobileCoinAddress","parameterTypes":[] }]
+},
 {
   "name":"org.asamk.signal.json.JsonContactAddress",
   "allDeclaredFields":true,
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 31bc5499..7335eba6 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -590,6 +590,12 @@ Specify if only blocked or unblocked contacts should be shown (default: all cont
 *--name*::
 Find contacts with the given contact or profile name.
 
+*--detailed*::
+List the contacts with more details. If output=json, then this is always set
+
+*--internal*::
+Include internal information that's normally not user visible
+
 === listIdentities
 
 List all known identity keys and their trust status, fingerprint and safety number.
diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index 698e6f2b..3865d829 100644
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -5,8 +5,10 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.json.JsonContact;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.Contact;
+import org.asamk.signal.manager.api.PhoneNumberSharingMode;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
@@ -35,6 +37,12 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                 .type(Boolean.class)
                 .help("Specify if only blocked or unblocked contacts should be shown (default: all contacts)");
         subparser.addArgument("--name").help("Find contacts with the given contact or profile name.");
+        subparser.addArgument("--detailed")
+                .action(Arguments.storeTrue())
+                .help("List the contacts with more details. If output=json, then this is always set");
+        subparser.addArgument("--internal")
+                .action(Arguments.storeTrue())
+                .help("Include internal information that's normally not user visible");
     }
 
     @Override
@@ -51,33 +59,94 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                 recipientIdentifiers,
                 Optional.ofNullable(name));
 
+        final var detailed = Boolean.TRUE.equals(ns.getBoolean("detailed"));
+        final var internal = Boolean.TRUE.equals(ns.getBoolean("internal"));
+
         switch (outputWriter) {
             case PlainTextWriter writer -> {
                 for (var r : recipients) {
                     final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
                     final var profile = r.getProfile() == null ? Profile.newBuilder().build() : r.getProfile();
                     writer.println(
-                            "Number: {} Name: {} Profile name: {} Username: {} Color: {} Blocked: {} Message expiration: {}",
-                            r.getAddress().getLegacyIdentifier(),
+                            "Number: {} ACI: {} Name: {} Profile name: {} Username: {} Color: {} Blocked: {} Message expiration: {}",
+                            r.getAddress().number().orElse(""),
+                            r.getAddress().aci().orElse(""),
                             contact.getName(),
                             profile.getDisplayName(),
                             r.getAddress().username().orElse(""),
-                            contact.color(),
+                            Optional.ofNullable(contact.color()).orElse(""),
                             contact.isBlocked(),
                             contact.messageExpirationTime() == 0 ? "disabled" : contact.messageExpirationTime() + "s");
+                    if (detailed) {
+                        writer.indentedWriter()
+                                .println(
+                                        "PNI: {} Given name: {} Family name: {}, Nick name: {} Nick given name: {} Nick family name {} Note: {} Archived: {} Hidden: {} Profile sharing: {} About: {} About Emoji: {} Unregistered: {}",
+                                        r.getAddress().pni().orElse(""),
+                                        Optional.ofNullable(r.getContact().givenName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().familyName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().nickName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().nickNameGivenName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().nickNameFamilyName()).orElse(""),
+                                        Optional.ofNullable(r.getContact().note()).orElse(""),
+                                        r.getContact().isArchived(),
+                                        r.getContact().isHidden(),
+                                        r.getContact().isProfileSharingEnabled(),
+                                        Optional.ofNullable(r.getProfile().getAbout()).orElse(""),
+                                        Optional.ofNullable(r.getProfile().getAboutEmoji()).orElse(""),
+                                        r.getContact().unregisteredTimestamp() != null);
+                    }
+                    if (internal) {
+                        writer.indentedWriter()
+                                .println(
+                                        "Capabilities: {} Unidentified access mode: {} Shares number: {} Discoverable by number: {}",
+                                        r.getProfile().getCapabilities().stream().map(Enum::name).toList(),
+                                        Optional.ofNullable(r.getProfile().getUnidentifiedAccessMode()
+                                                == Profile.UnidentifiedAccessMode.UNKNOWN
+                                                ? null
+                                                : r.getProfile().getUnidentifiedAccessMode().name()).orElse(""),
+                                        r.getProfile().getPhoneNumberSharingMode() == null
+                                                ? ""
+                                                : String.valueOf(r.getProfile().getPhoneNumberSharingMode()
+                                                        == PhoneNumberSharingMode.EVERYBODY),
+                                        r.getDiscoverable() == null ? "" : String.valueOf(r.getDiscoverable()));
+                    }
                 }
             }
             case JsonWriter writer -> {
                 final var jsonContacts = recipients.stream().map(r -> {
                     final var address = r.getAddress();
                     final var contact = r.getContact() == null ? Contact.newBuilder().build() : r.getContact();
+                    final var jsonInternal = !internal
+                            ? null
+                            : new JsonContact.JsonInternal(r.getProfile()
+                                    .getCapabilities()
+                                    .stream()
+                                    .map(Enum::name)
+                                    .toList(),
+                                    r.getProfile().getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNKNOWN
+                                            ? null
+                                            : r.getProfile().getUnidentifiedAccessMode().name(),
+                                    r.getProfile().getPhoneNumberSharingMode() == null
+                                            ? null
+                                            : r.getProfile().getPhoneNumberSharingMode()
+                                                    == PhoneNumberSharingMode.EVERYBODY,
+                                    r.getDiscoverable());
                     return new JsonContact(address.number().orElse(null),
                             address.uuid().map(UUID::toString).orElse(null),
                             address.username().orElse(null),
                             contact.getName(),
+                            contact.givenName(),
+                            contact.familyName(),
+                            contact.nickName(),
+                            contact.nickNameGivenName(),
+                            contact.nickNameFamilyName(),
+                            contact.note(),
                             contact.color(),
                             contact.isBlocked(),
+                            contact.isHidden(),
                             contact.messageExpirationTime(),
+                            r.getContact().isProfileSharingEnabled(),
+                            r.getContact().unregisteredTimestamp() != null,
                             r.getProfile() == null
                                     ? null
                                     : new JsonContact.JsonProfile(r.getProfile().getLastUpdateTimestamp(),
@@ -85,34 +154,15 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                                             r.getProfile().getFamilyName(),
                                             r.getProfile().getAbout(),
                                             r.getProfile().getAboutEmoji(),
+                                            r.getProfile().getAvatarUrlPath() != null,
                                             r.getProfile().getMobileCoinAddress() == null
                                                     ? null
                                                     : Base64.getEncoder()
-                                                            .encodeToString(r.getProfile().getMobileCoinAddress())));
+                                                            .encodeToString(r.getProfile().getMobileCoinAddress())),
+                            jsonInternal);
                 }).toList();
                 writer.write(jsonContacts);
             }
         }
     }
-
-    private record JsonContact(
-            String number,
-            String uuid,
-            String username,
-            String name,
-            String color,
-            boolean isBlocked,
-            int messageExpirationTime,
-            JsonProfile profile
-    ) {
-
-        private record JsonProfile(
-                long lastUpdateTimestamp,
-                String givenName,
-                String familyName,
-                String about,
-                String aboutEmoji,
-                String mobileCoinAddress
-        ) {}
-    }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonContact.java b/src/main/java/org/asamk/signal/json/JsonContact.java
new file mode 100644
index 00000000..71f05c8d
--- /dev/null
+++ b/src/main/java/org/asamk/signal/json/JsonContact.java
@@ -0,0 +1,44 @@
+package org.asamk.signal.json;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.List;
+
+public record JsonContact(
+        String number,
+        String uuid,
+        String username,
+        String name,
+        String givenName,
+        String familyName,
+        String nickName,
+        String nickGivenName,
+        String nickFamilyName,
+        String note,
+        String color,
+        boolean isBlocked,
+        boolean isHidden,
+        int messageExpirationTime,
+        boolean profileSharing,
+        boolean unregistered,
+        JsonProfile profile,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonInternal internal
+) {
+
+    public record JsonProfile(
+            long lastUpdateTimestamp,
+            String givenName,
+            String familyName,
+            String about,
+            String aboutEmoji,
+            boolean hasAvatar,
+            String mobileCoinAddress
+    ) {}
+
+    public record JsonInternal(
+            List<String> capabilities,
+            String unidentifiedAccessMode,
+            Boolean sharesPhoneNumber,
+            Boolean discoverableByPhonenumber
+    ) {}
+}

From c1775913b9c54c84b45154aa841a0ba475c7c9fd Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 17:07:18 +0200
Subject: [PATCH 442/672] Implement dbus support for listIdentities

Fixes #195
---
 graalvm-config-dir/proxy-config.json          |  3 +++
 graalvm-config-dir/reflect-config.json        |  6 ++++--
 .../asamk/signal/manager/api/Identity.java    | 11 ++---------
 .../signal/manager/internal/ManagerImpl.java  |  2 +-
 src/main/java/org/asamk/Signal.java           |  2 +-
 .../commands/ListIdentitiesCommand.java       |  4 ++--
 .../asamk/signal/dbus/DbusManagerImpl.java    | 19 +++++++++++++++++--
 .../org/asamk/signal/dbus/DbusSignalImpl.java |  2 +-
 8 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/graalvm-config-dir/proxy-config.json b/graalvm-config-dir/proxy-config.json
index d9a734a8..1a97b30a 100644
--- a/graalvm-config-dir/proxy-config.json
+++ b/graalvm-config-dir/proxy-config.json
@@ -14,6 +14,9 @@
   {
     "interfaces":["org.asamk.Signal$Group"]
   },
+  {
+    "interfaces":["org.asamk.Signal$Identity"]
+  },
   {
     "interfaces":["org.asamk.SignalControl"]
   },
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index c6e85760..67252c9d 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -572,7 +572,7 @@
   "name":"org.asamk.Signal",
   "allDeclaredMethods":true,
   "allDeclaredClasses":true,
-  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getDevice","parameterTypes":["long"] }, {"name":"getGroup","parameterTypes":["byte[]"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"getThisDevice","parameterTypes":[] }, {"name":"listDevices","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.util.List"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
+  "methods":[{"name":"getContactName","parameterTypes":["java.lang.String"] }, {"name":"getDevice","parameterTypes":["long"] }, {"name":"getGroup","parameterTypes":["byte[]"] }, {"name":"getSelfNumber","parameterTypes":[] }, {"name":"getThisDevice","parameterTypes":[] }, {"name":"listDevices","parameterTypes":[] }, {"name":"listIdentities","parameterTypes":[] }, {"name":"sendGroupMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","byte[]"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.lang.String"] }, {"name":"sendMessage","parameterTypes":["java.lang.String","java.util.List","java.util.List"] }, {"name":"sendMessageReaction","parameterTypes":["java.lang.String","boolean","java.lang.String","long","java.util.List"] }, {"name":"subscribeReceive","parameterTypes":[] }, {"name":"unsubscribeReceive","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.Signal$Configuration",
@@ -651,7 +651,9 @@
 },
 {
   "name":"org.asamk.Signal$StructIdentity",
-  "allDeclaredFields":true
+  "allDeclaredFields":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["org.freedesktop.dbus.DBusPath","java.lang.String","java.lang.String"] }]
 },
 {
   "name":"org.asamk.Signal$SyncMessageReceived",
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Identity.java b/lib/src/main/java/org/asamk/signal/manager/api/Identity.java
index 5d43aacc..91f46750 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Identity.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Identity.java
@@ -1,17 +1,10 @@
 package org.asamk.signal.manager.api;
 
-import org.signal.libsignal.protocol.IdentityKey;
-
 public record Identity(
         RecipientAddress recipient,
-        IdentityKey identityKey,
+        byte[] fingerprint,
         String safetyNumber,
         byte[] scannableSafetyNumber,
         TrustLevel trustLevel,
         long dateAddedTimestamp
-) {
-
-    public byte[] getFingerprint() {
-        return identityKey.getPublicKey().serialize();
-    }
-}
+) {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 8b32b19b..ef2e52e3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1366,7 +1366,7 @@ public class ManagerImpl implements Manager {
         final var scannableFingerprint = context.getIdentityHelper()
                 .computeSafetyNumberForScanning(identityInfo.getServiceId(), identityInfo.getIdentityKey());
         return new Identity(address.toApiRecipientAddress(),
-                identityInfo.getIdentityKey(),
+                identityInfo.getIdentityKey().getPublicKey().serialize(),
                 context.getIdentityHelper()
                         .computeSafetyNumber(identityInfo.getServiceId(), identityInfo.getIdentityKey()),
                 scannableFingerprint == null ? null : scannableFingerprint.getSerialized(),
diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index 1fab8102..1d715659 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -642,7 +642,7 @@ public interface Signal extends DBusInterface {
     @DBusProperty(name = "Fingerprint", type = Byte[].class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "SafetyNumber", type = String.class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "TrustLevel", type = String.class, access = DBusProperty.Access.READ)
-    @DBusProperty(name = "AddedDate", type = Integer.class, access = DBusProperty.Access.READ)
+    @DBusProperty(name = "AddedDate", type = Long.class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "ScannableSafetyNumber", type = Byte[].class, access = DBusProperty.Access.READ)
     interface Identity extends DBusInterface, Properties {
 
diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 3c4e7a19..6b49a812 100644
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -34,7 +34,7 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
                 theirId.recipient().getLegacyIdentifier(),
                 theirId.trustLevel(),
                 DateUtils.formatTimestamp(theirId.dateAddedTimestamp()),
-                Hex.toString(theirId.getFingerprint()),
+                Hex.toString(theirId.fingerprint()),
                 Util.formatSafetyNumber(theirId.safetyNumber()));
     }
 
@@ -70,7 +70,7 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
                     var scannableSafetyNumber = id.scannableSafetyNumber();
                     return new JsonIdentity(address.number().orElse(null),
                             address.uuid().map(UUID::toString).orElse(null),
-                            Hex.toString(id.getFingerprint()),
+                            Hex.toString(id.fingerprint()),
                             safetyNumber,
                             scannableSafetyNumber == null
                                     ? null
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 4573b861..574f68c6 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -41,6 +41,7 @@ import org.asamk.signal.manager.api.StickerPack;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.api.StickerPackInvalidException;
 import org.asamk.signal.manager.api.StickerPackUrl;
+import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.api.TypingAction;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.api.UpdateGroup;
@@ -759,12 +760,26 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public List<Identity> getIdentities() {
-        throw new UnsupportedOperationException();
+        final var identities = signal.listIdentities();
+        return identities.stream().map(Signal.StructIdentity::getObjectPath).map(this::getIdentity).toList();
     }
 
     @Override
     public List<Identity> getIdentities(final RecipientIdentifier.Single recipient) {
-        throw new UnsupportedOperationException();
+        final var path = signal.getIdentity(recipient.getIdentifier());
+        return List.of(getIdentity(path));
+    }
+
+    private Identity getIdentity(final DBusPath identityPath) {
+        final var group = getRemoteObject(identityPath, Signal.Identity.class).GetAll("org.asamk.Signal.Identity");
+        final var aci = (String) group.get("Uuid").getValue();
+        final var number = (String) group.get("Number").getValue();
+        return new Identity(new RecipientAddress(aci, null, number, null),
+                (byte[]) group.get("Fingerprint").getValue(),
+                (String) group.get("SafetyNumber").getValue(),
+                (byte[]) group.get("ScannableSafetyNumber").getValue(),
+                TrustLevel.valueOf((String) group.get("TrustLevel").getValue()),
+                (Long) group.get("AddedDate").getValue());
     }
 
     @Override
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 65c210fc..fae0c0a5 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1105,7 +1105,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
                     List.of(new DbusProperty<>("Number", () -> identity.recipient().number().orElse("")),
                             new DbusProperty<>("Uuid",
                                     () -> identity.recipient().uuid().map(UUID::toString).orElse("")),
-                            new DbusProperty<>("Fingerprint", identity::getFingerprint),
+                            new DbusProperty<>("Fingerprint", identity::fingerprint),
                             new DbusProperty<>("SafetyNumber", identity::safetyNumber),
                             new DbusProperty<>("ScannableSafetyNumber", identity::scannableSafetyNumber),
                             new DbusProperty<>("TrustLevel", identity::trustLevel),

From cef83d962cf5415e01fd65d4e602aaa42850d517 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 17:07:29 +0200
Subject: [PATCH 443/672] Fix missing null check

---
 .../signal/manager/storage/recipients/RecipientStore.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 31a5a963..6a672008 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -917,7 +917,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                     final var recipientId = recipientAddress.get().id();
                     markDiscoverable(connection, recipientId, false);
                     final var contact = getContact(connection, recipientId);
-                    if (recipientAddress.get().address().aci().isEmpty() || contact.unregisteredTimestamp() != null) {
+                    if (recipientAddress.get().address().aci().isEmpty() || (
+                            contact != null
+                                    && contact.unregisteredTimestamp() != null
+                    )) {
                         markUnregisteredAndSplitIfNecessary(connection, recipientId);
                     }
                 }

From 0a82c51b7937df9195501e61266d28756472420b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 17:13:25 +0200
Subject: [PATCH 444/672] Update dependencies

---
 graalvm-config-dir/jni-config.json             | 12 ++++++++++++
 settings.gradle.kts                            | 10 +++++-----
 src/main/java/org/asamk/signal/BaseConfig.java |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index d7667b09..5fed7404 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -89,6 +89,18 @@
   "name":"org.signal.libsignal.net.CdsiLookupResponse$Entry",
   "methods":[{"name":"<init>","parameterTypes":["byte[]","byte[]"] }]
 },
+{
+  "name":"org.signal.libsignal.net.ChatService"
+},
+{
+  "name":"org.signal.libsignal.net.ChatService$DebugInfo"
+},
+{
+  "name":"org.signal.libsignal.net.ChatService$Response"
+},
+{
+  "name":"org.signal.libsignal.net.ChatService$ResponseAndDebugInfo"
+},
 {
   "name":"org.signal.libsignal.protocol.DuplicateMessageException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8ef7a6e9..cf324502 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,17 +6,17 @@ dependencyResolutionManagement {
 
     versionCatalogs {
         create("libs") {
-            library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78")
+            library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78.1")
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.0")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
-            version("slf4j", "2.0.12")
+            version("slf4j", "2.0.13")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.5.3")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_100")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.2.0")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_101")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.3.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
             library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.2")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 8a0ddc06..060a2664 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.2.0");
+            .orElse("Signal-Android/7.5.0");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From f0054372b89c2a8372c1cc7b78bad559db092375 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 17:25:43 +0200
Subject: [PATCH 445/672] Add timestamp to account file

Closes #1498
---
 graalvm-config-dir/reflect-config.json                          | 2 +-
 .../java/org/asamk/signal/manager/storage/SignalAccount.java    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 67252c9d..dec3312e 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1152,7 +1152,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"aciAccountData","parameterTypes":[] }, {"name":"deviceId","parameterTypes":[] }, {"name":"encryptedDeviceName","parameterTypes":[] }, {"name":"isMultiDevice","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"password","parameterTypes":[] }, {"name":"pinMasterKey","parameterTypes":[] }, {"name":"pniAccountData","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"registered","parameterTypes":[] }, {"name":"registrationLockPin","parameterTypes":[] }, {"name":"serviceEnvironment","parameterTypes":[] }, {"name":"storageKey","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"usernameLinkEntropy","parameterTypes":[] }, {"name":"usernameLinkServerId","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":["int","long","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"aciAccountData","parameterTypes":[] }, {"name":"deviceId","parameterTypes":[] }, {"name":"encryptedDeviceName","parameterTypes":[] }, {"name":"isMultiDevice","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"password","parameterTypes":[] }, {"name":"pinMasterKey","parameterTypes":[] }, {"name":"pniAccountData","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"registered","parameterTypes":[] }, {"name":"registrationLockPin","parameterTypes":[] }, {"name":"serviceEnvironment","parameterTypes":[] }, {"name":"storageKey","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"usernameLinkEntropy","parameterTypes":[] }, {"name":"usernameLinkServerId","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData",
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index a65d157d..ee6f4167 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -959,6 +959,7 @@ public class SignalAccount implements Closeable {
         synchronized (fileChannel) {
             final var base64 = Base64.getEncoder();
             final var storage = new Storage(CURRENT_STORAGE_VERSION,
+                    System.currentTimeMillis(),
                     serviceEnvironment.name(),
                     registered,
                     number,
@@ -1858,6 +1859,7 @@ public class SignalAccount implements Closeable {
 
     public record Storage(
             int version,
+            long timestamp,
             String serviceEnvironment,
             boolean registered,
             String number,

From c9f2cca0241f93327ebc77aee895bccc29d3d52e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:21:07 +0200
Subject: [PATCH 446/672] Bump version to 0.13.3

---
 CHANGELOG.md     | 11 +++++++++--
 build.gradle.kts |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a96d412..3a443171 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,15 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.3] - 2024-04-19
 
-**Attention**: Now requires libsignal-client version 0.42.0
+**Attention**: Now requires libsignal-client version 0.44.0
+
+### Added
+- Support for reading contact nickname and notes
+- Add `--internal` and `--detailed` parameters to `listContacts` command
+
+### Fixed
+- Fix issue with sending messages when a new session is created
 
 ## [0.13.2] - 2024-03-23
 
diff --git a/build.gradle.kts b/build.gradle.kts
index f7a3737b..794a0972 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.1"
 }
 
-version = "0.13.3-SNAPSHOT"
+version = "0.13.3"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 7060faf5d39f79883bfe0e740ad5b58d6681dbbc Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 447/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a443171..6f9fad47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.3] - 2024-04-19
 
 **Attention**: Now requires libsignal-client version 0.44.0
diff --git a/build.gradle.kts b/build.gradle.kts
index 794a0972..527f8146 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.1"
 }
 
-version = "0.13.3"
+version = "0.13.4-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 3cd8e323c954393ebe539cddb158c6da92c6cfb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Apr 2024 13:53:36 +0200
Subject: [PATCH 448/672] Bump rustls from 0.21.10 to 0.21.11 in /client
 (#1511)

Bumps [rustls](https://github.com/rustls/rustls) from 0.21.10 to 0.21.11.
- [Release notes](https://github.com/rustls/rustls/releases)
- [Changelog](https://github.com/rustls/rustls/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rustls/rustls/compare/v/0.21.10...v/0.21.11)

---
updated-dependencies:
- dependency-name: rustls
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 client/Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 11c9659c..1794713a 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -776,9 +776,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.10"
+version = "0.21.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
 dependencies = [
  "log",
  "ring",

From 3f31f1a8a6bd7db967d448ae7831a89f85daec65 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 21 Apr 2024 09:34:06 +0200
Subject: [PATCH 449/672] Update metainfo

---
 data/org.asamk.SignalCli.metainfo.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 0fe85fa9..d5b9a976 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -8,6 +8,12 @@
     <name>AsamK</name>
   </developer>
   <icon type="stock">org.asamk.SignalCli</icon>
+  <keywords>
+    <keyword>signal</keyword>
+    <keyword>signal-cli</keyword>
+    <keyword>messenger</keyword>
+    <keyword>messaging</keyword>
+  </keywords>
 
   <url type="bugtracker">https://github.com/AsamK/signal-cli/issues</url>
   <url type="homepage">https://github.com/AsamK/signal-cli</url>
@@ -39,6 +45,9 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="0.13.3" date="2024-04-19">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>
+    </release>
     <release version="0.13.2" date="2024-03-23">
       <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.2</url>
     </release>

From 90b1e4bc02ddbb26332d9882542c976ba471fbad Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 1 May 2024 09:04:03 +0200
Subject: [PATCH 450/672] Delete username link when deleting username

---
 .../java/org/asamk/signal/manager/helper/AccountHelper.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 299ce4d3..85c9b220 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -446,6 +446,8 @@ public class AccountHelper {
     }
 
     public void deleteUsername() throws IOException {
+        dependencies.getAccountManager().deleteUsernameLink();
+        account.setUsernameLink(null);
         dependencies.getAccountManager().deleteUsername();
         account.setUsername(null);
         logger.debug("[deleteUsername] Successfully deleted the username.");

From 09e3e7f3358313e68487b1b5ab240837326844dc Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 1 May 2024 09:07:39 +0200
Subject: [PATCH 451/672] Rotate storageId after setting username

---
 .../java/org/asamk/signal/manager/helper/AccountHelper.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 85c9b220..5c74a37f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -376,6 +376,7 @@ public class AccountHelper {
         account.setUsername(username.getUsername());
         account.setUsernameLink(linkComponents);
         account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
+        account.getRecipientStore().rotateSelfStorageId();
         logger.debug("[confirmUsername] Successfully confirmed username.");
     }
 
@@ -409,6 +410,7 @@ public class AccountHelper {
                         e.getClass().getSimpleName());
                 account.setUsername(null);
                 account.setUsernameLink(null);
+                account.getRecipientStore().rotateSelfStorageId();
                 throw e;
             }
         } else {
@@ -431,6 +433,7 @@ public class AccountHelper {
             account.setUsernameLink(linkComponents);
             logger.debug("[confirmUsername] Successfully reclaimed existing username and link.");
         }
+        account.getRecipientStore().rotateSelfStorageId();
     }
 
     private void tryToSetUsernameLink(Username username) {

From 04726f005cb9a4c02df387c5bbfc464bf9f6b3aa Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 1 May 2024 09:08:00 +0200
Subject: [PATCH 452/672] Save account file after setting username link

Fixes #1515
---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index ee6f4167..0ca76e9d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1338,6 +1338,7 @@ public class SignalAccount implements Closeable {
 
     public void setUsernameLink(final UsernameLinkComponents usernameLink) {
         this.usernameLink = usernameLink;
+        save();
     }
 
     public ServiceEnvironment getServiceEnvironment() {

From fb81bf1d05f46c521ca0bd136728ca6024d7ba4a Mon Sep 17 00:00:00 2001
From: Sebastian Scheibner <asamk@gmx.de>
Date: Thu, 9 May 2024 21:20:38 +0200
Subject: [PATCH 453/672] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a4d6cc53..03455d12 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 signal-cli is a commandline interface for the [Signal messenger](https://signal.org/).
 It supports registering, verifying, sending and receiving messages.
 signal-cli uses a [patched libsignal-service-java](https://github.com/Turasa/libsignal-service-java),
-extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/libsignal/service).
+extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/libsignal-service).
 For registering you need a phone number where you can receive SMS or incoming calls.
 
 signal-cli is primarily intended to be used on servers to notify admins of important events.

From 8f756cd90c4579d89a8aa827a613cc78f9d3aee0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 9 May 2024 21:07:17 +0200
Subject: [PATCH 454/672] Update libsignal-service

---
 graalvm-config-dir/jni-config.json                  |  5 ++++-
 .../signal/manager/internal/SignalDependencies.java | 13 ++++++++-----
 .../internal/SignalWebSocketHealthMonitor.java      |  4 ++--
 settings.gradle.kts                                 |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 5fed7404..4050838c 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -12,7 +12,7 @@
 },
 {
   "name":"java.lang.Class",
-  "methods":[{"name":"getCanonicalName","parameterTypes":[] }]
+  "methods":[{"name":"getCanonicalName","parameterTypes":[] }, {"name":"getClassLoader","parameterTypes":[] }]
 },
 {
   "name":"java.lang.ClassLoader",
@@ -62,6 +62,9 @@
   "name":"java.util.UUID",
   "methods":[{"name":"<init>","parameterTypes":["long","long"] }, {"name":"getLeastSignificantBits","parameterTypes":[] }, {"name":"getMostSignificantBits","parameterTypes":[] }]
 },
+{
+  "name":"jdk.internal.loader.ClassLoaders$AppClassLoader"
+},
 {
   "name":"jdk.internal.loader.ClassLoaders$PlatformClassLoader"
 },
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index b715611e..b495466b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -23,6 +23,8 @@ import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
+import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
 import java.util.List;
@@ -49,7 +51,7 @@ public class SignalDependencies {
     private ClientZkOperations clientZkOperations;
 
     private PushServiceSocket pushServiceSocket;
-    private Network libSignalNetwork;
+    private LibSignalNetwork libSignalNetwork;
     private SignalWebSocket signalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
@@ -106,9 +108,10 @@ public class SignalDependencies {
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
-    public Network getLibSignalNetwork() {
+    public LibSignalNetwork getLibSignalNetwork() {
         return getOrCreate(() -> libSignalNetwork,
-                () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment()));
+                () -> libSignalNetwork = new LibSignalNetwork(new Network(serviceEnvironmentConfig.netEnvironment(),
+                        userAgent), serviceEnvironmentConfig.signalServiceConfiguration()));
     }
 
     public SignalServiceAccountManager getAccountManager() {
@@ -159,7 +162,7 @@ public class SignalDependencies {
             final var webSocketFactory = new WebSocketFactory() {
                 @Override
                 public WebSocketConnection createWebSocket() {
-                    return new WebSocketConnection("normal",
+                    return new OkHttpWebSocketConnection("normal",
                             serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.of(credentialsProvider),
                             userAgent,
@@ -169,7 +172,7 @@ public class SignalDependencies {
 
                 @Override
                 public WebSocketConnection createUnidentifiedWebSocket() {
-                    return new WebSocketConnection("unidentified",
+                    return new OkHttpWebSocketConnection("unidentified",
                             serviceEnvironmentConfig.signalServiceConfiguration(),
                             Optional.empty(),
                             userAgent,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index 3ebbe4f3..0fb1585a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -7,7 +7,7 @@ import org.whispersystems.signalservice.api.util.Preconditions;
 import org.whispersystems.signalservice.api.util.SleepTimer;
 import org.whispersystems.signalservice.api.websocket.HealthMonitor;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
-import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
+import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
@@ -25,7 +25,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
 
     private static final Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
 
-    private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(WebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
+    private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(OkHttpWebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
     private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3;
 
     private SignalWebSocket signalWebSocket;
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cf324502..7078f528 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_101")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_102")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.3.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")

From 53d7e0f08b3322eeedba328236e3df8ccac54d48 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 17 May 2024 18:02:05 +0200
Subject: [PATCH 455/672] Handle all possible identifiers of a RecipientAddress

Fixes #1516
---
 .../signal/manager/api/RecipientIdentifier.java   | 15 +++++++++++++++
 .../signal/manager/helper/RecipientHelper.java    |  2 ++
 .../signal/manager/internal/ManagerImpl.java      |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
index 823881c7..794672a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
@@ -49,6 +49,8 @@ public sealed interface RecipientIdentifier {
                 return new Number(address.number().get());
             } else if (address.aci().isPresent()) {
                 return new Uuid(UUID.fromString(address.aci().get()));
+            } else if (address.pni().isPresent()) {
+                return new Pni(address.pni().get());
             } else if (address.username().isPresent()) {
                 return new Username(address.username().get());
             }
@@ -71,6 +73,19 @@ public sealed interface RecipientIdentifier {
         }
     }
 
+    record Pni(String pni) implements Single {
+
+        @Override
+        public String getIdentifier() {
+            return pni;
+        }
+
+        @Override
+        public RecipientAddress toPartialRecipientAddress() {
+            return new RecipientAddress(null, pni, null, null);
+        }
+    }
+
     record Number(String number) implements Single {
 
         @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 092cff6f..bdd192a6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -77,6 +77,8 @@ public class RecipientHelper {
     public RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) throws UnregisteredRecipientException {
         if (recipient instanceof RecipientIdentifier.Uuid uuidRecipient) {
             return account.getRecipientResolver().resolveRecipient(ACI.from(uuidRecipient.uuid()));
+        } else if (recipient instanceof RecipientIdentifier.Pni pniRecipient) {
+            return account.getRecipientResolver().resolveRecipient(PNI.parseOrThrow(pniRecipient.pni()));
         } else if (recipient instanceof RecipientIdentifier.Number numberRecipient) {
             final var number = numberRecipient.number();
             return account.getRecipientStore().resolveRecipientByNumber(number, () -> {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index ef2e52e3..42bce3c6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -98,6 +98,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
@@ -836,6 +837,9 @@ public class ManagerImpl implements Manager {
             if (recipient instanceof RecipientIdentifier.Uuid u) {
                 account.getMessageSendLogStore()
                         .deleteEntryForRecipientNonGroup(targetSentTimestamp, ACI.from(u.uuid()));
+            } else if (recipient instanceof RecipientIdentifier.Pni pni) {
+                account.getMessageSendLogStore()
+                        .deleteEntryForRecipientNonGroup(targetSentTimestamp, PNI.parseOrThrow(pni.pni()));
             } else if (recipient instanceof RecipientIdentifier.Single r) {
                 try {
                     final var recipientId = context.getRecipientHelper().resolveRecipient(r);

From fb21a42cce033e4e2f99d3f63410c5ef63a74fef Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 May 2024 22:13:29 +0200
Subject: [PATCH 456/672] Update graalvm build tools

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 527f8146..eae31b12 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.10.1"
+    id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
 version = "0.13.4-SNAPSHOT"

From 6baf0eac13645fa67fe1707fef9a0e2b295332a3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 21 May 2024 20:28:16 +0200
Subject: [PATCH 457/672] Fix type parsing in JSON RPC mode

Fixes #1533
---
 .../signal/commands/SendMessageRequestResponseCommand.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
index 146ebaf2..53cd3ea7 100644
--- a/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
@@ -36,7 +36,10 @@ public class SendMessageRequestResponseCommand implements JsonRpcLocalCommand {
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
         final var usernameStrings = ns.<String>getList("username");
-        final var type = ns.<MessageRequestResponseType>get("type");
+        final var typeObj = ns.get("type");
+        final var type = typeObj instanceof MessageRequestResponseType t
+                ? t
+                : MessageRequestResponseType.valueOf(((String) typeObj).toUpperCase());
 
         final var recipientIdentifiers = CommandUtil.getRecipientIdentifiers(m,
                 false,

From 04cf54263eaf9a70ec4070f3ea1cbb40aa486994 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 23 May 2024 12:46:15 +0200
Subject: [PATCH 458/672] Fix getUserStatus command with only username
 parameter

Related #1535
---
 .../java/org/asamk/signal/commands/GetUserStatusCommand.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 1691fac8..09adabd4 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -22,6 +22,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;
 
 public class GetUserStatusCommand implements JsonRpcLocalCommand {
@@ -47,7 +48,8 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
         // Get a map of registration statuses
         Map<String, UserStatus> registered;
         try {
-            registered = m.getUserStatus(new HashSet<>(ns.getList("recipient")));
+            final var recipient = ns.<String>getList("recipient");
+            registered = m.getUserStatus(recipient == null ? Set.of() : new HashSet<>(recipient));
         } catch (RateLimitException e) {
             final var message = CommandUtil.getRateLimitMessage(e);
             throw new RateLimitErrorException(message, e);

From 9781c56571b063e90a50d66e2fcb5c7b3e11f08d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 24 May 2024 16:09:07 +0200
Subject: [PATCH 459/672] Improve username update error message

Fixes #1535
---
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 42bce3c6..c21a150e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -101,6 +101,8 @@ import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameMalformedException;
+import org.whispersystems.signalservice.api.push.exceptions.UsernameTakenException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.api.util.InvalidNumberException;
 import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
@@ -396,6 +398,10 @@ public class ManagerImpl implements Manager {
             } else {
                 context.getAccountHelper().reserveUsernameFromNickname(username);
             }
+        } catch (UsernameMalformedException e) {
+            throw new InvalidUsernameException("Username is malformed", e);
+        } catch (UsernameTakenException e) {
+            throw new InvalidUsernameException("Username is already registered", e);
         } catch (BaseUsernameException e) {
             throw new InvalidUsernameException(e.getMessage() + " (" + e.getClass().getSimpleName() + ")", e);
         }

From 777cfbb69f7279add5aabe174fda4695b5f37bd1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 2 Jun 2024 13:25:09 +0200
Subject: [PATCH 460/672] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradlew                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23a..a4413138 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a42..b740cf13 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

From 6d764db11418d6e3ea090a7c0dafb5ab3cfd6962 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 2 Jun 2024 13:26:17 +0200
Subject: [PATCH 461/672] Update dependencies

---
 settings.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7078f528..3210a55d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78.1")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.0")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.1")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
             version("slf4j", "2.0.13")
@@ -16,7 +16,7 @@ dependencyResolutionManagement {
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_102")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.45.3.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
             library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.2")

From a2b002ac5ea60fff33d8445c1a83ab1ee1b62747 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 6 Jun 2024 09:12:40 +0200
Subject: [PATCH 462/672] Add java 22 to CI

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1c6bb3c0..df7a6c79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21' ]
+        java: [ '21', '22' ]
 
     steps:
       - uses: actions/checkout@v4

From 10b9c264fde52bee3d7b61578683e6e547d7cfc7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 6 Jun 2024 09:37:01 +0200
Subject: [PATCH 463/672] Update libsignal-service

Fixes #1530
---
 graalvm-config-dir/reflect-config.json                |  3 +++
 .../org/asamk/signal/manager/helper/GroupHelper.java  | 11 +++++------
 .../signal/manager/internal/SignalDependencies.java   |  8 +++-----
 settings.gradle.kts                                   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index dec3312e..e17f4f64 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -203,6 +203,9 @@
   "name":"java.lang.Class",
   "methods":[{"name":"getPermittedSubclasses","parameterTypes":[] }, {"name":"getRecordComponents","parameterTypes":[] }, {"name":"isRecord","parameterTypes":[] }, {"name":"isSealed","parameterTypes":[] }]
 },
+{
+  "name":"java.lang.ClassValue"
+},
 {
   "name":"java.lang.Comparable",
   "allDeclaredMethods":true
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 8f7b2869..c0ca3871 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -38,7 +38,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupHistoryEntry;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
@@ -482,11 +482,10 @@ public class GroupHelper {
         final var newProfileKeys = new HashMap<RecipientId, ProfileKey>();
         while (true) {
             final var page = context.getGroupV2Helper().getDecryptedGroupHistoryPage(groupSecretParams, fromRevision);
-            page.getResults()
+            page.getChangeLogs()
                     .stream()
-                    .map(DecryptedGroupHistoryEntry::getChange)
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
+                    .map(DecryptedGroupChangeLog::getChange)
+                    .filter(Objects::nonNull)
                     .map(context.getGroupV2Helper()::getAuthoritativeProfileKeyFromChange)
                     .filter(Objects::nonNull)
                     .forEach(p -> {
@@ -495,7 +494,7 @@ public class GroupHelper {
                         final var recipientId = account.getRecipientResolver().resolveRecipient(serviceId);
                         newProfileKeys.put(recipientId, profileKey);
                     });
-            if (!page.getPagingData().hasMorePages()) {
+            if (!page.getPagingData().getHasMorePages()) {
                 break;
             }
             fromRevision = page.getPagingData().getNextPageRevision();
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index b495466b..a143fceb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -23,7 +23,6 @@ import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
-import org.whispersystems.signalservice.internal.websocket.LibSignalNetwork;
 import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
@@ -51,7 +50,7 @@ public class SignalDependencies {
     private ClientZkOperations clientZkOperations;
 
     private PushServiceSocket pushServiceSocket;
-    private LibSignalNetwork libSignalNetwork;
+    private Network libSignalNetwork;
     private SignalWebSocket signalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
@@ -108,10 +107,9 @@ public class SignalDependencies {
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
-    public LibSignalNetwork getLibSignalNetwork() {
+    public Network getLibSignalNetwork() {
         return getOrCreate(() -> libSignalNetwork,
-                () -> libSignalNetwork = new LibSignalNetwork(new Network(serviceEnvironmentConfig.netEnvironment(),
-                        userAgent), serviceEnvironmentConfig.signalServiceConfiguration()));
+                () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment(), userAgent));
     }
 
     public SignalServiceAccountManager getAccountManager() {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3210a55d..dd0e6244 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_102")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_103")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")

From 17596795c2e4cd9c1da790ca52bdd73810729c1c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 6 Jun 2024 09:37:53 +0200
Subject: [PATCH 464/672] Only store profile keys for group history if none is
 known yet

---
 .../java/org/asamk/signal/manager/helper/GroupHelper.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index c0ca3871..0c15ceff 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -500,7 +500,10 @@ public class GroupHelper {
             fromRevision = page.getPagingData().getNextPageRevision();
         }
 
-        newProfileKeys.forEach(account.getProfileStore()::storeProfileKey);
+        newProfileKeys.entrySet()
+                .stream()
+                .filter(entry -> account.getProfileStore().getProfileKey(entry.getKey()) == null)
+                .forEach(entry -> account.getProfileStore().storeProfileKey(entry.getKey(), entry.getValue()));
     }
 
     private GroupInfo getGroupForUpdating(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {

From 5a97b9e134dfa4acfc9c5d27a1b3c80fbbe6c4a3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 6 Jun 2024 10:03:27 +0200
Subject: [PATCH 465/672] Update groups when using listGroups command

Fixes #1517
---
 .../signal/manager/helper/GroupHelper.java    | 68 ++++++++++++-------
 .../signal/manager/helper/SendHelper.java     |  2 +-
 .../signal/manager/internal/ManagerImpl.java  |  2 +-
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 0c15ceff..7cc9fef8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -79,6 +79,12 @@ public class GroupHelper {
         return getGroup(groupId, false);
     }
 
+    public List<GroupInfo> getGroups() {
+        final var groups = account.getGroupStore().getGroups();
+        groups.forEach(group -> fillOrUpdateGroup(group, false));
+        return groups;
+    }
+
     public boolean isGroupBlocked(final GroupId groupId) {
         var group = getGroup(groupId);
         return group != null && group.isBlocked();
@@ -382,34 +388,46 @@ public class GroupHelper {
 
     private GroupInfo getGroup(GroupId groupId, boolean forceUpdate) {
         final var group = account.getGroupStore().getGroup(groupId);
-        if (group instanceof GroupInfoV2 groupInfoV2) {
-            if (forceUpdate || (!groupInfoV2.isPermissionDenied() && groupInfoV2.getGroup() == null)) {
-                final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
-                DecryptedGroup decryptedGroup;
-                try {
-                    decryptedGroup = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
-                } catch (NotAGroupMemberException e) {
-                    groupInfoV2.setPermissionDenied(true);
-                    decryptedGroup = null;
-                }
-                if (decryptedGroup != null) {
-                    try {
-                        storeProfileKeysFromHistory(groupSecretParams, groupInfoV2, decryptedGroup);
-                    } catch (NotAGroupMemberException ignored) {
-                    }
-                    storeProfileKeysFromMembers(decryptedGroup);
-                    final var avatar = decryptedGroup.avatar;
-                    if (!avatar.isEmpty()) {
-                        downloadGroupAvatar(groupInfoV2.getGroupId(), groupSecretParams, avatar);
-                    }
-                }
-                groupInfoV2.setGroup(decryptedGroup);
-                account.getGroupStore().updateGroup(group);
-            }
-        }
+        fillOrUpdateGroup(group, forceUpdate);
         return group;
     }
 
+    private void fillOrUpdateGroup(final GroupInfo group, final boolean forceUpdate) {
+        if (!(group instanceof GroupInfoV2 groupInfoV2)) {
+            return;
+        }
+
+        if (!forceUpdate && (groupInfoV2.isPermissionDenied() || groupInfoV2.getGroup() != null)) {
+            return;
+        }
+
+        final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+        DecryptedGroup decryptedGroup;
+        try {
+            decryptedGroup = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
+        } catch (NotAGroupMemberException e) {
+            groupInfoV2.setPermissionDenied(true);
+            account.getGroupStore().updateGroup(group);
+            return;
+        }
+
+        if (decryptedGroup == null) {
+            return;
+        }
+
+        try {
+            storeProfileKeysFromHistory(groupSecretParams, groupInfoV2, decryptedGroup);
+        } catch (NotAGroupMemberException ignored) {
+        }
+        storeProfileKeysFromMembers(decryptedGroup);
+        final var avatar = decryptedGroup.avatar;
+        if (!avatar.isEmpty()) {
+            downloadGroupAvatar(groupInfoV2.getGroupId(), groupSecretParams, avatar);
+        }
+        groupInfoV2.setGroup(decryptedGroup);
+        account.getGroupStore().updateGroup(group);
+    }
+
     private void downloadGroupAvatar(GroupIdV2 groupId, GroupSecretParams groupSecretParams, String cdnKey) {
         try {
             context.getAvatarStore()
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index a066c851..0ff7fd89 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -261,7 +261,7 @@ public class SendHelper {
         }
 
         final var groupId = messageSendLogEntry.groupId().get();
-        final var group = account.getGroupStore().getGroup(groupId);
+        final var group = context.getGroupHelper().getGroup(groupId);
 
         if (group == null) {
             logger.debug("Could not find a matching group for the groupId {}! Skipping message send.",
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index c21a150e..13785a94 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -511,7 +511,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public List<Group> getGroups() {
-        return account.getGroupStore().getGroups().stream().map(this::toGroup).toList();
+        return context.getGroupHelper().getGroups().stream().map(this::toGroup).toList();
     }
 
     private Group toGroup(final GroupInfo groupInfo) {

From fd402b52c8f3f2fd40006911191267d05971da3e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 6 Jun 2024 10:16:40 +0200
Subject: [PATCH 466/672] Update doc

---
 man/signal-cli.1.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 7335eba6..2b0f3dac 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -270,7 +270,7 @@ Uses a list of phone numbers or usernames to determine the statuses of those use
 Shows if they are registered on the Signal Servers or not.
 In json mode this is outputted as a list of objects.
 
-[NUMBER [NUMBER ...]]::
+[RECIPIENT [RECIPIENT ...]]::
 One or more numbers to check.
 
 [--username [USERNAME ...]]::

From 67012b40b1e17bbd2cb990b9dfed7e781902b770 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 6 Jun 2024 10:16:53 +0200
Subject: [PATCH 467/672] Update user agent

---
 src/main/java/org/asamk/signal/BaseConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 060a2664..e234ed2f 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.5.0");
+            .orElse("Signal-Android/7.9.0");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 8b355918e83c016bd11868974bcc9bdc17ae88b9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 6 Jun 2024 10:39:26 +0200
Subject: [PATCH 468/672] Use jvm running gradle if it's compatible with
 targetCompatibility

---
 build.gradle.kts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index eae31b12..0cc6d6de 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,8 +12,10 @@ java {
     sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_21
 
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+    if (!JavaVersion.current().isCompatibleWith(targetCompatibility)) {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(targetCompatibility.majorVersion))
+        }
     }
 }
 

From c716f946495e2236d03c3a7621e882c4f8eddacb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 6 Jun 2024 10:47:42 +0200
Subject: [PATCH 469/672] Bump version to 0.13.4

---
 CHANGELOG.md                          | 18 +++++++++++++++++-
 build.gradle.kts                      |  2 +-
 data/org.asamk.SignalCli.metainfo.xml |  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f9fad47..ce7a38c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,32 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.4] - 2024-06-06
+
+**Attention**: Now requires libsignal-client version 0.47.0
+
+### Improved
+
+- Improve username update error message
+- Update groups when using listGroups command
+
+### Fixed
+
+- Update libsignal to fix graalvm native startup
+- Fix issue with saving username link
+- Fix sendMessageRequestResponse type parameter parsing in JSON RPC mode
+- Fix getUserStatus command with only username parameter
 
 ## [0.13.3] - 2024-04-19
 
 **Attention**: Now requires libsignal-client version 0.44.0
 
 ### Added
+
 - Support for reading contact nickname and notes
 - Add `--internal` and `--detailed` parameters to `listContacts` command
 
 ### Fixed
+
 - Fix issue with sending messages when a new session is created
 
 ## [0.13.2] - 2024-03-23
diff --git a/build.gradle.kts b/build.gradle.kts
index 0cc6d6de..ec5da78e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
-version = "0.13.4-SNAPSHOT"
+version = "0.13.4"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index d5b9a976..de1a00bd 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="0.13.4" date="2024-06-06">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>
+    </release>
     <release version="0.13.3" date="2024-04-19">
       <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>
     </release>

From baf7b74a610250c280793252c8e41a6259bda593 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 470/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce7a38c3..987af127 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.4] - 2024-06-06
 
 **Attention**: Now requires libsignal-client version 0.47.0
diff --git a/build.gradle.kts b/build.gradle.kts
index ec5da78e..fc1dd1b0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
-version = "0.13.4"
+version = "0.13.5-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 5ff66728e32237a23fdffda4515031d24dad7cf0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 26 Jun 2024 15:35:54 +0200
Subject: [PATCH 471/672] Update libsignal-service

---
 graalvm-config-dir/reflect-config.json                |  2 +-
 .../asamk/signal/manager/config/ServiceConfig.java    | 11 ++++++++++-
 .../org/asamk/signal/manager/helper/PinHelper.java    |  2 +-
 .../asamk/signal/manager/internal/ManagerImpl.java    | 11 +++++++++--
 .../signal/manager/internal/SignalDependencies.java   |  3 +--
 .../asamk/signal/manager/util/AttachmentUtils.java    |  4 +++-
 settings.gradle.kts                                   |  2 +-
 7 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index e17f4f64..64efa057 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2142,7 +2142,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }]
+  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getDeleteSync","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest",
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index ea47b8a6..e827e3f5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -30,7 +30,16 @@ public class ServiceConfig {
         final var giftBadges = !isPrimaryDevice;
         final var pni = !isPrimaryDevice;
         final var paymentActivation = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(true, true, true, true, true, giftBadges, pni, paymentActivation);
+        final var deleteSync = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(true,
+                true,
+                true,
+                true,
+                true,
+                giftBadges,
+                pni,
+                paymentActivation,
+                deleteSync);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 0bcfe09e..cb9b9057 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -105,7 +105,7 @@ public class PinHelper {
     public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
             SecureValueRecovery secureValueRecovery, AuthCredentials authCredentials, String pin
     ) throws IOException, IncorrectPinException {
-        final var restoreResponse = secureValueRecovery.restoreDataPreRegistration(authCredentials, pin);
+        final var restoreResponse = secureValueRecovery.restoreDataPreRegistration(authCredentials, null, pin);
 
         switch (restoreResponse) {
             case SecureValueRecovery.RestoreResponse.Success s -> {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 13785a94..426429da 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -92,6 +92,7 @@ import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalSessionLock;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServicePreview;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
@@ -738,17 +739,23 @@ public class ManagerImpl implements Manager {
     private void applyMessage(
             final SignalServiceDataMessage.Builder messageBuilder, final Message message
     ) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException {
+        final var additionalAttachments = new ArrayList<SignalServiceAttachment>();
         if (message.messageText().length() > 2000) {
             final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8);
             final var textAttachment = AttachmentUtils.createAttachmentStream(new StreamDetails(new ByteArrayInputStream(
                     messageBytes), MimeUtils.LONG_TEXT, messageBytes.length), Optional.empty());
             messageBuilder.withBody(message.messageText().substring(0, 2000));
-            messageBuilder.withAttachment(context.getAttachmentHelper().uploadAttachment(textAttachment));
+            additionalAttachments.add(context.getAttachmentHelper().uploadAttachment(textAttachment));
         } else {
             messageBuilder.withBody(message.messageText());
         }
         if (!message.attachments().isEmpty()) {
-            messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+            if (!additionalAttachments.isEmpty()) {
+                additionalAttachments.addAll(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+                messageBuilder.withAttachments(additionalAttachments);
+            } else {
+                messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+            }
         }
         if (!message.mentions().isEmpty()) {
             messageBuilder.withMentions(resolveMentions(message.mentions()));
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index a143fceb..feb61d1c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -197,8 +197,7 @@ public class SignalDependencies {
                         Optional.empty(),
                         executor,
                         ServiceConfig.MAX_ENVELOPE_SIZE,
-                        pushServiceSocket,
-                        false));
+                        pushServiceSocket));
     }
 
     public List<SecureValueRecovery> getSecureValueRecoveryV2() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index 5126b691..d06d8745 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 public class AttachmentUtils {
 
@@ -58,6 +59,7 @@ public class AttachmentUtils {
                 blurHash,
                 null,
                 null,
-                resumableUploadSpec);
+                resumableUploadSpec,
+                UUID.randomUUID());
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index dd0e6244..d185c417 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_103")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_104")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")

From e51b1ee23a725ce8cfc25f0a277ab6065a532081 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 25 Jul 2024 16:24:41 +0200
Subject: [PATCH 472/672] Update libsignal-service

---
 graalvm-config-dir/jni-config.json            |   6 +
 .../manager/api/ProofRequiredException.java   |   1 -
 .../signal/manager/config/ServiceConfig.java  |  13 +-
 .../signal/manager/helper/GroupHelper.java    | 131 +++++++++++++-----
 .../signal/manager/helper/GroupV2Helper.java  |  80 ++++++-----
 .../signal/manager/helper/ProfileHelper.java  |  15 +-
 .../signal/manager/helper/SendHelper.java     |  34 +++--
 .../helper/UnidentifiedAccessHelper.java      |  54 +++-----
 settings.gradle.kts                           |   2 +-
 .../java/org/asamk/signal/BaseConfig.java     |   2 +-
 10 files changed, 201 insertions(+), 137 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 4050838c..381dca9e 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -1,7 +1,13 @@
 [
+{
+  "name":"[B"
+},
 {
   "name":"[Z"
 },
+{
+  "name":"[[B"
+},
 {
   "name":"com.sun.security.auth.module.UnixSystem",
   "fields":[{"name":"gid"}, {"name":"groups"}, {"name":"uid"}, {"name":"username"}]
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java b/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
index 277406cb..21b4034d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/ProofRequiredException.java
@@ -36,7 +36,6 @@ public class ProofRequiredException extends Exception {
 
         static Option from(org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException.Option option) {
             return switch (option) {
-                case RECAPTCHA -> CAPTCHA;
                 case CAPTCHA -> CAPTCHA;
                 case PUSH_CHALLENGE -> PUSH_CHALLENGE;
             };
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index e827e3f5..62aedaf6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -27,19 +27,8 @@ public class ServiceConfig {
     public static final long UNREGISTERED_LIFESPAN = TimeUnit.DAYS.toMillis(30);
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
-        final var giftBadges = !isPrimaryDevice;
-        final var pni = !isPrimaryDevice;
-        final var paymentActivation = !isPrimaryDevice;
         final var deleteSync = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(true,
-                true,
-                true,
-                true,
-                true,
-                giftBadges,
-                pni,
-                paymentActivation,
-                deleteSync);
+        return new AccountAttributes.Capabilities(true, deleteSync);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 7cc9fef8..62291a3a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -33,13 +33,16 @@ import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.signal.storageservice.protos.groups.GroupChange;
+import org.signal.storageservice.protos.groups.GroupChangeResponse;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupChangeLog;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupResponse;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;
+import org.whispersystems.signalservice.api.groupsv2.ReceivedGroupSendEndorsements;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
@@ -133,9 +136,10 @@ public class GroupHelper {
             }
             if (group == null) {
                 try {
-                    group = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
+                    final var response = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
 
-                    if (group != null) {
+                    if (response != null) {
+                        group = handleDecryptedGroupResponse(groupInfoV2, response);
                         storeProfileKeysFromHistory(groupSecretParams, groupInfoV2, group);
                     }
                 } catch (NotAGroupMemberException ignored) {
@@ -156,6 +160,35 @@ public class GroupHelper {
         return groupInfoV2;
     }
 
+    private DecryptedGroup handleDecryptedGroupResponse(
+            GroupInfoV2 groupInfoV2, final DecryptedGroupResponse decryptedGroupResponse
+    ) {
+        final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
+        ReceivedGroupSendEndorsements groupSendEndorsements = dependencies.getGroupsV2Operations()
+                .forGroup(groupSecretParams)
+                .receiveGroupSendEndorsements(account.getAci(),
+                        decryptedGroupResponse.getGroup(),
+                        decryptedGroupResponse.getGroupSendEndorsementsResponse());
+
+        // TODO save group endorsements
+
+        return decryptedGroupResponse.getGroup();
+    }
+
+    private GroupChange handleGroupChangeResponse(
+            final GroupInfoV2 groupInfoV2, final GroupChangeResponse groupChangeResponse
+    ) {
+        ReceivedGroupSendEndorsements groupSendEndorsements = dependencies.getGroupsV2Operations()
+                .forGroup(GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey()))
+                .receiveGroupSendEndorsements(account.getAci(),
+                        groupInfoV2.getGroup(),
+                        groupChangeResponse.groupSendEndorsementsResponse);
+
+        // TODO save group endorsements
+
+        return groupChangeResponse.groupChange;
+    }
+
     public Pair<GroupId, SendGroupMessageResults> createGroup(
             String name, Set<RecipientId> members, String avatarFile
     ) throws IOException, AttachmentInvalidException {
@@ -181,7 +214,7 @@ public class GroupHelper {
         final var gv2 = gv2Pair.first();
         final var decryptedGroup = gv2Pair.second();
 
-        gv2.setGroup(decryptedGroup);
+        gv2.setGroup(handleDecryptedGroupResponse(gv2, decryptedGroup));
         gv2.setProfileSharingEnabled(true);
         if (avatarBytes != null) {
             context.getAvatarStore()
@@ -277,7 +310,7 @@ public class GroupHelper {
         var group = getGroupForUpdating(groupId);
 
         if (group instanceof GroupInfoV2 groupInfoV2) {
-            Pair<DecryptedGroup, GroupChange> groupChangePair;
+            Pair<DecryptedGroup, GroupChangeResponse> groupChangePair;
             try {
                 groupChangePair = context.getGroupV2Helper().updateSelfProfileKey(groupInfoV2);
             } catch (ConflictException e) {
@@ -286,7 +319,9 @@ public class GroupHelper {
                 groupChangePair = context.getGroupV2Helper().updateSelfProfileKey(groupInfoV2);
             }
             if (groupChangePair != null) {
-                sendUpdateGroupV2Message(groupInfoV2, groupChangePair.first(), groupChangePair.second());
+                sendUpdateGroupV2Message(groupInfoV2,
+                        groupChangePair.first(),
+                        handleGroupChangeResponse(groupInfoV2, groupChangePair.second()));
             }
         }
     }
@@ -304,11 +339,12 @@ public class GroupHelper {
         if (groupJoinInfo.pendingAdminApproval) {
             throw new PendingAdminApprovalException("You have already requested to join the group.");
         }
-        final var groupChange = context.getGroupV2Helper()
+        final var changeResponse = context.getGroupV2Helper()
                 .joinGroup(inviteLinkUrl.getGroupMasterKey(), inviteLinkUrl.getPassword(), groupJoinInfo);
         final var group = getOrMigrateGroup(inviteLinkUrl.getGroupMasterKey(),
                 groupJoinInfo.revision + 1,
-                groupChange.encode());
+                changeResponse.groupChange == null ? null : changeResponse.groupChange.encode());
+        final var groupChange = handleGroupChangeResponse(group, changeResponse);
 
         if (group.getGroup() == null) {
             // Only requested member, can't send update to group members
@@ -404,17 +440,17 @@ public class GroupHelper {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         DecryptedGroup decryptedGroup;
         try {
-            decryptedGroup = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
+            final var response = context.getGroupV2Helper().getDecryptedGroup(groupSecretParams);
+            if (response == null) {
+                return;
+            }
+            decryptedGroup = handleDecryptedGroupResponse(groupInfoV2, response);
         } catch (NotAGroupMemberException e) {
             groupInfoV2.setPermissionDenied(true);
             account.getGroupStore().updateGroup(group);
             return;
         }
 
-        if (decryptedGroup == null) {
-            return;
-        }
-
         try {
             storeProfileKeysFromHistory(groupSecretParams, groupInfoV2, decryptedGroup);
         } catch (NotAGroupMemberException ignored) {
@@ -496,10 +532,12 @@ public class GroupHelper {
     ) throws NotAGroupMemberException {
         final var revisionWeWereAdded = context.getGroupV2Helper().findRevisionWeWereAdded(newDecryptedGroup);
         final var localRevision = localGroup.getGroup() == null ? 0 : localGroup.getGroup().revision;
+        final var sendEndorsementsExpirationMs = 0L;// TODO store expiration localGroup.getGroup() == null ? 0 : localGroup.getGroup().revision;
         var fromRevision = Math.max(revisionWeWereAdded, localRevision);
         final var newProfileKeys = new HashMap<RecipientId, ProfileKey>();
         while (true) {
-            final var page = context.getGroupV2Helper().getDecryptedGroupHistoryPage(groupSecretParams, fromRevision);
+            final var page = context.getGroupV2Helper()
+                    .getDecryptedGroupHistoryPage(groupSecretParams, fromRevision, sendEndorsementsExpirationMs);
             page.getChangeLogs()
                     .stream()
                     .map(DecryptedGroupChangeLog::getChange)
@@ -606,7 +644,9 @@ public class GroupHelper {
         final var groupV2Helper = context.getGroupV2Helper();
         if (group.isPendingMember(account.getSelfRecipientId())) {
             var groupGroupChangePair = groupV2Helper.acceptInvite(group);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (members != null) {
@@ -614,14 +654,18 @@ public class GroupHelper {
             requestingMembers.retainAll(group.getRequestingMembers());
             if (!requestingMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.approveJoinRequestMembers(group, requestingMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
             final var newMembers = new HashSet<>(members);
             newMembers.removeAll(group.getMembers());
             newMembers.removeAll(group.getRequestingMembers());
             if (!newMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.addMembers(group, newMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
         }
 
@@ -637,20 +681,26 @@ public class GroupHelper {
             existingRemoveMembers.remove(account.getSelfRecipientId());// self can be removed with sendQuitGroupMessage
             if (!existingRemoveMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.removeMembers(group, existingRemoveMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
 
             var pendingRemoveMembers = new HashSet<>(removeMembers);
             pendingRemoveMembers.retainAll(group.getPendingMembers());
             if (!pendingRemoveMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.revokeInvitedMembers(group, pendingRemoveMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
             var requestingRemoveMembers = new HashSet<>(removeMembers);
             requestingRemoveMembers.retainAll(group.getRequestingMembers());
             if (!requestingRemoveMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.refuseJoinRequestMembers(group, requestingRemoveMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
         }
 
@@ -663,7 +713,7 @@ public class GroupHelper {
                     var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, true);
                     result = sendUpdateGroupV2Message(group,
                             groupGroupChangePair.first(),
-                            groupGroupChangePair.second());
+                            handleGroupChangeResponse(group, groupGroupChangePair.second()));
                 }
             }
         }
@@ -676,7 +726,7 @@ public class GroupHelper {
                     var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, false);
                     result = sendUpdateGroupV2Message(group,
                             groupGroupChangePair.first(),
-                            groupGroupChangePair.second());
+                            handleGroupChangeResponse(group, groupGroupChangePair.second()));
                 }
             }
         }
@@ -686,7 +736,9 @@ public class GroupHelper {
             newlyBannedMembers.removeAll(group.getBannedMembers());
             if (!newlyBannedMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.banMembers(group, newlyBannedMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
         }
 
@@ -695,38 +747,52 @@ public class GroupHelper {
             existingUnbanMembers.retainAll(group.getBannedMembers());
             if (!existingUnbanMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.unbanMembers(group, existingUnbanMembers);
-                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+                result = sendUpdateGroupV2Message(group,
+                        groupGroupChangePair.first(),
+                        handleGroupChangeResponse(group, groupGroupChangePair.second()));
             }
         }
 
         if (resetGroupLink) {
             var groupGroupChangePair = groupV2Helper.resetGroupLinkPassword(group);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (groupLinkState != null) {
             var groupGroupChangePair = groupV2Helper.setGroupLinkState(group, groupLinkState);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (addMemberPermission != null) {
             var groupGroupChangePair = groupV2Helper.setAddMemberPermission(group, addMemberPermission);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (editDetailsPermission != null) {
             var groupGroupChangePair = groupV2Helper.setEditDetailsPermission(group, editDetailsPermission);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (expirationTimer != null) {
             var groupGroupChangePair = groupV2Helper.setMessageExpirationTimer(group, expirationTimer);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (isAnnouncementGroup != null) {
             var groupGroupChangePair = groupV2Helper.setIsAnnouncementGroup(group, isAnnouncementGroup);
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         if (name != null || description != null || avatarFile != null) {
@@ -735,7 +801,9 @@ public class GroupHelper {
                 context.getAvatarStore()
                         .storeGroupAvatar(group.getGroupId(), outputStream -> outputStream.write(avatarFile));
             }
-            result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            result = sendUpdateGroupV2Message(group,
+                    groupGroupChangePair.first(),
+                    handleGroupChangeResponse(group, groupGroupChangePair.second()));
         }
 
         return result;
@@ -771,7 +839,8 @@ public class GroupHelper {
         groupInfoV2.setGroup(groupGroupChangePair.first());
         account.getGroupStore().updateGroup(groupInfoV2);
 
-        var messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2, groupGroupChangePair.second().encode());
+        var messageBuilder = getGroupUpdateMessageBuilder(groupInfoV2,
+                handleGroupChangeResponse(groupInfoV2, groupGroupChangePair.second()).encode());
         return sendGroupMessage(messageBuilder,
                 groupInfoV2.getMembersIncludingPendingWithout(account.getSelfRecipientId()),
                 groupInfoV2.getDistributionId());
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 83f49926..6c6acd65 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -19,6 +19,7 @@ import org.signal.libsignal.zkgroup.groups.UuidCiphertext;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.GroupChange;
+import org.signal.storageservice.protos.groups.GroupChangeResponse;
 import org.signal.storageservice.protos.groups.Member;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
@@ -27,6 +28,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedMember;
 import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupResponse;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 import org.whispersystems.signalservice.api.groupsv2.GroupCandidate;
 import org.whispersystems.signalservice.api.groupsv2.GroupHistoryPage;
@@ -75,7 +77,7 @@ class GroupV2Helper {
         groupApiCredentials = null;
     }
 
-    DecryptedGroup getDecryptedGroup(final GroupSecretParams groupSecretParams) throws NotAGroupMemberException {
+    DecryptedGroupResponse getDecryptedGroup(final GroupSecretParams groupSecretParams) throws NotAGroupMemberException {
         try {
             final var groupsV2AuthorizationString = getGroupAuthForToday(groupSecretParams);
             return dependencies.getGroupsV2Api().getGroup(groupSecretParams, groupsV2AuthorizationString);
@@ -85,7 +87,7 @@ class GroupV2Helper {
             }
             logger.warn("Failed to retrieve Group V2 info, ignoring: {}", e.getMessage());
             return null;
-        } catch (IOException | VerificationFailedException | InvalidGroupStateException e) {
+        } catch (IOException | VerificationFailedException | InvalidGroupStateException | InvalidInputException e) {
             logger.warn("Failed to retrieve Group V2 info, ignoring: {}", e.getMessage());
             return null;
         }
@@ -103,19 +105,23 @@ class GroupV2Helper {
     }
 
     GroupHistoryPage getDecryptedGroupHistoryPage(
-            final GroupSecretParams groupSecretParams, int fromRevision
+            final GroupSecretParams groupSecretParams, int fromRevision, long sendEndorsementsExpirationMs
     ) throws NotAGroupMemberException {
         try {
             final var groupsV2AuthorizationString = getGroupAuthForToday(groupSecretParams);
             return dependencies.getGroupsV2Api()
-                    .getGroupHistoryPage(groupSecretParams, fromRevision, groupsV2AuthorizationString, false);
+                    .getGroupHistoryPage(groupSecretParams,
+                            fromRevision,
+                            groupsV2AuthorizationString,
+                            false,
+                            sendEndorsementsExpirationMs);
         } catch (NonSuccessfulResponseCodeException e) {
             if (e.getCode() == 403) {
                 throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);
             }
             logger.warn("Failed to retrieve Group V2 history, ignoring: {}", e.getMessage());
             return null;
-        } catch (IOException | VerificationFailedException | InvalidGroupStateException e) {
+        } catch (IOException | VerificationFailedException | InvalidGroupStateException | InvalidInputException e) {
             logger.warn("Failed to retrieve Group V2 history, ignoring: {}", e.getMessage());
             return null;
         }
@@ -132,7 +138,7 @@ class GroupV2Helper {
         return partialDecryptedGroup.revision;
     }
 
-    Pair<GroupInfoV2, DecryptedGroup> createGroup(
+    Pair<GroupInfoV2, DecryptedGroupResponse> createGroup(
             String name, Set<RecipientId> members, byte[] avatarFile
     ) {
         final var newGroup = buildNewGroup(name, members, avatarFile);
@@ -143,16 +149,16 @@ class GroupV2Helper {
         final var groupSecretParams = newGroup.getGroupSecretParams();
 
         final GroupsV2AuthorizationString groupAuthForToday;
-        final DecryptedGroup decryptedGroup;
+        final DecryptedGroupResponse response;
         try {
             groupAuthForToday = getGroupAuthForToday(groupSecretParams);
             dependencies.getGroupsV2Api().putNewGroup(newGroup, groupAuthForToday);
-            decryptedGroup = dependencies.getGroupsV2Api().getGroup(groupSecretParams, groupAuthForToday);
-        } catch (IOException | VerificationFailedException | InvalidGroupStateException e) {
+            response = dependencies.getGroupsV2Api().getGroup(groupSecretParams, groupAuthForToday);
+        } catch (IOException | VerificationFailedException | InvalidGroupStateException | InvalidInputException e) {
             logger.warn("Failed to create V2 group: {}", e.getMessage());
             return null;
         }
-        if (decryptedGroup == null) {
+        if (response == null) {
             logger.warn("Failed to create V2 group, unknown error!");
             return null;
         }
@@ -161,7 +167,7 @@ class GroupV2Helper {
         final var masterKey = groupSecretParams.getMasterKey();
         var g = new GroupInfoV2(groupId, masterKey, context.getAccount().getRecipientResolver());
 
-        return new Pair<>(g, decryptedGroup);
+        return new Pair<>(g, response);
     }
 
     private GroupsV2Operations.NewGroup buildNewGroup(
@@ -195,7 +201,7 @@ class GroupV2Helper {
                         0);
     }
 
-    Pair<DecryptedGroup, GroupChange> updateGroup(
+    Pair<DecryptedGroup, GroupChangeResponse> updateGroup(
             GroupInfoV2 groupInfoV2, String name, String description, byte[] avatarFile
     ) throws IOException {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
@@ -218,7 +224,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> addMembers(
+    Pair<DecryptedGroup, GroupChangeResponse> addMembers(
             GroupInfoV2 groupInfoV2, Set<RecipientId> newMembers
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -244,7 +250,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> leaveGroup(
+    Pair<DecryptedGroup, GroupChangeResponse> leaveGroup(
             GroupInfoV2 groupInfoV2, Set<RecipientId> membersToMakeAdmin
     ) throws IOException {
         var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
@@ -264,7 +270,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, groupOperations.createLeaveAndPromoteMembersToAdmin(selfAci, adminUuids));
     }
 
-    Pair<DecryptedGroup, GroupChange> removeMembers(
+    Pair<DecryptedGroup, GroupChangeResponse> removeMembers(
             GroupInfoV2 groupInfoV2, Set<RecipientId> members
     ) throws IOException {
         final var memberUuids = members.stream()
@@ -276,7 +282,7 @@ class GroupV2Helper {
         return ejectMembers(groupInfoV2, memberUuids);
     }
 
-    Pair<DecryptedGroup, GroupChange> approveJoinRequestMembers(
+    Pair<DecryptedGroup, GroupChangeResponse> approveJoinRequestMembers(
             GroupInfoV2 groupInfoV2, Set<RecipientId> members
     ) throws IOException {
         final var memberUuids = members.stream()
@@ -287,7 +293,7 @@ class GroupV2Helper {
         return approveJoinRequest(groupInfoV2, memberUuids);
     }
 
-    Pair<DecryptedGroup, GroupChange> refuseJoinRequestMembers(
+    Pair<DecryptedGroup, GroupChangeResponse> refuseJoinRequestMembers(
             GroupInfoV2 groupInfoV2, Set<RecipientId> members
     ) throws IOException {
         final var memberUuids = members.stream()
@@ -297,7 +303,7 @@ class GroupV2Helper {
         return refuseJoinRequest(groupInfoV2, memberUuids);
     }
 
-    Pair<DecryptedGroup, GroupChange> revokeInvitedMembers(
+    Pair<DecryptedGroup, GroupChangeResponse> revokeInvitedMembers(
             GroupInfoV2 groupInfoV2, Set<RecipientId> members
     ) throws IOException {
         var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
@@ -311,7 +317,7 @@ class GroupV2Helper {
         return revokeInvites(groupInfoV2, memberUuids);
     }
 
-    Pair<DecryptedGroup, GroupChange> banMembers(
+    Pair<DecryptedGroup, GroupChangeResponse> banMembers(
             GroupInfoV2 groupInfoV2, Set<RecipientId> block
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -329,7 +335,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> unbanMembers(
+    Pair<DecryptedGroup, GroupChangeResponse> unbanMembers(
             GroupInfoV2 groupInfoV2, Set<RecipientId> block
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -345,14 +351,14 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> resetGroupLinkPassword(GroupInfoV2 groupInfoV2) throws IOException {
+    Pair<DecryptedGroup, GroupChangeResponse> resetGroupLinkPassword(GroupInfoV2 groupInfoV2) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var newGroupLinkPassword = GroupLinkPassword.createNew().serialize();
         final var change = groupOperations.createModifyGroupLinkPasswordChange(newGroupLinkPassword);
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setGroupLinkState(
+    Pair<DecryptedGroup, GroupChangeResponse> setGroupLinkState(
             GroupInfoV2 groupInfoV2, GroupLinkState state
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -367,7 +373,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setEditDetailsPermission(
+    Pair<DecryptedGroup, GroupChangeResponse> setEditDetailsPermission(
             GroupInfoV2 groupInfoV2, GroupPermission permission
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -377,7 +383,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setAddMemberPermission(
+    Pair<DecryptedGroup, GroupChangeResponse> setAddMemberPermission(
             GroupInfoV2 groupInfoV2, GroupPermission permission
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -387,7 +393,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> updateSelfProfileKey(GroupInfoV2 groupInfoV2) throws IOException {
+    Pair<DecryptedGroup, GroupChangeResponse> updateSelfProfileKey(GroupInfoV2 groupInfoV2) throws IOException {
         Optional<DecryptedMember> selfInGroup = groupInfoV2.getGroup() == null
                 ? Optional.empty()
                 : DecryptedGroupUtil.findMemberByAci(groupInfoV2.getGroup().members, getSelfAci());
@@ -417,7 +423,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    GroupChange joinGroup(
+    GroupChangeResponse joinGroup(
             GroupMasterKey groupMasterKey,
             GroupLinkPassword groupLinkPassword,
             DecryptedGroupJoinInfo decryptedGroupJoinInfo
@@ -444,7 +450,7 @@ class GroupV2Helper {
         return commitChange(groupSecretParams, decryptedGroupJoinInfo.revision, change, groupLinkPassword);
     }
 
-    Pair<DecryptedGroup, GroupChange> acceptInvite(GroupInfoV2 groupInfoV2) throws IOException {
+    Pair<DecryptedGroup, GroupChangeResponse> acceptInvite(GroupInfoV2 groupInfoV2) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
         final var selfRecipientId = context.getAccount().getSelfRecipientId();
@@ -461,7 +467,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setMemberAdmin(
+    Pair<DecryptedGroup, GroupChangeResponse> setMemberAdmin(
             GroupInfoV2 groupInfoV2, RecipientId recipientId, boolean admin
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -475,7 +481,7 @@ class GroupV2Helper {
         }
     }
 
-    Pair<DecryptedGroup, GroupChange> setMessageExpirationTimer(
+    Pair<DecryptedGroup, GroupChangeResponse> setMessageExpirationTimer(
             GroupInfoV2 groupInfoV2, int messageExpirationTimer
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -483,7 +489,7 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChange> setIsAnnouncementGroup(
+    Pair<DecryptedGroup, GroupChangeResponse> setIsAnnouncementGroup(
             GroupInfoV2 groupInfoV2, boolean isAnnouncementGroup
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -511,7 +517,7 @@ class GroupV2Helper {
         return dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
     }
 
-    private Pair<DecryptedGroup, GroupChange> revokeInvites(
+    private Pair<DecryptedGroup, GroupChangeResponse> revokeInvites(
             GroupInfoV2 groupInfoV2, Set<DecryptedPendingMember> pendingMembers
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
@@ -525,28 +531,28 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, groupOperations.createRemoveInvitationChange(uuidCipherTexts));
     }
 
-    private Pair<DecryptedGroup, GroupChange> approveJoinRequest(
+    private Pair<DecryptedGroup, GroupChangeResponse> approveJoinRequest(
             GroupInfoV2 groupInfoV2, Set<UUID> uuids
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2, groupOperations.createApproveGroupJoinRequest(uuids));
     }
 
-    private Pair<DecryptedGroup, GroupChange> refuseJoinRequest(
+    private Pair<DecryptedGroup, GroupChangeResponse> refuseJoinRequest(
             GroupInfoV2 groupInfoV2, Set<ServiceId> serviceIds
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2, groupOperations.createRefuseGroupJoinRequest(serviceIds, false, List.of()));
     }
 
-    private Pair<DecryptedGroup, GroupChange> ejectMembers(
+    private Pair<DecryptedGroup, GroupChangeResponse> ejectMembers(
             GroupInfoV2 groupInfoV2, Set<ACI> members
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(members, false, List.of()));
     }
 
-    private Pair<DecryptedGroup, GroupChange> commitChange(
+    private Pair<DecryptedGroup, GroupChangeResponse> commitChange(
             GroupInfoV2 groupInfoV2, GroupChange.Actions.Builder change
     ) throws IOException {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
@@ -567,10 +573,12 @@ class GroupV2Helper {
         var signedGroupChange = dependencies.getGroupsV2Api()
                 .patchGroup(changeActions, getGroupAuthForToday(groupSecretParams), Optional.empty());
 
+        groupInfoV2.setGroup(decryptedGroupState);
+
         return new Pair<>(decryptedGroupState, signedGroupChange);
     }
 
-    private GroupChange commitChange(
+    private GroupChangeResponse commitChange(
             GroupSecretParams groupSecretParams,
             int currentRevision,
             GroupChange.Actions.Builder change,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 4a2b79bd..03d277f9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -16,13 +16,14 @@ import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.PaymentUtils;
 import org.asamk.signal.manager.util.ProfileUtils;
 import org.asamk.signal.manager.util.Utils;
+import org.jetbrains.annotations.Nullable;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.profiles.AvatarUploadParams;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
@@ -387,7 +388,7 @@ public final class ProfileHelper {
     private Single<ProfileAndCredential> retrieveProfile(
             SignalServiceAddress address,
             Optional<ProfileKey> profileKey,
-            Optional<UnidentifiedAccess> unidentifiedAccess,
+            @Nullable SealedSenderAccess unidentifiedAccess,
             SignalServiceProfile.RequestType requestType
     ) {
         final var profileService = dependencies.getProfileService();
@@ -450,13 +451,7 @@ public final class ProfileHelper {
         }
     }
 
-    private Optional<UnidentifiedAccess> getUnidentifiedAccess(RecipientId recipientId) {
-        var unidentifiedAccess = context.getUnidentifiedAccessHelper().getAccessFor(recipientId, true);
-
-        if (unidentifiedAccess.isPresent()) {
-            return unidentifiedAccess.get().getTargetUnidentifiedAccess();
-        }
-
-        return Optional.empty();
+    private @Nullable SealedSenderAccess getUnidentifiedAccess(RecipientId recipientId) {
+        return context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(recipientId, true);
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 0ff7fd89..2ac0fc9c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -13,6 +13,7 @@ import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogEntry;
+import org.jetbrains.annotations.Nullable;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.InvalidRegistrationIdException;
 import org.signal.libsignal.protocol.NoSessionException;
@@ -22,9 +23,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.whispersystems.signalservice.api.groupsv2.GroupSendEndorsements;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEditMessage;
@@ -199,7 +201,7 @@ public class SendHelper {
             return SendMessageResult.success(account.getSelfAddress(), List.of(), false, false, 0, Optional.empty());
         }
         try {
-            return messageSender.sendSyncMessage(message, context.getUnidentifiedAccessHelper().getAccessForSync());
+            return messageSender.sendSyncMessage(message);
         } catch (UnregisteredUserException e) {
             var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
             return SendMessageResult.unregisteredFailure(address);
@@ -380,10 +382,11 @@ public class SendHelper {
                                 () -> false,
                                 urgent,
                                 editTargetTimestamp.get());
-        final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendGroupDataMessage(
+        final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, groupSendEndorsements, isRecipientUpdate) -> messageSender.sendGroupDataMessage(
                 distId,
                 recipients,
                 unidentifiedAccess,
+                groupSendEndorsements,
                 isRecipientUpdate,
                 contentHint,
                 message,
@@ -436,9 +439,11 @@ public class SendHelper {
                         unidentifiedAccess,
                         message,
                         () -> false),
-                (distId, recipients, unidentifiedAccess, isRecipientUpdate) -> messageSender.sendGroupTyping(distId,
+                (distId, recipients, unidentifiedAccess, groupSendEndorsements, isRecipientUpdate) -> messageSender.sendGroupTyping(
+                        distId,
                         recipients,
                         unidentifiedAccess,
+                        groupSendEndorsements,
                         message),
                 recipientIds,
                 distributionId);
@@ -526,8 +531,8 @@ public class SendHelper {
         final var senderKeyTargets = new HashSet<RecipientId>();
         final var recipientList = new ArrayList<>(recipientIds);
         for (final var recipientId : recipientList) {
-            final var access = context.getUnidentifiedAccessHelper().getAccessFor(recipientId);
-            if (access.isEmpty() || access.get().getTargetUnidentifiedAccess().isEmpty()) {
+            final var access = context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(recipientId);
+            if (access != null) {
                 continue;
             }
 
@@ -562,7 +567,8 @@ public class SendHelper {
         final var addresses = recipientIdList.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
                 .toList();
-        final var unidentifiedAccesses = context.getUnidentifiedAccessHelper().getAccessFor(recipientIdList);
+        final var unidentifiedAccesses = context.getUnidentifiedAccessHelper()
+                .getSealedSenderAccessFor(recipientIdList);
         try {
             final var results = sender.send(addresses, unidentifiedAccesses, isRecipientUpdate);
 
@@ -601,15 +607,14 @@ public class SendHelper {
         List<UnidentifiedAccess> unidentifiedAccesses = context.getUnidentifiedAccessHelper()
                 .getAccessFor(recipientIdList)
                 .stream()
-                .map(Optional::get)
-                .map(UnidentifiedAccessPair::getTargetUnidentifiedAccess)
-                .map(Optional::get)
                 .toList();
 
+        final GroupSendEndorsements groupSendEndorsements = null;//TODO
         try {
             List<SendMessageResult> results = sender.send(distributionId,
                     addresses,
                     unidentifiedAccesses,
+                    groupSendEndorsements,
                     isRecipientUpdate);
 
             final var successCount = results.stream().filter(SendMessageResult::isSuccess).count();
@@ -684,7 +689,7 @@ public class SendHelper {
             try {
                 return s.send(messageSender,
                         address,
-                        context.getUnidentifiedAccessHelper().getAccessFor(recipientId),
+                        context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(recipientId),
                         includePniSignature);
             } catch (UnregisteredUserException e) {
                 final RecipientId newRecipientId;
@@ -696,7 +701,7 @@ public class SendHelper {
                 address = context.getRecipientHelper().resolveSignalServiceAddress(newRecipientId);
                 return s.send(messageSender,
                         address,
-                        context.getUnidentifiedAccessHelper().getAccessFor(newRecipientId),
+                        context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(newRecipientId),
                         includePniSignature);
             }
         } catch (UnregisteredUserException e) {
@@ -772,7 +777,7 @@ public class SendHelper {
         SendMessageResult send(
                 SignalServiceMessageSender messageSender,
                 SignalServiceAddress address,
-                Optional<UnidentifiedAccessPair> unidentifiedAccess,
+                @Nullable SealedSenderAccess unidentifiedAccess,
                 boolean includePniSignature
         ) throws IOException, UnregisteredUserException, ProofRequiredException, RateLimitException, org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
     }
@@ -783,6 +788,7 @@ public class SendHelper {
                 DistributionId distributionId,
                 List<SignalServiceAddress> recipients,
                 List<UnidentifiedAccess> unidentifiedAccess,
+                GroupSendEndorsements groupSendEndorsements,
                 boolean isRecipientUpdate
         ) throws IOException, UntrustedIdentityException, NoSessionException, InvalidKeyException, InvalidRegistrationIdException;
     }
@@ -791,7 +797,7 @@ public class SendHelper {
 
         List<SendMessageResult> send(
                 List<SignalServiceAddress> recipients,
-                List<Optional<UnidentifiedAccessPair>> unidentifiedAccess,
+                List<SealedSenderAccess> unidentifiedAccess,
                 boolean isRecipientUpdate
         ) throws IOException, UntrustedIdentityException;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index dacc97ba..3899179c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -5,17 +5,17 @@ import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.jetbrains.annotations.Nullable;
 import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
 import org.signal.libsignal.metadata.certificate.SenderCertificate;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 public class UnidentifiedAccessHelper {
@@ -42,57 +42,49 @@ public class UnidentifiedAccessHelper {
         senderCertificate = null;
     }
 
-    public List<Optional<UnidentifiedAccessPair>> getAccessFor(List<RecipientId> recipients) {
+    public List<SealedSenderAccess> getSealedSenderAccessFor(List<RecipientId> recipients) {
+        return recipients.stream().map(this::getAccessFor).map(SealedSenderAccess::forIndividual).toList();
+    }
+
+    public @Nullable SealedSenderAccess getSealedSenderAccessFor(RecipientId recipient) {
+        return getSealedSenderAccessFor(recipient, false);
+    }
+
+    public @Nullable SealedSenderAccess getSealedSenderAccessFor(RecipientId recipient, boolean noRefresh) {
+        return SealedSenderAccess.forIndividual(getAccessFor(recipient, noRefresh));
+    }
+
+    public List<UnidentifiedAccess> getAccessFor(List<RecipientId> recipients) {
         return recipients.stream().map(this::getAccessFor).toList();
     }
 
-    public Optional<UnidentifiedAccessPair> getAccessFor(RecipientId recipient) {
+    private @Nullable UnidentifiedAccess getAccessFor(RecipientId recipient) {
         return getAccessFor(recipient, false);
     }
 
-    public Optional<UnidentifiedAccessPair> getAccessFor(RecipientId recipientId, boolean noRefresh) {
+    private @Nullable UnidentifiedAccess getAccessFor(RecipientId recipientId, boolean noRefresh) {
         var recipientUnidentifiedAccessKey = getTargetUnidentifiedAccessKey(recipientId, noRefresh);
         if (recipientUnidentifiedAccessKey == null) {
             logger.trace("Unidentified access not available for {}", recipientId);
-            return Optional.empty();
+            return null;
         }
 
         var selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey(noRefresh);
         if (selfUnidentifiedAccessKey == null) {
             logger.trace("Unidentified access not available for self");
-            return Optional.empty();
+            return null;
         }
 
         var senderCertificate = getSenderCertificateFor(recipientId);
         if (senderCertificate == null) {
             logger.trace("Unidentified access not available due to missing sender certificate");
-            return Optional.empty();
+            return null;
         }
 
         try {
-            return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(recipientUnidentifiedAccessKey,
-                    senderCertificate,
-                    false), new UnidentifiedAccess(selfUnidentifiedAccessKey, senderCertificate, false)));
+            return new UnidentifiedAccess(recipientUnidentifiedAccessKey, senderCertificate, false);
         } catch (InvalidCertificateException e) {
-            return Optional.empty();
-        }
-    }
-
-    public Optional<UnidentifiedAccessPair> getAccessForSync() {
-        var selfUnidentifiedAccessKey = getSelfUnidentifiedAccessKey(false);
-        var selfUnidentifiedAccessCertificate = getSenderCertificate();
-
-        if (selfUnidentifiedAccessKey == null || selfUnidentifiedAccessCertificate == null) {
-            return Optional.empty();
-        }
-
-        try {
-            return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(selfUnidentifiedAccessKey,
-                    selfUnidentifiedAccessCertificate,
-                    false),
-                    new UnidentifiedAccess(selfUnidentifiedAccessKey, selfUnidentifiedAccessCertificate, false)));
-        } catch (InvalidCertificateException e) {
-            return Optional.empty();
+            return null;
         }
     }
 
@@ -121,7 +113,7 @@ public class UnidentifiedAccessHelper {
             privacySenderCertificate = new SenderCertificate(certificate);
             return certificate;
         } catch (IOException | InvalidCertificateException e) {
-            logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage());
+            logger.warn("Failed to get sender certificate (pnp), ignoring: {}", e.getMessage());
             return null;
         }
     }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d185c417..99018552 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_104")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_105")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index e234ed2f..43db0531 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.9.0");
+            .orElse("Signal-Android/7.12.1");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 2db3d3259e1274a6f5ee769186cf53cfdcfe0111 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 25 Jul 2024 22:17:46 +0200
Subject: [PATCH 473/672] Use UploadSpec for attachment uploads

---
 graalvm-config-dir/reflect-config.json        |  7 +++
 .../manager/helper/AttachmentHelper.java      | 17 +++++-
 .../signal/manager/helper/GroupHelper.java    |  3 +-
 .../signal/manager/helper/SyncHelper.java     | 14 ++++-
 .../signal/manager/internal/ManagerImpl.java  | 15 ++++-
 .../signal/manager/util/AttachmentUtils.java  | 57 ++++++-------------
 6 files changed, 67 insertions(+), 46 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 64efa057..50ed1e48 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2381,6 +2381,13 @@
   "name":"org.whispersystems.signalservice.internal.keybackup.protos.RestoreResponse",
   "fields":[{"name":"bitField0_"}, {"name":"data_"}, {"name":"status_"}, {"name":"token_"}, {"name":"tries_"}]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.AttachmentUploadForm",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["int","java.lang.String","java.util.Map","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","java.util.Map","java.lang.String","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.AttachmentV2UploadAttributes",
   "allDeclaredFields":true,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 75f0fd4a..951b7c5c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -44,7 +44,7 @@ public class AttachmentHelper {
     }
 
     public List<SignalServiceAttachment> uploadAttachments(final List<String> attachments) throws AttachmentInvalidException, IOException {
-        var attachmentStreams = AttachmentUtils.createAttachmentStreams(attachments);
+        var attachmentStreams = createAttachmentStreams(attachments);
 
         // Upload attachments here, so we only upload once even for multiple recipients
         var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
@@ -54,8 +54,21 @@ public class AttachmentHelper {
         return attachmentPointers;
     }
 
+    private List<SignalServiceAttachmentStream> createAttachmentStreams(List<String> attachments) throws AttachmentInvalidException, IOException {
+        if (attachments == null) {
+            return null;
+        }
+        final var signalServiceAttachments = new ArrayList<SignalServiceAttachmentStream>(attachments.size());
+        for (var attachment : attachments) {
+            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+            signalServiceAttachments.add(AttachmentUtils.createAttachmentStream(attachment, uploadSpec));
+        }
+        return signalServiceAttachments;
+    }
+
     public SignalServiceAttachmentPointer uploadAttachment(String attachment) throws IOException, AttachmentInvalidException {
-        var attachmentStream = AttachmentUtils.createAttachmentStream(attachment);
+        final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+        var attachmentStream = AttachmentUtils.createAttachmentStream(attachment, uploadSpec);
         return uploadAttachment(attachmentStream);
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 62291a3a..a1f04775 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -109,7 +109,8 @@ public class GroupHelper {
             return Optional.empty();
         }
 
-        return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty()));
+        final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+        return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty(), uploadSpec));
     }
 
     public GroupInfoV2 getOrMigrateGroup(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 0d516eb6..db8ee935 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -36,6 +36,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOper
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.internal.push.SyncMessage;
+import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -115,10 +116,15 @@ public class SyncHelper {
 
             if (groupsFile.exists() && groupsFile.length() > 0) {
                 try (var groupsFileStream = new FileInputStream(groupsFile)) {
+                    final var uploadSpec = context.getDependencies()
+                            .getMessageSender()
+                            .getResumableUploadSpec()
+                            .toProto();
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(groupsFileStream)
                             .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(groupsFile.length())
+                            .withResumableUploadSpec(ResumableUploadSpec.from(uploadSpec))
                             .build();
 
                     context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
@@ -158,10 +164,15 @@ public class SyncHelper {
 
             if (contactsFile.exists() && contactsFile.length() > 0) {
                 try (var contactsFileStream = new FileInputStream(contactsFile)) {
+                    final var uploadSpec = context.getDependencies()
+                            .getMessageSender()
+                            .getResumableUploadSpec()
+                            .toProto();
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(contactsFileStream)
                             .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(contactsFile.length())
+                            .withResumableUploadSpec(ResumableUploadSpec.from(uploadSpec))
                             .build();
 
                     context.getSendHelper()
@@ -400,7 +411,8 @@ public class SyncHelper {
             return Optional.empty();
         }
 
-        return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty()));
+        final var uploadSpec = context.getDependencies().getMessageSender().getResumableUploadSpec().toProto();
+        return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty(), uploadSpec));
     }
 
     private void downloadContactAvatar(SignalServiceAttachment avatar, RecipientAddress address) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 426429da..480fa751 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -742,8 +742,13 @@ public class ManagerImpl implements Manager {
         final var additionalAttachments = new ArrayList<SignalServiceAttachment>();
         if (message.messageText().length() > 2000) {
             final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8);
-            final var textAttachment = AttachmentUtils.createAttachmentStream(new StreamDetails(new ByteArrayInputStream(
-                    messageBytes), MimeUtils.LONG_TEXT, messageBytes.length), Optional.empty());
+            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+            final var streamDetails = new StreamDetails(new ByteArrayInputStream(messageBytes),
+                    MimeUtils.LONG_TEXT,
+                    messageBytes.length);
+            final var textAttachment = AttachmentUtils.createAttachmentStream(streamDetails,
+                    Optional.empty(),
+                    uploadSpec);
             messageBuilder.withBody(message.messageText().substring(0, 2000));
             additionalAttachments.add(context.getAttachmentHelper().uploadAttachment(textAttachment));
         } else {
@@ -800,11 +805,15 @@ public class ManagerImpl implements Manager {
             if (streamDetails == null) {
                 throw new InvalidStickerException("Missing local sticker file");
             }
+            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+            final var stickerAttachment = AttachmentUtils.createAttachmentStream(streamDetails,
+                    Optional.empty(),
+                    uploadSpec);
             messageBuilder.withSticker(new SignalServiceDataMessage.Sticker(packId.serialize(),
                     stickerPack.packKey(),
                     stickerId,
                     manifestSticker.emoji(),
-                    AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty())));
+                    stickerAttachment));
         }
         if (!message.previews().isEmpty()) {
             final var previews = new ArrayList<SignalServicePreview>(message.previews().size());
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index d06d8745..5504640f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -1,65 +1,44 @@
 package org.asamk.signal.manager.util;
 
 import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.signal.protos.resumableuploads.ResumableUpload;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
+import org.whispersystems.signalservice.api.push.exceptions.ResumeLocationInvalidException;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
 public class AttachmentUtils {
 
-    public static List<SignalServiceAttachmentStream> createAttachmentStreams(List<String> attachments) throws AttachmentInvalidException {
-        if (attachments == null) {
-            return null;
-        }
-        final var signalServiceAttachments = new ArrayList<SignalServiceAttachmentStream>(attachments.size());
-        for (var attachment : attachments) {
-            signalServiceAttachments.add(createAttachmentStream(attachment));
-        }
-        return signalServiceAttachments;
-    }
-
-    public static SignalServiceAttachmentStream createAttachmentStream(String attachment) throws AttachmentInvalidException {
+    public static SignalServiceAttachmentStream createAttachmentStream(
+            String attachment, ResumableUpload resumableUpload
+    ) throws AttachmentInvalidException {
         try {
             final var streamDetails = Utils.createStreamDetails(attachment);
 
-            return createAttachmentStream(streamDetails.first(), streamDetails.second());
+            return createAttachmentStream(streamDetails.first(), streamDetails.second(), resumableUpload);
         } catch (IOException e) {
             throw new AttachmentInvalidException(attachment, e);
         }
     }
 
     public static SignalServiceAttachmentStream createAttachmentStream(
-            StreamDetails streamDetails, Optional<String> name
-    ) {
+            StreamDetails streamDetails, Optional<String> name, ResumableUpload resumableUpload
+    ) throws ResumeLocationInvalidException {
         // TODO maybe add a parameter to set the voiceNote, borderless, preview, width, height and caption option
         final var uploadTimestamp = System.currentTimeMillis();
-        Optional<byte[]> preview = Optional.empty();
-        Optional<String> caption = Optional.empty();
-        Optional<String> blurHash = Optional.empty();
-        final Optional<ResumableUploadSpec> resumableUploadSpec = Optional.empty();
-        return new SignalServiceAttachmentStream(streamDetails.getStream(),
-                streamDetails.getContentType(),
-                streamDetails.getLength(),
-                name,
-                false,
-                false,
-                false,
-                false,
-                preview,
-                0,
-                0,
-                uploadTimestamp,
-                caption,
-                blurHash,
-                null,
-                null,
-                resumableUploadSpec,
-                UUID.randomUUID());
+        final var resumableUploadSpec = ResumableUploadSpec.from(resumableUpload);
+        return SignalServiceAttachmentStream.newStreamBuilder()
+                .withStream(streamDetails.getStream())
+                .withContentType(streamDetails.getContentType())
+                .withLength(streamDetails.getLength())
+                .withFileName(name.orElse(null))
+                .withUploadTimestamp(uploadTimestamp)
+                .withResumableUploadSpec(resumableUploadSpec)
+                .withUuid(UUID.randomUUID())
+                .build();
     }
 }

From e961488b1af4e5eb861d7938394c1cca1441671f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 25 Jul 2024 22:40:46 +0200
Subject: [PATCH 474/672] Update man page

---
 man/signal-cli.1.adoc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 2b0f3dac..a019b815 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -23,6 +23,11 @@ For registering you need a phone number where you can receive SMS or incoming ca
 signal-cli was primarily developed to be used on servers to notify admins of important events.
 For this use-case, it has a dbus and a JSON-RPC interface, that can be used to send messages from other programs.
 
+Originally the Signal protocol only allowed sending messages to other phone numbers.
+Now with the introduction of phone number privacy, the phone number of a recipient is not always known.
+Only the recipient's ServiceId, ACI/PNI (a special UUID) is known.
+This special identifier can be used instead of the phone number in signal-cli's interface.
+
 For some functionality the Signal protocol requires that all messages have been received from the server.
 The `receive` command should be regularly executed.
 In daemon mode messages are by default continuously received.
@@ -312,11 +317,13 @@ e.g.: `--sticker 00abac3bc18d7f599bff2325dc306d43:2`
 
 *--mention*::
 Mention another group member (syntax: start:length:recipientNumber) In the apps the mention replaces part of the message text, which is specified by the start and length values.
-The units of start and length should be UTF-16 code units, NOT Unicode code points. For more information, see https://github.com/AsamK/signal-cli/wiki/FAQ#string-indexing-units
+The units of start and length should be UTF-16 code units, NOT Unicode code points.
+For more information, see https://github.com/AsamK/signal-cli/wiki/FAQ#string-indexing-units
 e.g.: `-m "Hi X!" --mention "3:1:+123456789"`
 
 *--text-style*::
-Style parts of the message text (syntax: start:length:STYLE). Like `--mention`, the units are UTF-16 code units.
+Style parts of the message text (syntax: start:length:STYLE).
+Like `--mention`, the units are UTF-16 code units.
 Where STYLE is one of: BOLD, ITALIC, SPOILER, STRIKETHROUGH, MONOSPACE
 
 e.g.: `-m "Something BIG!" --text-style "10:3:BOLD"` or for a mixed text style `-m "Something BIG!" --text-style "0:9:ITALIC" "10:3:BOLD"`
@@ -591,7 +598,8 @@ Specify if only blocked or unblocked contacts should be shown (default: all cont
 Find contacts with the given contact or profile name.
 
 *--detailed*::
-List the contacts with more details. If output=json, then this is always set
+List the contacts with more details.
+If output=json, then this is always set
 
 *--internal*::
 Include internal information that's normally not user visible

From 3d11221732478d271ee3a0cfd4b5498d1a30b8e9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 25 Jul 2024 22:43:55 +0200
Subject: [PATCH 475/672] Update jackson

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 99018552..8c41b37d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78.1")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.1")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.2")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
             version("slf4j", "2.0.13")

From fe3934171d6dc659f7b0a6dadba06b642b3e65d9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 25 Jul 2024 22:47:16 +0200
Subject: [PATCH 476/672] Bump version to 0.13.5

---
 CHANGELOG.md                          | 8 +++++++-
 build.gradle.kts                      | 2 +-
 data/org.asamk.SignalCli.metainfo.xml | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 987af127..81153ceb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.5] - 2024-07-25
+
+Requires libsignal-client version 0.52.2
+
+### Fixed
+
+- Fixed device linking, due to new feature flag
 
 ## [0.13.4] - 2024-06-06
 
diff --git a/build.gradle.kts b/build.gradle.kts
index fc1dd1b0..d8ac80b7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
-version = "0.13.5-SNAPSHOT"
+version = "0.13.5"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index de1a00bd..42ae0509 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,8 +45,11 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="0.13.5" date="2024-07-25">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.5</url>
+    </release>
     <release version="0.13.4" date="2024-06-06">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.4</url>
     </release>
     <release version="0.13.3" date="2024-04-19">
       <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>

From 62da5148509f91e18b3d81e4a2944e1ab5c58e10 Mon Sep 17 00:00:00 2001
From: Ingmar Lippert <admin@ingli.de>
Date: Tue, 20 Aug 2024 16:59:52 +0200
Subject: [PATCH 477/672] Add more specificity to addDevice (#1561)

---
 man/signal-cli.1.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index a019b815..a892a296 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -254,7 +254,7 @@ Only works, if this is the primary device.
 
 *--uri* URI::
 Specify the uri contained in the QR code shown by the new device.
-You will need the full URI such as "sgnl://linkdevice?uuid=..." (formerly "tsdevice:/?uuid=...") Make sure to enclose it in quotation marks for shells.
+You will need the full URI such as "sgnl://linkdevice?uuid=...&pub_key=..." (formerly "tsdevice:/?uuid=...") Make sure to enclose it in quotation marks for shells.
 
 === listDevices
 

From 6ea373fbd5b739f392b2601187523805ad406251 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 478/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81153ceb..6b07eb2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.5] - 2024-07-25
 
 Requires libsignal-client version 0.52.2
diff --git a/build.gradle.kts b/build.gradle.kts
index d8ac80b7..983e128b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
-version = "0.13.5"
+version = "0.13.6-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From a69a9b7b0e3cf31446a977bedabda3ebfebefdf7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 27 Jul 2024 11:35:24 +0200
Subject: [PATCH 479/672] Add method to update group endorsements

---
 .../java/org/asamk/signal/manager/helper/GroupHelper.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index a1f04775..268e6186 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -82,6 +82,10 @@ public class GroupHelper {
         return getGroup(groupId, false);
     }
 
+    public void updateGroupSendEndorsements(GroupId groupId) {
+        getGroup(groupId, true);
+    }
+
     public List<GroupInfo> getGroups() {
         final var groups = account.getGroupStore().getGroups();
         groups.forEach(group -> fillOrUpdateGroup(group, false));

From 6bdc9a4b16be0f0dd3a458b3380ed7171b432b2c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 20 Aug 2024 17:09:36 +0200
Subject: [PATCH 480/672] Update gradle

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43453 -> 43583 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   5 ++++-
 gradlew.bat                              |   2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644
GIT binary patch
delta 12612
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
HJ<R_D`<Plw

delta 12460
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
L!=&c?m;C<#d67$>

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a4413138..9355b415 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index b740cf13..f5feea6d 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e4..9b42019c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

From 130cee9906c3f00120dee04959d5e4bc11dcf988 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 20 Aug 2024 17:13:57 +0200
Subject: [PATCH 481/672] Fix sending to groups with non sender key capable
 members

Regression in 0.13.5

Fixes #1568
---
 .../main/java/org/asamk/signal/manager/helper/SendHelper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 2ac0fc9c..d80de2f8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -532,7 +532,7 @@ public class SendHelper {
         final var recipientList = new ArrayList<>(recipientIds);
         for (final var recipientId : recipientList) {
             final var access = context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(recipientId);
-            if (access != null) {
+            if (access == null) {
                 continue;
             }
 

From cb129db95e20e2af9e5d7a6f4eca251074add951 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 20 Aug 2024 17:39:39 +0200
Subject: [PATCH 482/672] Update libsignal-service

---
 CHANGELOG.md                                  |  6 +++
 graalvm-config-dir/reflect-config.json        |  7 +--
 .../signal/manager/helper/SendHelper.java     | 46 +++++++------------
 settings.gradle.kts                           |  2 +-
 .../java/org/asamk/signal/BaseConfig.java     |  2 +-
 5 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b07eb2e..7b534de6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+Requires libsignal-client version 0.52.5
+
+### Fixed
+
+- Fix issue with sending to some groups
+
 ## [0.13.5] - 2024-07-25
 
 Requires libsignal-client version 0.52.2
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 50ed1e48..0a65c68b 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -248,7 +248,8 @@
   "allDeclaredMethods":true
 },
 {
-  "name":"java.lang.Object"
+  "name":"java.lang.Object",
+  "methods":[{"name":"equals","parameterTypes":["java.lang.Object"] }, {"name":"hashCode","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]
 },
 {
   "name":"java.lang.Record",
@@ -2236,7 +2237,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }]
+  "methods":[{"name":"<init>","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }, {"name":"equals","parameterTypes":["java.lang.Object"] }, {"name":"hashCode","parameterTypes":[] }, {"name":"logString","parameterTypes":[] }, {"name":"toByteArray","parameterTypes":[] }, {"name":"toByteString","parameterTypes":[] }, {"name":"toProtocolAddress","parameterTypes":["int"] }, {"name":"toString","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.push.ServiceId$ACI"
@@ -2246,7 +2247,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"fromLibSignal","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }, {"name":"parseOrNull","parameterTypes":["java.lang.String"] }, {"name":"parseOrNull","parameterTypes":["okio.ByteString"] }, {"name":"parseOrNull","parameterTypes":["byte[]"] }, {"name":"parseOrThrow","parameterTypes":["java.lang.String"] }, {"name":"parseOrThrow","parameterTypes":["okio.ByteString"] }, {"name":"parseOrThrow","parameterTypes":["byte[]"] }]
+  "methods":[{"name":"equals","parameterTypes":["java.lang.Object"] }, {"name":"fromLibSignal","parameterTypes":["org.signal.libsignal.protocol.ServiceId"] }, {"name":"hashCode","parameterTypes":[] }, {"name":"parseOrNull","parameterTypes":["java.lang.String"] }, {"name":"parseOrNull","parameterTypes":["java.lang.String","boolean"] }, {"name":"parseOrNull","parameterTypes":["okio.ByteString"] }, {"name":"parseOrNull","parameterTypes":["byte[]"] }, {"name":"parseOrThrow","parameterTypes":["java.lang.String"] }, {"name":"parseOrThrow","parameterTypes":["okio.ByteString"] }, {"name":"parseOrThrow","parameterTypes":["byte[]"] }, {"name":"toString","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.push.ServiceId$PNI"
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index d80de2f8..84b9f0e6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -202,24 +202,15 @@ public class SendHelper {
         }
         try {
             return messageSender.sendSyncMessage(message);
-        } catch (UnregisteredUserException e) {
+        } catch (Throwable e) {
             var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            return SendMessageResult.unregisteredFailure(address);
-        } catch (ProofRequiredException e) {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            return SendMessageResult.proofRequiredFailure(address, e);
-        } catch (RateLimitException e) {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            logger.warn("Sending failed due to rate limiting from the signal server: {}", e.getMessage());
-            return SendMessageResult.rateLimitFailure(address, e);
-        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            return SendMessageResult.identityFailure(address, e.getIdentityKey());
-        } catch (IOException e) {
-            var address = context.getRecipientHelper().resolveSignalServiceAddress(account.getSelfRecipientId());
-            logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
-            logger.debug("Exception", e);
-            return SendMessageResult.networkFailure(address);
+            try {
+                return SignalServiceMessageSender.mapSendErrorToSendResult(e, System.currentTimeMillis(), address);
+            } catch (IOException ex) {
+                logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
+                logger.debug("Exception", e);
+                return SendMessageResult.networkFailure(address);
+            }
         }
     }
 
@@ -704,19 +695,14 @@ public class SendHelper {
                         context.getUnidentifiedAccessHelper().getSealedSenderAccessFor(newRecipientId),
                         includePniSignature);
             }
-        } catch (UnregisteredUserException e) {
-            return SendMessageResult.unregisteredFailure(address);
-        } catch (ProofRequiredException e) {
-            return SendMessageResult.proofRequiredFailure(address, e);
-        } catch (RateLimitException e) {
-            logger.warn("Sending failed due to rate limiting from the signal server: {}", e.getMessage());
-            return SendMessageResult.rateLimitFailure(address, e);
-        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
-            return SendMessageResult.identityFailure(address, e.getIdentityKey());
-        } catch (IOException e) {
-            logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
-            logger.debug("Exception", e);
-            return SendMessageResult.networkFailure(address);
+        } catch (Throwable e) {
+            try {
+                return SignalServiceMessageSender.mapSendErrorToSendResult(e, System.currentTimeMillis(), address);
+            } catch (IOException ex) {
+                logger.warn("Failed to send message due to IO exception: {}", e.getMessage());
+                logger.debug("Exception", e);
+                return SendMessageResult.networkFailure(address);
+            }
         }
     }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 8c41b37d..e03e3059 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_105")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_106")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 43db0531..6fd1b21e 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.12.1");
+            .orElse("Signal-Android/7.14.1");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From bda395191b016b75119d14950aeb26a1b820568c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 08:29:54 +0200
Subject: [PATCH 483/672] Don't set previousE164s param if cdsi token is empty

Fixes #1576
---
 .../java/org/asamk/signal/manager/helper/RecipientHelper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index bdd192a6..e003450b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -231,7 +231,7 @@ public class RecipientHelper {
         final CdsiV2Service.Response response;
         try {
             response = dependencies.getAccountManager()
-                    .getRegisteredUsersWithCdsi(previousNumbers,
+                    .getRegisteredUsersWithCdsi(token.isEmpty() ? Set.of() : previousNumbers,
                             newNumbers,
                             account.getRecipientStore().getServiceIdToProfileKeyMap(),
                             token,

From 485c4fd46764e6be45e2da974b85e8a719d198a3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 08:30:08 +0200
Subject: [PATCH 484/672] Improve daemon deprecation message

---
 src/main/java/org/asamk/signal/commands/DaemonCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index e4a14f4a..59c2245e 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -198,7 +198,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
                 && httpAddress == null
                 && inheritedChannel == null) {
             logger.warn(
-                    "Running daemon command without explicit mode is deprecated. Use --dbus to use the dbus interface.");
+                    "Running daemon command without explicit mode is deprecated. Use 'daemon --dbus' to use the dbus interface.");
             daemonHandler.runDbus(false, DbusConfig.getBusname());
         }
     }

From 7cc0ef1c70f02629659da970528bca4c04986bb8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 08:30:31 +0200
Subject: [PATCH 485/672] Improve error message and log output for failed
 jsonrpc commands

---
 .../signal/jsonrpc/SignalJsonRpcCommandHandler.java  | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 3609163c..96456a4e 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -229,15 +229,17 @@ public class SignalJsonRpcCommandHandler {
                 case RateLimitErrorException e -> throw new JsonRpcException(new JsonRpcResponse.Error(RATELIMIT_ERROR,
                         e.getMessage(),
                         getErrorDataNode(objectMapper, result)));
-                case UnexpectedErrorException e ->
-                        throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
-                                e.getMessage(),
-                                getErrorDataNode(objectMapper, result)));
+                case UnexpectedErrorException e -> {
+                    logger.error("Command execution failed with unexpected error", e);
+                    throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
+                            e.getMessage() + " (" + e.getClass().getSimpleName() + ")",
+                            getErrorDataNode(objectMapper, result)));
+                }
             }
         } catch (Throwable e) {
             logger.error("Command execution failed", e);
             throw new JsonRpcException(new JsonRpcResponse.Error(JsonRpcResponse.Error.INTERNAL_ERROR,
-                    e.getMessage(),
+                    e.getMessage() + " (" + e.getClass().getSimpleName() + ")",
                     getErrorDataNode(objectMapper, result)));
         }
 

From b51f849fe63054d6575408855f63af2e1278c4c1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 08:51:33 +0200
Subject: [PATCH 486/672] Send sync message for read/viewed receipt messages

Fixes #1570
---
 .../signal/manager/helper/SyncHelper.java     | 20 +++++++++++++++++++
 .../signal/manager/internal/ManagerImpl.java  | 11 ++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index db8ee935..9af1f01f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
+import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ConfigurationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
@@ -30,10 +31,13 @@ import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsInp
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroupsOutputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.MessageRequestResponseMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.RequestMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.ViewedMessage;
+import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.internal.push.SyncMessage;
 import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;
@@ -89,6 +93,22 @@ public class SyncHelper {
                 .sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.STORAGE_MANIFEST));
     }
 
+    public void sendSyncReceiptMessage(ServiceId sender, SignalServiceReceiptMessage receiptMessage) {
+        if (receiptMessage.isReadReceipt()) {
+            final var readMessages = receiptMessage.getTimestamps()
+                    .stream()
+                    .map(t -> new ReadMessage(sender, t))
+                    .toList();
+            context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forRead(readMessages));
+        } else if (receiptMessage.isViewedReceipt()) {
+            final var viewedMessages = receiptMessage.getTimestamps()
+                    .stream()
+                    .map(t -> new ViewedMessage(sender, t))
+                    .toList();
+            context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forViewed(viewedMessages));
+        }
+    }
+
     public void sendGroups() throws IOException {
         var groupsFile = IOUtils.createTempFile();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 480fa751..6549b088 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -704,8 +704,15 @@ public class ManagerImpl implements Manager {
             final SignalServiceReceiptMessage receiptMessage
     ) {
         try {
-            final var result = context.getSendHelper()
-                    .sendReceiptMessage(receiptMessage, context.getRecipientHelper().resolveRecipient(sender));
+            final var recipientId = context.getRecipientHelper().resolveRecipient(sender);
+            final var result = context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId);
+
+            final var serviceId = account.getRecipientAddressResolver()
+                    .resolveRecipientAddress(recipientId)
+                    .serviceId();
+            if (serviceId.isPresent()) {
+                context.getSyncHelper().sendSyncReceiptMessage(serviceId.get(), receiptMessage);
+            }
             return new SendMessageResults(timestamp, Map.of(sender, List.of(toSendMessageResult(result))));
         } catch (UnregisteredRecipientException e) {
             return new SendMessageResults(timestamp,

From 19b15e68e4ec652e23f9625662b7c0f96b963029 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 09:00:34 +0200
Subject: [PATCH 487/672] Improve addDevice error message

Fixes #1573
---
 .../main/java/org/asamk/signal/manager/Manager.java  |  3 ++-
 .../manager/api/DeviceLimitExceededException.java    | 12 ++++++++++++
 .../asamk/signal/manager/helper/AccountHelper.java   | 10 ++++++++--
 .../asamk/signal/manager/internal/ManagerImpl.java   |  3 ++-
 .../org/asamk/signal/commands/AddDeviceCommand.java  |  5 ++++-
 .../java/org/asamk/signal/dbus/DbusSignalImpl.java   |  3 ++-
 6 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/DeviceLimitExceededException.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 736f4e08..4b086994 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.CaptchaRejectedException;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.GroupId;
@@ -148,7 +149,7 @@ public interface Manager extends Closeable {
 
     void removeLinkedDevices(int deviceId) throws IOException, NotPrimaryDeviceException;
 
-    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException;
+    void addDeviceLink(DeviceLinkUrl linkUri) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException, DeviceLimitExceededException;
 
     void setRegistrationLockPin(Optional<String> pin) throws IOException, NotPrimaryDeviceException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/DeviceLimitExceededException.java b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLimitExceededException.java
new file mode 100644
index 00000000..e24cc2ac
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLimitExceededException.java
@@ -0,0 +1,12 @@
+package org.asamk.signal.manager.api;
+
+public class DeviceLimitExceededException extends Exception {
+
+    public DeviceLimitExceededException(final String message) {
+        super(message);
+    }
+
+    public DeviceLimitExceededException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 5c74a37f..0ec45cb9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -39,6 +39,7 @@ import org.whispersystems.signalservice.api.push.exceptions.UsernameIsNotReserve
 import org.whispersystems.signalservice.api.push.exceptions.UsernameMalformedException;
 import org.whispersystems.signalservice.api.push.exceptions.UsernameTakenException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.internal.push.DeviceLimitExceededException;
 import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity;
 import org.whispersystems.signalservice.internal.push.OutgoingPushMessage;
 import org.whispersystems.signalservice.internal.push.SyncMessage;
@@ -466,8 +467,13 @@ public class AccountHelper {
         dependencies.getAccountManager().setAccountAttributes(account.getAccountAttributes(null));
     }
 
-    public void addDevice(DeviceLinkUrl deviceLinkInfo) throws IOException, InvalidDeviceLinkException {
-        var verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
+    public void addDevice(DeviceLinkUrl deviceLinkInfo) throws IOException, InvalidDeviceLinkException, org.asamk.signal.manager.api.DeviceLimitExceededException {
+        String verificationCode;
+        try {
+            verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
+        } catch (DeviceLimitExceededException e) {
+            throw new org.asamk.signal.manager.api.DeviceLimitExceededException("Too many linked devices", e);
+        }
 
         try {
             dependencies.getAccountManager()
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 6549b088..39f59ccd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -23,6 +23,7 @@ import org.asamk.signal.manager.api.CaptchaRejectedException;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.Configuration;
 import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.Group;
 import org.asamk.signal.manager.api.GroupId;
@@ -487,7 +488,7 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public void addDeviceLink(DeviceLinkUrl linkUrl) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException {
+    public void addDeviceLink(DeviceLinkUrl linkUrl) throws IOException, InvalidDeviceLinkException, NotPrimaryDeviceException, DeviceLimitExceededException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
         }
diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index 2813f4af..c40e4901 100644
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -7,6 +7,7 @@ import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
@@ -53,8 +54,10 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
             logger.error("Add device link failed: {}", e.getMessage());
             throw new IOErrorException("Add device link failed", e);
         } catch (InvalidDeviceLinkException e) {
-            logger.error("Invalid device link");
+            logger.info("Invalid device link");
             throw new UserErrorException("Invalid device link", e);
+        } catch (DeviceLimitExceededException e) {
+            throw new UserErrorException("Account has too many linked devices already", e);
         } catch (NotPrimaryDeviceException e) {
             throw new UserErrorException("This command doesn't work on linked devices.");
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index fae0c0a5..1b8b7825 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -5,6 +5,7 @@ import org.asamk.signal.BaseConfig;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.CaptchaRejectedException;
+import org.asamk.signal.manager.api.DeviceLimitExceededException;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.GroupInviteLinkUrl;
@@ -189,7 +190,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
         try {
             var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(new URI(uri));
             m.addDeviceLink(deviceLinkUrl);
-        } catch (IOException | InvalidDeviceLinkException e) {
+        } catch (IOException | InvalidDeviceLinkException | DeviceLimitExceededException e) {
             throw new Error.Failure(e.getClass().getSimpleName() + " Add device link failed. " + e.getMessage());
         } catch (NotPrimaryDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");

From 82fbde4f1958983f7ca65d832cdcd0bebeed154f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 09:00:39 +0200
Subject: [PATCH 488/672] Adapt code style

---
 .idea/codeStyles/Project.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index adf3548b..aa627792 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,8 +5,8 @@
       <option name="GENERATE_FINAL_LOCALS" value="true" />
       <option name="GENERATE_FINAL_PARAMETERS" value="true" />
       <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="50" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="com" withSubpackages="true" static="false" />

From ea436ecb646e3d2fdaac0c8ece249edbb66c3e80 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 09:22:52 +0200
Subject: [PATCH 489/672] Fix possible db dead lock

Fixes #1483
---
 .../org/asamk/signal/manager/storage/groups/GroupStore.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index 3dac4876..c4c075bf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -271,7 +271,7 @@ public class GroupStore {
     private GroupInfoV2 getGroupOrPartialMigrate(
             Connection connection, final GroupMasterKey groupMasterKey, final GroupIdV2 groupId
     ) throws SQLException {
-        switch (getGroup(groupId)) {
+        switch (getGroup(connection, (GroupId) groupId)) {
             case GroupInfoV1 groupInfoV1 -> {
                 // Received a v2 group message for a v1 group, we need to locally migrate the group
                 deleteGroup(connection, groupInfoV1.getGroupId());

From d8b1a2fffeeb1b39cb32861bb6636efa5068c719 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 09:24:51 +0200
Subject: [PATCH 490/672] Fix stripping the correct identifiers when merging
 recipients

---
 .../manager/storage/recipients/MergeRecipientHelper.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index 2fa91a59..edc1121e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -34,8 +34,7 @@ public class MergeRecipientHelper {
 
             if (recipient.address().aci().isEmpty() || (
                     address.aci().isEmpty() && (
-                            address.pni().isEmpty()
-                                    || recipient.address().pni().equals(address.pni())
+                            address.pni().isEmpty() || recipient.address().pni().equals(address.pni())
                     )
             ) || recipient.address().aci().equals(address.aci())) {
                 logger.debug("Got existing recipient {}, updating with high trust address", recipient.id());
@@ -104,7 +103,7 @@ public class MergeRecipientHelper {
         }
 
         for (final var recipient : recipientsToBeStripped) {
-            store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(address));
+            store.updateRecipientAddress(recipient.id(), recipient.address().removeIdentifiersFrom(finalAddress));
         }
 
         // Create fixed RecipientIds that won't update its id after merged

From 65adfdd6f5b69ffaefce20f00390474b60c4d238 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 10:14:14 +0200
Subject: [PATCH 491/672] Add signal CDN 3

---
 .../java/org/asamk/signal/manager/config/LiveConfig.java     | 5 ++++-
 .../java/org/asamk/signal/manager/config/StagingConfig.java  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index c86e650b..f89db53c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -33,6 +33,7 @@ class LiveConfig {
     private static final String URL = "https://chat.signal.org";
     private static final String CDN_URL = "https://cdn.signal.org";
     private static final String CDN2_URL = "https://cdn2.signal.org";
+    private static final String CDN3_URL = "https://cdn3.signal.org";
     private static final String STORAGE_URL = "https://storage.signal.org";
     private static final String SIGNAL_CDSI_URL = "https://cdsi.signal.org";
     private static final String SIGNAL_SVR2_URL = "https://svr2.signal.org";
@@ -58,7 +59,9 @@ class LiveConfig {
                 Map.of(0,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
-                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)},
+                        3,
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN3_URL, TRUST_STORE)}),
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
                 new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)},
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index c4d87cc3..f8032893 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -33,6 +33,7 @@ class StagingConfig {
     private static final String URL = "https://chat.staging.signal.org";
     private static final String CDN_URL = "https://cdn-staging.signal.org";
     private static final String CDN2_URL = "https://cdn2-staging.signal.org";
+    private static final String CDN3_URL = "https://cdn3-staging.signal.org";
     private static final String STORAGE_URL = "https://storage-staging.signal.org";
     private static final String SIGNAL_CDSI_URL = "https://cdsi.staging.signal.org";
     private static final String SIGNAL_SVR2_URL = "https://svr2.staging.signal.org";
@@ -58,7 +59,9 @@ class StagingConfig {
                 Map.of(0,
                         new SignalCdnUrl[]{new SignalCdnUrl(CDN_URL, TRUST_STORE)},
                         2,
-                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)}),
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN2_URL, TRUST_STORE)},
+                        3,
+                        new SignalCdnUrl[]{new SignalCdnUrl(CDN3_URL, TRUST_STORE)}),
                 new SignalStorageUrl[]{new SignalStorageUrl(STORAGE_URL, TRUST_STORE)},
                 new SignalCdsiUrl[]{new SignalCdsiUrl(SIGNAL_CDSI_URL, TRUST_STORE)},
                 new SignalSvr2Url[]{new SignalSvr2Url(SIGNAL_SVR2_URL, TRUST_STORE, null, null)},

From 52bb92dce40f945a5b30225dd215596ae7c076e6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 10:14:47 +0200
Subject: [PATCH 492/672] Call getter instead of using cached instance variable

---
 .../org/asamk/signal/manager/internal/SignalDependencies.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index feb61d1c..54f7f90a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -185,7 +185,7 @@ public class SignalDependencies {
 
     public SignalServiceMessageReceiver getMessageReceiver() {
         return getOrCreate(() -> messageReceiver,
-                () -> messageReceiver = new SignalServiceMessageReceiver(pushServiceSocket));
+                () -> messageReceiver = new SignalServiceMessageReceiver(getPushServiceSocket()));
     }
 
     public SignalServiceMessageSender getMessageSender() {
@@ -197,7 +197,7 @@ public class SignalDependencies {
                         Optional.empty(),
                         executor,
                         ServiceConfig.MAX_ENVELOPE_SIZE,
-                        pushServiceSocket));
+                        getPushServiceSocket()));
     }
 
     public List<SecureValueRecovery> getSecureValueRecoveryV2() {

From 41726d339f570ed89f5aa0aefd8466d793ab1909 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 10:13:59 +0200
Subject: [PATCH 493/672] Update libsignal-service-java

---
 CHANGELOG.md                                  |  2 +-
 graalvm-config-dir/reflect-config.json        |  2 +-
 graalvm-config-dir/resource-config.json       |  2 ++
 .../signal/manager/config/ServiceConfig.java  |  3 +-
 .../signal/manager/helper/AccountHelper.java  | 34 +++++++++++-------
 .../signal/manager/helper/SyncHelper.java     | 35 +++++++++++++------
 .../storage/prekeys/SignedPreKeyStore.java    | 20 +++++++----
 settings.gradle.kts                           |  2 +-
 .../java/org/asamk/signal/BaseConfig.java     |  2 +-
 9 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b534de6..bcceabd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## [Unreleased]
 
-Requires libsignal-client version 0.52.5
+Requires libsignal-client version 0.56.0
 
 ### Fixed
 
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 0a65c68b..d38c8ed2 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2143,7 +2143,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getDeleteSync","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }]
+  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getDeleteSync","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }, {"name":"getVersionedExpirationTimer","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest",
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 2c5463f7..eb97bf2f 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -184,6 +184,8 @@
     "pattern":"\\Qlibsignal_jni.dylib\\E"
   }, {
     "pattern":"\\Qlibsignal_jni.so\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni_amd64.so\\E"
   }, {
     "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
   }, {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 62aedaf6..2de70a53 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -28,7 +28,8 @@ public class ServiceConfig {
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var deleteSync = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(true, deleteSync);
+        final var versionedExpirationTimer = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(true, deleteSync, versionedExpirationTimer);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 0ec45cb9..5163c8fc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -220,20 +220,30 @@ public class AccountHelper {
         final var messageSender = dependencies.getMessageSender();
         for (final var deviceId : deviceIds) {
             // Signed Prekey
-            final var signedPreKeyRecord = KeyUtils.generateSignedPreKeyRecord(KeyUtils.getRandomInt(PREKEY_MAXIMUM_ID),
-                    pniIdentity.getPrivateKey());
-            final var signedPreKeyEntity = new SignedPreKeyEntity(signedPreKeyRecord.getId(),
-                    signedPreKeyRecord.getKeyPair().getPublicKey(),
-                    signedPreKeyRecord.getSignature());
-            devicePniSignedPreKeys.put(deviceId, signedPreKeyEntity);
+            final SignedPreKeyRecord signedPreKeyRecord;
+            try {
+                signedPreKeyRecord = KeyUtils.generateSignedPreKeyRecord(KeyUtils.getRandomInt(PREKEY_MAXIMUM_ID),
+                        pniIdentity.getPrivateKey());
+                final var signedPreKeyEntity = new SignedPreKeyEntity(signedPreKeyRecord.getId(),
+                        signedPreKeyRecord.getKeyPair().getPublicKey(),
+                        signedPreKeyRecord.getSignature());
+                devicePniSignedPreKeys.put(deviceId, signedPreKeyEntity);
+            } catch (InvalidKeyException e) {
+                throw new AssertionError("unexpected invalid key", e);
+            }
 
             // Last-resort kyber prekey
-            final var lastResortKyberPreKeyRecord = KeyUtils.generateKyberPreKeyRecord(KeyUtils.getRandomInt(
-                    PREKEY_MAXIMUM_ID), pniIdentity.getPrivateKey());
-            final var kyberPreKeyEntity = new KyberPreKeyEntity(lastResortKyberPreKeyRecord.getId(),
-                    lastResortKyberPreKeyRecord.getKeyPair().getPublicKey(),
-                    lastResortKyberPreKeyRecord.getSignature());
-            devicePniLastResortKyberPreKeys.put(deviceId, kyberPreKeyEntity);
+            final KyberPreKeyRecord lastResortKyberPreKeyRecord;
+            try {
+                lastResortKyberPreKeyRecord = KeyUtils.generateKyberPreKeyRecord(KeyUtils.getRandomInt(PREKEY_MAXIMUM_ID),
+                        pniIdentity.getPrivateKey());
+                final var kyberPreKeyEntity = new KyberPreKeyEntity(lastResortKyberPreKeyRecord.getId(),
+                        lastResortKyberPreKeyRecord.getKeyPair().getPublicKey(),
+                        lastResortKyberPreKeyRecord.getSignature());
+                devicePniLastResortKyberPreKeys.put(deviceId, kyberPreKeyEntity);
+            } catch (InvalidKeyException e) {
+                throw new AssertionError("unexpected invalid key", e);
+            }
 
             // Registration Id
             var pniRegistrationId = -1;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 9af1f01f..efb48623 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -9,7 +9,6 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.stickers.StickerPack;
-import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.MimeUtils;
 import org.jetbrains.annotations.NotNull;
@@ -18,12 +17,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ConfigurationMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceContact;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactAvatar;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsInputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceContactsOutputStream;
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceGroup;
@@ -170,7 +169,14 @@ public class SyncHelper {
                     final var contact = contactPair.second();
                     final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
 
-                    out.write(getDeviceContact(address, recipientId, contact));
+                    final var deviceContact = getDeviceContact(address, recipientId, contact);
+                    out.write(deviceContact);
+                    deviceContact.getAvatar().ifPresent(a -> {
+                        try {
+                            a.getInputStream().close();
+                        } catch (IOException ignored) {
+                        }
+                    });
                 }
 
                 if (account.getProfileKey() != null) {
@@ -178,7 +184,14 @@ public class SyncHelper {
                     final var address = account.getSelfRecipientAddress();
                     final var recipientId = account.getSelfRecipientId();
                     final var contact = account.getContactStore().getContact(recipientId);
-                    out.write(getDeviceContact(address, recipientId, contact));
+                    final var deviceContact = getDeviceContact(address, recipientId, contact);
+                    out.write(deviceContact);
+                    deviceContact.getAvatar().ifPresent(a -> {
+                        try {
+                            a.getInputStream().close();
+                        } catch (IOException ignored) {
+                        }
+                    });
                 }
             }
 
@@ -234,6 +247,7 @@ public class SyncHelper {
                 Optional.ofNullable(profileKey),
                 Optional.ofNullable(contact == null ? null : contact.messageExpirationTime()),
                 Optional.empty(),
+                Optional.empty(),
                 contact != null && contact.isArchived());
     }
 
@@ -391,7 +405,7 @@ public class SyncHelper {
             account.getContactStore().storeContact(recipientId, builder.build());
 
             if (c.getAvatar().isPresent()) {
-                downloadContactAvatar(c.getAvatar().get(), address);
+                storeContactAvatar(c.getAvatar().get(), address);
             }
         }
     }
@@ -425,21 +439,22 @@ public class SyncHelper {
         return context.getSendHelper().sendSyncMessage(message);
     }
 
-    private Optional<SignalServiceAttachmentStream> createContactAvatarAttachment(RecipientAddress address) throws IOException {
+    private Optional<DeviceContactAvatar> createContactAvatarAttachment(RecipientAddress address) throws IOException {
         final var streamDetails = context.getAvatarStore().retrieveContactAvatar(address);
         if (streamDetails == null) {
             return Optional.empty();
         }
 
-        final var uploadSpec = context.getDependencies().getMessageSender().getResumableUploadSpec().toProto();
-        return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty(), uploadSpec));
+        return Optional.of(new DeviceContactAvatar(streamDetails.getStream(),
+                streamDetails.getLength(),
+                streamDetails.getContentType()));
     }
 
-    private void downloadContactAvatar(SignalServiceAttachment avatar, RecipientAddress address) {
+    private void storeContactAvatar(DeviceContactAvatar avatar, RecipientAddress address) {
         try {
             context.getAvatarStore()
                     .storeContactAvatar(address,
-                            outputStream -> context.getAttachmentHelper().retrieveAttachment(avatar, outputStream));
+                            outputStream -> IOUtils.copyStream(avatar.getInputStream(), outputStream));
         } catch (IOException e) {
             logger.warn("Failed to download avatar for contact {}, ignoring: {}", address, e.getMessage());
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
index 0de10b13..d62e939d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
@@ -93,9 +93,13 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setInt(1, accountIdType);
                 statement.setInt(2, signedPreKeyId);
-                final var keyPair = record.getKeyPair();
-                statement.setBytes(3, keyPair.getPublicKey().serialize());
-                statement.setBytes(4, keyPair.getPrivateKey().serialize());
+                try {
+                    final var keyPair = record.getKeyPair();
+                    statement.setBytes(3, keyPair.getPublicKey().serialize());
+                    statement.setBytes(4, keyPair.getPrivateKey().serialize());
+                } catch (InvalidKeyException e) {
+                    throw new AssertionError("unexpected invalid key", e);
+                }
                 statement.setBytes(5, record.getSignature());
                 statement.setLong(6, record.getTimestamp());
                 statement.executeUpdate();
@@ -193,9 +197,13 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
                 for (final var record : signedPreKeys) {
                     statement.setInt(1, accountIdType);
                     statement.setInt(2, record.getId());
-                    final var keyPair = record.getKeyPair();
-                    statement.setBytes(3, keyPair.getPublicKey().serialize());
-                    statement.setBytes(4, keyPair.getPrivateKey().serialize());
+                    try {
+                        final var keyPair = record.getKeyPair();
+                        statement.setBytes(3, keyPair.getPublicKey().serialize());
+                        statement.setBytes(4, keyPair.getPrivateKey().serialize());
+                    } catch (InvalidKeyException e) {
+                        throw new AssertionError("unexpected invalid key", e);
+                    }
                     statement.setBytes(5, record.getSignature());
                     statement.setLong(6, record.getTimestamp());
                     statement.executeUpdate();
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e03e3059..95d5a87d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_106")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_107")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 6fd1b21e..ef4c4d7e 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.14.1");
+            .orElse("Signal-Android/7.16.2");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From b32271621511b5e7443a9757aa018828d124a913 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 10:18:26 +0200
Subject: [PATCH 494/672] Update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcceabd7..e7d8ce93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,15 @@
 
 Requires libsignal-client version 0.56.0
 
+### Improved
+
+- Send sync message to linked devices when sending read/viewed receipts
+
 ### Fixed
 
 - Fix issue with sending to some groups
+- Fix CDSI sync if no token is stored
+- Fix possible db dead lock during storage sync
 
 ## [0.13.5] - 2024-07-25
 

From 2b5451f74ade765e48c4ea9eb77b35685259de41 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 18:51:56 +0200
Subject: [PATCH 495/672] Update client dependencies

---
 client/Cargo.lock  | 811 ++++++++++++++++++++++++++-------------------
 client/Cargo.toml  |   2 +-
 client/src/main.rs |   4 +-
 3 files changed, 482 insertions(+), 335 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 1794713a..5118fb2a 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -19,47 +19,48 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -67,43 +68,38 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
-
-[[package]]
-name = "async-lock"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
-dependencies = [
- "event-listener",
- "event-listener-strategy",
- "pin-project-lite",
-]
+checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn",
 ]
 
 [[package]]
-name = "autocfg"
-version = "1.1.0"
+name = "atomic-waker"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -116,46 +112,37 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.7"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "beef"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
-dependencies = [
- "serde",
-]
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
 dependencies = [
- "libc",
+ "shlex",
 ]
 
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -164,9 +151,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -174,9 +161,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
  "anstream",
  "anstyle",
@@ -187,35 +174,36 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
-name = "concurrent-queue"
-version = "2.4.0"
+name = "combine"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
- "crossbeam-utils",
+ "bytes",
+ "memchr",
 ]
 
 [[package]]
@@ -230,15 +218,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "equivalent"
@@ -248,35 +230,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "event-listener"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener",
- "pin-project-lite",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -315,7 +276,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn",
 ]
 
 [[package]]
@@ -332,9 +293,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
@@ -353,9 +314,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -364,21 +325,21 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "h2"
-version = "0.3.26"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "futures-util",
  "http",
  "indexmap",
  "slab",
@@ -389,27 +350,27 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -418,65 +379,89 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
  "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
  "bytes",
  "futures-channel",
- "futures-core",
  "futures-util",
  "h2",
  "http",
  "http-body",
  "httparse",
- "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2",
+ "smallvec",
  "tokio",
- "tower-service",
- "tracing",
  "want",
 ]
 
 [[package]]
 name = "hyper-rustls"
-version = "0.24.2"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http",
  "hyper",
+ "hyper-util",
  "log",
  "rustls",
- "rustls-native-certs",
+ "rustls-pki-types",
  "tokio",
  "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -491,25 +476,51 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown",
 ]
 
 [[package]]
-name = "itoa"
-version = "1.0.10"
+name = "is_terminal_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "jni"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+dependencies = [
+ "cesu8",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jsonrpsee"
-version = "0.21.0"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9579d0ca9fb30da026bac2f0f7d9576ec93489aeb7cd4971dd5b4617d82c79b2"
+checksum = "5ec465b607a36dc5dd45d48b7689bc83f679f66a3ac6b6b21cc787a11e0f8685"
 dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-http-client",
@@ -520,17 +531,17 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.21.0"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "776d009e2f591b78c038e0d053a796f94575d66ca4e77dd84bfc5e81419e436c"
+checksum = "e942c55635fbf5dc421938b8558a8141c7e773720640f4f1dbe1f4164ca4e221"
 dependencies = [
- "anyhow",
- "async-lock",
  "async-trait",
- "beef",
+ "bytes",
  "futures-timer",
  "futures-util",
- "hyper",
+ "http",
+ "http-body",
+ "http-body-util",
  "jsonrpsee-types",
  "pin-project",
  "rustc-hash",
@@ -544,15 +555,20 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.21.0"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b7de9f3219d95985eb77fd03194d7c1b56c19bce1abfcc9d07462574b15572"
+checksum = "e33774602df12b68a2310b38a535733c477ca4a498751739f89fe8dbbb62ec4c"
 dependencies = [
  "async-trait",
+ "base64",
+ "http-body",
  "hyper",
  "hyper-rustls",
+ "hyper-util",
  "jsonrpsee-core",
  "jsonrpsee-types",
+ "rustls",
+ "rustls-platform-verifier",
  "serde",
  "serde_json",
  "thiserror",
@@ -564,25 +580,24 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.21.0"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d94b7505034e2737e688e1153bf81e6f93ad296695c43958d6da2e4321f0a990"
+checksum = "6b07a2daf52077ab1b197aea69a5c990c060143835bf04c77070e98903791715"
 dependencies = [
  "heck",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.21.0"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3266dfb045c9174b24c77c2dfe0084914bb23a6b2597d70c9dc6018392e1cd1b"
+checksum = "23b67d6e008164f027afbc2e7bb79662650158d26df200040282d2aa1cbb093b"
 dependencies = [
- "anyhow",
- "beef",
+ "http",
  "serde",
  "serde_json",
  "thiserror",
@@ -590,63 +605,82 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
  "hermit-abi",
  "libc",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
 ]
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
 dependencies = [
  "memchr",
 ]
@@ -663,12 +697,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
-[[package]]
-name = "parking"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -677,29 +705,29 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -709,65 +737,65 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.2"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_datetime",
  "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "ring"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if",
  "getrandom",
  "libc",
  "spin",
  "untrusted",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
 
 [[package]]
 name = "rustix"
-version = "0.38.30"
+version = "0.38.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -776,90 +804,129 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.11"
+version = "0.23.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
+checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
 dependencies = [
  "log",
+ "once_cell",
  "ring",
+ "rustls-pki-types",
  "rustls-webpki",
- "sct",
+ "subtle",
+ "zeroize",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.6.3"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
  "rustls-pemfile",
+ "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.4"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
 dependencies = [
  "base64",
+ "rustls-pki-types",
 ]
 
 [[package]]
-name = "rustls-webpki"
-version = "0.101.7"
+name = "rustls-pki-types"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
+dependencies = [
+ "core-foundation",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-roots",
+ "winapi",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
 dependencies = [
  "ring",
+ "rustls-pki-types",
  "untrusted",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
-name = "schannel"
-version = "0.1.23"
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "windows-sys 0.52.0",
+ "winapi-util",
 ]
 
 [[package]]
-name = "sct"
-version = "0.7.1"
+name = "schannel"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "ring",
- "untrusted",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "security-framework"
-version = "2.9.2"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "core-foundation",
  "core-foundation-sys",
  "libc",
+ "num-bigint",
  "security-framework-sys",
 ]
 
 [[package]]
 name = "security-framework-sys"
-version = "2.9.1"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -867,35 +934,42 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "signal-cli-client"
 version = "0.0.1"
@@ -923,13 +997,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "socket2"
-version = "0.5.5"
+name = "smallvec"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "socket2"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -940,26 +1020,21 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -978,29 +1053,29 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn",
 ]
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1013,47 +1088,47 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.24.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
  "rustls",
+ "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -1062,29 +1137,28 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1101,6 +1175,7 @@ dependencies = [
  "futures-util",
  "pin-project",
  "pin-project-lite",
+ "tokio",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -1108,15 +1183,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -1138,7 +1213,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn",
 ]
 
 [[package]]
@@ -1170,9 +1245,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
@@ -1185,9 +1260,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -1196,9 +1271,19 @@ dependencies = [
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
 
 [[package]]
 name = "want"
@@ -1215,6 +1300,46 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -1230,7 +1355,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1250,17 +1384,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -1271,9 +1406,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1283,9 +1418,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1295,9 +1430,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1307,9 +1448,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1319,9 +1460,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1331,9 +1472,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1343,15 +1484,21 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.5.36"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index a32a600f..b60f2041 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -12,7 +12,7 @@ log = "0.4"
 serde = "1"
 serde_json = "1"
 tokio = { version = "1", features = ["rt", "macros", "net", "rt-multi-thread"] }
-jsonrpsee = { version = "0.21.0", features = [
+jsonrpsee = { version = "0.24", features = [
     "macros",
     "async-client",
     "http-client",
diff --git a/client/src/main.rs b/client/src/main.rs
index 71903e1d..35c1ab22 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -2,7 +2,7 @@ use std::{path::PathBuf, time::Duration};
 
 use clap::Parser;
 use jsonrpsee::core::client::{Error as RpcError, Subscription, SubscriptionClientT};
-use serde_json::Value;
+use serde_json::{Error, Value};
 use tokio::{select, time::sleep};
 
 use cli::Cli;
@@ -500,7 +500,7 @@ async fn connect(cli: Cli) -> Result<Value, RpcError> {
 async fn stream_next(
     timeout: f64,
     stream: &mut Subscription<Value>,
-) -> Option<Result<Value, RpcError>> {
+) -> Option<Result<Value, Error>> {
     if timeout < 0.0 {
         stream.next().await
     } else {

From d852c60c373b502f5577ec0b5f6343670ad77c0e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 18:55:23 +0200
Subject: [PATCH 496/672] Update dependencies

---
 settings.gradle.kts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 95d5a87d..7ce0e385 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,17 +9,17 @@ dependencyResolutionManagement {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78.1")
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.2")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
-            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
+            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.1.0")
             version("slf4j", "2.0.13")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.5.6")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.5.8")
 
             library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_107")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.0.0")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
-            library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.10.2")
-            library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.10.2")
+            library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.0")
+            library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.11.0")
         }
     }
 }

From a0d1b081ffcceeed4889bb90481610065185e6a4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 18:59:22 +0200
Subject: [PATCH 497/672] Bump version to 0.13.6

---
 CHANGELOG.md                          | 2 +-
 build.gradle.kts                      | 2 +-
 data/org.asamk.SignalCli.metainfo.xml | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7d8ce93..f9075c5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.6] - 2024-09-08
 
 Requires libsignal-client version 0.56.0
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 983e128b..35122b54 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
-version = "0.13.6-SNAPSHOT"
+version = "0.13.6"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 42ae0509..78b244c6 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="0.13.6" date="2024-09-08">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.6</url>
+    </release>
     <release version="0.13.5" date="2024-07-25">
       <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.5</url>
     </release>

From eca3c6fa30a8c6c72599a80cea39d674db1c0d65 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 19:22:02 +0200
Subject: [PATCH 498/672] Replace deprecated DBusMap

---
 graalvm-config-dir/reflect-config.json        | 34 ++++++++++++++++++-
 .../asamk/signal/dbus/DbusManagerImpl.java    |  5 ++-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index d38c8ed2..d6247e74 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -799,6 +799,34 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"pin","parameterTypes":[] }, {"name":"verificationCode","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.dbus.DbusProperties",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalControlImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalConfigurationImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalDeviceImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalGroupImpl",
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.asamk.signal.dbus.DbusSignalImpl$DbusSignalIdentityImpl",
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"org.asamk.signal.json.JsonAttachment",
   "allDeclaredFields":true,
@@ -1831,6 +1859,10 @@
   "name":"org.bouncycastle.pqc.jcajce.provider.XMSS$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.freedesktop.dbus.connections.base.GlobalHandler",
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"org.freedesktop.dbus.errors.ServiceUnknown",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
@@ -1863,7 +1895,7 @@
   "name":"org.freedesktop.dbus.interfaces.Properties",
   "allDeclaredMethods":true,
   "allDeclaredClasses":true,
-  "methods":[{"name":"Get","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"GetAll","parameterTypes":["java.lang.String"] }]
+  "methods":[{"name":"Get","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"GetAll","parameterTypes":["java.lang.String"] }, {"name":"Set","parameterTypes":["java.lang.String","java.lang.String","java.lang.Object"] }]
 },
 {
   "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 574f68c6..9ae3001a 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -49,7 +49,6 @@ import org.asamk.signal.manager.api.UpdateProfile;
 import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.asamk.signal.manager.api.UsernameStatus;
-import org.freedesktop.dbus.DBusMap;
 import org.freedesktop.dbus.DBusPath;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
@@ -1063,7 +1062,7 @@ public class DbusManagerImpl implements Manager {
             return List.of();
         }
 
-        final List<DBusMap<String, Variant<?>>> attachments = getValue(extras, "attachments");
+        final List<Map<String, Variant<?>>> attachments = getValue(extras, "attachments");
         return attachments.stream().map(a -> {
             final String file = a.containsKey("file") ? getValue(a, "file") : null;
             return new MessageEnvelope.Data.Attachment(a.containsKey("remoteId")
@@ -1090,7 +1089,7 @@ public class DbusManagerImpl implements Manager {
             return List.of();
         }
 
-        final List<DBusMap<String, Variant<?>>> mentions = getValue(extras, "mentions");
+        final List<Map<String, Variant<?>>> mentions = getValue(extras, "mentions");
         return mentions.stream()
                 .map(a -> new MessageEnvelope.Data.Mention(new RecipientAddress(this.<String>getValue(a, "recipient")),
                         getValue(a, "start"),

From 20add0f27bd0728b158b88aef91c2e38c05ef582 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Sep 2024 19:23:47 +0200
Subject: [PATCH 499/672] Downgrade dbus-java

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7ce0e385..07b197a6 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -9,7 +9,7 @@ dependencyResolutionManagement {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78.1")
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.2")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
-            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.1.0")
+            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
             version("slf4j", "2.0.13")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")

From 6f9e9e9302285d5199e23054b1a3fc281f7a4926 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 500/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9075c5b..6e9e9ecb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.6] - 2024-09-08
 
 Requires libsignal-client version 0.56.0
diff --git a/build.gradle.kts b/build.gradle.kts
index 35122b54..666e132f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.2"
 }
 
-version = "0.13.6"
+version = "0.13.7-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 1d5d16f57e8da397dff26af317d2ce9d416ab1c3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 9 Sep 2024 18:22:36 +0200
Subject: [PATCH 501/672] Adapt signal_jni file names in graalvm config

---
 graalvm-config-dir/resource-config.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index eb97bf2f..2225aafe 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -181,9 +181,9 @@
   }, {
     "pattern":"\\Qkotlin/reflect/reflect.kotlin_builtins\\E"
   }, {
-    "pattern":"\\Qlibsignal_jni.dylib\\E"
+    "pattern":"\\Qlibsignal_jni_aarch64.dylib\\E"
   }, {
-    "pattern":"\\Qlibsignal_jni.so\\E"
+    "pattern":"\\Qlibsignal_jni_amd64.dylib\\E"
   }, {
     "pattern":"\\Qlibsignal_jni_amd64.so\\E"
   }, {
@@ -195,7 +195,7 @@
   }, {
     "pattern":"\\Qorg/sqlite/native/Linux/x86_64/libsqlitejdbc.so\\E"
   }, {
-    "pattern":"\\Qsignal_jni.dll\\E"
+    "pattern":"\\Qsignal_jni_amd64.dll\\E"
   }, {
     "pattern":"\\Qsqlite-jdbc.properties\\E"
   }, {

From bab8ddf35ad9fa3641e3a731b82665d70e1ba0e0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 9 Sep 2024 18:31:47 +0200
Subject: [PATCH 502/672] Update slf4j

---
 settings.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 07b197a6..f859d911 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -10,7 +10,7 @@ dependencyResolutionManagement {
             library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.2")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
-            version("slf4j", "2.0.13")
+            version("slf4j", "2.0.16")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.8")

From bea2772491d966baf19df254a4bc682530c490b1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 10 Sep 2024 19:16:42 +0200
Subject: [PATCH 503/672] Update graalvm buildtools

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 666e132f..2b831256 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.10.2"
+    id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
 version = "0.13.7-SNAPSHOT"

From 352699c4b6a893de74767220898d6e3eb505e29c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 11 Sep 2024 17:50:01 +0200
Subject: [PATCH 504/672] Update artifact CI actions

---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/release.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df7a6c79..97cd5530 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Compress archive
         run: gzip -n -9 build/distributions/signal-cli-*.tar
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: signal-cli-archive-${{ matrix.java }}
           path: build/distributions/signal-cli-*.tar.gz
@@ -54,7 +54,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew --no-daemon nativeCompile
       - name: Archive production artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: signal-cli-native
           path: build/native/nativeCompile/signal-cli
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 335f1eec..b1f4027d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
 
       - name: Download signal-cli build from CI workflow
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Get signal-cli version
         id: cli_ver
@@ -168,7 +168,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download signal-cli build from CI workflow
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Get signal-cli version
         id: cli_ver
@@ -218,7 +218,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download signal-cli build from CI workflow
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Get signal-cli version
         id: cli_ver

From c6e93126fa70334caba38ebd87e35cd0162bb621 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 12 Sep 2024 23:09:20 +0200
Subject: [PATCH 505/672] Fix truncating cdsi table

Fixes #1587
---
 .../java/org/asamk/signal/manager/helper/RecipientHelper.java  | 3 ++-
 .../org/asamk/signal/manager/storage/recipients/CdsiStore.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index e003450b..24b3eb5f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -14,6 +14,7 @@ import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidArgumentException;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException;
 import org.whispersystems.signalservice.api.services.CdsiV2Service;
 
@@ -254,7 +255,7 @@ public class RecipientHelper {
                                     account.setLastRecipientsRefresh(System.currentTimeMillis());
                                 }
                             });
-        } catch (CdsiInvalidTokenException e) {
+        } catch (CdsiInvalidTokenException | CdsiInvalidArgumentException e) {
             account.setCdsiToken(null);
             account.getCdsiStore().clearAll();
             throw e;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
index fd0846e9..1170e651 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
@@ -156,7 +156,7 @@ public class CdsiStore {
     public void clearAll() {
         final var sql = (
                 """
-                TRUNCATE %s
+                DELETE FROM %s
                 """
         ).formatted(TABLE_CDSI);
         try (final var connection = database.getConnection()) {

From dbbc3fbd71faf18e73ad409a3a7b308ce56cd52d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 24 Sep 2024 17:28:24 +0200
Subject: [PATCH 506/672] Remove unnecessary proto conversion

---
 .../org/asamk/signal/manager/helper/AttachmentHelper.java | 4 ++--
 .../java/org/asamk/signal/manager/helper/GroupHelper.java | 2 +-
 .../org/asamk/signal/manager/internal/ManagerImpl.java    | 4 ++--
 .../org/asamk/signal/manager/util/AttachmentUtils.java    | 8 +++-----
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 951b7c5c..3005325a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -60,14 +60,14 @@ public class AttachmentHelper {
         }
         final var signalServiceAttachments = new ArrayList<SignalServiceAttachmentStream>(attachments.size());
         for (var attachment : attachments) {
-            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
             signalServiceAttachments.add(AttachmentUtils.createAttachmentStream(attachment, uploadSpec));
         }
         return signalServiceAttachments;
     }
 
     public SignalServiceAttachmentPointer uploadAttachment(String attachment) throws IOException, AttachmentInvalidException {
-        final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+        final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
         var attachmentStream = AttachmentUtils.createAttachmentStream(attachment, uploadSpec);
         return uploadAttachment(attachmentStream);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 268e6186..ad31f35b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -113,7 +113,7 @@ public class GroupHelper {
             return Optional.empty();
         }
 
-        final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+        final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
         return Optional.of(AttachmentUtils.createAttachmentStream(streamDetails, Optional.empty(), uploadSpec));
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 39f59ccd..a6121e2f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -750,7 +750,7 @@ public class ManagerImpl implements Manager {
         final var additionalAttachments = new ArrayList<SignalServiceAttachment>();
         if (message.messageText().length() > 2000) {
             final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8);
-            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
             final var streamDetails = new StreamDetails(new ByteArrayInputStream(messageBytes),
                     MimeUtils.LONG_TEXT,
                     messageBytes.length);
@@ -813,7 +813,7 @@ public class ManagerImpl implements Manager {
             if (streamDetails == null) {
                 throw new InvalidStickerException("Missing local sticker file");
             }
-            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec().toProto();
+            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
             final var stickerAttachment = AttachmentUtils.createAttachmentStream(streamDetails,
                     Optional.empty(),
                     uploadSpec);
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index 5504640f..ac15a30a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -1,7 +1,6 @@
 package org.asamk.signal.manager.util;
 
 import org.asamk.signal.manager.api.AttachmentInvalidException;
-import org.signal.protos.resumableuploads.ResumableUpload;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.push.exceptions.ResumeLocationInvalidException;
 import org.whispersystems.signalservice.api.util.StreamDetails;
@@ -14,23 +13,22 @@ import java.util.UUID;
 public class AttachmentUtils {
 
     public static SignalServiceAttachmentStream createAttachmentStream(
-            String attachment, ResumableUpload resumableUpload
+            String attachment, ResumableUploadSpec resumableUploadSpec
     ) throws AttachmentInvalidException {
         try {
             final var streamDetails = Utils.createStreamDetails(attachment);
 
-            return createAttachmentStream(streamDetails.first(), streamDetails.second(), resumableUpload);
+            return createAttachmentStream(streamDetails.first(), streamDetails.second(), resumableUploadSpec);
         } catch (IOException e) {
             throw new AttachmentInvalidException(attachment, e);
         }
     }
 
     public static SignalServiceAttachmentStream createAttachmentStream(
-            StreamDetails streamDetails, Optional<String> name, ResumableUpload resumableUpload
+            StreamDetails streamDetails, Optional<String> name, ResumableUploadSpec resumableUploadSpec
     ) throws ResumeLocationInvalidException {
         // TODO maybe add a parameter to set the voiceNote, borderless, preview, width, height and caption option
         final var uploadTimestamp = System.currentTimeMillis();
-        final var resumableUploadSpec = ResumableUploadSpec.from(resumableUpload);
         return SignalServiceAttachmentStream.newStreamBuilder()
                 .withStream(streamDetails.getStream())
                 .withContentType(streamDetails.getContentType())

From 8524037900cfac57b39a740ceec5c57b6bd19d15 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 28 Sep 2024 12:13:49 +0200
Subject: [PATCH 507/672] Update gradle

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9355b415..df97d72b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From 19dc2d446b753460c5e89ec3ea23fa3fae5b89c6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 28 Sep 2024 16:39:16 +0200
Subject: [PATCH 508/672] Update libsignal-service

---
 graalvm-config-dir/resource-config.json       |  4 ++
 .../helper/IncomingMessageHandler.java        |  2 +-
 .../signal/manager/helper/SyncHelper.java     | 15 ++----
 .../internal/ProvisioningManagerImpl.java     | 20 +++++--
 .../internal/RegistrationManagerImpl.java     | 52 +++++++++++--------
 .../manager/internal/SignalDependencies.java  | 19 ++++---
 settings.gradle.kts                           |  2 +-
 .../java/org/asamk/signal/BaseConfig.java     |  2 +-
 8 files changed, 69 insertions(+), 47 deletions(-)

diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 2225aafe..8bd8a7af 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -180,6 +180,8 @@
     "pattern":"\\Qkotlin/ranges/ranges.kotlin_builtins\\E"
   }, {
     "pattern":"\\Qkotlin/reflect/reflect.kotlin_builtins\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni.so\\E"
   }, {
     "pattern":"\\Qlibsignal_jni_aarch64.dylib\\E"
   }, {
@@ -194,6 +196,8 @@
     "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
   }, {
     "pattern":"\\Qorg/sqlite/native/Linux/x86_64/libsqlitejdbc.so\\E"
+  }, {
+    "pattern":"\\Qsignal_jni.dll\\E"
   }, {
     "pattern":"\\Qsignal_jni_amd64.dll\\E"
   }, {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index fbd719b9..5e04f135 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -194,7 +194,7 @@ public final class IncomingMessageHandler {
     ) throws ProtocolInvalidKeyException, ProtocolInvalidMessageException, UnsupportedDataMessageException, InvalidMessageStructureException {
         final var content = cipherResult.getContent();
         final var envelopeMetadata = cipherResult.getMetadata();
-        final var validationResult = EnvelopeContentValidator.INSTANCE.validate(envelope, content);
+        final var validationResult = EnvelopeContentValidator.INSTANCE.validate(envelope, content, account.getAci());
 
         if (validationResult instanceof EnvelopeContentValidator.Result.Invalid v) {
             logger.warn("Invalid content! {}", v.getReason(), v.getThrowable());
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index efb48623..ecaf7605 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -39,7 +39,6 @@ import org.whispersystems.signalservice.api.messages.multidevice.ViewedMessage;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.internal.push.SyncMessage;
-import org.whispersystems.signalservice.internal.push.http.ResumableUploadSpec;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -135,15 +134,12 @@ public class SyncHelper {
 
             if (groupsFile.exists() && groupsFile.length() > 0) {
                 try (var groupsFileStream = new FileInputStream(groupsFile)) {
-                    final var uploadSpec = context.getDependencies()
-                            .getMessageSender()
-                            .getResumableUploadSpec()
-                            .toProto();
+                    final var uploadSpec = context.getDependencies().getMessageSender().getResumableUploadSpec();
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(groupsFileStream)
                             .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(groupsFile.length())
-                            .withResumableUploadSpec(ResumableUploadSpec.from(uploadSpec))
+                            .withResumableUploadSpec(uploadSpec)
                             .build();
 
                     context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forGroups(attachmentStream));
@@ -197,15 +193,12 @@ public class SyncHelper {
 
             if (contactsFile.exists() && contactsFile.length() > 0) {
                 try (var contactsFileStream = new FileInputStream(contactsFile)) {
-                    final var uploadSpec = context.getDependencies()
-                            .getMessageSender()
-                            .getResumableUploadSpec()
-                            .toProto();
+                    final var uploadSpec = context.getDependencies().getMessageSender().getResumableUploadSpec();
                     var attachmentStream = SignalServiceAttachment.newStreamBuilder()
                             .withStream(contactsFileStream)
                             .withContentType(MimeUtils.OCTET_STREAM)
                             .withLength(contactsFile.length())
-                            .withResumableUploadSpec(ResumableUploadSpec.from(uploadSpec))
+                            .withResumableUploadSpec(uploadSpec)
                             .build();
 
                     context.getSendHelper()
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 1dbe7e9b..2204b743 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -36,6 +36,8 @@ import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
+import org.whispersystems.signalservice.internal.push.ProvisioningSocket;
+import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
 import java.io.IOException;
@@ -75,13 +77,21 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
 
         tempIdentityKey = KeyUtils.generateIdentityKeyPair();
         password = KeyUtils.createPassword();
-        GroupsV2Operations groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(
-                serviceEnvironmentConfig.signalServiceConfiguration()), ServiceConfig.GROUP_MAX_SIZE);
-        accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
-                new DynamicCredentialsProvider(null, null, null, password, SignalServiceAddress.DEFAULT_DEVICE_ID),
+        final var clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration());
+        final var groupsV2Operations = new GroupsV2Operations(clientZkOperations, ServiceConfig.GROUP_MAX_SIZE);
+        final var credentialsProvider = new DynamicCredentialsProvider(null,
+                null,
+                null,
+                password,
+                SignalServiceAddress.DEFAULT_DEVICE_ID);
+        final var pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                credentialsProvider,
                 userAgent,
-                groupsV2Operations,
+                clientZkOperations.getProfileOperations(),
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+        accountManager = new SignalServiceAccountManager(pushServiceSocket,
+                new ProvisioningSocket(serviceEnvironmentConfig.signalServiceConfiguration(), userAgent),
+                groupsV2Operations);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 597b15c0..47aeaf92 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -48,8 +48,8 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
+import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
-import org.whispersystems.signalservice.internal.util.DynamicCredentialsProvider;
 
 import java.io.IOException;
 import java.util.function.Consumer;
@@ -65,9 +65,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
     private final String userAgent;
     private final Consumer<Manager> newManagerListener;
-    private final GroupsV2Operations groupsV2Operations;
 
-    private final SignalServiceAccountManager accountManager;
+    private final SignalServiceAccountManager unauthenticatedAccountManager;
     private final PinHelper pinHelper;
     private final AccountFileUpdater accountFileUpdater;
 
@@ -86,15 +85,17 @@ public class RegistrationManagerImpl implements RegistrationManager {
         this.userAgent = userAgent;
         this.newManagerListener = newManagerListener;
 
-        groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
-                ServiceConfig.GROUP_MAX_SIZE);
-        this.accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
-                new DynamicCredentialsProvider(
-                        // Using empty UUID, because registering doesn't work otherwise
-                        null, null, account.getNumber(), account.getPassword(), SignalServiceAddress.DEFAULT_DEVICE_ID),
+        this.unauthenticatedAccountManager = SignalServiceAccountManager.createWithStaticCredentials(
+                serviceEnvironmentConfig.signalServiceConfiguration(),
+                // Using empty UUID, because registering doesn't work otherwise
+                null,
+                null,
+                account.getNumber(),
+                SignalServiceAddress.DEFAULT_DEVICE_ID,
+                account.getPassword(),
                 userAgent,
-                groupsV2Operations,
-                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY,
+                ServiceConfig.GROUP_MAX_SIZE);
         final var secureValueRecoveryV2 = serviceEnvironmentConfig.svr2Mrenclaves()
                 .stream()
                 .map(mr -> (SecureValueRecovery) accountManager.getSecureValueRecoveryV2(mr))
@@ -128,12 +129,14 @@ public class RegistrationManagerImpl implements RegistrationManager {
                 return;
             }
 
-            String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
+            String sessionId = NumberVerificationUtils.handleVerificationSession(unauthenticatedAccountManager,
                     account.getSessionId(account.getNumber()),
                     id -> account.setSessionId(account.getNumber(), id),
                     voiceVerification,
                     captcha);
-            NumberVerificationUtils.requestVerificationCode(accountManager, sessionId, voiceVerification);
+            NumberVerificationUtils.requestVerificationCode(unauthenticatedAccountManager,
+                    sessionId,
+                    voiceVerification);
             account.setRegistered(false);
         } catch (DeprecatedVersionException e) {
             logger.debug("Signal-Server returned deprecated version exception", e);
@@ -193,7 +196,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
             final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
             final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
-            final var response = Utils.handleResponseException(accountManager.registerAccount(null,
+            final var response = Utils.handleResponseException(unauthenticatedAccountManager.registerAccount(null,
                     recoveryPassword,
                     account.getAccountAttributes(null),
                     aciPreKeys,
@@ -215,11 +218,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
     private boolean attemptReactivateAccount() {
         try {
-            final var accountManager = new SignalServiceAccountManager(serviceEnvironmentConfig.signalServiceConfiguration(),
-                    account.getCredentialsProvider(),
-                    userAgent,
-                    groupsV2Operations,
-                    ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+            final var accountManager = createAuthenticatedSignalServiceAccountManager();
             accountManager.setAccountAttributes(account.getAccountAttributes(null));
             account.setRegistered(true);
             logger.info("Reactivated existing account, verify is not necessary.");
@@ -239,6 +238,17 @@ public class RegistrationManagerImpl implements RegistrationManager {
         return false;
     }
 
+    private SignalServiceAccountManager createAuthenticatedSignalServiceAccountManager() {
+        final var clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration());
+        final var pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                account.getCredentialsProvider(),
+                userAgent,
+                clientZkOperations.getProfileOperations(),
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+        final var groupsV2Operations = new GroupsV2Operations(clientZkOperations, ServiceConfig.GROUP_MAX_SIZE);
+        return new SignalServiceAccountManager(pushServiceSocket, null, groupsV2Operations);
+    }
+
     private VerifyAccountResponse verifyAccountWithCode(
             final String sessionId,
             final String verificationCode,
@@ -247,11 +257,11 @@ public class RegistrationManagerImpl implements RegistrationManager {
             final PreKeyCollection pniPreKeys
     ) throws IOException {
         try {
-            Utils.handleResponseException(accountManager.verifyAccount(verificationCode, sessionId));
+            Utils.handleResponseException(unauthenticatedAccountManager.verifyAccount(verificationCode, sessionId));
         } catch (AlreadyVerifiedException e) {
             // Already verified so can continue registering
         }
-        return Utils.handleResponseException(accountManager.registerAccount(sessionId,
+        return Utils.handleResponseException(unauthenticatedAccountManager.registerAccount(sessionId,
                 null,
                 account.getAccountAttributes(registrationLock),
                 aciPreKeys,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 54f7f90a..37fbb3bb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -22,6 +22,7 @@ import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
 import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
+import org.whispersystems.signalservice.internal.push.ProvisioningSocket;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
@@ -50,6 +51,7 @@ public class SignalDependencies {
     private ClientZkOperations clientZkOperations;
 
     private PushServiceSocket pushServiceSocket;
+    private ProvisioningSocket provisioningSocket;
     private Network libSignalNetwork;
     private SignalWebSocket signalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
@@ -107,6 +109,12 @@ public class SignalDependencies {
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
+    public ProvisioningSocket getProvisioningSocket() {
+        return getOrCreate(() -> provisioningSocket,
+                () -> provisioningSocket = new ProvisioningSocket(getServiceEnvironmentConfig().signalServiceConfiguration(),
+                        userAgent));
+    }
+
     public Network getLibSignalNetwork() {
         return getOrCreate(() -> libSignalNetwork,
                 () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment(), userAgent));
@@ -115,14 +123,12 @@ public class SignalDependencies {
     public SignalServiceAccountManager getAccountManager() {
         return getOrCreate(() -> accountManager,
                 () -> accountManager = new SignalServiceAccountManager(getPushServiceSocket(),
-                        null,
-                        serviceEnvironmentConfig.signalServiceConfiguration(),
-                        credentialsProvider,
+                        getProvisioningSocket(),
                         getGroupsV2Operations()));
     }
 
     public SignalServiceAccountManager createUnauthenticatedAccountManager(String number, String password) {
-        return new SignalServiceAccountManager(getServiceEnvironmentConfig().signalServiceConfiguration(),
+        return SignalServiceAccountManager.createWithStaticCredentials(getServiceEnvironmentConfig().signalServiceConfiguration(),
                 null,
                 null,
                 number,
@@ -190,14 +196,13 @@ public class SignalDependencies {
 
     public SignalServiceMessageSender getMessageSender() {
         return getOrCreate(() -> messageSender,
-                () -> messageSender = new SignalServiceMessageSender(credentialsProvider,
+                () -> messageSender = new SignalServiceMessageSender(getPushServiceSocket(),
                         dataStore,
                         sessionLock,
                         getSignalWebSocket(),
                         Optional.empty(),
                         executor,
-                        ServiceConfig.MAX_ENVELOPE_SIZE,
-                        getPushServiceSocket()));
+                        ServiceConfig.MAX_ENVELOPE_SIZE));
     }
 
     public List<SecureValueRecovery> getSecureValueRecoveryV2() {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f859d911..a473f18a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.8")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_107")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_108")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.0")
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index ef4c4d7e..ae85882c 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.16.2");
+            .orElse("Signal-Android/7.18.2");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From a6ab8f7e80d74b4a7313c0c1c4cf3b1cda84aa17 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 28 Sep 2024 16:44:23 +0200
Subject: [PATCH 509/672] Remove v2 suffix from secure value recovery

---
 .../java/org/asamk/signal/manager/helper/Context.java     | 2 +-
 .../java/org/asamk/signal/manager/helper/PinHelper.java   | 6 +++---
 .../signal/manager/internal/RegistrationManagerImpl.java  | 6 +++---
 .../asamk/signal/manager/internal/SignalDependencies.java | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
index 848a57c1..2ff9c7e4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/Context.java
@@ -114,7 +114,7 @@ public class Context implements AutoCloseable {
     }
 
     PinHelper getPinHelper() {
-        return getOrCreate(() -> pinHelper, () -> pinHelper = new PinHelper(dependencies.getSecureValueRecoveryV2()));
+        return getOrCreate(() -> pinHelper, () -> pinHelper = new PinHelper(dependencies.getSecureValueRecovery()));
     }
 
     public PreKeyHelper getPreKeyHelper() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index cb9b9057..7669b383 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -32,11 +32,11 @@ public class PinHelper {
                     case SecureValueRecovery.BackupResponse.Success success -> {
                     }
                     case SecureValueRecovery.BackupResponse.ServerRejected serverRejected ->
-                            logger.warn("Backup svr2 failed: ServerRejected");
+                            logger.warn("Backup svr failed: ServerRejected");
                     case SecureValueRecovery.BackupResponse.EnclaveNotFound enclaveNotFound ->
-                            logger.warn("Backup svr2 failed: EnclaveNotFound");
+                            logger.warn("Backup svr failed: EnclaveNotFound");
                     case SecureValueRecovery.BackupResponse.ExposeFailure exposeFailure ->
-                            logger.warn("Backup svr2 failed: ExposeFailure");
+                            logger.warn("Backup svr failed: ExposeFailure");
                     case SecureValueRecovery.BackupResponse.ApplicationError error ->
                             throw new IOException(error.getException());
                     case SecureValueRecovery.BackupResponse.NetworkError error -> throw error.getException();
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 47aeaf92..015d17a0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -96,11 +96,11 @@ public class RegistrationManagerImpl implements RegistrationManager {
                 userAgent,
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY,
                 ServiceConfig.GROUP_MAX_SIZE);
-        final var secureValueRecoveryV2 = serviceEnvironmentConfig.svr2Mrenclaves()
+        final var secureValueRecovery = serviceEnvironmentConfig.svr2Mrenclaves()
                 .stream()
-                .map(mr -> (SecureValueRecovery) accountManager.getSecureValueRecoveryV2(mr))
+                .map(mr -> (SecureValueRecovery) this.unauthenticatedAccountManager.getSecureValueRecoveryV2(mr))
                 .toList();
-        this.pinHelper = new PinHelper(secureValueRecoveryV2);
+        this.pinHelper = new PinHelper(secureValueRecovery);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 37fbb3bb..f4f72aca 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -57,7 +57,7 @@ public class SignalDependencies {
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
 
-    private List<SecureValueRecovery> secureValueRecoveryV2;
+    private List<SecureValueRecovery> secureValueRecovery;
     private ProfileService profileService;
 
     SignalDependencies(
@@ -205,9 +205,9 @@ public class SignalDependencies {
                         ServiceConfig.MAX_ENVELOPE_SIZE));
     }
 
-    public List<SecureValueRecovery> getSecureValueRecoveryV2() {
-        return getOrCreate(() -> secureValueRecoveryV2,
-                () -> secureValueRecoveryV2 = serviceEnvironmentConfig.svr2Mrenclaves()
+    public List<SecureValueRecovery> getSecureValueRecovery() {
+        return getOrCreate(() -> secureValueRecovery,
+                () -> secureValueRecovery = serviceEnvironmentConfig.svr2Mrenclaves()
                         .stream()
                         .map(mr -> (SecureValueRecovery) getAccountManager().getSecureValueRecoveryV2(mr))
                         .toList());

From 69d691f4160ae34f35cc10ae783f1dde296b426c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 28 Sep 2024 16:54:27 +0200
Subject: [PATCH 510/672] Update graalvm reflect-config

Fixes #1590
---
 graalvm-config-dir/reflect-config.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index d6247e74..2ae5c452 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2314,6 +2314,13 @@
   "allDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.api.svr.Svr3Credentials",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","byte[]"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","byte[]","int","kotlin.jvm.internal.DefaultConstructorMarker"] }, {"name":"getAuthCredentials","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.contacts.crypto.SignatureBodyEntity",
   "allDeclaredFields":true,
@@ -2435,6 +2442,10 @@
   "allDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.ByteArrayDeserializerBase64",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.CdsiAuthResponse",
   "allDeclaredFields":true,

From 946c483f35e4c364f5a25af993556c54616c316f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 28 Sep 2024 22:13:24 +0200
Subject: [PATCH 511/672] Bump version to 0.13.7

---
 CHANGELOG.md                          | 9 ++++++++-
 build.gradle.kts                      | 2 +-
 data/org.asamk.SignalCli.metainfo.xml | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e9e9ecb..96392bae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.7] - 2024-09-28
+
+Requires libsignal-client version 0.58.0
+
+### Fixed
+
+- Fix unnecessary log output
+- Fix issue with CDSI sync with invalid token
 
 ## [0.13.6] - 2024-09-08
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 2b831256..4f47d149 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
-version = "0.13.7-SNAPSHOT"
+version = "0.13.7"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 78b244c6..8b2fa7ba 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
     <content_attribute id="social-chat">intense</content_attribute>
   </content_rating>
   <releases>
+    <release version="0.13.7" date="2024-09-28">
+      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.7</url>
+    </release>
     <release version="0.13.6" date="2024-09-08">
       <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.6</url>
     </release>

From 304c44064dc6ebab7735046b66b8069c840183e1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 512/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96392bae..80ed008d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.7] - 2024-09-28
 
 Requires libsignal-client version 0.58.0
diff --git a/build.gradle.kts b/build.gradle.kts
index 4f47d149..158778fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
-version = "0.13.7"
+version = "0.13.8-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 7f1fc932ad8c966d00248ae4ac7b4f602d55036a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 29 Sep 2024 09:43:05 +0200
Subject: [PATCH 513/672] Add constant for MAX_MESSAGE_BODY_SIZE

---
 .../java/org/asamk/signal/manager/config/ServiceConfig.java  | 1 +
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java  | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 2de70a53..52ee82e2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -20,6 +20,7 @@ public class ServiceConfig {
 
     public static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
     public static final long MAX_ENVELOPE_SIZE = 0;
+    public static final int MAX_MESSAGE_BODY_SIZE = 2000;
     public static final long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
     public static final boolean AUTOMATIC_NETWORK_RETRY = true;
     public static final int GROUP_MAX_SIZE = 1001;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index a6121e2f..0dc7f5ed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -68,6 +68,7 @@ import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
+import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
@@ -748,7 +749,7 @@ public class ManagerImpl implements Manager {
             final SignalServiceDataMessage.Builder messageBuilder, final Message message
     ) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException {
         final var additionalAttachments = new ArrayList<SignalServiceAttachment>();
-        if (message.messageText().length() > 2000) {
+        if (message.messageText().length() > ServiceConfig.MAX_MESSAGE_BODY_SIZE) {
             final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8);
             final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
             final var streamDetails = new StreamDetails(new ByteArrayInputStream(messageBytes),
@@ -757,7 +758,7 @@ public class ManagerImpl implements Manager {
             final var textAttachment = AttachmentUtils.createAttachmentStream(streamDetails,
                     Optional.empty(),
                     uploadSpec);
-            messageBuilder.withBody(message.messageText().substring(0, 2000));
+            messageBuilder.withBody(message.messageText().substring(0, ServiceConfig.MAX_MESSAGE_BODY_SIZE));
             additionalAttachments.add(context.getAttachmentHelper().uploadAttachment(textAttachment));
         } else {
             messageBuilder.withBody(message.messageText());

From 91eacc18c20b25cb787ae39a74b621bc4b1702a0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 29 Sep 2024 09:43:26 +0200
Subject: [PATCH 514/672] Refactor attachment upload

---
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 0dc7f5ed..4e6bee90 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -764,11 +764,12 @@ public class ManagerImpl implements Manager {
             messageBuilder.withBody(message.messageText());
         }
         if (!message.attachments().isEmpty()) {
+            final var uploadedAttachments = context.getAttachmentHelper().uploadAttachments(message.attachments());
             if (!additionalAttachments.isEmpty()) {
-                additionalAttachments.addAll(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+                additionalAttachments.addAll(uploadedAttachments);
                 messageBuilder.withAttachments(additionalAttachments);
             } else {
-                messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+                messageBuilder.withAttachments(uploadedAttachments);
             }
         }
         if (!message.mentions().isEmpty()) {

From fab1b96c21ead48b64442f6d07beedef959de6ee Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 29 Sep 2024 09:43:51 +0200
Subject: [PATCH 515/672] Upload text attachment also if there no other
 attachments

Fixes #1598
---
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 4e6bee90..27bda583 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -771,6 +771,8 @@ public class ManagerImpl implements Manager {
             } else {
                 messageBuilder.withAttachments(uploadedAttachments);
             }
+        } else if (!additionalAttachments.isEmpty()) {
+            messageBuilder.withAttachments(additionalAttachments);
         }
         if (!message.mentions().isEmpty()) {
             messageBuilder.withMentions(resolveMentions(message.mentions()));

From 5646f6519517b765779b092a98d0c1be824efeae Mon Sep 17 00:00:00 2001
From: Jailson Dias <jaison.diasc@gmail.com>
Date: Thu, 24 Oct 2024 17:27:18 -0300
Subject: [PATCH 516/672] add received and delivered timestamps on json message

---
 .../asamk/signal/json/JsonMessageEnvelope.java | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index bafa97e7..f4f06927 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -17,6 +17,8 @@ public record JsonMessageEnvelope(
         String sourceName,
         Integer sourceDevice,
         long timestamp,
+        long serverReceivedTimestamp,
+        long serverDeliveredTimestamp,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonDataMessage dataMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryMessage storyMessage,
@@ -58,13 +60,21 @@ public record JsonMessageEnvelope(
             sourceName = null;
         }
         final var timestamp = envelope.timestamp();
+        final var serverReceivedTimestamp = envelope.serverReceivedTimestamp();
+        final var serverDeliveredTimestamp = envelope.serverDeliveredTimestamp();
         final var receiptMessage = envelope.receipt().map(JsonReceiptMessage::from).orElse(null);
         final var typingMessage = envelope.typing().map(JsonTypingMessage::from).orElse(null);
 
-        final var dataMessage = envelope.data().map(JsonDataMessage::from).orElse(null);
-        final var editMessage = envelope.edit().map(JsonEditMessage::from).orElse(null);
+        final var dataMessage = envelope.data()
+            .map(data -> JsonDataMessage.from(data, m))
+            .orElse(null);
+        final var editMessage = envelope.edit()
+            .map(data -> JsonEditMessage.from(data, m))
+            .orElse(null);
         final var storyMessage = envelope.story().map(JsonStoryMessage::from).orElse(null);
-        final var syncMessage = envelope.sync().map(JsonSyncMessage::from).orElse(null);
+        final var syncMessage = envelope.sync()
+            .map(data -> JsonSyncMessage.from(data, m))
+            .orElse(null);
         final var callMessage = envelope.call().map(JsonCallMessage::from).orElse(null);
 
         return new JsonMessageEnvelope(source,
@@ -73,6 +83,8 @@ public record JsonMessageEnvelope(
                 sourceName,
                 sourceDevice,
                 timestamp,
+                serverReceivedTimestamp,
+                serverDeliveredTimestamp,
                 dataMessage,
                 editMessage,
                 storyMessage,

From eac2a47163a07c2553fee8a0cfcdf3f1e6adafd2 Mon Sep 17 00:00:00 2001
From: Jailson Dias <jaison.diasc@gmail.com>
Date: Thu, 24 Oct 2024 17:27:51 -0300
Subject: [PATCH 517/672] add group info on json message

---
 .../java/org/asamk/signal/json/JsonDataMessage.java   |  5 +++--
 .../java/org/asamk/signal/json/JsonEditMessage.java   |  5 +++--
 .../java/org/asamk/signal/json/JsonGroupInfo.java     |  7 +++++--
 .../org/asamk/signal/json/JsonSyncDataMessage.java    | 11 ++++++++---
 .../java/org/asamk/signal/json/JsonSyncMessage.java   |  5 +++--
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index ef742585..f24fdbba 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -2,6 +2,7 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
@@ -25,10 +26,10 @@ record JsonDataMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryContext storyContext
 ) {
 
-    static JsonDataMessage from(MessageEnvelope.Data dataMessage) {
+    static JsonDataMessage from(MessageEnvelope.Data dataMessage, Manager m) {
         final var timestamp = dataMessage.timestamp();
         final var groupInfo = dataMessage.groupContext().isPresent() ? JsonGroupInfo.from(dataMessage.groupContext()
-                .get()) : null;
+                .get(), m) : null;
         final var storyContext = dataMessage.storyContext().isPresent()
                 ? JsonStoryContext.from(dataMessage.storyContext().get())
                 : null;
diff --git a/src/main/java/org/asamk/signal/json/JsonEditMessage.java b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
index 193bd16a..6b17344b 100644
--- a/src/main/java/org/asamk/signal/json/JsonEditMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
@@ -1,10 +1,11 @@
 package org.asamk.signal.json;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
 
-    static JsonEditMessage from(MessageEnvelope.Edit editMessage) {
-        return new JsonEditMessage(editMessage.targetSentTimestamp(), JsonDataMessage.from(editMessage.dataMessage()));
+    static JsonEditMessage from(MessageEnvelope.Edit editMessage, Manager m) {
+        return new JsonEditMessage(editMessage.targetSentTimestamp(), JsonDataMessage.from(editMessage.dataMessage(), m));
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
index 01e39900..c370d1e2 100644
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -1,11 +1,14 @@
 package org.asamk.signal.json;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
-record JsonGroupInfo(String groupId, String type) {
+record JsonGroupInfo(String groupId, String groupName, int revision, String type) {
 
-    static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext) {
+    static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext, Manager m) {
         return new JsonGroupInfo(groupContext.groupId().toBase64(),
+                m.getGroup(groupContext.groupId()).title(),
+                groupContext.revision(),
                 groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER");
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index fe427ef1..391181b0 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -3,6 +3,7 @@ package org.asamk.signal.json;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.RecipientAddress;
 
@@ -16,13 +17,17 @@ record JsonSyncDataMessage(
         @JsonUnwrapped JsonDataMessage dataMessage
 ) {
 
-    static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage) {
+    static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage, Manager m) {
         return new JsonSyncDataMessage(transcriptMessage.destination()
                 .map(RecipientAddress::getLegacyIdentifier)
                 .orElse(null),
                 transcriptMessage.destination().flatMap(RecipientAddress::number).orElse(null),
                 transcriptMessage.destination().flatMap(address -> address.uuid().map(UUID::toString)).orElse(null),
-                transcriptMessage.editMessage().map(JsonEditMessage::from).orElse(null),
-                transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
+                transcriptMessage.editMessage()
+                    .map(data -> JsonEditMessage.from(data, m))
+                    .orElse(null),
+                transcriptMessage.message()
+                    .map(data -> JsonDataMessage.from(data, m))
+                    .orElse(null));
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
index fbe11daf..072b2e3b 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -2,6 +2,7 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.manager.api.RecipientAddress;
@@ -23,9 +24,9 @@ record JsonSyncMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessageType type
 ) {
 
-    static JsonSyncMessage from(MessageEnvelope.Sync syncMessage) {
+    static JsonSyncMessage from(MessageEnvelope.Sync syncMessage, Manager m) {
         final var sentMessage = syncMessage.sent().isPresent() && syncMessage.sent().get().story().isEmpty()
-                ? JsonSyncDataMessage.from(syncMessage.sent().get())
+                ? JsonSyncDataMessage.from(syncMessage.sent().get(), m)
                 : null;
         final var sentStoryMessage = syncMessage.sent().isPresent() && syncMessage.sent().get().story().isPresent()
                 ? JsonSyncStoryMessage.from(syncMessage.sent().get())

From 9afd4e43284e05a322aa261bcf4753eb96ba882a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 14 Oct 2024 22:06:01 +0200
Subject: [PATCH 518/672] Update libsignal-service

---
 .../java/org/asamk/signal/manager/api/MessageEnvelope.java  | 4 ++--
 .../java/org/asamk/signal/manager/config/LiveConfig.java    | 5 +++--
 .../java/org/asamk/signal/manager/config/StagingConfig.java | 5 +++--
 settings.gradle.kts                                         | 2 +-
 src/main/java/org/asamk/signal/ReceiveMessageHandler.java   | 6 +++---
 src/main/java/org/asamk/signal/json/JsonContactName.java    | 4 ++--
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index c5da641c..aefaa800 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -390,7 +390,7 @@ public record MessageEnvelope(
             }
 
             public record Name(
-                    Optional<String> display,
+                    Optional<String> nickname,
                     Optional<String> given,
                     Optional<String> family,
                     Optional<String> prefix,
@@ -399,7 +399,7 @@ public record MessageEnvelope(
             ) {
 
                 static Name from(org.whispersystems.signalservice.api.messages.shared.SharedContact.Name name) {
-                    return new Name(name.getDisplay(),
+                    return new Name(name.getNickname(),
                             name.getGiven(),
                             name.getFamily(),
                             name.getPrefix(),
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index f89db53c..f7859dae 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -28,7 +28,8 @@ class LiveConfig {
     private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE = "a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97";
+    private static final String SVR2_MRENCLAVE = "9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570";
+    private static final String SVR2_LEGACY_MRENCLAVE = "a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97";
 
     private static final String URL = "https://chat.signal.org";
     private static final String CDN_URL = "https://cdn.signal.org";
@@ -87,7 +88,7 @@ class LiveConfig {
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE));
+                List.of(SVR2_MRENCLAVE, SVR2_LEGACY_MRENCLAVE));
     }
 
     private LiveConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index f8032893..a3212c07 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -28,7 +28,8 @@ class StagingConfig {
     private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE = "acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482";
+    private static final String SVR2_MRENCLAVE = "38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3";
+    private static final String SVR2_LEGACY_MRENCLAVE = "acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482";
 
     private static final String URL = "https://chat.staging.signal.org";
     private static final String CDN_URL = "https://cdn-staging.signal.org";
@@ -87,7 +88,7 @@ class StagingConfig {
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE));
+                List.of(SVR2_MRENCLAVE, SVR2_LEGACY_MRENCLAVE));
     }
 
     private StagingConfig() {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a473f18a..d06a1e1d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -15,7 +15,7 @@ dependencyResolutionManagement {
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
             library("logback", "ch.qos.logback", "logback-classic").version("1.5.8")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_108")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_109")
             library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.1.0")
             library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
             library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.0")
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index f6eb660e..d96835a5 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -448,9 +448,6 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         writer.println("Name:");
         var name = contact.name();
         writer.indent(w -> {
-            if (name.display().isPresent() && !name.display().get().isBlank()) {
-                w.println("Display name: {}", name.display().get());
-            }
             if (name.given().isPresent() && !name.given().get().isBlank()) {
                 w.println("First name: {}", name.given().get());
             }
@@ -466,6 +463,9 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             if (name.suffix().isPresent() && !name.suffix().get().isBlank()) {
                 w.println("Suffix name: {}", name.suffix().get());
             }
+            if (name.nickname().isPresent() && !name.nickname().get().isBlank()) {
+                w.println("Display name: {}", name.nickname().get());
+            }
         });
 
         if (contact.avatar().isPresent()) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContactName.java b/src/main/java/org/asamk/signal/json/JsonContactName.java
index fdf11298..4d8c2327 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactName.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactName.java
@@ -4,11 +4,11 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
 public record JsonContactName(
-        String display, String given, String family, String prefix, String suffix, String middle
+        String nickname, String given, String family, String prefix, String suffix, String middle
 ) {
 
     static JsonContactName from(MessageEnvelope.Data.SharedContact.Name name) {
-        return new JsonContactName(Util.getStringIfNotBlank(name.display()),
+        return new JsonContactName(Util.getStringIfNotBlank(name.nickname()),
                 Util.getStringIfNotBlank(name.given()),
                 Util.getStringIfNotBlank(name.family()),
                 Util.getStringIfNotBlank(name.prefix()),

From 47e6fc1769ce3f8c6f48352ce2e11ae15f734a05 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 23 Oct 2024 21:57:13 +0200
Subject: [PATCH 519/672] Update dependencies

---
 CHANGELOG.md                                  |  5 +-
 graalvm-config-dir/reflect-config.json        | 66 ++++++++++++++++++-
 .../signal/manager/helper/AccountHelper.java  | 11 ++--
 .../internal/RegistrationManagerImpl.java     | 15 +++--
 .../manager/internal/SignalDependencies.java  | 14 +++-
 .../manager/util/NumberVerificationUtils.java | 45 +++++++------
 .../org/asamk/signal/manager/util/Utils.java  | 16 ++---
 settings.gradle.kts                           | 14 ++--
 .../java/org/asamk/signal/BaseConfig.java     |  2 +-
 9 files changed, 138 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80ed008d..524ac160 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+Requires libsignal-client version 0.58.2
+
 ## [0.13.7] - 2024-09-28
 
 Requires libsignal-client version 0.58.0
@@ -706,7 +708,8 @@ Requires libsignal-client version 0.52.2
 ### Added
 
 - New parameters for `updateGroup` command for group v2 features:
-  `--description`, `--remove-member`, `--admin`, `--remove-admin`, `--reset-link`, `--link`, `--set-permission-add-member`, `--set-permission-edit-details`, `--expiration`
+  `--description`, `--remove-member`, `--admin`, `--remove-admin`, `--reset-link`, `--link`,
+  `--set-permission-add-member`, `--set-permission-edit-details`, `--expiration`
 - New `--admin` parameter for `quitGroup` to set an admin before leaving the group
 - New `--delete` parameter for `quitGroup`, to delete the local group data
 - New 'sendTyping' command to send typing indicators
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 2ae5c452..62b89b78 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -39,6 +39,24 @@
 {
   "name":"[Ljava.sql.Statement;"
 },
+{
+  "name":"[Lorg.asamk.signal.json.JsonAttachment;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonMention;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonPreview;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonQuotedAttachment;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonTextStyle;"
+},
+{
+  "name":"[Lorg.asamk.signal.manager.storage.accounts.AccountsStorage$Account;"
+},
 {
   "name":"[Lorg.whispersystems.signalservice.api.groupsv2.TemporalCredential;"
 },
@@ -371,6 +389,11 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true
 },
+{
+  "name":"java.util.AbstractMap",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
 {
   "name":"java.util.ArrayList",
   "allDeclaredMethods":true,
@@ -385,6 +408,39 @@
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true
 },
+{
+  "name":"java.util.ImmutableCollections$AbstractImmutableCollection",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.util.ImmutableCollections$AbstractImmutableList",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.util.ImmutableCollections$AbstractImmutableMap",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"java.util.ImmutableCollections$ListN",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"java.util.ImmutableCollections$Map1",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"java.util.ImmutableCollections$MapN",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"java.util.LinkedHashMap",
   "allDeclaredMethods":true,
@@ -399,7 +455,8 @@
   "methods":[{"name":"getUnicodeLocaleType","parameterTypes":["java.lang.String"] }]
 },
 {
-  "name":"java.util.Map"
+  "name":"java.util.Map",
+  "queryAllDeclaredMethods":true
 },
 {
   "name":"java.util.Optional",
@@ -887,18 +944,21 @@
   "name":"org.asamk.signal.json.JsonContact",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
   "methods":[{"name":"color","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"internal","parameterTypes":[] }, {"name":"isBlocked","parameterTypes":[] }, {"name":"isHidden","parameterTypes":[] }, {"name":"messageExpirationTime","parameterTypes":[] }, {"name":"name","parameterTypes":[] }, {"name":"nickFamilyName","parameterTypes":[] }, {"name":"nickGivenName","parameterTypes":[] }, {"name":"nickName","parameterTypes":[] }, {"name":"note","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"profile","parameterTypes":[] }, {"name":"profileSharing","parameterTypes":[] }, {"name":"unregistered","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"uuid","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContact$JsonInternal",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
   "methods":[{"name":"capabilities","parameterTypes":[] }, {"name":"discoverableByPhonenumber","parameterTypes":[] }, {"name":"sharesPhoneNumber","parameterTypes":[] }, {"name":"unidentifiedAccessMode","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContact$JsonProfile",
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
   "methods":[{"name":"about","parameterTypes":[] }, {"name":"aboutEmoji","parameterTypes":[] }, {"name":"familyName","parameterTypes":[] }, {"name":"givenName","parameterTypes":[] }, {"name":"hasAvatar","parameterTypes":[] }, {"name":"lastUpdateTimestamp","parameterTypes":[] }, {"name":"mobileCoinAddress","parameterTypes":[] }]
 },
 {
@@ -2160,6 +2220,9 @@
   "name":"org.signal.storageservice.protos.groups.local.DecryptedTimer",
   "fields":[{"name":"duration_"}]
 },
+{
+  "name":"org.slf4j.Logger"
+},
 {
   "name":"org.sqlite.JDBC"
 },
@@ -2557,6 +2620,7 @@
   "allDeclaredFields":true,
   "allDeclaredClasses":true,
   "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
   "methods":[{"name":"accountAttributes","parameterTypes":[] }, {"name":"aciPqLastResortPreKey","parameterTypes":[] }, {"name":"aciSignedPreKey","parameterTypes":[] }, {"name":"pniPqLastResortPreKey","parameterTypes":[] }, {"name":"pniSignedPreKey","parameterTypes":[] }, {"name":"verificationCode","parameterTypes":[] }]
 },
 {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 5163c8fc..ba18c63c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -168,12 +168,13 @@ public class AccountHelper {
             String newNumber, boolean voiceVerification, String captcha
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException {
         final var accountManager = dependencies.createUnauthenticatedAccountManager(newNumber, account.getPassword());
-        String sessionId = NumberVerificationUtils.handleVerificationSession(accountManager,
+        final var registrationApi = accountManager.getRegistrationApi();
+        String sessionId = NumberVerificationUtils.handleVerificationSession(registrationApi,
                 account.getSessionId(newNumber),
                 id -> account.setSessionId(newNumber, id),
                 voiceVerification,
                 captcha);
-        NumberVerificationUtils.requestVerificationCode(accountManager, sessionId, voiceVerification);
+        NumberVerificationUtils.requestVerificationCode(registrationApi, sessionId, voiceVerification);
     }
 
     public void finishChangeNumber(
@@ -280,13 +281,13 @@ public class AccountHelper {
                 pin,
                 context.getPinHelper(),
                 (sessionId1, verificationCode1, registrationLock) -> {
-                    final var accountManager = dependencies.getAccountManager();
+                    final var registrationApi = dependencies.getRegistrationApi();
                     try {
-                        Utils.handleResponseException(accountManager.verifyAccount(verificationCode1, sessionId1));
+                        Utils.handleResponseException(registrationApi.verifyAccount(verificationCode1, sessionId1));
                     } catch (AlreadyVerifiedException e) {
                         // Already verified so can continue changing number
                     }
-                    return Utils.handleResponseException(accountManager.changeNumber(new ChangePhoneNumberRequest(
+                    return Utils.handleResponseException(registrationApi.changeNumber(new ChangePhoneNumberRequest(
                             sessionId1,
                             null,
                             newNumber,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 015d17a0..eaaba787 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -129,14 +129,13 @@ public class RegistrationManagerImpl implements RegistrationManager {
                 return;
             }
 
-            String sessionId = NumberVerificationUtils.handleVerificationSession(unauthenticatedAccountManager,
+            final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
+            String sessionId = NumberVerificationUtils.handleVerificationSession(registrationApi,
                     account.getSessionId(account.getNumber()),
                     id -> account.setSessionId(account.getNumber(), id),
                     voiceVerification,
                     captcha);
-            NumberVerificationUtils.requestVerificationCode(unauthenticatedAccountManager,
-                    sessionId,
-                    voiceVerification);
+            NumberVerificationUtils.requestVerificationCode(registrationApi, sessionId, voiceVerification);
             account.setRegistered(false);
         } catch (DeprecatedVersionException e) {
             logger.debug("Signal-Server returned deprecated version exception", e);
@@ -196,7 +195,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
             final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
             final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
-            final var response = Utils.handleResponseException(unauthenticatedAccountManager.registerAccount(null,
+            final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
+            final var response = Utils.handleResponseException(registrationApi.registerAccount(null,
                     recoveryPassword,
                     account.getAccountAttributes(null),
                     aciPreKeys,
@@ -256,12 +256,13 @@ public class RegistrationManagerImpl implements RegistrationManager {
             final PreKeyCollection aciPreKeys,
             final PreKeyCollection pniPreKeys
     ) throws IOException {
+        final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
         try {
-            Utils.handleResponseException(unauthenticatedAccountManager.verifyAccount(verificationCode, sessionId));
+            Utils.handleResponseException(registrationApi.verifyAccount(verificationCode, sessionId));
         } catch (AlreadyVerifiedException e) {
             // Already verified so can continue registering
         }
-        return Utils.handleResponseException(unauthenticatedAccountManager.registerAccount(sessionId,
+        return Utils.handleResponseException(registrationApi.registerAccount(sessionId,
                 null,
                 account.getAccountAttributes(registrationLock),
                 aciPreKeys,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index f4f72aca..7ee2b39e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -17,6 +17,7 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
@@ -47,6 +48,7 @@ public class SignalDependencies {
 
     private SignalServiceAccountManager accountManager;
     private GroupsV2Api groupsV2Api;
+    private RegistrationApi registrationApi;
     private GroupsV2Operations groupsV2Operations;
     private ClientZkOperations clientZkOperations;
 
@@ -80,8 +82,14 @@ public class SignalDependencies {
         if (this.pushServiceSocket != null) {
             this.pushServiceSocket.close();
             this.pushServiceSocket = null;
+            this.accountManager = null;
+            this.messageReceiver = null;
+            this.messageSender = null;
+            this.profileService = null;
+            this.groupsV2Api = null;
+            this.registrationApi = null;
+            this.secureValueRecovery = null;
         }
-        this.messageSender = null;
         getSignalWebSocket().forceNewWebSockets();
     }
 
@@ -143,6 +151,10 @@ public class SignalDependencies {
         return getOrCreate(() -> groupsV2Api, () -> groupsV2Api = getAccountManager().getGroupsV2Api());
     }
 
+    public RegistrationApi getRegistrationApi() {
+        return getOrCreate(() -> registrationApi, () -> registrationApi = getAccountManager().getRegistrationApi());
+    }
+
     public GroupsV2Operations getGroupsV2Operations() {
         return getOrCreate(() -> groupsV2Operations,
                 () -> groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index f96e79d3..1c5aa411 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -10,14 +10,15 @@ import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.helper.PinHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.NetworkResult;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.push.exceptions.PushChallengeRequiredException;
 import org.whispersystems.signalservice.api.push.exceptions.TokenNotAcceptedException;
-import org.whispersystems.signalservice.internal.ServiceResponse;
+import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.internal.push.LockedException;
+import org.whispersystems.signalservice.internal.push.PushServiceSocket.VerificationCodeTransport;
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataResponse;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 
@@ -30,7 +31,7 @@ public class NumberVerificationUtils {
     private static final Logger logger = LoggerFactory.getLogger(NumberVerificationUtils.class);
 
     public static String handleVerificationSession(
-            SignalServiceAccountManager accountManager,
+            RegistrationApi registrationApi,
             String sessionId,
             Consumer<String> sessionIdSaver,
             boolean voiceVerification,
@@ -38,11 +39,11 @@ public class NumberVerificationUtils {
     ) throws CaptchaRequiredException, IOException, RateLimitException, VerificationMethodNotAvailableException {
         RegistrationSessionMetadataResponse sessionResponse;
         try {
-            sessionResponse = getValidSession(accountManager, sessionId);
+            sessionResponse = getValidSession(registrationApi, sessionId);
         } catch (PushChallengeRequiredException |
                  org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) {
             if (captcha != null) {
-                sessionResponse = submitCaptcha(accountManager, sessionId, captcha);
+                sessionResponse = submitCaptcha(registrationApi, sessionId, captcha);
             } else {
                 throw new CaptchaRequiredException("Captcha Required");
             }
@@ -77,7 +78,7 @@ public class NumberVerificationUtils {
 
         if (sessionResponse.getBody().getRequestedInformation().contains("captcha")) {
             if (captcha != null) {
-                sessionResponse = submitCaptcha(accountManager, sessionId, captcha);
+                sessionResponse = submitCaptcha(registrationApi, sessionId, captcha);
             }
             if (!sessionResponse.getBody().getAllowedToRequestCode()) {
                 throw new CaptchaRequiredException("Captcha Required");
@@ -88,14 +89,20 @@ public class NumberVerificationUtils {
     }
 
     public static void requestVerificationCode(
-            SignalServiceAccountManager accountManager, String sessionId, boolean voiceVerification
+            RegistrationApi registrationApi, String sessionId, boolean voiceVerification
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
-        final ServiceResponse<RegistrationSessionMetadataResponse> response;
+        final NetworkResult<RegistrationSessionMetadataResponse> response;
         final var locale = Utils.getDefaultLocale(Locale.US);
         if (voiceVerification) {
-            response = accountManager.requestVoiceVerificationCode(sessionId, locale, false);
+            response = registrationApi.requestSmsVerificationCode(sessionId,
+                    locale,
+                    false,
+                    VerificationCodeTransport.VOICE);
         } else {
-            response = accountManager.requestSmsVerificationCode(sessionId, locale, false);
+            response = registrationApi.requestSmsVerificationCode(sessionId,
+                    locale,
+                    false,
+                    VerificationCodeTransport.SMS);
         }
         try {
             Utils.handleResponseException(response);
@@ -140,37 +147,37 @@ public class NumberVerificationUtils {
     }
 
     private static RegistrationSessionMetadataResponse validateSession(
-            final SignalServiceAccountManager accountManager, final String sessionId
+            final RegistrationApi registrationApi, final String sessionId
     ) throws IOException {
         if (sessionId == null || sessionId.isEmpty()) {
             throw new NoSuchSessionException();
         }
-        return Utils.handleResponseException(accountManager.getRegistrationSession(sessionId));
+        return Utils.handleResponseException(registrationApi.getRegistrationSessionStatus(sessionId));
     }
 
     private static RegistrationSessionMetadataResponse requestValidSession(
-            final SignalServiceAccountManager accountManager
+            final RegistrationApi registrationApi
     ) throws IOException {
-        return Utils.handleResponseException(accountManager.createRegistrationSession(null, "", ""));
+        return Utils.handleResponseException(registrationApi.createRegistrationSession(null, "", ""));
     }
 
     private static RegistrationSessionMetadataResponse getValidSession(
-            final SignalServiceAccountManager accountManager, final String sessionId
+            final RegistrationApi registrationApi, final String sessionId
     ) throws IOException {
         try {
-            return validateSession(accountManager, sessionId);
+            return validateSession(registrationApi, sessionId);
         } catch (NoSuchSessionException e) {
             logger.debug("No registration session, creating new one.");
-            return requestValidSession(accountManager);
+            return requestValidSession(registrationApi);
         }
     }
 
     private static RegistrationSessionMetadataResponse submitCaptcha(
-            SignalServiceAccountManager accountManager, String sessionId, String captcha
+            RegistrationApi registrationApi, String sessionId, String captcha
     ) throws IOException, CaptchaRequiredException {
         captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
         try {
-            return Utils.handleResponseException(accountManager.submitCaptchaToken(sessionId, captcha));
+            return Utils.handleResponseException(registrationApi.submitCaptchaToken(sessionId, captcha));
         } catch (PushChallengeRequiredException |
                  org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException |
                  TokenNotAcceptedException _e) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index e6d8e4d3..16aa3275 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -6,9 +6,9 @@ import org.signal.libsignal.protocol.fingerprint.Fingerprint;
 import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.NetworkResult;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.util.StreamDetails;
-import org.whispersystems.signalservice.internal.ServiceResponse;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -140,15 +140,15 @@ public class Utils {
         return map;
     }
 
-    public static <T> T handleResponseException(final ServiceResponse<T> response) throws IOException {
-        final var throwableOptional = response.getExecutionError().or(response::getApplicationError);
-        if (throwableOptional.isPresent()) {
-            if (throwableOptional.get() instanceof IOException) {
-                throw (IOException) throwableOptional.get();
+    public static <T> T handleResponseException(final NetworkResult<T> response) throws IOException {
+        final var throwableOptional = response.getCause();
+        if (throwableOptional != null) {
+            if (throwableOptional instanceof IOException ioException) {
+                throw ioException;
             } else {
-                throw new IOException(throwableOptional.get());
+                throw new IOException(throwableOptional);
             }
         }
-        return response.getResult().orElse(null);
+        return response.successOrThrow();
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d06a1e1d..ef9ec486 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,19 +7,19 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78.1")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.17.2")
+            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.18.0")
             library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
             library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
             version("slf4j", "2.0.16")
             library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
             library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.5.8")
+            library("logback", "ch.qos.logback", "logback-classic").version("1.5.11")
 
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_109")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.46.1.0")
-            library("hikari", "com.zaxxer", "HikariCP").version("5.1.0")
-            library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.0")
-            library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.11.0")
+            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_110")
+            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.47.0.0")
+            library("hikari", "com.zaxxer", "HikariCP").version("6.0.0")
+            library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.3")
+            library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.11.3")
         }
     }
 }
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index ae85882c..7b182351 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.18.2");
+            .orElse("Signal-Android/7.21.4");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 5171107a29c175a305bd30ee3fb6b40b7269eec3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 25 Oct 2024 17:22:47 +0200
Subject: [PATCH 520/672] Run CI with Java 23

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 97cd5530..75d892a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21', '22' ]
+        java: [ '21', '23' ]
 
     steps:
       - uses: actions/checkout@v4

From 5a4f4ba6db935d54757f4c6a79e544708a994d6f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 26 Oct 2024 13:08:21 +0200
Subject: [PATCH 521/672] Implement message expiration timer version

Fixes #1605
---
 .../org/asamk/signal/manager/api/Contact.java |  8 ++++
 .../signal/manager/config/ServiceConfig.java  |  3 +-
 .../signal/manager/helper/ContactHelper.java  | 28 ++++++++++++-
 .../helper/IncomingMessageHandler.java        |  4 +-
 .../signal/manager/helper/SendHelper.java     |  8 ++--
 .../signal/manager/helper/SyncHelper.java     | 15 ++++++-
 .../manager/storage/AccountDatabase.java      | 10 ++++-
 .../signal/manager/storage/SignalAccount.java |  2 +
 .../recipients/LegacyRecipientStore2.java     |  1 +
 .../storage/recipients/RecipientStore.java    | 42 ++++++++++---------
 .../asamk/signal/dbus/DbusManagerImpl.java    |  1 +
 11 files changed, 91 insertions(+), 31 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
index 3605b7c5..91cf82df 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -11,6 +11,7 @@ public record Contact(
         String note,
         String color,
         int messageExpirationTime,
+        int messageExpirationTimeVersion,
         long muteUntil,
         boolean hideStory,
         boolean isBlocked,
@@ -29,6 +30,7 @@ public record Contact(
                 builder.note,
                 builder.color,
                 builder.messageExpirationTime,
+                builder.messageExpirationTimeVersion,
                 builder.muteUntil,
                 builder.hideStory,
                 builder.isBlocked,
@@ -84,6 +86,7 @@ public record Contact(
         private String note;
         private String color;
         private int messageExpirationTime;
+        private int messageExpirationTimeVersion = 1;
         private long muteUntil;
         private boolean hideStory;
         private boolean isBlocked;
@@ -139,6 +142,11 @@ public record Contact(
             return this;
         }
 
+        public Builder withMessageExpirationTimeVersion(final int val) {
+            messageExpirationTimeVersion = val;
+            return this;
+        }
+
         public Builder withMuteUntil(final long val) {
             muteUntil = val;
             return this;
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 52ee82e2..7ee80815 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -29,8 +29,7 @@ public class ServiceConfig {
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var deleteSync = !isPrimaryDevice;
-        final var versionedExpirationTimer = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(true, deleteSync, versionedExpirationTimer);
+        return new AccountAttributes.Capabilities(true, deleteSync, true);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index f9af27f1..56ef89ed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -36,8 +36,34 @@ public class ContactHelper {
             return;
         }
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        final var version = contact == null
+                ? 1
+                : contact.messageExpirationTimeVersion() == Integer.MAX_VALUE
+                        ? Integer.MAX_VALUE
+                        : contact.messageExpirationTimeVersion() + 1;
         account.getContactStore()
-                .storeContact(recipientId, builder.withMessageExpirationTime(messageExpirationTimer).build());
+                .storeContact(recipientId,
+                        builder.withMessageExpirationTime(messageExpirationTimer)
+                                .withMessageExpirationTimeVersion(version)
+                                .build());
+    }
+
+    public void setExpirationTimer(
+            RecipientId recipientId, int messageExpirationTimer, int messageExpirationTimerVersion
+    ) {
+        var contact = account.getContactStore().getContact(recipientId);
+        if (contact != null && (
+                contact.messageExpirationTime() == messageExpirationTimer
+                        || contact.messageExpirationTimeVersion() >= messageExpirationTimerVersion
+        )) {
+            return;
+        }
+        final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
+        account.getContactStore()
+                .storeContact(recipientId,
+                        builder.withMessageExpirationTime(messageExpirationTimer)
+                                .withMessageExpirationTimeVersion(messageExpirationTimerVersion)
+                                .build());
     }
 
     public void setContactBlocked(RecipientId recipientId, boolean blocked) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 5e04f135..294b17f6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -802,7 +802,9 @@ public final class IncomingMessageHandler {
                 }
             } else if (conversationPartnerAddress != null) {
                 context.getContactHelper()
-                        .setExpirationTimer(conversationPartnerAddress.recipientId(), message.getExpiresInSeconds());
+                        .setExpirationTimer(conversationPartnerAddress.recipientId(),
+                                message.getExpiresInSeconds(),
+                                message.getExpireTimerVersion());
             }
         }
         if (!ignoreAttachments) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 84b9f0e6..0622b4a8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -86,8 +86,8 @@ public class SendHelper {
             account.getContactStore().storeContact(recipientId, contact);
         }
 
-        final var expirationTime = contact.messageExpirationTime();
-        messageBuilder.withExpiration(expirationTime);
+        messageBuilder.withExpiration(contact.messageExpirationTime());
+        messageBuilder.withExpireTimerVersion(contact.messageExpirationTimeVersion());
 
         if (!contact.isBlocked()) {
             final var profileKey = account.getProfileKey().serialize();
@@ -187,8 +187,8 @@ public class SendHelper {
     ) {
         final var recipientId = account.getSelfRecipientId();
         final var contact = account.getContactStore().getContact(recipientId);
-        final var expirationTime = contact != null ? contact.messageExpirationTime() : 0;
-        messageBuilder.withExpiration(expirationTime);
+        messageBuilder.withExpiration(contact != null ? contact.messageExpirationTime() : 0);
+        messageBuilder.withExpireTimerVersion(contact != null ? contact.messageExpirationTimeVersion() : 1);
 
         var message = messageBuilder.build();
         return sendSelfMessage(message, editTargetTimestamp);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index ecaf7605..56665fda 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -239,7 +239,7 @@ public class SyncHelper {
                 Optional.ofNullable(verifiedMessage),
                 Optional.ofNullable(profileKey),
                 Optional.ofNullable(contact == null ? null : contact.messageExpirationTime()),
-                Optional.empty(),
+                Optional.ofNullable(contact == null ? null : contact.messageExpirationTimeVersion()),
                 Optional.empty(),
                 contact != null && contact.isArchived());
     }
@@ -392,7 +392,18 @@ public class SyncHelper {
                                 TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
             }
             if (c.getExpirationTimer().isPresent()) {
-                builder.withMessageExpirationTime(c.getExpirationTimer().get());
+                if (c.getExpirationTimerVersion().isPresent() && (
+                        contact == null || c.getExpirationTimerVersion().get() > contact.messageExpirationTimeVersion()
+                )) {
+                    builder.withMessageExpirationTime(c.getExpirationTimer().get());
+                    builder.withMessageExpirationTimeVersion(c.getExpirationTimerVersion().get());
+                } else {
+                    logger.debug(
+                            "[ContactSync] {} was synced with an old expiration timer. Ignoring. Received: {} Current: ${}",
+                            recipientId,
+                            c.getExpirationTimerVersion(),
+                            contact == null ? 1 : contact.messageExpirationTimeVersion());
+                }
             }
             builder.withIsArchived(c.isArchived());
             account.getContactStore().storeContact(recipientId, builder.build());
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 3d9fad9c..be9e7af1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -33,7 +33,7 @@ import java.util.UUID;
 public class AccountDatabase extends Database {
 
     private static final Logger logger = LoggerFactory.getLogger(AccountDatabase.class);
-    private static final long DATABASE_VERSION = 26;
+    private static final long DATABASE_VERSION = 27;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -600,6 +600,14 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
+        if (oldVersion < 27) {
+            logger.debug("Updating database: Create expiration_time_version column");
+            try (final var statement = connection.createStatement()) {
+                statement.executeUpdate("""
+                                        ALTER TABLE recipient ADD expiration_time_version INTEGER DEFAULT 1 NOT NULL;
+                                        """);
+            }
+        }
     }
 
     private static void createUuidMappingTable(
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 0ca76e9d..87cf3aa3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -864,6 +864,7 @@ public class SignalAccount implements Closeable {
                                 null,
                                 contact.color,
                                 contact.messageExpirationTime,
+                                1,
                                 0,
                                 false,
                                 contact.blocked,
@@ -939,6 +940,7 @@ public class SignalAccount implements Closeable {
                             getContactStore().storeContact(recipientId,
                                     Contact.newBuilder(contact)
                                             .withMessageExpirationTime(thread.messageExpirationTime)
+                                            .withMessageExpirationTimeVersion(1)
                                             .build());
                         }
                     } else {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
index e7aff640..e8d44ab9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java
@@ -46,6 +46,7 @@ public class LegacyRecipientStore2 {
                             null,
                             r.contact.color,
                             r.contact.messageExpirationTime,
+                            1,
                             0,
                             false,
                             r.contact.blocked,
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 6a672008..54383eb0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -79,6 +79,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       color TEXT,
 
                                       expiration_time INTEGER NOT NULL DEFAULT 0,
+                                      expiration_time_version INTEGER DEFAULT 1 NOT NULL,
                                       mute_until INTEGER NOT NULL DEFAULT 0,
                                       blocked INTEGER NOT NULL DEFAULT FALSE,
                                       archived INTEGER NOT NULL DEFAULT FALSE,
@@ -332,7 +333,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public List<Pair<RecipientId, Contact>> getContacts() {
         final var sql = (
                 """
-                SELECT r._id, r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
+                SELECT r._id, r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                 FROM %s r
                 WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
                 """
@@ -356,7 +357,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 SELECT r._id,
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                        r.discoverable,
                        r.storage_record
@@ -376,7 +377,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 SELECT r._id,
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                        r.discoverable,
                        r.storage_record
@@ -413,7 +414,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 SELECT r._id,
                        r.number, r.aci, r.pni, r.username,
                        r.profile_key, r.profile_key_credential,
-                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
+                       r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp,
                        r.profile_last_update_timestamp, r.profile_given_name, r.profile_family_name, r.profile_about, r.profile_about_emoji, r.profile_avatar_url_path, r.profile_mobile_coin_address, r.profile_unidentified_access_mode, r.profile_capabilities, r.profile_phone_number_sharing,
                        r.discoverable,
                        r.storage_record
@@ -817,7 +818,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, archived = ?, unregistered_timestamp = ?, nick_name_given_name = ?, nick_name_family_name = ?, note = ?
+                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, expiration_time_version = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, archived = ?, unregistered_timestamp = ?, nick_name_given_name = ?, nick_name_family_name = ?, note = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -826,21 +827,22 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setString(2, contact == null ? null : contact.familyName());
             statement.setString(3, contact == null ? null : contact.nickName());
             statement.setInt(4, contact == null ? 0 : contact.messageExpirationTime());
-            statement.setLong(5, contact == null ? 0 : contact.muteUntil());
-            statement.setBoolean(6, contact != null && contact.hideStory());
-            statement.setBoolean(7, contact != null && contact.isProfileSharingEnabled());
-            statement.setString(8, contact == null ? null : contact.color());
-            statement.setBoolean(9, contact != null && contact.isBlocked());
-            statement.setBoolean(10, contact != null && contact.isArchived());
+            statement.setInt(5, contact == null ? 0 : Math.max(1, contact.messageExpirationTimeVersion()));
+            statement.setLong(6, contact == null ? 0 : contact.muteUntil());
+            statement.setBoolean(7, contact != null && contact.hideStory());
+            statement.setBoolean(8, contact != null && contact.isProfileSharingEnabled());
+            statement.setString(9, contact == null ? null : contact.color());
+            statement.setBoolean(10, contact != null && contact.isBlocked());
+            statement.setBoolean(11, contact != null && contact.isArchived());
             if (contact == null || contact.unregisteredTimestamp() == null) {
-                statement.setNull(11, Types.INTEGER);
+                statement.setNull(12, Types.INTEGER);
             } else {
-                statement.setLong(11, contact.unregisteredTimestamp());
+                statement.setLong(12, contact.unregisteredTimestamp());
             }
-            statement.setString(12, contact == null ? null : contact.nickNameGivenName());
-            statement.setString(13, contact == null ? null : contact.nickNameFamilyName());
-            statement.setString(14, contact == null ? null : contact.note());
-            statement.setLong(15, recipientId.id());
+            statement.setString(13, contact == null ? null : contact.nickNameGivenName());
+            statement.setString(14, contact == null ? null : contact.nickNameFamilyName());
+            statement.setString(15, contact == null ? null : contact.note());
+            statement.setLong(16, recipientId.id());
             statement.executeUpdate();
         }
         if (contact != null && contact.unregisteredTimestamp() != null) {
@@ -918,8 +920,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                     markDiscoverable(connection, recipientId, false);
                     final var contact = getContact(connection, recipientId);
                     if (recipientAddress.get().address().aci().isEmpty() || (
-                            contact != null
-                                    && contact.unregisteredTimestamp() != null
+                            contact != null && contact.unregisteredTimestamp() != null
                     )) {
                         markUnregisteredAndSplitIfNecessary(connection, recipientId);
                     }
@@ -1416,7 +1417,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     private Contact getContact(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
-                SELECT r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
+                SELECT r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                 FROM %s r
                 WHERE r._id = ? AND (%s)
                 """
@@ -1514,6 +1515,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 resultSet.getString("note"),
                 resultSet.getString("color"),
                 resultSet.getInt("expiration_time"),
+                resultSet.getInt("expiration_time_version"),
                 resultSet.getLong("mute_until"),
                 resultSet.getBoolean("hide_story"),
                 resultSet.getBoolean("blocked"),
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 9ae3001a..bd5bdfb2 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -699,6 +699,7 @@ public class DbusManagerImpl implements Manager {
                             null,
                             null,
                             0,
+                            1,
                             0,
                             false,
                             contactBlocked,

From 0a287b0b3eef6591fed86fd4b39506e4d32eb69c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 26 Oct 2024 13:10:33 +0200
Subject: [PATCH 522/672] Reformat files

---
 .../manager/storage/AccountDatabase.java      | 34 +++++++++----------
 .../storage/recipients/RecipientStore.java    |  6 ++--
 .../asamk/signal/json/JsonEditMessage.java    |  3 +-
 .../signal/json/JsonMessageEnvelope.java      | 12 ++-----
 .../signal/json/JsonSyncDataMessage.java      |  8 ++---
 5 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index be9e7af1..63ba5a37 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -73,16 +73,16 @@ public class AccountDatabase extends Database {
                                           uuid BLOB UNIQUE,
                                           profile_key BLOB,
                                           profile_key_credential BLOB,
-
+                                        
                                           given_name TEXT,
                                           family_name TEXT,
                                           color TEXT,
-
+                                        
                                           expiration_time INTEGER NOT NULL DEFAULT 0,
                                           blocked INTEGER NOT NULL DEFAULT FALSE,
                                           archived INTEGER NOT NULL DEFAULT FALSE,
                                           profile_sharing INTEGER NOT NULL DEFAULT FALSE,
-
+                                        
                                           profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                           profile_given_name TEXT,
                                           profile_family_name TEXT,
@@ -244,7 +244,7 @@ public class AccountDatabase extends Database {
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE identity;
                                         ALTER TABLE identity2 RENAME TO identity;
-
+                                        
                                         DROP INDEX msl_recipient_index;
                                         ALTER TABLE message_send_log ADD COLUMN uuid BLOB;
                                         UPDATE message_send_log
@@ -254,7 +254,7 @@ public class AccountDatabase extends Database {
                                         DELETE FROM message_send_log WHERE uuid IS NULL;
                                         ALTER TABLE message_send_log DROP COLUMN recipient_id;
                                         CREATE INDEX msl_recipient_index ON message_send_log (uuid, device_id, content_id);
-
+                                        
                                         CREATE TABLE sender_key2 (
                                           _id INTEGER PRIMARY KEY,
                                           uuid BLOB NOT NULL,
@@ -270,7 +270,7 @@ public class AccountDatabase extends Database {
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE sender_key;
                                         ALTER TABLE sender_key2 RENAME TO sender_key;
-
+                                        
                                         CREATE TABLE sender_key_shared2 (
                                           _id INTEGER PRIMARY KEY,
                                           uuid BLOB NOT NULL,
@@ -285,7 +285,7 @@ public class AccountDatabase extends Database {
                                           WHERE uuid IS NOT NULL;
                                         DROP TABLE sender_key_shared;
                                         ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;
-
+                                        
                                         CREATE TABLE session2 (
                                           _id INTEGER PRIMARY KEY,
                                           account_id_type INTEGER NOT NULL,
@@ -378,7 +378,7 @@ public class AccountDatabase extends Database {
                                           WHERE address IS NOT NULL;
                                         DROP TABLE identity;
                                         ALTER TABLE identity2 RENAME TO identity;
-
+                                        
                                         CREATE TABLE message_send_log2 (
                                           _id INTEGER PRIMARY KEY,
                                           content_id INTEGER NOT NULL REFERENCES message_send_log_content (_id) ON DELETE CASCADE,
@@ -395,7 +395,7 @@ public class AccountDatabase extends Database {
                                         ALTER TABLE message_send_log2 RENAME TO message_send_log;
                                         CREATE INDEX msl_recipient_index ON message_send_log (address, device_id, content_id);
                                         CREATE INDEX msl_content_index ON message_send_log (content_id);
-
+                                        
                                         CREATE TABLE sender_key2 (
                                           _id INTEGER PRIMARY KEY,
                                           address TEXT NOT NULL,
@@ -411,7 +411,7 @@ public class AccountDatabase extends Database {
                                           WHERE address IS NOT NULL;
                                         DROP TABLE sender_key;
                                         ALTER TABLE sender_key2 RENAME TO sender_key;
-
+                                        
                                         CREATE TABLE sender_key_shared2 (
                                           _id INTEGER PRIMARY KEY,
                                           address TEXT NOT NULL,
@@ -426,7 +426,7 @@ public class AccountDatabase extends Database {
                                           WHERE address IS NOT NULL;
                                         DROP TABLE sender_key_shared;
                                         ALTER TABLE sender_key_shared2 RENAME TO sender_key_shared;
-
+                                        
                                         CREATE TABLE session2 (
                                           _id INTEGER PRIMARY KEY,
                                           account_id_type INTEGER NOT NULL,
@@ -441,7 +441,7 @@ public class AccountDatabase extends Database {
                                           WHERE address IS NOT NULL;
                                         DROP TABLE session;
                                         ALTER TABLE session2 RENAME TO session;
-
+                                        
                                         DROP TABLE tmp_mapping_table;
                                         """);
             }
@@ -531,12 +531,12 @@ public class AccountDatabase extends Database {
                                           unregistered_timestamp INTEGER,
                                           profile_key BLOB,
                                           profile_key_credential BLOB,
-
+                                        
                                           given_name TEXT,
                                           family_name TEXT,
                                           nick_name TEXT,
                                           color TEXT,
-
+                                        
                                           expiration_time INTEGER NOT NULL DEFAULT 0,
                                           mute_until INTEGER NOT NULL DEFAULT 0,
                                           blocked INTEGER NOT NULL DEFAULT FALSE,
@@ -544,7 +544,7 @@ public class AccountDatabase extends Database {
                                           profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                           hide_story INTEGER NOT NULL DEFAULT FALSE,
                                           hidden INTEGER NOT NULL DEFAULT FALSE,
-
+                                        
                                           profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                           profile_given_name TEXT,
                                           profile_family_name TEXT,
@@ -560,7 +560,7 @@ public class AccountDatabase extends Database {
                                           FROM recipient r;
                                         DROP TABLE recipient;
                                         ALTER TABLE recipient2 RENAME TO recipient;
-
+                                        
                                         DROP TABLE tmp_mapping_table;
                                         """);
             }
@@ -592,7 +592,7 @@ public class AccountDatabase extends Database {
             }
         }
         if (oldVersion < 26) {
-            logger.debug("Updating database: Create discoverabel and profile_phone_number_sharing columns");
+            logger.debug("Updating database: Create discoverable and profile_phone_number_sharing columns");
             try (final var statement = connection.createStatement()) {
                 statement.executeUpdate("""
                                         ALTER TABLE recipient ADD discoverable INTEGER;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 54383eb0..2aad97d6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -69,7 +69,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
                                       needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,
-
+                                    
                                       given_name TEXT,
                                       family_name TEXT,
                                       nick_name TEXT,
@@ -77,7 +77,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       nick_name_family_name TEXT,
                                       note TEXT,
                                       color TEXT,
-
+                                    
                                       expiration_time INTEGER NOT NULL DEFAULT 0,
                                       expiration_time_version INTEGER DEFAULT 1 NOT NULL,
                                       mute_until INTEGER NOT NULL DEFAULT 0,
@@ -86,7 +86,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                       hide_story INTEGER NOT NULL DEFAULT FALSE,
                                       hidden INTEGER NOT NULL DEFAULT FALSE,
-
+                                    
                                       profile_last_update_timestamp INTEGER NOT NULL DEFAULT 0,
                                       profile_given_name TEXT,
                                       profile_family_name TEXT,
diff --git a/src/main/java/org/asamk/signal/json/JsonEditMessage.java b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
index 6b17344b..ef61e343 100644
--- a/src/main/java/org/asamk/signal/json/JsonEditMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
@@ -6,6 +6,7 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
 
     static JsonEditMessage from(MessageEnvelope.Edit editMessage, Manager m) {
-        return new JsonEditMessage(editMessage.targetSentTimestamp(), JsonDataMessage.from(editMessage.dataMessage(), m));
+        return new JsonEditMessage(editMessage.targetSentTimestamp(),
+                JsonDataMessage.from(editMessage.dataMessage(), m));
     }
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index f4f06927..7ba4b307 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -65,16 +65,10 @@ public record JsonMessageEnvelope(
         final var receiptMessage = envelope.receipt().map(JsonReceiptMessage::from).orElse(null);
         final var typingMessage = envelope.typing().map(JsonTypingMessage::from).orElse(null);
 
-        final var dataMessage = envelope.data()
-            .map(data -> JsonDataMessage.from(data, m))
-            .orElse(null);
-        final var editMessage = envelope.edit()
-            .map(data -> JsonEditMessage.from(data, m))
-            .orElse(null);
+        final var dataMessage = envelope.data().map(data -> JsonDataMessage.from(data, m)).orElse(null);
+        final var editMessage = envelope.edit().map(data -> JsonEditMessage.from(data, m)).orElse(null);
         final var storyMessage = envelope.story().map(JsonStoryMessage::from).orElse(null);
-        final var syncMessage = envelope.sync()
-            .map(data -> JsonSyncMessage.from(data, m))
-            .orElse(null);
+        final var syncMessage = envelope.sync().map(data -> JsonSyncMessage.from(data, m)).orElse(null);
         final var callMessage = envelope.call().map(JsonCallMessage::from).orElse(null);
 
         return new JsonMessageEnvelope(source,
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index 391181b0..4c2cd6ab 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -23,11 +23,7 @@ record JsonSyncDataMessage(
                 .orElse(null),
                 transcriptMessage.destination().flatMap(RecipientAddress::number).orElse(null),
                 transcriptMessage.destination().flatMap(address -> address.uuid().map(UUID::toString)).orElse(null),
-                transcriptMessage.editMessage()
-                    .map(data -> JsonEditMessage.from(data, m))
-                    .orElse(null),
-                transcriptMessage.message()
-                    .map(data -> JsonDataMessage.from(data, m))
-                    .orElse(null));
+                transcriptMessage.editMessage().map(data -> JsonEditMessage.from(data, m)).orElse(null),
+                transcriptMessage.message().map(data -> JsonDataMessage.from(data, m)).orElse(null));
     }
 }

From 0e77870b59bd970b4c599c3ac588b2bbce52e7bf Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 26 Oct 2024 15:01:05 +0200
Subject: [PATCH 523/672] Bump version to 0.13.7

---
 CHANGELOG.md                           |  11 +-
 build.gradle.kts                       |   2 +-
 data/org.asamk.SignalCli.metainfo.xml  | 143 +++++++++++++------------
 graalvm-config-dir/reflect-config.json |   2 +-
 4 files changed, 85 insertions(+), 73 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 524ac160..4ccb96cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,18 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.8] - 2024-10-26
 
 Requires libsignal-client version 0.58.2
 
+### Fixed
+
+- Fix sending large text messages
+- Fix setting message expiration timer with recent Signal apps
+
+### Improved
+
+- Add group name and timestamps on json message (Thanks @jailson-dias)
+
 ## [0.13.7] - 2024-09-28
 
 Requires libsignal-client version 0.58.0
diff --git a/build.gradle.kts b/build.gradle.kts
index 158778fb..37495dde 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
-version = "0.13.8-SNAPSHOT"
+version = "0.13.8"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 8b2fa7ba..4722f8f7 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -1,79 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="console-application">
-  <id>org.asamk.SignalCli</id>
+    <id>org.asamk.SignalCli</id>
 
-  <name>signal-cli</name>
-  <summary>Use Signal messenger in terminal</summary>
-  <developer id="org.asamk">
-    <name>AsamK</name>
-  </developer>
-  <icon type="stock">org.asamk.SignalCli</icon>
-  <keywords>
-    <keyword>signal</keyword>
-    <keyword>signal-cli</keyword>
-    <keyword>messenger</keyword>
-    <keyword>messaging</keyword>
-  </keywords>
+    <name>signal-cli</name>
+    <summary>Use Signal messenger in terminal</summary>
+    <developer id="org.asamk">
+        <name>AsamK</name>
+    </developer>
+    <icon type="stock">org.asamk.SignalCli</icon>
+    <keywords>
+        <keyword>signal</keyword>
+        <keyword>signal-cli</keyword>
+        <keyword>messenger</keyword>
+        <keyword>messaging</keyword>
+    </keywords>
 
-  <url type="bugtracker">https://github.com/AsamK/signal-cli/issues</url>
-  <url type="homepage">https://github.com/AsamK/signal-cli</url>
-  <url type="donation">https://github.com/sponsors/AsamK</url>
-  <url type="faq">https://github.com/AsamK/signal-cli/discussions</url>
-  <url type="vcs-browser">https://github.com/AsamK/signal-cli</url>
+    <url type="bugtracker">https://github.com/AsamK/signal-cli/issues</url>
+    <url type="homepage">https://github.com/AsamK/signal-cli</url>
+    <url type="donation">https://github.com/sponsors/AsamK</url>
+    <url type="faq">https://github.com/AsamK/signal-cli/discussions</url>
+    <url type="vcs-browser">https://github.com/AsamK/signal-cli</url>
 
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0-only</project_license>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>GPL-3.0-only</project_license>
 
-  <description>
-    <p>
-	    signal-cli is an unofficial commandline interface for the Signal Messenger.
-	    It supports many Signal functions, including registering, verifying, sending and receiving messages.
-	    For registering you need a phone number where you can receive SMS or incoming calls.
-	    Alternatively signal-cli can be linked to an existing App account.
-    </p>
-  </description>
+    <description>
+        <p>
+            signal-cli is an unofficial commandline interface for the Signal Messenger.
+            It supports many Signal functions, including registering, verifying, sending and receiving messages.
+            For registering you need a phone number where you can receive SMS or incoming calls.
+            Alternatively signal-cli can be linked to an existing App account.
+        </p>
+    </description>
 
-  <categories>
-    <category>Utility</category>
-    <category>Java</category>
-  </categories>
+    <categories>
+        <category>Utility</category>
+        <category>Java</category>
+    </categories>
 
-  <provides>
-    <binary>signal-cli</binary>
-  </provides>
-  <content_rating type="oars-1.1">
-    <content_attribute id="social-chat">intense</content_attribute>
-  </content_rating>
-  <releases>
-    <release version="0.13.7" date="2024-09-28">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.7</url>
-    </release>
-    <release version="0.13.6" date="2024-09-08">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.6</url>
-    </release>
-    <release version="0.13.5" date="2024-07-25">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.5</url>
-    </release>
-    <release version="0.13.4" date="2024-06-06">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.4</url>
-    </release>
-    <release version="0.13.3" date="2024-04-19">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>
-    </release>
-    <release version="0.13.2" date="2024-03-23">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.2</url>
-    </release>
-    <release version="0.13.1" date="2024-02-27">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.1</url>
-    </release>
-    <release version="0.13.0" date="2024-02-18">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.0</url>
-    </release>
-    <release version="0.12.8" date="2024-02-08">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.8</url>
-    </release>
-    <release version="0.12.7" date="2023-12-15">
-      <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.7</url>
-    </release>
-  </releases>
+    <provides>
+        <binary>signal-cli</binary>
+    </provides>
+    <content_rating type="oars-1.1">
+        <content_attribute id="social-chat">intense</content_attribute>
+    </content_rating>
+    <releases>
+        <release version="0.13.8" date="2024-10-26">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.8</url>
+        </release>
+        <release version="0.13.7" date="2024-09-28">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.7</url>
+        </release>
+        <release version="0.13.6" date="2024-09-08">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.6</url>
+        </release>
+        <release version="0.13.5" date="2024-07-25">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.5</url>
+        </release>
+        <release version="0.13.4" date="2024-06-06">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.4</url>
+        </release>
+        <release version="0.13.3" date="2024-04-19">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.3</url>
+        </release>
+        <release version="0.13.2" date="2024-03-23">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.2</url>
+        </release>
+        <release version="0.13.1" date="2024-02-27">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.1</url>
+        </release>
+        <release version="0.13.0" date="2024-02-18">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.0</url>
+        </release>
+        <release version="0.12.8" date="2024-02-08">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.8</url>
+        </release>
+        <release version="0.12.7" date="2023-12-15">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.12.7</url>
+        </release>
+    </releases>
 </component>
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 62b89b78..06daf4b4 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1036,7 +1036,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"callMessage","parameterTypes":[] }, {"name":"dataMessage","parameterTypes":[] }, {"name":"editMessage","parameterTypes":[] }, {"name":"receiptMessage","parameterTypes":[] }, {"name":"source","parameterTypes":[] }, {"name":"sourceDevice","parameterTypes":[] }, {"name":"sourceName","parameterTypes":[] }, {"name":"sourceNumber","parameterTypes":[] }, {"name":"sourceUuid","parameterTypes":[] }, {"name":"storyMessage","parameterTypes":[] }, {"name":"syncMessage","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"typingMessage","parameterTypes":[] }]
+  "methods":[{"name":"callMessage","parameterTypes":[] }, {"name":"dataMessage","parameterTypes":[] }, {"name":"editMessage","parameterTypes":[] }, {"name":"receiptMessage","parameterTypes":[] }, {"name":"serverDeliveredTimestamp","parameterTypes":[] }, {"name":"serverReceivedTimestamp","parameterTypes":[] }, {"name":"source","parameterTypes":[] }, {"name":"sourceDevice","parameterTypes":[] }, {"name":"sourceName","parameterTypes":[] }, {"name":"sourceNumber","parameterTypes":[] }, {"name":"sourceUuid","parameterTypes":[] }, {"name":"storyMessage","parameterTypes":[] }, {"name":"syncMessage","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"typingMessage","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonPayment",

From acddef6e35fcb1f7c5782bc4628e2adb4fdff20a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 524/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ccb96cd..b40c4ed7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.8] - 2024-10-26
 
 Requires libsignal-client version 0.58.2
diff --git a/build.gradle.kts b/build.gradle.kts
index 37495dde..523e2980 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
-version = "0.13.8"
+version = "0.13.9-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 1b959608c36a795668c8e4a6a44474a9ab7c0bcd Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 28 Oct 2024 10:35:18 +0100
Subject: [PATCH 525/672] Simplify verification code request

---
 graalvm-config-dir/reflect-config.json          |  2 +-
 .../manager/util/NumberVerificationUtils.java   | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 06daf4b4..09df8cfb 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -179,7 +179,7 @@
   "name":"com.zaxxer.hikari.HikariConfig",
   "allDeclaredFields":true,
   "queryAllPublicMethods":true,
-  "methods":[{"name":"getAllowPoolSuspension","parameterTypes":[] }, {"name":"getAutoCommit","parameterTypes":[] }, {"name":"getCatalog","parameterTypes":[] }, {"name":"getConnectionInitSql","parameterTypes":[] }, {"name":"getConnectionTestQuery","parameterTypes":[] }, {"name":"getConnectionTimeout","parameterTypes":[] }, {"name":"getDataSource","parameterTypes":[] }, {"name":"getDataSourceClassName","parameterTypes":[] }, {"name":"getDataSourceJNDI","parameterTypes":[] }, {"name":"getDataSourceProperties","parameterTypes":[] }, {"name":"getDriverClassName","parameterTypes":[] }, {"name":"getExceptionOverrideClassName","parameterTypes":[] }, {"name":"getHealthCheckProperties","parameterTypes":[] }, {"name":"getHealthCheckRegistry","parameterTypes":[] }, {"name":"getIdleTimeout","parameterTypes":[] }, {"name":"getInitializationFailTimeout","parameterTypes":[] }, {"name":"getIsolateInternalQueries","parameterTypes":[] }, {"name":"getJdbcUrl","parameterTypes":[] }, {"name":"getKeepaliveTime","parameterTypes":[] }, {"name":"getLeakDetectionThreshold","parameterTypes":[] }, {"name":"getMaxLifetime","parameterTypes":[] }, {"name":"getMaximumPoolSize","parameterTypes":[] }, {"name":"getMetricRegistry","parameterTypes":[] }, {"name":"getMetricsTrackerFactory","parameterTypes":[] }, {"name":"getMinimumIdle","parameterTypes":[] }, {"name":"getPassword","parameterTypes":[] }, {"name":"getPoolName","parameterTypes":[] }, {"name":"getReadOnly","parameterTypes":[] }, {"name":"getRegisterMbeans","parameterTypes":[] }, {"name":"getScheduledExecutor","parameterTypes":[] }, {"name":"getSchema","parameterTypes":[] }, {"name":"getThreadFactory","parameterTypes":[] }, {"name":"getTransactionIsolation","parameterTypes":[] }, {"name":"getUsername","parameterTypes":[] }, {"name":"getValidationTimeout","parameterTypes":[] }, {"name":"isAllowPoolSuspension","parameterTypes":[] }, {"name":"isAutoCommit","parameterTypes":[] }, {"name":"isIsolateInternalQueries","parameterTypes":[] }, {"name":"isReadOnly","parameterTypes":[] }, {"name":"isRegisterMbeans","parameterTypes":[] }, {"name":"setAllowPoolSuspension","parameterTypes":["boolean"] }, {"name":"setAutoCommit","parameterTypes":["boolean"] }, {"name":"setCatalog","parameterTypes":["java.lang.String"] }, {"name":"setClass","parameterTypes":["java.lang.Class"] }, {"name":"setConnectionInitSql","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTestQuery","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTimeout","parameterTypes":["long"] }, {"name":"setDataSource","parameterTypes":["javax.sql.DataSource"] }, {"name":"setDataSourceClassName","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceJNDI","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceProperties","parameterTypes":["java.util.Properties"] }, {"name":"setDriverClassName","parameterTypes":["java.lang.String"] }, {"name":"setExceptionOverrideClassName","parameterTypes":["java.lang.String"] }, {"name":"setHealthCheckProperties","parameterTypes":["java.util.Properties"] }, {"name":"setHealthCheckRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setIdleTimeout","parameterTypes":["long"] }, {"name":"setInitializationFailTimeout","parameterTypes":["long"] }, {"name":"setIsolateInternalQueries","parameterTypes":["boolean"] }, {"name":"setJdbcUrl","parameterTypes":["java.lang.String"] }, {"name":"setKeepaliveTime","parameterTypes":["long"] }, {"name":"setLeakDetectionThreshold","parameterTypes":["long"] }, {"name":"setMaxLifetime","parameterTypes":["long"] }, {"name":"setMaximumPoolSize","parameterTypes":["int"] }, {"name":"setMetricRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setMetricsTrackerFactory","parameterTypes":["com.zaxxer.hikari.metrics.MetricsTrackerFactory"] }, {"name":"setMinimumIdle","parameterTypes":["int"] }, {"name":"setPassword","parameterTypes":["java.lang.String"] }, {"name":"setPoolName","parameterTypes":["java.lang.String"] }, {"name":"setReadOnly","parameterTypes":["boolean"] }, {"name":"setRegisterMbeans","parameterTypes":["boolean"] }, {"name":"setScheduledExecutor","parameterTypes":["java.util.concurrent.ScheduledExecutorService"] }, {"name":"setSchema","parameterTypes":["java.lang.String"] }, {"name":"setThreadFactory","parameterTypes":["java.util.concurrent.ThreadFactory"] }, {"name":"setTransactionIsolation","parameterTypes":["java.lang.String"] }, {"name":"setUsername","parameterTypes":["java.lang.String"] }, {"name":"setValidationTimeout","parameterTypes":["long"] }]
+  "methods":[{"name":"getAllowPoolSuspension","parameterTypes":[] }, {"name":"getAutoCommit","parameterTypes":[] }, {"name":"getCatalog","parameterTypes":[] }, {"name":"getConnectionInitSql","parameterTypes":[] }, {"name":"getConnectionTestQuery","parameterTypes":[] }, {"name":"getConnectionTimeout","parameterTypes":[] }, {"name":"getCredentials","parameterTypes":[] }, {"name":"getDataSource","parameterTypes":[] }, {"name":"getDataSourceClassName","parameterTypes":[] }, {"name":"getDataSourceJNDI","parameterTypes":[] }, {"name":"getDataSourceProperties","parameterTypes":[] }, {"name":"getDriverClassName","parameterTypes":[] }, {"name":"getExceptionOverride","parameterTypes":[] }, {"name":"getExceptionOverrideClassName","parameterTypes":[] }, {"name":"getHealthCheckProperties","parameterTypes":[] }, {"name":"getHealthCheckRegistry","parameterTypes":[] }, {"name":"getIdleTimeout","parameterTypes":[] }, {"name":"getInitializationFailTimeout","parameterTypes":[] }, {"name":"getIsolateInternalQueries","parameterTypes":[] }, {"name":"getJdbcUrl","parameterTypes":[] }, {"name":"getKeepaliveTime","parameterTypes":[] }, {"name":"getLeakDetectionThreshold","parameterTypes":[] }, {"name":"getMaxLifetime","parameterTypes":[] }, {"name":"getMaximumPoolSize","parameterTypes":[] }, {"name":"getMetricRegistry","parameterTypes":[] }, {"name":"getMetricsTrackerFactory","parameterTypes":[] }, {"name":"getMinimumIdle","parameterTypes":[] }, {"name":"getPassword","parameterTypes":[] }, {"name":"getPoolName","parameterTypes":[] }, {"name":"getReadOnly","parameterTypes":[] }, {"name":"getRegisterMbeans","parameterTypes":[] }, {"name":"getScheduledExecutor","parameterTypes":[] }, {"name":"getSchema","parameterTypes":[] }, {"name":"getThreadFactory","parameterTypes":[] }, {"name":"getTransactionIsolation","parameterTypes":[] }, {"name":"getUsername","parameterTypes":[] }, {"name":"getValidationTimeout","parameterTypes":[] }, {"name":"isAllowPoolSuspension","parameterTypes":[] }, {"name":"isAutoCommit","parameterTypes":[] }, {"name":"isIsolateInternalQueries","parameterTypes":[] }, {"name":"isReadOnly","parameterTypes":[] }, {"name":"isRegisterMbeans","parameterTypes":[] }, {"name":"setAllowPoolSuspension","parameterTypes":["boolean"] }, {"name":"setAutoCommit","parameterTypes":["boolean"] }, {"name":"setCatalog","parameterTypes":["java.lang.String"] }, {"name":"setClass","parameterTypes":["java.lang.Class"] }, {"name":"setConnectionInitSql","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTestQuery","parameterTypes":["java.lang.String"] }, {"name":"setConnectionTimeout","parameterTypes":["long"] }, {"name":"setCredentials","parameterTypes":["com.zaxxer.hikari.util.Credentials"] }, {"name":"setDataSource","parameterTypes":["javax.sql.DataSource"] }, {"name":"setDataSourceClassName","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceJNDI","parameterTypes":["java.lang.String"] }, {"name":"setDataSourceProperties","parameterTypes":["java.util.Properties"] }, {"name":"setDriverClassName","parameterTypes":["java.lang.String"] }, {"name":"setExceptionOverride","parameterTypes":["com.zaxxer.hikari.SQLExceptionOverride"] }, {"name":"setExceptionOverrideClassName","parameterTypes":["java.lang.String"] }, {"name":"setHealthCheckProperties","parameterTypes":["java.util.Properties"] }, {"name":"setHealthCheckRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setIdleTimeout","parameterTypes":["long"] }, {"name":"setInitializationFailTimeout","parameterTypes":["long"] }, {"name":"setIsolateInternalQueries","parameterTypes":["boolean"] }, {"name":"setJdbcUrl","parameterTypes":["java.lang.String"] }, {"name":"setKeepaliveTime","parameterTypes":["long"] }, {"name":"setLeakDetectionThreshold","parameterTypes":["long"] }, {"name":"setMaxLifetime","parameterTypes":["long"] }, {"name":"setMaximumPoolSize","parameterTypes":["int"] }, {"name":"setMetricRegistry","parameterTypes":["java.lang.Object"] }, {"name":"setMetricsTrackerFactory","parameterTypes":["com.zaxxer.hikari.metrics.MetricsTrackerFactory"] }, {"name":"setMinimumIdle","parameterTypes":["int"] }, {"name":"setPassword","parameterTypes":["java.lang.String"] }, {"name":"setPoolName","parameterTypes":["java.lang.String"] }, {"name":"setReadOnly","parameterTypes":["boolean"] }, {"name":"setRegisterMbeans","parameterTypes":["boolean"] }, {"name":"setScheduledExecutor","parameterTypes":["java.util.concurrent.ScheduledExecutorService"] }, {"name":"setSchema","parameterTypes":["java.lang.String"] }, {"name":"setThreadFactory","parameterTypes":["java.util.concurrent.ThreadFactory"] }, {"name":"setTransactionIsolation","parameterTypes":["java.lang.String"] }, {"name":"setUsername","parameterTypes":["java.lang.String"] }, {"name":"setValidationTimeout","parameterTypes":["long"] }]
 },
 {
   "name":"com.zaxxer.hikari.pool.PoolBase",
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 1c5aa411..03b1c03a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -10,7 +10,6 @@ import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.asamk.signal.manager.helper.PinHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.NetworkResult;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
@@ -91,19 +90,11 @@ public class NumberVerificationUtils {
     public static void requestVerificationCode(
             RegistrationApi registrationApi, String sessionId, boolean voiceVerification
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
-        final NetworkResult<RegistrationSessionMetadataResponse> response;
         final var locale = Utils.getDefaultLocale(Locale.US);
-        if (voiceVerification) {
-            response = registrationApi.requestSmsVerificationCode(sessionId,
-                    locale,
-                    false,
-                    VerificationCodeTransport.VOICE);
-        } else {
-            response = registrationApi.requestSmsVerificationCode(sessionId,
-                    locale,
-                    false,
-                    VerificationCodeTransport.SMS);
-        }
+        final var response = registrationApi.requestSmsVerificationCode(sessionId,
+                locale,
+                false,
+                voiceVerification ? VerificationCodeTransport.VOICE : VerificationCodeTransport.SMS);
         try {
             Utils.handleResponseException(response);
         } catch (org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) {

From a1d552698a8bbadc70af9793b5bc5ea5a49b1a42 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 28 Oct 2024 10:42:26 +0100
Subject: [PATCH 526/672] Fix verifyAccount

Fixes #1614
---
 .../java/org/asamk/signal/manager/helper/AccountHelper.java     | 2 +-
 .../asamk/signal/manager/internal/RegistrationManagerImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index ba18c63c..474a2822 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -283,7 +283,7 @@ public class AccountHelper {
                 (sessionId1, verificationCode1, registrationLock) -> {
                     final var registrationApi = dependencies.getRegistrationApi();
                     try {
-                        Utils.handleResponseException(registrationApi.verifyAccount(verificationCode1, sessionId1));
+                        Utils.handleResponseException(registrationApi.verifyAccount(sessionId1, verificationCode1));
                     } catch (AlreadyVerifiedException e) {
                         // Already verified so can continue changing number
                     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index eaaba787..543d9a99 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -258,7 +258,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
     ) throws IOException {
         final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
         try {
-            Utils.handleResponseException(registrationApi.verifyAccount(verificationCode, sessionId));
+            Utils.handleResponseException(registrationApi.verifyAccount(sessionId, verificationCode));
         } catch (AlreadyVerifiedException e) {
             // Already verified so can continue registering
         }

From 181086aefecfe7bcc0827477a442324fa4570e8b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 28 Oct 2024 10:58:14 +0100
Subject: [PATCH 527/672] Update graalvm config

Fixes #1612
---
 graalvm-config-dir/reflect-config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 09df8cfb..8a80f9c7 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -51,6 +51,9 @@
 {
   "name":"[Lorg.asamk.signal.json.JsonQuotedAttachment;"
 },
+{
+  "name":"[Lorg.asamk.signal.json.JsonSyncReadMessage;"
+},
 {
   "name":"[Lorg.asamk.signal.json.JsonTextStyle;"
 },

From 277652e3f2d6369da3c66c2ea941e493f344eb84 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 28 Oct 2024 23:37:26 +0100
Subject: [PATCH 528/672] Bump version to 0.13.9

---
 CHANGELOG.md                          | 6 +++++-
 build.gradle.kts                      | 2 +-
 data/org.asamk.SignalCli.metainfo.xml | 3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b40c4ed7..f49b8b81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.9] - 2024-10-28
+
+### Fixed
+
+- Fix verify command
 
 ## [0.13.8] - 2024-10-26
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 523e2980..8e74a5bf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
-version = "0.13.9-SNAPSHOT"
+version = "0.13.9"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 4722f8f7..46921033 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.9" date="2024-10-28">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.9</url>
+        </release>
         <release version="0.13.8" date="2024-10-26">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.8</url>
         </release>

From a5e272be3f8d5280b702069604b7b1c6869e69bd Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 529/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f49b8b81..dd44885b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.9] - 2024-10-28
 
 ### Fixed
diff --git a/build.gradle.kts b/build.gradle.kts
index 8e74a5bf..c205612e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
-version = "0.13.9"
+version = "0.13.10-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From e5251ae1589bc82dade0dc294dc7e66a7b25cc9b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 21 Nov 2024 21:17:33 +0100
Subject: [PATCH 530/672] Switch to using toml version catalogs

---
 gradle/libs.versions.toml | 17 +++++++++++++++++
 settings.gradle.kts       | 19 -------------------
 2 files changed, 17 insertions(+), 19 deletions(-)
 create mode 100644 gradle/libs.versions.toml

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000..17a8dd46
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,17 @@
+[versions]
+slf4j = "2.0.16"
+
+[libraries]
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.78.1"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.0"
+argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
+dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
+logback = "ch.qos.logback:logback-classic:1.5.11"
+
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_110"
+sqlite = "org.xerial:sqlite-jdbc:3.47.0.0"
+hikari = "com.zaxxer:HikariCP:6.0.0"
+junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3"
+junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.3"
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ef9ec486..fe7c45a9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -3,25 +3,6 @@ dependencyResolutionManagement {
         mavenLocal()
         mavenCentral()
     }
-
-    versionCatalogs {
-        create("libs") {
-            library("bouncycastle", "org.bouncycastle", "bcprov-jdk18on").version("1.78.1")
-            library("jackson.databind", "com.fasterxml.jackson.core", "jackson-databind").version("2.18.0")
-            library("argparse4j", "net.sourceforge.argparse4j", "argparse4j").version("0.9.0")
-            library("dbusjava", "com.github.hypfvieh", "dbus-java-transport-native-unixsocket").version("5.0.0")
-            version("slf4j", "2.0.16")
-            library("slf4j.api", "org.slf4j", "slf4j-api").versionRef("slf4j")
-            library("slf4j.jul", "org.slf4j", "jul-to-slf4j").versionRef("slf4j")
-            library("logback", "ch.qos.logback", "logback-classic").version("1.5.11")
-
-            library("signalservice", "com.github.turasa", "signal-service-java").version("2.15.3_unofficial_110")
-            library("sqlite", "org.xerial", "sqlite-jdbc").version("3.47.0.0")
-            library("hikari", "com.zaxxer", "HikariCP").version("6.0.0")
-            library("junit.jupiter", "org.junit.jupiter", "junit-jupiter").version("5.11.3")
-            library("junit.launcher", "org.junit.platform", "junit-platform-launcher").version("1.11.3")
-        }
-    }
 }
 
 rootProject.name = "signal-cli"

From 3533500b736ce382b9cc1d53d29ff267324bf4be Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 21 Nov 2024 21:17:44 +0100
Subject: [PATCH 531/672] Update dependencies

---
 graalvm-config-dir/reflect-config.json           | 16 ++++++++++++++++
 gradle/libs.versions.toml                        |  8 ++++----
 .../asamk/signal/logging/LogConfigurator.java    | 11 ++++++-----
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 8a80f9c7..abe02ac4 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1499,6 +1499,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.COMPOSITE$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.CONTEXT$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.CompositeSignatures$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1559,6 +1563,14 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.LMS$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.MLDSA$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.MLKEM$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.NTRU$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -1567,6 +1579,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.RSA$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.SLHDSA$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.SPHINCSPlus$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 17a8dd46..d7d56d71 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,16 +2,16 @@
 slf4j = "2.0.16"
 
 [libraries]
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.78.1"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.0"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.79"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.1"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
-logback = "ch.qos.logback:logback-classic:1.5.11"
+logback = "ch.qos.logback:logback-classic:1.5.12"
 
 signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_110"
 sqlite = "org.xerial:sqlite-jdbc:3.47.0.0"
-hikari = "com.zaxxer:HikariCP:6.0.0"
+hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.3"
diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index 65e8c4f5..f6e23b70 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -42,7 +42,7 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         }});
         final var rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
 
-        final var defaultLevel = verboseLevel > 2 ? Level.ALL : verboseLevel > 0 ? Level.INFO : Level.WARN;
+        final var defaultLevel = verboseLevel > 2 ? Level.TRACE : verboseLevel > 0 ? Level.INFO : Level.WARN;
         rootLogger.setLevel(defaultLevel);
 
         final var consoleLayout = verboseLevel == 0 || logFile != null
@@ -51,13 +51,14 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
         final var consoleAppender = createLoggingConsoleAppender(lc, createLayoutWrappingEncoder(consoleLayout));
         rootLogger.addAppender(consoleAppender);
 
-        lc.getLogger("org.asamk").setLevel(verboseLevel > 1 ? Level.ALL : verboseLevel > 0 ? Level.DEBUG : Level.INFO);
+        lc.getLogger("org.asamk")
+                .setLevel(verboseLevel > 1 ? Level.TRACE : verboseLevel > 0 ? Level.DEBUG : Level.INFO);
         lc.getLogger("org.asamk.Signal")
-                .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN);
+                .setLevel(verboseLevel > 2 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN);
         lc.getLogger("com.zaxxer.hikari.pool.PoolBase")
-                .setLevel(verboseLevel > 2 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN);
+                .setLevel(verboseLevel > 2 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN);
         lc.getLogger("org.sqlite.core.NativeDB")
-                .setLevel(verboseLevel > 3 ? Level.ALL : verboseLevel > 1 ? Level.INFO : Level.WARN);
+                .setLevel(verboseLevel > 3 ? Level.TRACE : verboseLevel > 1 ? Level.INFO : Level.WARN);
 
         if (logFile != null) {
             consoleAppender.addFilter(new Filter<>() {

From f2005593ecefd37c7e1666c2dc0c71b259271af0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Nov 2024 21:28:00 +0100
Subject: [PATCH 532/672] Reformat files

---
 .../org/asamk/signal/manager/Manager.java     |  70 ++++++++----
 .../signal/manager/RegistrationManager.java   |   7 +-
 .../signal/manager/SignalAccountFiles.java    |   6 +-
 .../manager/actions/ResendMessageAction.java  |   4 +-
 .../manager/actions/SendReceiptAction.java    |   4 +-
 .../org/asamk/signal/manager/api/Group.java   |   4 +-
 .../signal/manager/api/MessageEnvelope.java   |  14 +--
 .../signal/manager/config/ServiceConfig.java  |   3 +-
 .../signal/manager/groups/GroupUtils.java     |   3 +-
 .../signal/manager/helper/AccountHelper.java  |  16 ++-
 .../manager/helper/AttachmentHelper.java      |   7 +-
 .../signal/manager/helper/ContactHelper.java  |   4 +-
 .../signal/manager/helper/GroupHelper.java    |  48 +++++---
 .../signal/manager/helper/GroupV2Helper.java  |  81 +++++++++-----
 .../signal/manager/helper/IdentityHelper.java |   8 +-
 .../helper/IncomingMessageHandler.java        |  15 ++-
 .../signal/manager/helper/PinHelper.java      |  11 +-
 .../signal/manager/helper/PreKeyHelper.java   |  14 ++-
 .../signal/manager/helper/ProfileHelper.java  |  19 ++--
 .../signal/manager/helper/ReceiveHelper.java  |   8 +-
 .../manager/helper/RecipientHelper.java       |   9 +-
 .../signal/manager/helper/SendHelper.java     |  29 +++--
 .../signal/manager/helper/StickerHelper.java  |   7 +-
 .../signal/manager/helper/StorageHelper.java  |  19 +++-
 .../signal/manager/helper/SyncHelper.java     |  21 ++--
 .../helper/UnidentifiedAccessHelper.java      |   3 +-
 .../signal/manager/internal/ManagerImpl.java  |  88 ++++++++++-----
 .../internal/RegistrationManagerImpl.java     |   7 +-
 .../manager/storage/AccountDatabase.java      |   3 +-
 .../manager/storage/AttachmentStore.java      |  18 +--
 .../signal/manager/storage/Database.java      |   3 +-
 .../signal/manager/storage/SignalAccount.java |  20 ++--
 .../storage/UnknownStorageIdStore.java        |   4 +-
 .../asamk/signal/manager/storage/Utils.java   |   9 +-
 .../storage/accounts/AccountsStore.java       |   8 +-
 .../configuration/ConfigurationStore.java     |   6 +-
 .../manager/storage/groups/GroupInfoV2.java   |   4 +-
 .../manager/storage/groups/GroupStore.java    |  32 ++++--
 .../storage/groups/LegacyGroupStore.java      |   6 +-
 .../storage/identities/IdentityInfo.java      |   4 +-
 .../storage/identities/IdentityKeyStore.java  |  16 ++-
 .../identities/LegacyIdentityKeyStore.java    |   8 +-
 .../storage/keyValue/KeyValueStore.java       |  12 +-
 .../storage/profiles/LegacyProfileStore.java  |   3 +-
 .../storage/profiles/ProfileStore.java        |   3 +-
 .../protocol/LegacyJsonIdentityKeyStore.java  |   7 +-
 .../protocol/LegacyJsonPreKeyStore.java       |   3 +-
 .../protocol/LegacyJsonSessionStore.java      |   3 +-
 .../protocol/LegacyJsonSignedPreKeyStore.java |   3 +-
 .../storage/protocol/SignalProtocolStore.java |   7 +-
 .../manager/storage/recipients/CdsiStore.java |  12 +-
 .../recipients/LegacyRecipientStore.java      |   3 +-
 .../recipients/MergeRecipientHelper.java      |   3 +-
 .../storage/recipients/RecipientStore.java    | 105 ++++++++++++------
 .../recipients/RecipientTrustedResolver.java  |   4 +-
 .../storage/sendLog/MessageSendLogStore.java  |  25 ++++-
 .../senderKeys/SenderKeyRecordStore.java      |   8 +-
 .../senderKeys/SenderKeySharedStore.java      |  11 +-
 .../storage/senderKeys/SenderKeyStore.java    |   7 +-
 .../storage/sessions/SessionStore.java        |   4 +-
 .../threads/LegacyJsonThreadStore.java        |   7 +-
 .../syncStorage/AccountRecordProcessor.java   |   4 +-
 .../syncStorage/ContactRecordProcessor.java   |   4 +-
 .../syncStorage/StorageSyncModels.java        |  12 +-
 .../syncStorage/StorageSyncValidations.java   |   8 +-
 .../signal/manager/util/AttachmentUtils.java  |   7 +-
 .../asamk/signal/manager/util/KeyUtils.java   |   7 +-
 .../manager/util/NumberVerificationUtils.java |  24 +++-
 .../signal/manager/util/PaymentUtils.java     |   8 +-
 .../signal/manager/util/ProfileUtils.java     |  17 +--
 .../signal/manager/util/StickerUtils.java     |   8 +-
 .../org/asamk/signal/manager/util/Utils.java  |  10 +-
 .../recipients/MergeRecipientHelperTest.java  |   4 +-
 src/main/java/org/asamk/Signal.java           |  76 ++++++++-----
 src/main/java/org/asamk/SignalControl.java    |   7 +-
 src/main/java/org/asamk/signal/App.java       |   6 +-
 .../asamk/signal/ReceiveMessageHandler.java   |  60 +++-------
 .../signal/commands/AddDeviceCommand.java     |   4 +-
 .../commands/AddStickerPackCommand.java       |   4 +-
 .../asamk/signal/commands/BlockCommand.java   |   4 +-
 .../asamk/signal/commands/CommandHandler.java |   9 +-
 .../asamk/signal/commands/DaemonCommand.java  |   8 +-
 .../DeleteLocalAccountDataCommand.java        |   4 +-
 .../commands/FinishChangeNumberCommand.java   |   4 +-
 .../signal/commands/FinishLinkCommand.java    |   4 +-
 .../signal/commands/GetAttachmentCommand.java |   4 +-
 .../signal/commands/GetAvatarCommand.java     |   4 +-
 .../signal/commands/GetStickerCommand.java    |   4 +-
 .../signal/commands/GetUserStatusCommand.java |   4 +-
 .../signal/commands/JoinGroupCommand.java     |   4 +-
 .../commands/JsonRpcDispatcherCommand.java    |   8 +-
 .../signal/commands/JsonRpcLocalCommand.java  |   4 +-
 .../commands/JsonRpcMultiLocalCommand.java    |   4 +-
 .../asamk/signal/commands/LinkCommand.java    |   4 +-
 .../signal/commands/ListAccountsCommand.java  |   4 +-
 .../signal/commands/ListContactsCommand.java  |   4 +-
 .../signal/commands/ListDevicesCommand.java   |   4 +-
 .../signal/commands/ListGroupsCommand.java    |   8 +-
 .../commands/ListIdentitiesCommand.java       |   4 +-
 .../commands/ListStickerPacksCommand.java     |   4 +-
 .../signal/commands/QuitGroupCommand.java     |   4 +-
 .../asamk/signal/commands/ReceiveCommand.java |   8 +-
 .../signal/commands/RegisterCommand.java      |   9 +-
 .../signal/commands/RemoteDeleteCommand.java  |   4 +-
 .../signal/commands/RemoveContactCommand.java |   4 +-
 .../signal/commands/RemoveDeviceCommand.java  |   4 +-
 .../signal/commands/RemovePinCommand.java     |   4 +-
 .../asamk/signal/commands/SendCommand.java    |   7 +-
 .../signal/commands/SendContactsCommand.java  |   4 +-
 .../SendMessageRequestResponseCommand.java    |   4 +-
 .../SendPaymentNotificationCommand.java       |   4 +-
 .../signal/commands/SendReactionCommand.java  |   4 +-
 .../signal/commands/SendReceiptCommand.java   |   4 +-
 .../commands/SendSyncRequestCommand.java      |   4 +-
 .../signal/commands/SendTypingCommand.java    |   4 +-
 .../asamk/signal/commands/SetPinCommand.java  |   4 +-
 .../commands/StartChangeNumberCommand.java    |   4 +-
 .../signal/commands/StartLinkCommand.java     |   4 +-
 .../asamk/signal/commands/TrustCommand.java   |   4 +-
 .../asamk/signal/commands/UnblockCommand.java |   4 +-
 .../signal/commands/UnregisterCommand.java    |   4 +-
 .../signal/commands/UpdateAccountCommand.java |   4 +-
 .../commands/UpdateConfigurationCommand.java  |   4 +-
 .../signal/commands/UpdateContactCommand.java |   4 +-
 .../signal/commands/UpdateGroupCommand.java   |   8 +-
 .../signal/commands/UpdateProfileCommand.java |   4 +-
 .../commands/UploadStickerPackCommand.java    |   4 +-
 .../asamk/signal/commands/VerifyCommand.java  |   8 +-
 .../asamk/signal/commands/VersionCommand.java |   8 +-
 .../asamk/signal/dbus/DbusCommandHandler.java |   3 +-
 .../org/asamk/signal/dbus/DbusHandler.java    |   5 +-
 .../dbus/DbusInterfacePropertiesHandler.java  |   4 +-
 .../asamk/signal/dbus/DbusManagerImpl.java    |  68 +++++++-----
 .../dbus/DbusMultiAccountManagerImpl.java     |   4 +-
 .../dbus/DbusProvisioningManagerImpl.java     |   4 +-
 .../dbus/DbusRegistrationManagerImpl.java     |   7 +-
 .../signal/dbus/DbusSignalControlImpl.java    |  11 +-
 .../org/asamk/signal/dbus/DbusSignalImpl.java |  49 ++++----
 .../asamk/signal/http/HttpServerHandler.java  |   4 +-
 .../signal/json/JsonMessageEnvelope.java      |   4 +-
 .../asamk/signal/jsonrpc/JsonRpcRequest.java  |   9 +-
 .../jsonrpc/SignalJsonRpcCommandHandler.java  |   8 +-
 .../SignalJsonRpcDispatcherHandler.java       |  20 +++-
 .../asamk/signal/jsonrpc/SocketHandler.java   |   4 +-
 .../asamk/signal/logging/LogConfigurator.java |   6 +-
 .../org/asamk/signal/logging/Scrubber.java    |   4 +-
 .../org/asamk/signal/util/CommandUtil.java    |   6 +-
 .../signal/util/SendMessageResultUtils.java   |   3 +-
 148 files changed, 1056 insertions(+), 578 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 4b086994..85644f61 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -130,11 +130,15 @@ public interface Manager extends Closeable {
     void deleteUsername() throws IOException;
 
     void startChangeNumber(
-            String newNumber, boolean voiceVerification, String captcha
+            String newNumber,
+            boolean voiceVerification,
+            String captcha
     ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException;
 
     void finishChangeNumber(
-            String newNumber, String verificationCode, String pin
+            String newNumber,
+            String verificationCode,
+            String pin
     ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException;
 
     void unregister() throws IOException;
@@ -142,7 +146,8 @@ public interface Manager extends Closeable {
     void deleteAccount() throws IOException;
 
     void submitRateLimitRecaptchaChallenge(
-            String challenge, String captcha
+            String challenge,
+            String captcha
     ) throws IOException, CaptchaRejectedException;
 
     List<Device> getLinkedDevices() throws IOException;
@@ -156,17 +161,21 @@ public interface Manager extends Closeable {
     List<Group> getGroups();
 
     SendGroupMessageResults quitGroup(
-            GroupId groupId, Set<RecipientIdentifier.Single> groupAdmins
+            GroupId groupId,
+            Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException, UnregisteredRecipientException;
 
     void deleteGroup(GroupId groupId) throws IOException;
 
     Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientIdentifier.Single> members, String avatarFile
+            String name,
+            Set<RecipientIdentifier.Single> members,
+            String avatarFile
     ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException;
 
     SendGroupMessageResults updateGroup(
-            final GroupId groupId, final UpdateGroup updateGroup
+            final GroupId groupId,
+            final UpdateGroup updateGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException, UnregisteredRecipientException;
 
     Pair<GroupId, SendGroupMessageResults> joinGroup(
@@ -174,27 +183,29 @@ public interface Manager extends Closeable {
     ) throws IOException, InactiveGroupLinkException, PendingAdminApprovalException;
 
     SendMessageResults sendTypingMessage(
-            TypingAction action, Set<RecipientIdentifier> recipients
+            TypingAction action,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
 
-    SendMessageResults sendReadReceipt(
-            RecipientIdentifier.Single sender, List<Long> messageIds
-    );
+    SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List<Long> messageIds);
 
-    SendMessageResults sendViewedReceipt(
-            RecipientIdentifier.Single sender, List<Long> messageIds
-    );
+    SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List<Long> messageIds);
 
     SendMessageResults sendMessage(
-            Message message, Set<RecipientIdentifier> recipients, boolean notifySelf
+            Message message,
+            Set<RecipientIdentifier> recipients,
+            boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
 
     SendMessageResults sendEditMessage(
-            Message message, Set<RecipientIdentifier> recipients, long editTargetTimestamp
+            Message message,
+            Set<RecipientIdentifier> recipients,
+            long editTargetTimestamp
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
 
     SendMessageResults sendRemoteDeleteMessage(
-            long targetSentTimestamp, Set<RecipientIdentifier> recipients
+            long targetSentTimestamp,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException;
 
     SendMessageResults sendMessageReaction(
@@ -207,13 +218,16 @@ public interface Manager extends Closeable {
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException;
 
     SendMessageResults sendPaymentNotificationMessage(
-            byte[] receipt, String note, RecipientIdentifier.Single recipient
+            byte[] receipt,
+            String note,
+            RecipientIdentifier.Single recipient
     ) throws IOException;
 
     SendMessageResults sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) throws IOException;
 
     SendMessageResults sendMessageRequestResponse(
-            MessageEnvelope.Sync.MessageRequestResponse.Type type, Set<RecipientIdentifier> recipientIdentifiers
+            MessageEnvelope.Sync.MessageRequestResponse.Type type,
+            Set<RecipientIdentifier> recipientIdentifiers
     );
 
     void hideRecipient(RecipientIdentifier.Single recipient);
@@ -223,22 +237,27 @@ public interface Manager extends Closeable {
     void deleteContact(RecipientIdentifier.Single recipient);
 
     void setContactName(
-            RecipientIdentifier.Single recipient, String givenName, final String familyName
+            RecipientIdentifier.Single recipient,
+            String givenName,
+            final String familyName
     ) throws NotPrimaryDeviceException, UnregisteredRecipientException;
 
     void setContactsBlocked(
-            Collection<RecipientIdentifier.Single> recipient, boolean blocked
+            Collection<RecipientIdentifier.Single> recipient,
+            boolean blocked
     ) throws NotPrimaryDeviceException, IOException, UnregisteredRecipientException;
 
     void setGroupsBlocked(
-            Collection<GroupId> groupId, boolean blocked
+            Collection<GroupId> groupId,
+            boolean blocked
     ) throws GroupNotFoundException, IOException, NotPrimaryDeviceException;
 
     /**
      * Change the expiration timer for a contact
      */
     void setExpirationTimer(
-            RecipientIdentifier.Single recipient, int messageExpirationTimer
+            RecipientIdentifier.Single recipient,
+            int messageExpirationTimer
     ) throws IOException, UnregisteredRecipientException;
 
     /**
@@ -277,7 +296,9 @@ public interface Manager extends Closeable {
      * Receive new messages from server, returns if no new message arrive in a timespan of timeout.
      */
     void receiveMessages(
-            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
+            Optional<Duration> timeout,
+            Optional<Integer> maxMessages,
+            ReceiveMessageHandler handler
     ) throws IOException, AlreadyReceivingException;
 
     void stopReceiveMessages();
@@ -309,7 +330,8 @@ public interface Manager extends Closeable {
      * @param recipient account of the identity
      */
     boolean trustIdentityVerified(
-            RecipientIdentifier.Single recipient, IdentityVerificationCode verificationCode
+            RecipientIdentifier.Single recipient,
+            IdentityVerificationCode verificationCode
     ) throws UnregisteredRecipientException;
 
     /**
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index 5660bb13..7d358df6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -13,11 +13,14 @@ import java.io.IOException;
 public interface RegistrationManager extends Closeable {
 
     void register(
-            boolean voiceVerification, String captcha, final boolean forceRegister
+            boolean voiceVerification,
+            String captcha,
+            final boolean forceRegister
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException;
 
     void verifyAccount(
-            String verificationCode, String pin
+            String verificationCode,
+            String pin
     ) throws IOException, PinLockedException, IncorrectPinException;
 
     void deleteLocalAccountData() throws IOException;
diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
index 03c44013..4072a9df 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
@@ -85,7 +85,8 @@ public class SignalAccountFiles {
     }
 
     private Manager initManager(
-            String number, String accountPath
+            String number,
+            String accountPath
     ) throws IOException, NotRegisteredException, AccountCheckException {
         if (accountPath == null) {
             throw new NotRegisteredException();
@@ -152,7 +153,8 @@ public class SignalAccountFiles {
     }
 
     public RegistrationManager initRegistrationManager(
-            String number, Consumer<Manager> newManagerListener
+            String number,
+            Consumer<Manager> newManagerListener
     ) throws IOException {
         final var accountPath = accountsStore.getPathByNumber(number);
         if (accountPath == null || !SignalAccount.accountFileExists(pathConfig.dataPath(), accountPath)) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java
index 9f399dd8..a8f67fd6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/ResendMessageAction.java
@@ -13,7 +13,9 @@ public class ResendMessageAction implements HandleAction {
     private final MessageSendLogEntry messageSendLogEntry;
 
     public ResendMessageAction(
-            final RecipientId recipientId, final long timestamp, final MessageSendLogEntry messageSendLogEntry
+            final RecipientId recipientId,
+            final long timestamp,
+            final MessageSendLogEntry messageSendLogEntry
     ) {
         this.recipientId = recipientId;
         this.timestamp = timestamp;
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java
index c08438b5..6a5cfd59 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendReceiptAction.java
@@ -15,7 +15,9 @@ public class SendReceiptAction implements HandleAction {
     private final List<Long> timestamps = new ArrayList<>();
 
     public SendReceiptAction(
-            final RecipientId recipientId, final SignalServiceReceiptMessage.Type type, final long timestamp
+            final RecipientId recipientId,
+            final SignalServiceReceiptMessage.Type type,
+            final long timestamp
     ) {
         this.recipientId = recipientId;
         this.type = type;
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Group.java b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
index 5e7e36f8..4d1fdaa1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Group.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
@@ -27,7 +27,9 @@ public record Group(
 ) {
 
     public static Group from(
-            final GroupInfo groupInfo, final RecipientAddressResolver recipientStore, final RecipientId selfRecipientId
+            final GroupInfo groupInfo,
+            final RecipientAddressResolver recipientStore,
+            final RecipientId selfRecipientId
     ) {
         return new Group(groupInfo.getGroupId(),
                 groupInfo.getTitle(),
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index aefaa800..5598d438 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -338,7 +338,8 @@ public record MessageEnvelope(
             }
 
             static Attachment from(
-                    SignalServiceDataMessage.Quote.QuotedAttachment a, final AttachmentFileProvider fileProvider
+                    SignalServiceDataMessage.Quote.QuotedAttachment a,
+                    final AttachmentFileProvider fileProvider
             ) {
                 return new Attachment(Optional.empty(),
                         Optional.empty(),
@@ -510,9 +511,7 @@ public record MessageEnvelope(
 
         public record Preview(String title, String description, long date, String url, Optional<Attachment> image) {
 
-            static Preview from(
-                    SignalServicePreview preview, final AttachmentFileProvider fileProvider
-            ) {
+            static Preview from(SignalServicePreview preview, final AttachmentFileProvider fileProvider) {
                 return new Preview(preview.getTitle(),
                         preview.getDescription(),
                         preview.getDate(),
@@ -832,9 +831,7 @@ public record MessageEnvelope(
             Optional<TextAttachment> textAttachment
     ) {
 
-        public static Story from(
-                SignalServiceStoryMessage storyMessage, final AttachmentFileProvider fileProvider
-        ) {
+        public static Story from(SignalServiceStoryMessage storyMessage, final AttachmentFileProvider fileProvider) {
             return new Story(storyMessage.getAllowsReplies().orElse(false),
                     storyMessage.getGroupContext().map(c -> GroupUtils.getGroupIdV2(c.getMasterKey())),
                     storyMessage.getFileAttachment().map(f -> Data.Attachment.from(f, fileProvider)),
@@ -852,7 +849,8 @@ public record MessageEnvelope(
         ) {
 
             static TextAttachment from(
-                    SignalServiceTextAttachment textAttachment, final AttachmentFileProvider fileProvider
+                    SignalServiceTextAttachment textAttachment,
+                    final AttachmentFileProvider fileProvider
             ) {
                 return new TextAttachment(textAttachment.getText(),
                         textAttachment.getStyle().map(Style::from),
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 7ee80815..482e0f60 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -33,7 +33,8 @@ public class ServiceConfig {
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
-            ServiceEnvironment serviceEnvironment, String userAgent
+            ServiceEnvironment serviceEnvironment,
+            String userAgent
     ) {
         final Interceptor userAgentInterceptor = chain -> chain.proceed(chain.request()
                 .newBuilder()
diff --git a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
index 76352d1a..ae686c36 100644
--- a/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java
@@ -18,7 +18,8 @@ import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 public class GroupUtils {
 
     public static void setGroupContext(
-            final SignalServiceDataMessage.Builder messageBuilder, final GroupInfo groupInfo
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final GroupInfo groupInfo
     ) {
         if (groupInfo instanceof GroupInfoV1) {
             var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.DELIVER)
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 474a2822..d5e8581e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -165,7 +165,9 @@ public class AccountHelper {
     }
 
     public void startChangeNumber(
-            String newNumber, boolean voiceVerification, String captcha
+            String newNumber,
+            boolean voiceVerification,
+            String captcha
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException {
         final var accountManager = dependencies.createUnauthenticatedAccountManager(newNumber, account.getPassword());
         final var registrationApi = accountManager.getRegistrationApi();
@@ -178,7 +180,9 @@ public class AccountHelper {
     }
 
     public void finishChangeNumber(
-            String newNumber, String verificationCode, String pin
+            String newNumber,
+            String verificationCode,
+            String pin
     ) throws IncorrectPinException, PinLockedException, IOException {
         for (var attempts = 0; attempts < 5; attempts++) {
             try {
@@ -196,7 +200,9 @@ public class AccountHelper {
     }
 
     private void finishChangeNumberInternal(
-            String newNumber, String verificationCode, String pin
+            String newNumber,
+            String verificationCode,
+            String pin
     ) throws IncorrectPinException, PinLockedException, IOException {
         final var pniIdentity = KeyUtils.generateIdentityKeyPair();
         final var encryptedDeviceMessages = new ArrayList<OutgoingPushMessage>();
@@ -308,9 +314,7 @@ public class AccountHelper {
         handlePniChangeNumberMessage(selfChangeNumber, updatePni);
     }
 
-    public void handlePniChangeNumberMessage(
-            final SyncMessage.PniChangeNumber pniChangeNumber, final PNI updatedPni
-    ) {
+    public void handlePniChangeNumberMessage(final SyncMessage.PniChangeNumber pniChangeNumber, final PNI updatedPni) {
         if (pniChangeNumber.identityKeyPair != null
                 && pniChangeNumber.registrationId != null
                 && pniChangeNumber.signedPreKey != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 3005325a..0ffa62ed 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -104,9 +104,7 @@ public class AttachmentHelper {
         retrieveAttachment(attachment, input -> IOUtils.copyStream(input, outputStream));
     }
 
-    public void retrieveAttachment(
-            SignalServiceAttachment attachment, AttachmentHandler consumer
-    ) throws IOException {
+    public void retrieveAttachment(SignalServiceAttachment attachment, AttachmentHandler consumer) throws IOException {
         if (attachment.isStream()) {
             var input = attachment.asStream().getInputStream();
             // don't close input stream here, it might be reused later (e.g. with contact sync messages ...)
@@ -131,7 +129,8 @@ public class AttachmentHelper {
     }
 
     private InputStream retrieveAttachmentAsStream(
-            SignalServiceAttachmentPointer pointer, File tmpFile
+            SignalServiceAttachmentPointer pointer,
+            File tmpFile
     ) throws IOException {
         try {
             return dependencies.getMessageReceiver()
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index 56ef89ed..fafb9ffe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -49,7 +49,9 @@ public class ContactHelper {
     }
 
     public void setExpirationTimer(
-            RecipientId recipientId, int messageExpirationTimer, int messageExpirationTimerVersion
+            RecipientId recipientId,
+            int messageExpirationTimer,
+            int messageExpirationTimerVersion
     ) {
         var contact = account.getContactStore().getContact(recipientId);
         if (contact != null && (
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index ad31f35b..0d838204 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -118,7 +118,9 @@ public class GroupHelper {
     }
 
     public GroupInfoV2 getOrMigrateGroup(
-            final GroupMasterKey groupMasterKey, final int revision, final byte[] signedGroupChange
+            final GroupMasterKey groupMasterKey,
+            final int revision,
+            final byte[] signedGroupChange
     ) {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
 
@@ -166,7 +168,8 @@ public class GroupHelper {
     }
 
     private DecryptedGroup handleDecryptedGroupResponse(
-            GroupInfoV2 groupInfoV2, final DecryptedGroupResponse decryptedGroupResponse
+            GroupInfoV2 groupInfoV2,
+            final DecryptedGroupResponse decryptedGroupResponse
     ) {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         ReceivedGroupSendEndorsements groupSendEndorsements = dependencies.getGroupsV2Operations()
@@ -181,7 +184,8 @@ public class GroupHelper {
     }
 
     private GroupChange handleGroupChangeResponse(
-            final GroupInfoV2 groupInfoV2, final GroupChangeResponse groupChangeResponse
+            final GroupInfoV2 groupInfoV2,
+            final GroupChangeResponse groupChangeResponse
     ) {
         ReceivedGroupSendEndorsements groupSendEndorsements = dependencies.getGroupsV2Operations()
                 .forGroup(GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey()))
@@ -195,7 +199,9 @@ public class GroupHelper {
     }
 
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientId> members, String avatarFile
+            String name,
+            Set<RecipientId> members,
+            String avatarFile
     ) throws IOException, AttachmentInvalidException {
         final var selfRecipientId = account.getSelfRecipientId();
         if (members != null && members.contains(selfRecipientId)) {
@@ -363,7 +369,8 @@ public class GroupHelper {
     }
 
     public SendGroupMessageResults quitGroup(
-            final GroupId groupId, final Set<RecipientId> newAdmins
+            final GroupId groupId,
+            final Set<RecipientId> newAdmins
     ) throws IOException, LastGroupAdminException, NotAGroupMemberException, GroupNotFoundException {
         var group = getGroupForUpdating(groupId);
         if (group instanceof GroupInfoV1) {
@@ -396,9 +403,7 @@ public class GroupHelper {
         context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
-    public SendGroupMessageResults sendGroupInfoRequest(
-            GroupIdV1 groupId, RecipientId recipientId
-    ) throws IOException {
+    public SendGroupMessageResults sendGroupInfoRequest(GroupIdV1 groupId, RecipientId recipientId) throws IOException {
         var group = SignalServiceGroup.newBuilder(SignalServiceGroup.Type.REQUEST_INFO).withId(groupId.serialize());
 
         var messageBuilder = SignalServiceDataMessage.newBuilder().asGroupMessage(group.build());
@@ -408,7 +413,8 @@ public class GroupHelper {
     }
 
     public SendGroupMessageResults sendGroupInfoMessage(
-            GroupIdV1 groupId, RecipientId recipientId
+            GroupIdV1 groupId,
+            RecipientId recipientId
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, AttachmentInvalidException {
         GroupInfoV1 g;
         var group = getGroupForUpdating(groupId);
@@ -480,7 +486,9 @@ public class GroupHelper {
     }
 
     private void retrieveGroupV2Avatar(
-            GroupSecretParams groupSecretParams, String cdnKey, OutputStream outputStream
+            GroupSecretParams groupSecretParams,
+            String cdnKey,
+            OutputStream outputStream
     ) throws IOException {
         var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
 
@@ -583,7 +591,10 @@ public class GroupHelper {
     }
 
     private SendGroupMessageResults updateGroupV1(
-            final GroupInfoV1 gv1, final String name, final Set<RecipientId> members, final byte[] avatarFile
+            final GroupInfoV1 gv1,
+            final String name,
+            final Set<RecipientId> members,
+            final byte[] avatarFile
     ) throws IOException, AttachmentInvalidException {
         updateGroupV1Details(gv1, name, members, avatarFile);
 
@@ -596,7 +607,10 @@ public class GroupHelper {
     }
 
     private void updateGroupV1Details(
-            final GroupInfoV1 g, final String name, final Collection<RecipientId> members, final byte[] avatarFile
+            final GroupInfoV1 g,
+            final String name,
+            final Collection<RecipientId> members,
+            final byte[] avatarFile
     ) throws IOException {
         if (name != null) {
             g.name = name;
@@ -615,7 +629,8 @@ public class GroupHelper {
      * Change the expiration timer for a group
      */
     private void setExpirationTimer(
-            GroupInfoV1 groupInfoV1, int messageExpirationTimer
+            GroupInfoV1 groupInfoV1,
+            int messageExpirationTimer
     ) throws NotAGroupMemberException, GroupNotFoundException, IOException, GroupSendingNotAllowedException {
         groupInfoV1.messageExpirationTime = messageExpirationTimer;
         account.getGroupStore().updateGroup(groupInfoV1);
@@ -828,7 +843,8 @@ public class GroupHelper {
     }
 
     private SendGroupMessageResults quitGroupV2(
-            final GroupInfoV2 groupInfoV2, final Set<RecipientId> newAdmins
+            final GroupInfoV2 groupInfoV2,
+            final Set<RecipientId> newAdmins
     ) throws LastGroupAdminException, IOException {
         final var currentAdmins = groupInfoV2.getAdminMembers();
         newAdmins.removeAll(currentAdmins);
@@ -882,7 +898,9 @@ public class GroupHelper {
     }
 
     private SendGroupMessageResults sendUpdateGroupV2Message(
-            GroupInfoV2 group, DecryptedGroup newDecryptedGroup, GroupChange groupChange
+            GroupInfoV2 group,
+            DecryptedGroup newDecryptedGroup,
+            GroupChange groupChange
     ) throws IOException {
         final var selfRecipientId = account.getSelfRecipientId();
         final var members = group.getMembersIncludingPendingWithout(selfRecipientId);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 6c6acd65..05bc876a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -94,7 +94,8 @@ class GroupV2Helper {
     }
 
     DecryptedGroupJoinInfo getDecryptedGroupJoinInfo(
-            GroupMasterKey groupMasterKey, GroupLinkPassword password
+            GroupMasterKey groupMasterKey,
+            GroupLinkPassword password
     ) throws IOException, GroupLinkNotActiveException {
         var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
 
@@ -105,7 +106,9 @@ class GroupV2Helper {
     }
 
     GroupHistoryPage getDecryptedGroupHistoryPage(
-            final GroupSecretParams groupSecretParams, int fromRevision, long sendEndorsementsExpirationMs
+            final GroupSecretParams groupSecretParams,
+            int fromRevision,
+            long sendEndorsementsExpirationMs
     ) throws NotAGroupMemberException {
         try {
             final var groupsV2AuthorizationString = getGroupAuthForToday(groupSecretParams);
@@ -138,9 +141,7 @@ class GroupV2Helper {
         return partialDecryptedGroup.revision;
     }
 
-    Pair<GroupInfoV2, DecryptedGroupResponse> createGroup(
-            String name, Set<RecipientId> members, byte[] avatarFile
-    ) {
+    Pair<GroupInfoV2, DecryptedGroupResponse> createGroup(String name, Set<RecipientId> members, byte[] avatarFile) {
         final var newGroup = buildNewGroup(name, members, avatarFile);
         if (newGroup == null) {
             return null;
@@ -170,9 +171,7 @@ class GroupV2Helper {
         return new Pair<>(g, response);
     }
 
-    private GroupsV2Operations.NewGroup buildNewGroup(
-            String name, Set<RecipientId> members, byte[] avatar
-    ) {
+    private GroupsV2Operations.NewGroup buildNewGroup(String name, Set<RecipientId> members, byte[] avatar) {
         final var profileKeyCredential = context.getProfileHelper()
                 .getExpiringProfileKeyCredential(context.getAccount().getSelfRecipientId());
         if (profileKeyCredential == null) {
@@ -202,7 +201,10 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> updateGroup(
-            GroupInfoV2 groupInfoV2, String name, String description, byte[] avatarFile
+            GroupInfoV2 groupInfoV2,
+            String name,
+            String description,
+            byte[] avatarFile
     ) throws IOException {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
@@ -225,7 +227,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> addMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> newMembers
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> newMembers
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
@@ -251,7 +254,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> leaveGroup(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> membersToMakeAdmin
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> membersToMakeAdmin
     ) throws IOException {
         var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
         final var selfAci = getSelfAci();
@@ -271,7 +275,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> removeMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> members
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> members
     ) throws IOException {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
@@ -283,7 +288,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> approveJoinRequestMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> members
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> members
     ) throws IOException {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
@@ -294,7 +300,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> refuseJoinRequestMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> members
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> members
     ) throws IOException {
         final var memberUuids = members.stream()
                 .map(context.getRecipientHelper()::resolveSignalServiceAddress)
@@ -304,7 +311,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> revokeInvitedMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> members
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> members
     ) throws IOException {
         var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
         final var memberUuids = members.stream()
@@ -318,7 +326,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> banMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> block
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> block
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
@@ -336,7 +345,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> unbanMembers(
-            GroupInfoV2 groupInfoV2, Set<RecipientId> block
+            GroupInfoV2 groupInfoV2,
+            Set<RecipientId> block
     ) throws IOException {
         GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
@@ -359,7 +369,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> setGroupLinkState(
-            GroupInfoV2 groupInfoV2, GroupLinkState state
+            GroupInfoV2 groupInfoV2,
+            GroupLinkState state
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
@@ -374,7 +385,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> setEditDetailsPermission(
-            GroupInfoV2 groupInfoV2, GroupPermission permission
+            GroupInfoV2 groupInfoV2,
+            GroupPermission permission
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
@@ -384,7 +396,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> setAddMemberPermission(
-            GroupInfoV2 groupInfoV2, GroupPermission permission
+            GroupInfoV2 groupInfoV2,
+            GroupPermission permission
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
 
@@ -468,7 +481,9 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> setMemberAdmin(
-            GroupInfoV2 groupInfoV2, RecipientId recipientId, boolean admin
+            GroupInfoV2 groupInfoV2,
+            RecipientId recipientId,
+            boolean admin
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
@@ -482,7 +497,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> setMessageExpirationTimer(
-            GroupInfoV2 groupInfoV2, int messageExpirationTimer
+            GroupInfoV2 groupInfoV2,
+            int messageExpirationTimer
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var change = groupOperations.createModifyGroupTimerChange(messageExpirationTimer);
@@ -490,7 +506,8 @@ class GroupV2Helper {
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> setIsAnnouncementGroup(
-            GroupInfoV2 groupInfoV2, boolean isAnnouncementGroup
+            GroupInfoV2 groupInfoV2,
+            boolean isAnnouncementGroup
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var change = groupOperations.createAnnouncementGroupChange(isAnnouncementGroup);
@@ -518,7 +535,8 @@ class GroupV2Helper {
     }
 
     private Pair<DecryptedGroup, GroupChangeResponse> revokeInvites(
-            GroupInfoV2 groupInfoV2, Set<DecryptedPendingMember> pendingMembers
+            GroupInfoV2 groupInfoV2,
+            Set<DecryptedPendingMember> pendingMembers
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var uuidCipherTexts = pendingMembers.stream().map(member -> {
@@ -532,28 +550,32 @@ class GroupV2Helper {
     }
 
     private Pair<DecryptedGroup, GroupChangeResponse> approveJoinRequest(
-            GroupInfoV2 groupInfoV2, Set<UUID> uuids
+            GroupInfoV2 groupInfoV2,
+            Set<UUID> uuids
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2, groupOperations.createApproveGroupJoinRequest(uuids));
     }
 
     private Pair<DecryptedGroup, GroupChangeResponse> refuseJoinRequest(
-            GroupInfoV2 groupInfoV2, Set<ServiceId> serviceIds
+            GroupInfoV2 groupInfoV2,
+            Set<ServiceId> serviceIds
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2, groupOperations.createRefuseGroupJoinRequest(serviceIds, false, List.of()));
     }
 
     private Pair<DecryptedGroup, GroupChangeResponse> ejectMembers(
-            GroupInfoV2 groupInfoV2, Set<ACI> members
+            GroupInfoV2 groupInfoV2,
+            Set<ACI> members
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(members, false, List.of()));
     }
 
     private Pair<DecryptedGroup, GroupChangeResponse> commitChange(
-            GroupInfoV2 groupInfoV2, GroupChange.Actions.Builder change
+            GroupInfoV2 groupInfoV2,
+            GroupChange.Actions.Builder change
     ) throws IOException {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupInfoV2.getMasterKey());
         final var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
@@ -676,7 +698,8 @@ class GroupV2Helper {
     }
 
     private GroupsV2AuthorizationString getAuthorizationString(
-            final GroupSecretParams groupSecretParams, final long todaySeconds
+            final GroupSecretParams groupSecretParams,
+            final long todaySeconds
     ) throws VerificationFailedException {
         var authCredentialResponse = groupApiCredentials.get(todaySeconds);
         final var aci = getSelfAci();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
index cc71e15c..82d44fde 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IdentityHelper.java
@@ -66,9 +66,7 @@ public class IdentityHelper {
         return fingerprint == null ? null : fingerprint.getScannableFingerprint();
     }
 
-    private Fingerprint computeSafetyNumberFingerprint(
-            final ServiceId serviceId, final IdentityKey theirIdentityKey
-    ) {
+    private Fingerprint computeSafetyNumberFingerprint(final ServiceId serviceId, final IdentityKey theirIdentityKey) {
         if (!serviceId.isUnknown()) {
             return Utils.computeSafetyNumberForUuid(account.getAci(),
                     account.getAciIdentityKeyPair().getPublicKey(),
@@ -89,7 +87,9 @@ public class IdentityHelper {
     }
 
     private boolean trustIdentity(
-            RecipientId recipientId, BiFunction<ServiceId, IdentityKey, Boolean> verifier, TrustLevel trustLevel
+            RecipientId recipientId,
+            BiFunction<ServiceId, IdentityKey, Boolean> verifier,
+            TrustLevel trustLevel
     ) {
         final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
         final var serviceId = address.serviceId().orElse(null);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 294b17f6..376a671b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -190,7 +190,9 @@ public final class IncomingMessageHandler {
     }
 
     private SignalServiceContent validate(
-            Envelope envelope, SignalServiceCipherResult cipherResult, long serverDeliveredTimestamp
+            Envelope envelope,
+            SignalServiceCipherResult cipherResult,
+            long serverDeliveredTimestamp
     ) throws ProtocolInvalidKeyException, ProtocolInvalidMessageException, UnsupportedDataMessageException, InvalidMessageStructureException {
         final var content = cipherResult.getContent();
         final var envelopeMetadata = cipherResult.getMetadata();
@@ -280,7 +282,9 @@ public final class IncomingMessageHandler {
     }
 
     public List<HandleAction> handleMessage(
-            SignalServiceEnvelope envelope, SignalServiceContent content, ReceiveConfig receiveConfig
+            SignalServiceEnvelope envelope,
+            SignalServiceContent content,
+            ReceiveConfig receiveConfig
     ) {
         var actions = new ArrayList<HandleAction>();
         final var senderDeviceAddress = getSender(envelope, content);
@@ -381,7 +385,8 @@ public final class IncomingMessageHandler {
     }
 
     private boolean handlePniSignatureMessage(
-            final SignalServicePniSignatureMessage message, final SignalServiceAddress senderAddress
+            final SignalServicePniSignatureMessage message,
+            final SignalServiceAddress senderAddress
     ) {
         final var aci = senderAddress.getServiceId();
         final var aciIdentity = account.getIdentityKeyStore().getIdentityInfo(aci);
@@ -865,7 +870,9 @@ public final class IncomingMessageHandler {
     }
 
     private List<HandleAction> handleSignalServiceStoryMessage(
-            SignalServiceStoryMessage message, RecipientId source, boolean ignoreAttachments
+            SignalServiceStoryMessage message,
+            RecipientId source,
+            boolean ignoreAttachments
     ) {
         var actions = new ArrayList<HandleAction>();
         if (message.getGroupContext().isPresent()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index 7669b383..a95635cf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -21,9 +21,7 @@ public class PinHelper {
         this.secureValueRecoveries = secureValueRecoveries;
     }
 
-    public void setRegistrationLockPin(
-            String pin, MasterKey masterKey
-    ) throws IOException {
+    public void setRegistrationLockPin(String pin, MasterKey masterKey) throws IOException {
         IOException exception = null;
         for (final var secureValueRecovery : secureValueRecoveries) {
             try {
@@ -82,7 +80,8 @@ public class PinHelper {
     }
 
     public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
-            String pin, LockedException lockedException
+            String pin,
+            LockedException lockedException
     ) throws IOException, IncorrectPinException {
         var svr2Credentials = lockedException.getSvr2Credentials();
         if (svr2Credentials != null) {
@@ -103,7 +102,9 @@ public class PinHelper {
     }
 
     public SecureValueRecovery.RestoreResponse.Success getRegistrationLockData(
-            SecureValueRecovery secureValueRecovery, AuthCredentials authCredentials, String pin
+            SecureValueRecovery secureValueRecovery,
+            AuthCredentials authCredentials,
+            String pin
     ) throws IOException, IncorrectPinException {
         final var restoreResponse = secureValueRecovery.restoreDataPreRegistration(authCredentials, null, pin);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 864ef656..339425c1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -30,9 +30,7 @@ public class PreKeyHelper {
     private final SignalAccount account;
     private final SignalDependencies dependencies;
 
-    public PreKeyHelper(
-            final SignalAccount account, final SignalDependencies dependencies
-    ) {
+    public PreKeyHelper(final SignalAccount account, final SignalDependencies dependencies) {
         this.account = account;
         this.dependencies = dependencies;
     }
@@ -79,7 +77,8 @@ public class PreKeyHelper {
     }
 
     private boolean refreshPreKeysIfNecessary(
-            final ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
+            final ServiceIdType serviceIdType,
+            final IdentityKeyPair identityKeyPair
     ) throws IOException {
         OneTimePreKeyCounts preKeyCounts;
         try {
@@ -221,7 +220,8 @@ public class PreKeyHelper {
     }
 
     private List<KyberPreKeyRecord> generateKyberPreKeys(
-            ServiceIdType serviceIdType, final IdentityKeyPair identityKeyPair
+            ServiceIdType serviceIdType,
+            final IdentityKeyPair identityKeyPair
     ) {
         final var accountData = account.getAccountData(serviceIdType);
         final var offset = accountData.getPreKeyMetadata().getNextKyberPreKeyId();
@@ -246,7 +246,9 @@ public class PreKeyHelper {
     }
 
     private KyberPreKeyRecord generateLastResortKyberPreKey(
-            ServiceIdType serviceIdType, IdentityKeyPair identityKeyPair, final int offset
+            ServiceIdType serviceIdType,
+            IdentityKeyPair identityKeyPair,
+            final int offset
     ) {
         final var accountData = account.getAccountData(serviceIdType);
         final var signedPreKeyId = accountData.getPreKeyMetadata().getNextKyberPreKeyId() + offset;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 03d277f9..184eac6b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -271,7 +271,9 @@ public final class ProfileHelper {
     }
 
     private Profile decryptProfileAndDownloadAvatar(
-            final RecipientId recipientId, final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
+            final RecipientId recipientId,
+            final ProfileKey profileKey,
+            final SignalServiceProfile encryptedProfile
     ) {
         final var avatarPath = encryptedProfile.getAvatar();
         downloadProfileAvatar(recipientId, avatarPath, profileKey);
@@ -280,7 +282,9 @@ public final class ProfileHelper {
     }
 
     public void downloadProfileAvatar(
-            final RecipientId recipientId, final String avatarPath, final ProfileKey profileKey
+            final RecipientId recipientId,
+            final String avatarPath,
+            final ProfileKey profileKey
     ) {
         var profile = account.getProfileStore().getProfile(recipientId);
         if (profile == null || !Objects.equals(avatarPath, profile.getAvatarUrlPath())) {
@@ -308,7 +312,8 @@ public final class ProfileHelper {
     }
 
     private Single<ProfileAndCredential> retrieveProfile(
-            RecipientId recipientId, SignalServiceProfile.RequestType requestType
+            RecipientId recipientId,
+            SignalServiceProfile.RequestType requestType
     ) {
         var unidentifiedAccess = getUnidentifiedAccess(recipientId);
         var profileKey = Optional.ofNullable(account.getProfileStore().getProfileKey(recipientId));
@@ -408,9 +413,7 @@ public final class ProfileHelper {
         });
     }
 
-    private void downloadProfileAvatar(
-            RecipientAddress address, String avatarPath, ProfileKey profileKey
-    ) {
+    private void downloadProfileAvatar(RecipientAddress address, String avatarPath, ProfileKey profileKey) {
         if (avatarPath == null) {
             try {
                 context.getAvatarStore().deleteProfileAvatar(address);
@@ -430,7 +433,9 @@ public final class ProfileHelper {
     }
 
     private void retrieveProfileAvatar(
-            String avatarPath, ProfileKey profileKey, OutputStream outputStream
+            String avatarPath,
+            ProfileKey profileKey,
+            OutputStream outputStream
     ) throws IOException {
         var tmpFile = IOUtils.createTempFile();
         try (var input = dependencies.getMessageReceiver()
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index baa0d583..ab75bd16 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -83,7 +83,10 @@ public class ReceiveHelper {
     }
 
     public void receiveMessages(
-            Duration timeout, boolean returnOnTimeout, Integer maxMessages, Manager.ReceiveMessageHandler handler
+            Duration timeout,
+            boolean returnOnTimeout,
+            Integer maxMessages,
+            Manager.ReceiveMessageHandler handler
     ) throws IOException {
         account.setNeedsToRetryFailedMessages(true);
         hasCaughtUpWithOldMessages = false;
@@ -264,7 +267,8 @@ public class ReceiveHelper {
     }
 
     private List<HandleAction> retryFailedReceivedMessage(
-            final Manager.ReceiveMessageHandler handler, final CachedMessage cachedMessage
+            final Manager.ReceiveMessageHandler handler,
+            final CachedMessage cachedMessage
     ) {
         var envelope = cachedMessage.loadEnvelope();
         if (envelope == null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 24b3eb5f..6225b982 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -97,7 +97,8 @@ public class RecipientHelper {
     }
 
     public RecipientId resolveRecipientByUsernameOrLink(
-            String username, boolean forceRefresh
+            String username,
+            boolean forceRefresh
     ) throws UnregisteredRecipientException {
         final Username finalUsername;
         try {
@@ -180,7 +181,8 @@ public class RecipientHelper {
     }
 
     private Map<String, RegisteredUser> getRegisteredUsers(
-            final Set<String> numbers, final boolean isPartialRefresh
+            final Set<String> numbers,
+            final boolean isPartialRefresh
     ) throws IOException {
         Map<String, RegisteredUser> registeredUsers = getRegisteredUsersV2(numbers, isPartialRefresh);
 
@@ -211,7 +213,8 @@ public class RecipientHelper {
     }
 
     private Map<String, RegisteredUser> getRegisteredUsersV2(
-            final Set<String> numbers, boolean isPartialRefresh
+            final Set<String> numbers,
+            boolean isPartialRefresh
     ) throws IOException {
         final var previousNumbers = isPartialRefresh ? Set.<String>of() : account.getCdsiStore().getAllNumbers();
         final var newNumbers = new HashSet<>(numbers) {{
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
index 0622b4a8..2fb55003 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@@ -125,7 +125,8 @@ public class SendHelper {
     }
 
     public SendMessageResult sendReceiptMessage(
-            final SignalServiceReceiptMessage receiptMessage, final RecipientId recipientId
+            final SignalServiceReceiptMessage receiptMessage,
+            final RecipientId recipientId
     ) {
         final var messageSendLogStore = account.getMessageSendLogStore();
         final var result = handleSendMessage(recipientId,
@@ -157,7 +158,9 @@ public class SendHelper {
     }
 
     public SendMessageResult sendRetryReceipt(
-            DecryptionErrorMessage errorMessage, RecipientId recipientId, Optional<GroupId> groupId
+            DecryptionErrorMessage errorMessage,
+            RecipientId recipientId,
+            Optional<GroupId> groupId
     ) {
         logger.debug("Sending retry receipt for {} to {}, device: {}",
                 errorMessage.getTimestamp(),
@@ -183,7 +186,8 @@ public class SendHelper {
     }
 
     public SendMessageResult sendSelfMessage(
-            SignalServiceDataMessage.Builder messageBuilder, Optional<Long> editTargetTimestamp
+            SignalServiceDataMessage.Builder messageBuilder,
+            Optional<Long> editTargetTimestamp
     ) {
         final var recipientId = account.getSelfRecipientId();
         final var contact = account.getContactStore().getContact(recipientId);
@@ -214,9 +218,7 @@ public class SendHelper {
         }
     }
 
-    public SendMessageResult sendTypingMessage(
-            SignalServiceTypingMessage message, RecipientId recipientId
-    ) {
+    public SendMessageResult sendTypingMessage(SignalServiceTypingMessage message, RecipientId recipientId) {
         final var result = handleSendMessage(recipientId,
                 (messageSender, address, unidentifiedAccess, includePniSignature) -> messageSender.sendTyping(List.of(
                         address), List.of(unidentifiedAccess), message, null).getFirst());
@@ -225,7 +227,8 @@ public class SendHelper {
     }
 
     public List<SendMessageResult> sendGroupTypingMessage(
-            SignalServiceTypingMessage message, GroupId groupId
+            SignalServiceTypingMessage message,
+            GroupId groupId
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         final var g = getGroupForSending(groupId);
         if (g.isAnnouncementGroup() && !g.isAdmin(account.getSelfRecipientId())) {
@@ -238,7 +241,9 @@ public class SendHelper {
     }
 
     public SendMessageResult resendMessage(
-            final RecipientId recipientId, final long timestamp, final MessageSendLogEntry messageSendLogEntry
+            final RecipientId recipientId,
+            final long timestamp,
+            final MessageSendLogEntry messageSendLogEntry
     ) {
         logger.trace("Resending message {} to {}", timestamp, recipientId);
         if (messageSendLogEntry.groupId().isEmpty()) {
@@ -552,7 +557,9 @@ public class SendHelper {
     }
 
     private List<SendMessageResult> sendGroupMessageInternalWithLegacy(
-            final LegacySenderHandler sender, final Set<RecipientId> recipientIds, final boolean isRecipientUpdate
+            final LegacySenderHandler sender,
+            final Set<RecipientId> recipientIds,
+            final boolean isRecipientUpdate
     ) throws IOException {
         final var recipientIdList = new ArrayList<>(recipientIds);
         final var addresses = recipientIdList.stream()
@@ -644,7 +651,9 @@ public class SendHelper {
     }
 
     private SendMessageResult sendMessage(
-            SignalServiceDataMessage message, RecipientId recipientId, Optional<Long> editTargetTimestamp
+            SignalServiceDataMessage message,
+            RecipientId recipientId,
+            Optional<Long> editTargetTimestamp
     ) {
         final var messageSendLogStore = account.getMessageSendLogStore();
         final var urgent = true;
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
index 4a0d25fe..b6d90ff9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StickerHelper.java
@@ -30,7 +30,9 @@ public class StickerHelper {
     }
 
     public StickerPack addOrUpdateStickerPack(
-            final StickerPackId stickerPackId, final byte[] stickerPackKey, final boolean installed
+            final StickerPackId stickerPackId,
+            final byte[] stickerPackKey,
+            final boolean installed
     ) {
         final var sticker = account.getStickerStore().getStickerPack(stickerPackId);
         if (sticker != null) {
@@ -50,7 +52,8 @@ public class StickerHelper {
     }
 
     public JsonStickerPack getOrRetrieveStickerPack(
-            StickerPackId packId, byte[] packKey
+            StickerPackId packId,
+            byte[] packKey
     ) throws InvalidStickerException {
         try {
             retrieveStickerPack(packId, packKey);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index c18e8df3..8c6b3c52 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -218,7 +218,9 @@ public class StorageHelper {
     }
 
     private boolean writeToStorage(
-            final StorageKey storageKey, final SignalStorageManifest remoteManifest, final boolean needsForcePush
+            final StorageKey storageKey,
+            final SignalStorageManifest remoteManifest,
+            final boolean needsForcePush
     ) throws IOException, RetryLaterException {
         final WriteOperationResult remoteWriteOperation;
         try (final var connection = account.getAccountDatabase().getConnection()) {
@@ -408,7 +410,8 @@ public class StorageHelper {
     }
 
     private List<SignalStorageRecord> getSignalStorageRecords(
-            final StorageKey storageKey, final List<StorageId> storageIds
+            final StorageKey storageKey,
+            final List<StorageId> storageIds
     ) throws IOException {
         List<SignalStorageRecord> records;
         try {
@@ -430,7 +433,8 @@ public class StorageHelper {
     }
 
     private List<SignalStorageRecord> buildLocalStorageRecords(
-            final Connection connection, final List<StorageId> storageIds
+            final Connection connection,
+            final List<StorageId> storageIds
     ) throws SQLException {
         final var records = new ArrayList<SignalStorageRecord>();
         for (final var storageId : storageIds) {
@@ -443,7 +447,8 @@ public class StorageHelper {
     }
 
     private SignalStorageRecord buildLocalStorageRecord(
-            Connection connection, StorageId storageId
+            Connection connection,
+            StorageId storageId
     ) throws SQLException {
         return switch (ManifestRecord.Identifier.Type.fromValue(storageId.getType())) {
             case ManifestRecord.Identifier.Type.CONTACT -> {
@@ -484,7 +489,8 @@ public class StorageHelper {
      * exclusive to the local data set.
      */
     private static IdDifferenceResult findIdDifference(
-            Collection<StorageId> remoteIds, Collection<StorageId> localIds
+            Collection<StorageId> remoteIds,
+            Collection<StorageId> localIds
     ) {
         final var base64Encoder = Base64.getEncoder();
         final var remoteByRawId = remoteIds.stream()
@@ -520,7 +526,8 @@ public class StorageHelper {
     }
 
     private List<StorageId> processKnownRecords(
-            final Connection connection, List<SignalStorageRecord> records
+            final Connection connection,
+            List<SignalStorageRecord> records
     ) throws SQLException {
         final var unknownRecords = new ArrayList<StorageId>();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 56665fda..70427f00 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -217,7 +217,9 @@ public class SyncHelper {
 
     @NotNull
     private DeviceContact getDeviceContact(
-            final RecipientAddress address, final RecipientId recipientId, final Contact contact
+            final RecipientAddress address,
+            final RecipientId recipientId,
+            final Contact contact
     ) throws IOException {
         var currentIdentity = address.serviceId().isEmpty()
                 ? null
@@ -262,7 +264,9 @@ public class SyncHelper {
     }
 
     public SendMessageResult sendVerifiedMessage(
-            SignalServiceAddress destination, IdentityKey identityKey, TrustLevel trustLevel
+            SignalServiceAddress destination,
+            IdentityKey identityKey,
+            TrustLevel trustLevel
     ) {
         var verifiedMessage = new VerifiedMessage(destination,
                 identityKey,
@@ -278,7 +282,8 @@ public class SyncHelper {
     }
 
     public SendMessageResult sendStickerOperationsMessage(
-            List<StickerPack> installStickers, List<StickerPack> removeStickers
+            List<StickerPack> installStickers,
+            List<StickerPack> removeStickers
     ) {
         var installStickerMessages = installStickers.stream().map(s -> getStickerPackOperationMessage(s, true));
         var removeStickerMessages = removeStickers.stream().map(s -> getStickerPackOperationMessage(s, false));
@@ -288,7 +293,8 @@ public class SyncHelper {
     }
 
     private static StickerPackOperationMessage getStickerPackOperationMessage(
-            final StickerPack s, final boolean installed
+            final StickerPack s,
+            final boolean installed
     ) {
         return new StickerPackOperationMessage(s.packId().serialize(),
                 s.packKey(),
@@ -414,15 +420,14 @@ public class SyncHelper {
         }
     }
 
-    public SendMessageResult sendMessageRequestResponse(
-            final MessageRequestResponse.Type type, final GroupId groupId
-    ) {
+    public SendMessageResult sendMessageRequestResponse(final MessageRequestResponse.Type type, final GroupId groupId) {
         final var response = MessageRequestResponseMessage.forGroup(groupId.serialize(), localToRemoteType(type));
         return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forMessageRequestResponse(response));
     }
 
     public SendMessageResult sendMessageRequestResponse(
-            final MessageRequestResponse.Type type, final RecipientId recipientId
+            final MessageRequestResponse.Type type,
+            final RecipientId recipientId
     ) {
         final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
         if (address.serviceId().isEmpty()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index 3899179c..fb39789e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -158,7 +158,8 @@ public class UnidentifiedAccessHelper {
     }
 
     private static byte[] getTargetUnidentifiedAccessKey(
-            final Profile targetProfile, final ProfileKey theirProfileKey
+            final Profile targetProfile,
+            final ProfileKey theirProfileKey
     ) {
         return switch (targetProfile.getUnidentifiedAccessMode()) {
             case ENABLED -> theirProfileKey == null ? null : UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 27bda583..2f2ba3db 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -417,7 +417,9 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void startChangeNumber(
-            String newNumber, boolean voiceVerification, String captcha
+            String newNumber,
+            boolean voiceVerification,
+            String captcha
     ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, NotPrimaryDeviceException, VerificationMethodNotAvailableException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
@@ -427,7 +429,9 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void finishChangeNumber(
-            String newNumber, String verificationCode, String pin
+            String newNumber,
+            String verificationCode,
+            String pin
     ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
@@ -447,7 +451,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void submitRateLimitRecaptchaChallenge(
-            String challenge, String captcha
+            String challenge,
+            String captcha
     ) throws IOException, CaptchaRejectedException {
         captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
 
@@ -527,7 +532,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults quitGroup(
-            GroupId groupId, Set<RecipientIdentifier.Single> groupAdmins
+            GroupId groupId,
+            Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException, UnregisteredRecipientException {
         final var newAdmins = context.getRecipientHelper().resolveRecipients(groupAdmins);
         return context.getGroupHelper().quitGroup(groupId, newAdmins);
@@ -545,7 +551,9 @@ public class ManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            String name, Set<RecipientIdentifier.Single> members, String avatarFile
+            String name,
+            Set<RecipientIdentifier.Single> members,
+            String avatarFile
     ) throws IOException, AttachmentInvalidException, UnregisteredRecipientException {
         return context.getGroupHelper()
                 .createGroup(name,
@@ -555,7 +563,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults updateGroup(
-            final GroupId groupId, final UpdateGroup updateGroup
+            final GroupId groupId,
+            final UpdateGroup updateGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException, UnregisteredRecipientException {
         return context.getGroupHelper()
                 .updateGroup(groupId,
@@ -596,7 +605,9 @@ public class ManagerImpl implements Manager {
     }
 
     private SendMessageResults sendMessage(
-            SignalServiceDataMessage.Builder messageBuilder, Set<RecipientIdentifier> recipients, boolean notifySelf
+            SignalServiceDataMessage.Builder messageBuilder,
+            Set<RecipientIdentifier> recipients,
+            boolean notifySelf
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return sendMessage(messageBuilder, recipients, notifySelf, Optional.empty());
     }
@@ -644,7 +655,8 @@ public class ManagerImpl implements Manager {
     }
 
     private SendMessageResults sendTypingMessage(
-            SignalServiceTypingMessage.Action action, Set<RecipientIdentifier> recipients
+            SignalServiceTypingMessage.Action action,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
         final var timestamp = System.currentTimeMillis();
@@ -671,15 +683,14 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendTypingMessage(
-            TypingAction action, Set<RecipientIdentifier> recipients
+            TypingAction action,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return sendTypingMessage(action.toSignalService(), recipients);
     }
 
     @Override
-    public SendMessageResults sendReadReceipt(
-            RecipientIdentifier.Single sender, List<Long> messageIds
-    ) {
+    public SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List<Long> messageIds) {
         final var timestamp = System.currentTimeMillis();
         var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ,
                 messageIds,
@@ -689,9 +700,7 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public SendMessageResults sendViewedReceipt(
-            RecipientIdentifier.Single sender, List<Long> messageIds
-    ) {
+    public SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List<Long> messageIds) {
         final var timestamp = System.currentTimeMillis();
         var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED,
                 messageIds,
@@ -724,7 +733,9 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendMessage(
-            Message message, Set<RecipientIdentifier> recipients, boolean notifySelf
+            Message message,
+            Set<RecipientIdentifier> recipients,
+            boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
         final var selfProfile = context.getProfileHelper().getSelfProfile();
         if (selfProfile == null || selfProfile.getDisplayName().isEmpty()) {
@@ -738,7 +749,9 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendEditMessage(
-            Message message, Set<RecipientIdentifier> recipients, long editTargetTimestamp
+            Message message,
+            Set<RecipientIdentifier> recipients,
+            long editTargetTimestamp
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
         final var messageBuilder = SignalServiceDataMessage.newBuilder();
         applyMessage(messageBuilder, message);
@@ -746,7 +759,8 @@ public class ManagerImpl implements Manager {
     }
 
     private void applyMessage(
-            final SignalServiceDataMessage.Builder messageBuilder, final Message message
+            final SignalServiceDataMessage.Builder messageBuilder,
+            final Message message
     ) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException {
         final var additionalAttachments = new ArrayList<SignalServiceAttachment>();
         if (message.messageText().length() > ServiceConfig.MAX_MESSAGE_BODY_SIZE) {
@@ -863,7 +877,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendRemoteDeleteMessage(
-            long targetSentTimestamp, Set<RecipientIdentifier> recipients
+            long targetSentTimestamp,
+            Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var delete = new SignalServiceDataMessage.RemoteDelete(targetSentTimestamp);
         final var messageBuilder = SignalServiceDataMessage.newBuilder().withRemoteDelete(delete);
@@ -915,7 +930,9 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendPaymentNotificationMessage(
-            byte[] receipt, String note, RecipientIdentifier.Single recipient
+            byte[] receipt,
+            String note,
+            RecipientIdentifier.Single recipient
     ) throws IOException {
         final var paymentNotification = new SignalServiceDataMessage.PaymentNotification(receipt, note);
         final var payment = new SignalServiceDataMessage.Payment(paymentNotification, null);
@@ -958,7 +975,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendMessageRequestResponse(
-            final MessageRequestResponse.Type type, final Set<RecipientIdentifier> recipients
+            final MessageRequestResponse.Type type,
+            final Set<RecipientIdentifier> recipients
     ) {
         var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
         for (final var recipient : recipients) {
@@ -1021,7 +1039,9 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void setContactName(
-            RecipientIdentifier.Single recipient, String givenName, final String familyName
+            RecipientIdentifier.Single recipient,
+            String givenName,
+            final String familyName
     ) throws NotPrimaryDeviceException, UnregisteredRecipientException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
@@ -1033,7 +1053,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void setContactsBlocked(
-            Collection<RecipientIdentifier.Single> recipients, boolean blocked
+            Collection<RecipientIdentifier.Single> recipients,
+            boolean blocked
     ) throws IOException, UnregisteredRecipientException {
         if (recipients.isEmpty()) {
             return;
@@ -1067,7 +1088,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void setGroupsBlocked(
-            final Collection<GroupId> groupIds, final boolean blocked
+            final Collection<GroupId> groupIds,
+            final boolean blocked
     ) throws GroupNotFoundException, IOException {
         if (groupIds.isEmpty()) {
             return;
@@ -1093,7 +1115,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void setExpirationTimer(
-            RecipientIdentifier.Single recipient, int messageExpirationTimer
+            RecipientIdentifier.Single recipient,
+            int messageExpirationTimer
     ) throws IOException, UnregisteredRecipientException {
         var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
         context.getContactHelper().setExpirationTimer(recipientId, messageExpirationTimer);
@@ -1255,7 +1278,9 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void receiveMessages(
-            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
+            Optional<Duration> timeout,
+            Optional<Integer> maxMessages,
+            ReceiveMessageHandler handler
     ) throws IOException, AlreadyReceivingException {
         receiveMessages(timeout.orElse(Duration.ofMinutes(1)), timeout.isPresent(), maxMessages.orElse(null), handler);
     }
@@ -1275,7 +1300,10 @@ public class ManagerImpl implements Manager {
     }
 
     private void receiveMessages(
-            Duration timeout, boolean returnOnTimeout, Integer maxMessages, ReceiveMessageHandler handler
+            Duration timeout,
+            boolean returnOnTimeout,
+            Integer maxMessages,
+            ReceiveMessageHandler handler
     ) throws IOException, AlreadyReceivingException {
         synchronized (messageHandlers) {
             if (isReceiving()) {
@@ -1431,7 +1459,8 @@ public class ManagerImpl implements Manager {
 
     @Override
     public boolean trustIdentityVerified(
-            RecipientIdentifier.Single recipient, IdentityVerificationCode verificationCode
+            RecipientIdentifier.Single recipient,
+            IdentityVerificationCode verificationCode
     ) throws UnregisteredRecipientException {
         return switch (verificationCode) {
             case IdentityVerificationCode.Fingerprint fingerprint -> trustIdentity(recipient,
@@ -1450,7 +1479,8 @@ public class ManagerImpl implements Manager {
     }
 
     private boolean trustIdentity(
-            RecipientIdentifier.Single recipient, Function<RecipientId, Boolean> trustMethod
+            RecipientIdentifier.Single recipient,
+            Function<RecipientId, Boolean> trustMethod
     ) throws UnregisteredRecipientException {
         final var recipientId = context.getRecipientHelper().resolveRecipient(recipient);
         final var updated = trustMethod.apply(recipientId);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 543d9a99..5faf1371 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -105,7 +105,9 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
     @Override
     public void register(
-            boolean voiceVerification, String captcha, final boolean forceRegister
+            boolean voiceVerification,
+            String captcha,
+            final boolean forceRegister
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException, RateLimitException, VerificationMethodNotAvailableException {
         if (account.isRegistered()
                 && account.getServiceEnvironment() != null
@@ -145,7 +147,8 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
     @Override
     public void verifyAccount(
-            String verificationCode, String pin
+            String verificationCode,
+            String pin
     ) throws IOException, PinLockedException, IncorrectPinException {
         if (account.isRegistered()) {
             throw new IOException("Account is already registered");
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
index 63ba5a37..9e1c6303 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AccountDatabase.java
@@ -611,7 +611,8 @@ public class AccountDatabase extends Database {
     }
 
     private static void createUuidMappingTable(
-            final Connection connection, final Statement statement
+            final Connection connection,
+            final Statement statement
     ) throws SQLException {
         statement.executeUpdate("""
                                 CREATE TABLE tmp_mapping_table (
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
index 5e734174..d25f1a72 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/AttachmentStore.java
@@ -22,7 +22,8 @@ public class AttachmentStore {
     }
 
     public void storeAttachmentPreview(
-            final SignalServiceAttachmentPointer pointer, final AttachmentStorer storer
+            final SignalServiceAttachmentPointer pointer,
+            final AttachmentStorer storer
     ) throws IOException {
         storeAttachment(getAttachmentPreviewFile(pointer.getRemoteId(),
                 pointer.getFileName(),
@@ -30,7 +31,8 @@ public class AttachmentStore {
     }
 
     public void storeAttachment(
-            final SignalServiceAttachmentPointer pointer, final AttachmentStorer storer
+            final SignalServiceAttachmentPointer pointer,
+            final AttachmentStorer storer
     ) throws IOException {
         storeAttachment(getAttachmentFile(pointer), storer);
     }
@@ -54,22 +56,24 @@ public class AttachmentStore {
     }
 
     private File getAttachmentPreviewFile(
-            SignalServiceAttachmentRemoteId attachmentId, Optional<String> filename, Optional<String> contentType
+            SignalServiceAttachmentRemoteId attachmentId,
+            Optional<String> filename,
+            Optional<String> contentType
     ) {
         final var extension = getAttachmentExtension(filename, contentType);
         return new File(attachmentsPath, attachmentId.toString() + extension + ".preview");
     }
 
     private File getAttachmentFile(
-            SignalServiceAttachmentRemoteId attachmentId, Optional<String> filename, Optional<String> contentType
+            SignalServiceAttachmentRemoteId attachmentId,
+            Optional<String> filename,
+            Optional<String> contentType
     ) {
         final var extension = getAttachmentExtension(filename, contentType);
         return new File(attachmentsPath, attachmentId.toString() + extension);
     }
 
-    private static String getAttachmentExtension(
-            final Optional<String> filename, final Optional<String> contentType
-    ) {
+    private static String getAttachmentExtension(final Optional<String> filename, final Optional<String> contentType) {
         return filename.filter(f -> f.contains("."))
                 .map(f -> f.substring(f.lastIndexOf(".") + 1))
                 .or(() -> contentType.flatMap(MimeUtils::guessExtensionFromMimeType))
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
index 71704698..2fb09a4f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
@@ -24,7 +24,8 @@ public abstract class Database implements AutoCloseable {
     }
 
     public static <T extends Database> T initDatabase(
-            File databaseFile, Function<HikariDataSource, T> newDatabase
+            File databaseFile,
+            Function<HikariDataSource, T> newDatabase
     ) throws SQLException {
         HikariDataSource dataSource = null;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 87cf3aa3..5c8a5530 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -189,7 +189,10 @@ public class SignalAccount implements Closeable {
     }
 
     public static SignalAccount load(
-            File dataPath, String accountPath, boolean waitForLock, final Settings settings
+            File dataPath,
+            String accountPath,
+            boolean waitForLock,
+            final Settings settings
     ) throws IOException {
         logger.trace("Opening account file");
         final var fileName = getFileName(dataPath, accountPath);
@@ -316,7 +319,9 @@ public class SignalAccount implements Closeable {
     }
 
     public void finishLinking(
-            final int deviceId, final PreKeyCollection aciPreKeys, final PreKeyCollection pniPreKeys
+            final int deviceId,
+            final PreKeyCollection aciPreKeys,
+            final PreKeyCollection pniPreKeys
     ) {
         this.registered = true;
         this.deviceId = deviceId;
@@ -375,7 +380,9 @@ public class SignalAccount implements Closeable {
     }
 
     private void mergeRecipients(
-            final Connection connection, RecipientId recipientId, RecipientId toBeMergedRecipientId
+            final Connection connection,
+            RecipientId recipientId,
+            RecipientId toBeMergedRecipientId
     ) throws SQLException {
         getMessageCache().mergeRecipients(recipientId, toBeMergedRecipientId);
         getGroupStore().mergeRecipients(connection, recipientId, toBeMergedRecipientId);
@@ -438,9 +445,7 @@ public class SignalAccount implements Closeable {
         return f.exists() && !f.isDirectory() && f.length() > 0L;
     }
 
-    private void load(
-            File dataPath, String accountPath, final Settings settings
-    ) throws IOException {
+    private void load(File dataPath, String accountPath, final Settings settings) throws IOException {
         logger.trace("Loading account file {}", accountPath);
         this.dataPath = dataPath;
         this.accountPath = accountPath;
@@ -786,7 +791,8 @@ public class SignalAccount implements Closeable {
     }
 
     private void loadLegacyStores(
-            final JsonNode rootNode, final LegacyJsonSignalProtocolStore legacySignalProtocolStore
+            final JsonNode rootNode,
+            final LegacyJsonSignalProtocolStore legacySignalProtocolStore
     ) {
         var legacyRecipientStoreNode = rootNode.get("recipientStore");
         if (legacyRecipientStoreNode != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
index 75389751..5ea5eff0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/UnknownStorageIdStore.java
@@ -41,9 +41,7 @@ public class UnknownStorageIdStore {
         }
     }
 
-    public List<StorageId> getUnknownStorageIds(
-            Connection connection, Collection<Integer> types
-    ) throws SQLException {
+    public List<StorageId> getUnknownStorageIds(Connection connection, Collection<Integer> types) throws SQLException {
         final var typesCommaSeparated = types.stream().map(String::valueOf).collect(Collectors.joining(","));
         final var sql = (
                 """
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
index fa2e8916..e4858f21 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Utils.java
@@ -72,7 +72,8 @@ public class Utils {
     }
 
     public static <T> T executeQuerySingleRow(
-            PreparedStatement statement, ResultSetMapper<T> mapper
+            PreparedStatement statement,
+            ResultSetMapper<T> mapper
     ) throws SQLException {
         final var resultSet = statement.executeQuery();
         if (!resultSet.next()) {
@@ -82,7 +83,8 @@ public class Utils {
     }
 
     public static <T> Optional<T> executeQueryForOptional(
-            PreparedStatement statement, ResultSetMapper<T> mapper
+            PreparedStatement statement,
+            ResultSetMapper<T> mapper
     ) throws SQLException {
         final var resultSet = statement.executeQuery();
         if (!resultSet.next()) {
@@ -92,7 +94,8 @@ public class Utils {
     }
 
     public static <T> Stream<T> executeQueryForStream(
-            PreparedStatement statement, ResultSetMapper<T> mapper
+            PreparedStatement statement,
+            ResultSetMapper<T> mapper
     ) throws SQLException {
         final var resultSet = statement.executeQuery();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
index 02379941..a0fa3012 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
@@ -41,7 +41,9 @@ public class AccountsStore {
     private final AccountLoader accountLoader;
 
     public AccountsStore(
-            final File dataPath, final ServiceEnvironment serviceEnvironment, final AccountLoader accountLoader
+            final File dataPath,
+            final ServiceEnvironment serviceEnvironment,
+            final AccountLoader accountLoader
     ) throws IOException {
         this.dataPath = dataPath;
         this.serviceEnvironment = getServiceEnvironmentString(serviceEnvironment);
@@ -202,7 +204,9 @@ public class AccountsStore {
     }
 
     private AccountsStorage upgradeAccountsFile(
-            final FileChannel fileChannel, final AccountsStorage storage, final int accountsVersion
+            final FileChannel fileChannel,
+            final AccountsStorage storage,
+            final int accountsVersion
     ) {
         try {
             List<AccountsStorage.Account> newAccounts = storage.accounts();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
index 558d4f86..ef4a4545 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
@@ -59,7 +59,8 @@ public class ConfigurationStore {
     }
 
     public void setUnidentifiedDeliveryIndicators(
-            final Connection connection, final boolean value
+            final Connection connection,
+            final boolean value
     ) throws SQLException {
         if (keyValueStore.storeEntry(connection, unidentifiedDeliveryIndicators, value)) {
             recipientStore.rotateSelfStorageId(connection);
@@ -125,7 +126,8 @@ public class ConfigurationStore {
     }
 
     public void setPhoneNumberSharingMode(
-            final Connection connection, final PhoneNumberSharingMode value
+            final Connection connection,
+            final PhoneNumberSharingMode value
     ) throws SQLException {
         if (keyValueStore.storeEntry(connection, phoneNumberSharingMode, value)) {
             recipientStore.rotateSelfStorageId(connection);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index 89306ecd..f15b94a8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -31,7 +31,9 @@ public final class GroupInfoV2 extends GroupInfo {
     private final RecipientResolver recipientResolver;
 
     public GroupInfoV2(
-            final GroupIdV2 groupId, final GroupMasterKey masterKey, final RecipientResolver recipientResolver
+            final GroupIdV2 groupId,
+            final GroupMasterKey masterKey,
+            final RecipientResolver recipientResolver
     ) {
         this.groupId = groupId;
         this.masterKey = masterKey;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
index c4c075bf..26c4c08d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java
@@ -121,7 +121,10 @@ public class GroupStore {
     }
 
     public void storeStorageRecord(
-            final Connection connection, final GroupId groupId, final StorageId storageId, final byte[] storageRecord
+            final Connection connection,
+            final GroupId groupId,
+            final StorageId storageId,
+            final byte[] storageRecord
     ) throws SQLException {
         final var groupTable = groupId instanceof GroupIdV1 ? TABLE_GROUP_V1 : TABLE_GROUP_V2;
         final var deleteSql = (
@@ -250,7 +253,8 @@ public class GroupStore {
     }
 
     public GroupInfoV2 getGroupOrPartialMigrate(
-            Connection connection, final GroupMasterKey groupMasterKey
+            Connection connection,
+            final GroupMasterKey groupMasterKey
     ) throws SQLException {
         final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
         final var groupId = GroupUtils.getGroupIdV2(groupSecretParams);
@@ -258,9 +262,7 @@ public class GroupStore {
         return getGroupOrPartialMigrate(connection, groupMasterKey, groupId);
     }
 
-    public GroupInfoV2 getGroupOrPartialMigrate(
-            final GroupMasterKey groupMasterKey, final GroupIdV2 groupId
-    ) {
+    public GroupInfoV2 getGroupOrPartialMigrate(final GroupMasterKey groupMasterKey, final GroupIdV2 groupId) {
         try (final var connection = database.getConnection()) {
             return getGroupOrPartialMigrate(connection, groupMasterKey, groupId);
         } catch (SQLException e) {
@@ -269,7 +271,9 @@ public class GroupStore {
     }
 
     private GroupInfoV2 getGroupOrPartialMigrate(
-            Connection connection, final GroupMasterKey groupMasterKey, final GroupIdV2 groupId
+            Connection connection,
+            final GroupMasterKey groupMasterKey,
+            final GroupIdV2 groupId
     ) throws SQLException {
         switch (getGroup(connection, (GroupId) groupId)) {
             case GroupInfoV1 groupInfoV1 -> {
@@ -325,7 +329,9 @@ public class GroupStore {
     }
 
     public void mergeRecipients(
-            final Connection connection, final RecipientId recipientId, final RecipientId toBeMergedRecipientId
+            final Connection connection,
+            final RecipientId recipientId,
+            final RecipientId toBeMergedRecipientId
     ) throws SQLException {
         final var sql = (
                 """
@@ -360,7 +366,9 @@ public class GroupStore {
     }
 
     public void updateStorageIds(
-            Connection connection, Map<GroupIdV1, StorageId> storageIdV1Map, Map<GroupIdV2, StorageId> storageIdV2Map
+            Connection connection,
+            Map<GroupIdV1, StorageId> storageIdV1Map,
+            Map<GroupIdV2, StorageId> storageIdV2Map
     ) throws SQLException {
         final var sql = (
                 """
@@ -385,9 +393,7 @@ public class GroupStore {
         }
     }
 
-    public void updateStorageId(
-            Connection connection, GroupId groupId, StorageId storageId
-    ) throws SQLException {
+    public void updateStorageId(Connection connection, GroupId groupId, StorageId storageId) throws SQLException {
         final var sqlV1 = (
                 """
                 UPDATE %s
@@ -460,7 +466,9 @@ public class GroupStore {
     }
 
     private void insertOrReplaceGroup(
-            final Connection connection, Long internalId, final GroupInfo group
+            final Connection connection,
+            Long internalId,
+            final GroupInfo group
     ) throws SQLException {
         if (group instanceof GroupInfoV1 groupV1) {
             if (internalId != null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
index 1d8c8799..383912dd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java
@@ -151,7 +151,8 @@ public class LegacyGroupStore {
 
                 @Override
                 public List<Member> deserialize(
-                        JsonParser jsonParser, DeserializationContext deserializationContext
+                        JsonParser jsonParser,
+                        DeserializationContext deserializationContext
                 ) throws IOException {
                     var addresses = new ArrayList<Member>();
                     JsonNode node = jsonParser.getCodec().readTree(jsonParser);
@@ -184,7 +185,8 @@ public class LegacyGroupStore {
 
         @Override
         public List<Object> deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             var groups = new ArrayList<>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
index d00d455c..0b9b8c17 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java
@@ -11,9 +11,7 @@ public class IdentityInfo {
     private final TrustLevel trustLevel;
     private final long addedTimestamp;
 
-    IdentityInfo(
-            final String address, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp
-    ) {
+    IdentityInfo(final String address, IdentityKey identityKey, TrustLevel trustLevel, long addedTimestamp) {
         this.address = address;
         this.identityKey = identityKey;
         this.trustLevel = trustLevel;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index a4b355ea..5e32ba12 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -49,7 +49,9 @@ public class IdentityKeyStore {
     }
 
     public IdentityKeyStore(
-            final Database database, final TrustNewIdentity trustNewIdentity, RecipientStore recipientStore
+            final Database database,
+            final TrustNewIdentity trustNewIdentity,
+            RecipientStore recipientStore
     ) {
         this.database = database;
         this.trustNewIdentity = trustNewIdentity;
@@ -65,7 +67,9 @@ public class IdentityKeyStore {
     }
 
     public boolean saveIdentity(
-            final Connection connection, final ServiceId serviceId, final IdentityKey identityKey
+            final Connection connection,
+            final ServiceId serviceId,
+            final IdentityKey identityKey
     ) throws SQLException {
         return saveIdentity(connection, serviceId.toString(), identityKey);
     }
@@ -82,7 +86,9 @@ public class IdentityKeyStore {
     }
 
     private boolean saveIdentity(
-            final Connection connection, final String address, final IdentityKey identityKey
+            final Connection connection,
+            final String address,
+            final IdentityKey identityKey
     ) throws SQLException {
         final var identityInfo = loadIdentity(connection, address);
         if (identityInfo != null && identityInfo.getIdentityKey().equals(identityKey)) {
@@ -230,9 +236,7 @@ public class IdentityKeyStore {
         logger.debug("Complete identities migration took {}ms", (System.nanoTime() - start) / 1000000);
     }
 
-    private IdentityInfo loadIdentity(
-            final Connection connection, final String address
-    ) throws SQLException {
+    private IdentityInfo loadIdentity(final Connection connection, final String address) throws SQLException {
         final var sql = (
                 """
                 SELECT i.address, i.identity_key, i.added_timestamp, i.trust_level
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
index a7f6a4aa..fc6e93e1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/LegacyIdentityKeyStore.java
@@ -41,7 +41,9 @@ public class LegacyIdentityKeyStore {
     static final Pattern identityFileNamePattern = Pattern.compile("(\\d+)");
 
     private static List<IdentityInfo> getIdentities(
-            final File identitiesPath, final RecipientResolver resolver, final RecipientAddressResolver addressResolver
+            final File identitiesPath,
+            final RecipientResolver resolver,
+            final RecipientAddressResolver addressResolver
     ) {
         final var files = identitiesPath.listFiles();
         if (files == null) {
@@ -66,7 +68,9 @@ public class LegacyIdentityKeyStore {
     }
 
     private static IdentityInfo loadIdentityLocked(
-            final RecipientId recipientId, RecipientAddressResolver addressResolver, final File identitiesPath
+            final RecipientId recipientId,
+            RecipientAddressResolver addressResolver,
+            final File identitiesPath
     ) {
         final var file = getIdentityFile(recipientId, identitiesPath);
         if (!file.exists()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index c51f32f1..e5bbc188 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -74,7 +74,9 @@ public class KeyValueStore {
     }
 
     public <T> boolean storeEntry(
-            final Connection connection, final KeyValueEntry<T> key, final T value
+            final Connection connection,
+            final KeyValueEntry<T> key,
+            final T value
     ) throws SQLException {
         final var entry = getEntry(key);
         if (Objects.equals(entry, value)) {
@@ -98,7 +100,8 @@ public class KeyValueStore {
 
     @SuppressWarnings("unchecked")
     private static <T> T readValueFromResultSet(
-            final KeyValueEntry<T> key, final ResultSet resultSet
+            final KeyValueEntry<T> key,
+            final ResultSet resultSet
     ) throws SQLException {
         Object value;
         final var clazz = key.clazz();
@@ -134,7 +137,10 @@ public class KeyValueStore {
     }
 
     private static <T> void setParameterValue(
-            final PreparedStatement statement, final int parameterIndex, final Class<T> clazz, final T value
+            final PreparedStatement statement,
+            final int parameterIndex,
+            final Class<T> clazz,
+            final T value
     ) throws SQLException {
         if (clazz == int.class || clazz == Integer.class) {
             if (value == null) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
index abb66470..39d6b7fb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java
@@ -34,7 +34,8 @@ public class LegacyProfileStore {
 
         @Override
         public List<LegacySignalProfileEntry> deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
index 5d3a95a8..ec91a628 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java
@@ -18,6 +18,7 @@ public interface ProfileStore {
     void storeProfileKey(RecipientId recipientId, ProfileKey profileKey);
 
     void storeExpiringProfileKeyCredential(
-            RecipientId recipientId, ExpiringProfileKeyCredential expiringProfileKeyCredential
+            RecipientId recipientId,
+            ExpiringProfileKeyCredential expiringProfileKeyCredential
     );
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
index 0d12a303..632efc7e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java
@@ -32,7 +32,9 @@ public class LegacyJsonIdentityKeyStore {
     private final int localRegistrationId;
 
     private LegacyJsonIdentityKeyStore(
-            final List<LegacyIdentityInfo> identities, IdentityKeyPair identityKeyPair, int localRegistrationId
+            final List<LegacyIdentityInfo> identities,
+            IdentityKeyPair identityKeyPair,
+            int localRegistrationId
     ) {
         this.identities = identities;
         this.identityKeyPair = identityKeyPair;
@@ -77,7 +79,8 @@ public class LegacyJsonIdentityKeyStore {
 
         @Override
         public LegacyJsonIdentityKeyStore deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java
index 7412f95a..feb27e97 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonPreKeyStore.java
@@ -26,7 +26,8 @@ public class LegacyJsonPreKeyStore {
 
         @Override
         public LegacyJsonPreKeyStore deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
index ee675d78..b971078c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSessionStore.java
@@ -31,7 +31,8 @@ public class LegacyJsonSessionStore {
 
         @Override
         public LegacyJsonSessionStore deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java
index cdcba916..ed1b5d95 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonSignedPreKeyStore.java
@@ -26,7 +26,8 @@ public class LegacyJsonSignedPreKeyStore {
 
         @Override
         public LegacyJsonSignedPreKeyStore deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index f334a2be..b631f632 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -172,7 +172,9 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
 
     @Override
     public void storeSenderKey(
-            final SignalProtocolAddress sender, final UUID distributionId, final SenderKeyRecord record
+            final SignalProtocolAddress sender,
+            final UUID distributionId,
+            final SenderKeyRecord record
     ) {
         senderKeyStore.storeSenderKey(sender, distributionId, record);
     }
@@ -189,7 +191,8 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
 
     @Override
     public void markSenderKeySharedWith(
-            final DistributionId distributionId, final Collection<SignalProtocolAddress> addresses
+            final DistributionId distributionId,
+            final Collection<SignalProtocolAddress> addresses
     ) {
         senderKeyStore.markSenderKeySharedWith(distributionId, addresses);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
index 1170e651..4b68adbe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/CdsiStore.java
@@ -98,9 +98,7 @@ public class CdsiStore {
         }
     }
 
-    private static void removeNumbers(
-            final Connection connection, final Set<String> numbers
-    ) throws SQLException {
+    private static void removeNumbers(final Connection connection, final Set<String> numbers) throws SQLException {
         final var sql = (
                 """
                 DELETE FROM %s
@@ -116,7 +114,9 @@ public class CdsiStore {
     }
 
     private static void addNumbers(
-            final Connection connection, final Set<String> numbers, final long lastSeen
+            final Connection connection,
+            final Set<String> numbers,
+            final long lastSeen
     ) throws SQLException {
         final var sql = (
                 """
@@ -135,7 +135,9 @@ public class CdsiStore {
     }
 
     private static void updateLastSeen(
-            final Connection connection, final Set<String> numbers, final long lastSeen
+            final Connection connection,
+            final Set<String> numbers,
+            final long lastSeen
     ) throws SQLException {
         final var sql = (
                 """
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
index fb1e188b..907aafe4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore.java
@@ -27,7 +27,8 @@ public class LegacyRecipientStore {
 
         @Override
         public List<RecipientAddress> deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index edc1121e..95c17102 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -15,7 +15,8 @@ public class MergeRecipientHelper {
     private static final Logger logger = LoggerFactory.getLogger(MergeRecipientHelper.class);
 
     static Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
-            Store store, RecipientAddress address
+            Store store,
+            RecipientAddress address
     ) throws SQLException {
         // address has at least one of serviceId/pni and optionally number/username
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 2aad97d6..00048560 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -208,7 +208,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public RecipientId resolveRecipientByNumber(
-            final String number, Supplier<ServiceId> serviceIdSupplier
+            final String number,
+            Supplier<ServiceId> serviceIdSupplier
     ) throws UnregisteredRecipientException {
         final Optional<RecipientWithAddress> byNumber;
         try (final var connection = database.getConnection()) {
@@ -238,7 +239,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public RecipientId resolveRecipientByUsername(
-            final String username, Supplier<ACI> aciSupplier
+            final String username,
+            Supplier<ACI> aciSupplier
     ) throws UnregisteredRecipientException {
         final Optional<RecipientWithAddress> byUsername;
         try (final var connection = database.getConnection()) {
@@ -301,7 +303,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     @Override
     public RecipientId resolveRecipientTrusted(
-            final Optional<ACI> aci, final Optional<PNI> pni, final Optional<String> number
+            final Optional<ACI> aci,
+            final Optional<PNI> pni,
+            final Optional<String> number
     ) {
         return resolveRecipientTrusted(new RecipientAddress(aci, pni, number, Optional.empty()));
     }
@@ -392,7 +396,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public List<Recipient> getRecipients(
-            boolean onlyContacts, Optional<Boolean> blocked, Set<RecipientId> recipientIds, Optional<String> name
+            boolean onlyContacts,
+            Optional<Boolean> blocked,
+            Set<RecipientId> recipientIds,
+            Optional<String> name
     ) {
         final var sqlWhere = new ArrayList<String>();
         if (onlyContacts) {
@@ -614,14 +621,17 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public void storeProfileKey(
-            Connection connection, RecipientId recipientId, final ProfileKey profileKey
+            Connection connection,
+            RecipientId recipientId,
+            final ProfileKey profileKey
     ) throws SQLException {
         storeProfileKey(connection, recipientId, profileKey, true);
     }
 
     @Override
     public void storeExpiringProfileKeyCredential(
-            RecipientId recipientId, final ExpiringProfileKeyCredential profileKeyCredential
+            RecipientId recipientId,
+            final ExpiringProfileKeyCredential profileKeyCredential
     ) {
         try (final var connection = database.getConnection()) {
             storeExpiringProfileKeyCredential(connection, recipientId, profileKeyCredential);
@@ -661,7 +671,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public void updateStorageId(
-            Connection connection, RecipientId recipientId, StorageId storageId
+            Connection connection,
+            RecipientId recipientId,
+            StorageId storageId
     ) throws SQLException {
         final var sql = (
                 """
@@ -813,7 +825,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public void storeContact(
-            final Connection connection, final RecipientId recipientId, final Contact contact
+            final Connection connection,
+            final RecipientId recipientId,
+            final Contact contact
     ) throws SQLException {
         final var sql = (
                 """
@@ -852,7 +866,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public int removeStorageIdsFromLocalOnlyUnregisteredRecipients(
-            final Connection connection, final List<StorageId> storageIds
+            final Connection connection,
+            final List<StorageId> storageIds
     ) throws SQLException {
         final var sql = (
                 """
@@ -965,7 +980,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private void markUnregisteredAndSplitIfNecessary(
-            final Connection connection, final RecipientId recipientId
+            final Connection connection,
+            final RecipientId recipientId
     ) throws SQLException {
         markUnregistered(connection, recipientId);
         final var address = resolveRecipientAddress(connection, recipientId);
@@ -977,7 +993,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private void markDiscoverable(
-            final Connection connection, final RecipientId recipientId, final boolean discoverable
+            final Connection connection,
+            final RecipientId recipientId,
+            final boolean discoverable
     ) throws SQLException {
         final var sql = (
                 """
@@ -993,9 +1011,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    private void markRegistered(
-            final Connection connection, final RecipientId recipientId
-    ) throws SQLException {
+    private void markRegistered(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
                 UPDATE %s
@@ -1009,9 +1025,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    private void markUnregistered(
-            final Connection connection, final RecipientId recipientId
-    ) throws SQLException {
+    private void markUnregistered(final Connection connection, final RecipientId recipientId) throws SQLException {
         final var sql = (
                 """
                 UPDATE %s
@@ -1046,7 +1060,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public void storeProfile(
-            final Connection connection, final RecipientId recipientId, final Profile profile
+            final Connection connection,
+            final RecipientId recipientId,
+            final Profile profile
     ) throws SQLException {
         final var sql = (
                 """
@@ -1079,7 +1095,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private void storeProfileKey(
-            Connection connection, RecipientId recipientId, final ProfileKey profileKey, boolean resetProfile
+            Connection connection,
+            RecipientId recipientId,
+            final ProfileKey profileKey,
+            boolean resetProfile
     ) throws SQLException {
         if (profileKey != null) {
             final var recipientProfileKey = getProfileKey(connection, recipientId);
@@ -1111,7 +1130,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private RecipientAddress resolveRecipientAddress(
-            final Connection connection, final RecipientId recipientId
+            final Connection connection,
+            final RecipientId recipientId
     ) throws SQLException {
         final var sql = (
                 """
@@ -1150,7 +1170,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private Pair<RecipientId, List<RecipientId>> resolveRecipientTrustedLocked(
-            final Connection connection, final RecipientAddress address, final boolean isSelf
+            final Connection connection,
+            final RecipientAddress address,
+            final boolean isSelf
     ) throws SQLException {
         if (address.hasSingleIdentifier() || (
                 !isSelf && selfAddressProvider.getSelfAddress().matches(address)
@@ -1168,7 +1190,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private void mergeRecipients(
-            final Connection connection, final RecipientId recipientId, final List<RecipientId> toBeMergedRecipientIds
+            final Connection connection,
+            final RecipientId recipientId,
+            final List<RecipientId> toBeMergedRecipientIds
     ) throws SQLException {
         for (final var toBeMergedRecipientId : toBeMergedRecipientIds) {
             recipientMergeHandler.mergeRecipients(connection, recipientId, toBeMergedRecipientId);
@@ -1177,9 +1201,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    private RecipientId resolveRecipientLocked(
-            Connection connection, RecipientAddress address
-    ) throws SQLException {
+    private RecipientId resolveRecipientLocked(Connection connection, RecipientAddress address) throws SQLException {
         final var byAci = address.aci().isEmpty()
                 ? Optional.<RecipientWithAddress>empty()
                 : findByServiceId(connection, address.aci().get());
@@ -1236,7 +1258,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private RecipientId addNewRecipient(
-            final Connection connection, final RecipientAddress address
+            final Connection connection,
+            final RecipientAddress address
     ) throws SQLException {
         final var sql = (
                 """
@@ -1277,7 +1300,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private void updateRecipientAddress(
-            Connection connection, RecipientId recipientId, final RecipientAddress address
+            Connection connection,
+            RecipientId recipientId,
+            final RecipientAddress address
     ) throws SQLException {
         recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
         final var sql = (
@@ -1312,7 +1337,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private void mergeRecipientsLocked(
-            Connection connection, RecipientId recipientId, RecipientId toBeMergedRecipientId
+            Connection connection,
+            RecipientId recipientId,
+            RecipientId toBeMergedRecipientId
     ) throws SQLException {
         final var contact = getContact(connection, recipientId);
         if (contact == null) {
@@ -1343,7 +1370,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private Optional<RecipientWithAddress> findByNumber(
-            final Connection connection, final String number
+            final Connection connection,
+            final String number
     ) throws SQLException {
         final var sql = """
                         SELECT r._id, r.number, r.aci, r.pni, r.username
@@ -1358,7 +1386,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private Optional<RecipientWithAddress> findByUsername(
-            final Connection connection, final String username
+            final Connection connection,
+            final String username
     ) throws SQLException {
         final var sql = """
                         SELECT r._id, r.number, r.aci, r.pni, r.username
@@ -1373,7 +1402,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private Optional<RecipientWithAddress> findByServiceId(
-            final Connection connection, final ServiceId serviceId
+            final Connection connection,
+            final ServiceId serviceId
     ) throws SQLException {
         var recipientWithAddress = Optional.ofNullable(recipientAddressCache.get(serviceId));
         if (recipientWithAddress.isPresent()) {
@@ -1394,7 +1424,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private Set<RecipientWithAddress> findAllByAddress(
-            final Connection connection, final RecipientAddress address
+            final Connection connection,
+            final RecipientAddress address
     ) throws SQLException {
         final var sql = """
                         SELECT r._id, r.number, r.aci, r.pni, r.username
@@ -1447,7 +1478,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     private ExpiringProfileKeyCredential getExpiringProfileKeyCredential(
-            final Connection connection, final RecipientId recipientId
+            final Connection connection,
+            final RecipientId recipientId
     ) throws SQLException {
         final var sql = (
                 """
@@ -1593,7 +1625,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     public interface RecipientMergeHandler {
 
         void mergeRecipients(
-                final Connection connection, RecipientId recipientId, RecipientId toBeMergedRecipientId
+                final Connection connection,
+                RecipientId recipientId,
+                RecipientId toBeMergedRecipientId
         ) throws SQLException;
     }
 
@@ -1617,7 +1651,8 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
         @Override
         public void updateRecipientAddress(
-                final RecipientId recipientId, final RecipientAddress address
+                final RecipientId recipientId,
+                final RecipientAddress address
         ) throws SQLException {
             RecipientStore.this.updateRecipientAddress(connection, recipientId, address);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
index 598ef791..06d29060 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientTrustedResolver.java
@@ -44,7 +44,9 @@ public interface RecipientTrustedResolver {
 
         @Override
         public RecipientId resolveRecipientTrusted(
-                final Optional<ACI> aci, final Optional<PNI> pni, final Optional<String> number
+                final Optional<ACI> aci,
+                final Optional<PNI> pni,
+                final Optional<String> number
         ) {
             return recipientTrustedResolverSupplier.get().resolveRecipientTrusted(aci, pni, number);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
index 910da3cf..20bfdb6a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java
@@ -83,7 +83,10 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     public List<MessageSendLogEntry> findMessages(
-            final ServiceId serviceId, final int deviceId, final long timestamp, final boolean isSenderKey
+            final ServiceId serviceId,
+            final int deviceId,
+            final long timestamp,
+            final boolean isSenderKey
     ) {
         final var sql = """
                         SELECT group_id, content, content_hint, urgent
@@ -111,7 +114,10 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     public long insertIfPossible(
-            long sentTimestamp, SendMessageResult sendMessageResult, ContentHint contentHint, boolean urgent
+            long sentTimestamp,
+            SendMessageResult sendMessageResult,
+            ContentHint contentHint,
+            boolean urgent
     ) {
         if (sendLogDisabled) {
             return -1;
@@ -129,7 +135,10 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     public long insertIfPossible(
-            long sentTimestamp, List<SendMessageResult> sendMessageResults, ContentHint contentHint, boolean urgent
+            long sentTimestamp,
+            List<SendMessageResult> sendMessageResults,
+            ContentHint contentHint,
+            boolean urgent
     ) {
         if (sendLogDisabled) {
             return -1;
@@ -164,7 +173,8 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     public void addRecipientToExistingEntryIfPossible(
-            final long contentId, final List<SendMessageResult> sendMessageResults
+            final long contentId,
+            final List<SendMessageResult> sendMessageResults
     ) {
         if (sendLogDisabled) {
             return;
@@ -322,7 +332,8 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     private void insertRecipientsForExistingContent(
-            final long contentId, final List<RecipientDevices> recipientDevices
+            final long contentId,
+            final List<RecipientDevices> recipientDevices
     ) {
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
@@ -334,7 +345,9 @@ public class MessageSendLogStore implements AutoCloseable {
     }
 
     private void insertRecipientsForExistingContent(
-            final long contentId, final List<RecipientDevices> recipientDevices, final Connection connection
+            final long contentId,
+            final List<RecipientDevices> recipientDevices,
+            final Connection connection
     ) throws SQLException {
         final var sql = """
                         INSERT INTO %s (address, device_id, content_id)
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
index 39e1df97..dd48fcdc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java
@@ -59,7 +59,9 @@ public class SenderKeyRecordStore implements SenderKeyStore {
 
     @Override
     public void storeSenderKey(
-            final SignalProtocolAddress address, final UUID distributionId, final SenderKeyRecord record
+            final SignalProtocolAddress address,
+            final UUID distributionId,
+            final SenderKeyRecord record
     ) {
         final var key = getKey(address, distributionId);
 
@@ -165,7 +167,9 @@ public class SenderKeyRecordStore implements SenderKeyStore {
     }
 
     private void storeSenderKey(
-            final Connection connection, final Key key, final SenderKeyRecord senderKeyRecord
+            final Connection connection,
+            final Key key,
+            final SenderKeyRecord senderKeyRecord
     ) throws SQLException {
         final var sqlUpdate = """
                               UPDATE %s
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
index 284ba08f..175524f5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java
@@ -65,7 +65,8 @@ public class SenderKeySharedStore {
     }
 
     public void markSenderKeySharedWith(
-            final DistributionId distributionId, final Collection<SignalProtocolAddress> addresses
+            final DistributionId distributionId,
+            final Collection<SignalProtocolAddress> addresses
     ) {
         final var newEntries = addresses.stream()
                 .map(a -> new SenderKeySharedEntry(a.getName(), a.getDeviceId()))
@@ -138,9 +139,7 @@ public class SenderKeySharedStore {
         }
     }
 
-    public void deleteSharedWith(
-            final ServiceId serviceId, final int deviceId, final DistributionId distributionId
-    ) {
+    public void deleteSharedWith(final ServiceId serviceId, final int deviceId, final DistributionId distributionId) {
         try (final var connection = database.getConnection()) {
             final var sql = (
                     """
@@ -192,7 +191,9 @@ public class SenderKeySharedStore {
     }
 
     private void markSenderKeysSharedWith(
-            final Connection connection, final DistributionId distributionId, final Set<SenderKeySharedEntry> newEntries
+            final Connection connection,
+            final DistributionId distributionId,
+            final Set<SenderKeySharedEntry> newEntries
     ) throws SQLException {
         final var sql = (
                 """
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java
index d60249b6..5ae2790e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java
@@ -25,7 +25,9 @@ public class SenderKeyStore implements SignalServiceSenderKeyStore {
 
     @Override
     public void storeSenderKey(
-            final SignalProtocolAddress sender, final UUID distributionId, final SenderKeyRecord record
+            final SignalProtocolAddress sender,
+            final UUID distributionId,
+            final SenderKeyRecord record
     ) {
         senderKeyRecordStore.storeSenderKey(sender, distributionId, record);
     }
@@ -42,7 +44,8 @@ public class SenderKeyStore implements SignalServiceSenderKeyStore {
 
     @Override
     public void markSenderKeySharedWith(
-            final DistributionId distributionId, final Collection<SignalProtocolAddress> addresses
+            final DistributionId distributionId,
+            final Collection<SignalProtocolAddress> addresses
     ) {
         senderKeySharedStore.markSenderKeySharedWith(distributionId, addresses);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
index 067dc5d3..86fe875e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java
@@ -342,7 +342,9 @@ public class SessionStore implements SignalServiceSessionStore {
     }
 
     private void storeSession(
-            final Connection connection, final Key key, final SessionRecord session
+            final Connection connection,
+            final Key key,
+            final SessionRecord session
     ) throws SQLException {
         synchronized (cachedSessions) {
             cachedSessions.put(key, session);
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
index 428e9e95..efe65c64 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/threads/LegacyJsonThreadStore.java
@@ -35,7 +35,9 @@ public class LegacyJsonThreadStore {
 
         @Override
         public void serialize(
-                final Map<?, ?> value, final JsonGenerator jgen, final SerializerProvider provider
+                final Map<?, ?> value,
+                final JsonGenerator jgen,
+                final SerializerProvider provider
         ) throws IOException {
             jgen.writeObject(value.values());
         }
@@ -45,7 +47,8 @@ public class LegacyJsonThreadStore {
 
         @Override
         public Map<String, LegacyThreadInfo> deserialize(
-                JsonParser jsonParser, DeserializationContext deserializationContext
+                JsonParser jsonParser,
+                DeserializationContext deserializationContext
         ) throws IOException {
             var threads = new HashMap<String, LegacyThreadInfo>();
             JsonNode node = jsonParser.getCodec().readTree(jsonParser);
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 31e7a90b..18dd1869 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -33,7 +33,9 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
     private final JobExecutor jobExecutor;
 
     public AccountRecordProcessor(
-            SignalAccount account, Connection connection, final JobExecutor jobExecutor
+            SignalAccount account,
+            Connection connection,
+            final JobExecutor jobExecutor
     ) throws SQLException {
         this.account = account;
         this.connection = connection;
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 72ee4163..3fa8598f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -91,9 +91,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
     }
 
     @Override
-    protected SignalContactRecord merge(
-            SignalContactRecord remote, SignalContactRecord local
-    ) {
+    protected SignalContactRecord merge(SignalContactRecord remote, SignalContactRecord local) {
         String profileGivenName;
         String profileFamilyName;
         if (remote.getProfileGivenName().isPresent() || remote.getProfileFamilyName().isPresent()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index ecb97bdf..9c6b7b53 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -80,7 +80,9 @@ public final class StorageSyncModels {
     }
 
     public static SignalStorageRecord localToRemoteRecord(
-            Recipient recipient, IdentityInfo identity, byte[] rawStorageId
+            Recipient recipient,
+            IdentityInfo identity,
+            byte[] rawStorageId
     ) {
         final var address = recipient.getAddress();
         final var builder = new SignalContactRecord.Builder(rawStorageId,
@@ -121,9 +123,7 @@ public final class StorageSyncModels {
         return SignalStorageRecord.forContact(builder.build());
     }
 
-    public static SignalStorageRecord localToRemoteRecord(
-            GroupInfoV1 group, byte[] rawStorageId
-    ) {
+    public static SignalStorageRecord localToRemoteRecord(GroupInfoV1 group, byte[] rawStorageId) {
         final var builder = new SignalGroupV1Record.Builder(rawStorageId,
                 group.getGroupId().serialize(),
                 group.getStorageRecord());
@@ -133,9 +133,7 @@ public final class StorageSyncModels {
         return SignalStorageRecord.forGroupV1(builder.build());
     }
 
-    public static SignalStorageRecord localToRemoteRecord(
-            GroupInfoV2 group, byte[] rawStorageId
-    ) {
+    public static SignalStorageRecord localToRemoteRecord(GroupInfoV2 group, byte[] rawStorageId) {
         final var builder = new SignalGroupV2Record.Builder(rawStorageId,
                 group.getMasterKey(),
                 group.getStorageRecord());
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
index e69481ed..b9b7025a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
@@ -112,13 +112,17 @@ public final class StorageSyncValidations {
     }
 
     public static void validateForcePush(
-            SignalStorageManifest manifest, List<SignalStorageRecord> inserts, RecipientAddress self
+            SignalStorageManifest manifest,
+            List<SignalStorageRecord> inserts,
+            RecipientAddress self
     ) {
         validateManifestAndInserts(manifest, inserts, self);
     }
 
     private static void validateManifestAndInserts(
-            SignalStorageManifest manifest, List<SignalStorageRecord> inserts, RecipientAddress self
+            SignalStorageManifest manifest,
+            List<SignalStorageRecord> inserts,
+            RecipientAddress self
     ) {
         int accountCount = 0;
         for (StorageId id : manifest.getStorageIds()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
index ac15a30a..bab4c433 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java
@@ -13,7 +13,8 @@ import java.util.UUID;
 public class AttachmentUtils {
 
     public static SignalServiceAttachmentStream createAttachmentStream(
-            String attachment, ResumableUploadSpec resumableUploadSpec
+            String attachment,
+            ResumableUploadSpec resumableUploadSpec
     ) throws AttachmentInvalidException {
         try {
             final var streamDetails = Utils.createStreamDetails(attachment);
@@ -25,7 +26,9 @@ public class AttachmentUtils {
     }
 
     public static SignalServiceAttachmentStream createAttachmentStream(
-            StreamDetails streamDetails, Optional<String> name, ResumableUploadSpec resumableUploadSpec
+            StreamDetails streamDetails,
+            Optional<String> name,
+            ResumableUploadSpec resumableUploadSpec
     ) throws ResumeLocationInvalidException {
         // TODO maybe add a parameter to set the voiceNote, borderless, preview, width, height and caption option
         final var uploadTimestamp = System.currentTimeMillis();
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index bfcb750c..c3dcf3fe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -63,7 +63,8 @@ public class KeyUtils {
     }
 
     public static SignedPreKeyRecord generateSignedPreKeyRecord(
-            final int signedPreKeyId, final ECPrivateKey privateKey
+            final int signedPreKeyId,
+            final ECPrivateKey privateKey
     ) {
         var keyPair = Curve.generateKeyPair();
         byte[] signature;
@@ -75,9 +76,7 @@ public class KeyUtils {
         return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature);
     }
 
-    public static List<KyberPreKeyRecord> generateKyberPreKeyRecords(
-            final int offset, final ECPrivateKey privateKey
-    ) {
+    public static List<KyberPreKeyRecord> generateKyberPreKeyRecords(final int offset, final ECPrivateKey privateKey) {
         var records = new ArrayList<KyberPreKeyRecord>(PREKEY_BATCH_SIZE);
         for (var i = 0; i < PREKEY_BATCH_SIZE; i++) {
             var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID;
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 03b1c03a..e27ba980 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -88,7 +88,9 @@ public class NumberVerificationUtils {
     }
 
     public static void requestVerificationCode(
-            RegistrationApi registrationApi, String sessionId, boolean voiceVerification
+            RegistrationApi registrationApi,
+            String sessionId,
+            boolean voiceVerification
     ) throws IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
         final var locale = Utils.getDefaultLocale(Locale.US);
         final var response = registrationApi.requestSmsVerificationCode(sessionId,
@@ -108,7 +110,11 @@ public class NumberVerificationUtils {
     }
 
     public static Pair<VerifyAccountResponse, MasterKey> verifyNumber(
-            String sessionId, String verificationCode, String pin, PinHelper pinHelper, Verifier verifier
+            String sessionId,
+            String verificationCode,
+            String pin,
+            PinHelper pinHelper,
+            Verifier verifier
     ) throws IOException, PinLockedException, IncorrectPinException {
         verificationCode = verificationCode.replace("-", "");
         try {
@@ -138,7 +144,8 @@ public class NumberVerificationUtils {
     }
 
     private static RegistrationSessionMetadataResponse validateSession(
-            final RegistrationApi registrationApi, final String sessionId
+            final RegistrationApi registrationApi,
+            final String sessionId
     ) throws IOException {
         if (sessionId == null || sessionId.isEmpty()) {
             throw new NoSuchSessionException();
@@ -153,7 +160,8 @@ public class NumberVerificationUtils {
     }
 
     private static RegistrationSessionMetadataResponse getValidSession(
-            final RegistrationApi registrationApi, final String sessionId
+            final RegistrationApi registrationApi,
+            final String sessionId
     ) throws IOException {
         try {
             return validateSession(registrationApi, sessionId);
@@ -164,7 +172,9 @@ public class NumberVerificationUtils {
     }
 
     private static RegistrationSessionMetadataResponse submitCaptcha(
-            RegistrationApi registrationApi, String sessionId, String captcha
+            RegistrationApi registrationApi,
+            String sessionId,
+            String captcha
     ) throws IOException, CaptchaRequiredException {
         captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
         try {
@@ -184,7 +194,9 @@ public class NumberVerificationUtils {
     public interface Verifier {
 
         VerifyAccountResponse verify(
-                String sessionId, String verificationCode, String registrationLock
+                String sessionId,
+                String verificationCode,
+                String registrationLock
         ) throws IOException;
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
index fe338e73..36275d8f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
@@ -20,9 +20,7 @@ public class PaymentUtils {
     /**
      * Signs the supplied address bytes with the {@link IdentityKeyPair}'s private key and returns a proto that includes it, and it's signature.
      */
-    public static PaymentAddress signPaymentsAddress(
-            byte[] publicAddressBytes, ECPrivateKey privateKey
-    ) {
+    public static PaymentAddress signPaymentsAddress(byte[] publicAddressBytes, ECPrivateKey privateKey) {
         byte[] signature = privateKey.calculateSignature(publicAddressBytes);
 
         return new PaymentAddress.Builder().mobileCoinAddress(new PaymentAddress.MobileCoinAddress.Builder().address(
@@ -34,9 +32,7 @@ public class PaymentUtils {
      * <p>
      * Returns the validated bytes if so, otherwise returns null.
      */
-    public static byte[] verifyPaymentsAddress(
-            PaymentAddress paymentAddress, ECPublicKey publicKey
-    ) {
+    public static byte[] verifyPaymentsAddress(PaymentAddress paymentAddress, ECPublicKey publicKey) {
         final var mobileCoinAddress = paymentAddress.mobileCoinAddress;
         if (mobileCoinAddress == null || mobileCoinAddress.address == null || mobileCoinAddress.signature == null) {
             logger.debug("Got payment address without mobile coin address, ignoring.");
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index 17e26ee8..def75049 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -23,9 +23,7 @@ public class ProfileUtils {
 
     private static final Logger logger = LoggerFactory.getLogger(ProfileUtils.class);
 
-    public static Profile decryptProfile(
-            final ProfileKey profileKey, final SignalServiceProfile encryptedProfile
-    ) {
+    public static Profile decryptProfile(final ProfileKey profileKey, final SignalServiceProfile encryptedProfile) {
         var profileCipher = new ProfileCipher(profileKey);
         IdentityKey identityKey = null;
         try {
@@ -64,7 +62,8 @@ public class ProfileUtils {
     }
 
     public static Profile.UnidentifiedAccessMode getUnidentifiedAccessMode(
-            final SignalServiceProfile encryptedProfile, final ProfileCipher profileCipher
+            final SignalServiceProfile encryptedProfile,
+            final ProfileCipher profileCipher
     ) {
         if (encryptedProfile.isUnrestrictedUnidentifiedAccess()) {
             return Profile.UnidentifiedAccessMode.UNRESTRICTED;
@@ -90,7 +89,8 @@ public class ProfileUtils {
     }
 
     private static String decryptString(
-            final String encrypted, final ProfileCipher profileCipher
+            final String encrypted,
+            final ProfileCipher profileCipher
     ) throws InvalidCiphertextException {
         try {
             return encrypted == null ? null : profileCipher.decryptString(Base64.getDecoder().decode(encrypted));
@@ -100,7 +100,8 @@ public class ProfileUtils {
     }
 
     private static Optional<Boolean> decryptBoolean(
-            final String encrypted, final ProfileCipher profileCipher
+            final String encrypted,
+            final ProfileCipher profileCipher
     ) throws InvalidCiphertextException {
         try {
             return encrypted == null
@@ -112,7 +113,9 @@ public class ProfileUtils {
     }
 
     private static byte[] decryptAndVerifyMobileCoinAddress(
-            final byte[] encryptedPaymentAddress, final ProfileCipher profileCipher, final ECPublicKey publicKey
+            final byte[] encryptedPaymentAddress,
+            final ProfileCipher profileCipher,
+            final ECPublicKey publicKey
     ) throws InvalidCiphertextException {
         byte[] decrypted;
         try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
index 302535d9..d017f0a5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java
@@ -100,7 +100,9 @@ public class StickerUtils {
     }
 
     private static Pair<InputStream, Long> getInputStreamAndLength(
-            final String rootPath, final ZipFile zip, final String subfile
+            final String rootPath,
+            final ZipFile zip,
+            final String subfile
     ) throws IOException {
         if (zip != null) {
             final var entry = zip.getEntry(subfile);
@@ -112,7 +114,9 @@ public class StickerUtils {
     }
 
     private static String getContentType(
-            final String rootPath, final ZipFile zip, final String subfile
+            final String rootPath,
+            final ZipFile zip,
+            final String subfile
     ) throws IOException {
         if (zip != null) {
             final var entry = zip.getEntry(subfile);
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 16aa3275..ee1f608f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -59,7 +59,10 @@ public class Utils {
     }
 
     public static Fingerprint computeSafetyNumberForNumber(
-            String ownNumber, IdentityKey ownIdentityKey, String theirNumber, IdentityKey theirIdentityKey
+            String ownNumber,
+            IdentityKey ownIdentityKey,
+            String theirNumber,
+            IdentityKey theirIdentityKey
     ) {
         // Version 1: E164 user
         final var version = 1;
@@ -70,7 +73,10 @@ public class Utils {
     }
 
     public static Fingerprint computeSafetyNumberForUuid(
-            ServiceId ownServiceId, IdentityKey ownIdentityKey, ServiceId theirServiceId, IdentityKey theirIdentityKey
+            ServiceId ownServiceId,
+            IdentityKey ownIdentityKey,
+            ServiceId theirServiceId,
+            IdentityKey theirIdentityKey
     ) {
         // Version 2: UUID user
         final var version = 2;
diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
index b57dc6fc..0931b008 100644
--- a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
@@ -217,9 +217,7 @@ class MergeRecipientHelperTest {
         }
 
         @Override
-        public void updateRecipientAddress(
-                final RecipientId recipientId, final RecipientAddress address
-        ) {
+        public void updateRecipientAddress(final RecipientId recipientId, final RecipientAddress address) {
             recipients.removeIf(r -> r.id().equals(recipientId));
             recipients.add(new RecipientWithAddress(recipientId, address));
         }
diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index 1d715659..ac1f6d50 100644
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -27,39 +27,44 @@ public interface Signal extends DBusInterface {
     void unsubscribeReceive();
 
     long sendMessage(
-            String message, List<String> attachments, String recipient
+            String message,
+            List<String> attachments,
+            String recipient
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
 
     long sendMessage(
-            String message, List<String> attachments, List<String> recipients
+            String message,
+            List<String> attachments,
+            List<String> recipients
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
 
-    void sendTyping(
-            String recipient, boolean stop
-    ) throws Error.Failure, Error.UntrustedIdentity;
+    void sendTyping(String recipient, boolean stop) throws Error.Failure, Error.UntrustedIdentity;
 
-    void sendReadReceipt(
-            String recipient, List<Long> messageIds
-    ) throws Error.Failure, Error.UntrustedIdentity;
+    void sendReadReceipt(String recipient, List<Long> messageIds) throws Error.Failure, Error.UntrustedIdentity;
 
-    void sendViewedReceipt(
-            String recipient, List<Long> messageIds
-    ) throws Error.Failure, Error.UntrustedIdentity;
+    void sendViewedReceipt(String recipient, List<Long> messageIds) throws Error.Failure, Error.UntrustedIdentity;
+
+    long sendRemoteDeleteMessage(long targetSentTimestamp, String recipient) throws Error.Failure, Error.InvalidNumber;
 
     long sendRemoteDeleteMessage(
-            long targetSentTimestamp, String recipient
-    ) throws Error.Failure, Error.InvalidNumber;
-
-    long sendRemoteDeleteMessage(
-            long targetSentTimestamp, List<String> recipients
+            long targetSentTimestamp,
+            List<String> recipients
     ) throws Error.Failure, Error.InvalidNumber;
 
     long sendMessageReaction(
-            String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, String recipient
+            String emoji,
+            boolean remove,
+            String targetAuthor,
+            long targetSentTimestamp,
+            String recipient
     ) throws Error.InvalidNumber, Error.Failure;
 
     long sendMessageReaction(
-            String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, List<String> recipients
+            String emoji,
+            boolean remove,
+            String targetAuthor,
+            long targetSentTimestamp,
+            List<String> recipients
     ) throws Error.InvalidNumber, Error.Failure;
 
     long sendPaymentNotification(byte[] receipt, String note, String recipient) throws Error.Failure;
@@ -68,9 +73,7 @@ public interface Signal extends DBusInterface {
 
     void sendSyncRequest() throws Error.Failure;
 
-    long sendNoteToSelfMessage(
-            String message, List<String> attachments
-    ) throws Error.AttachmentInvalid, Error.Failure;
+    long sendNoteToSelfMessage(String message, List<String> attachments) throws Error.AttachmentInvalid, Error.Failure;
 
     void sendEndSessionMessage(List<String> recipients) throws Error.Failure, Error.InvalidNumber, Error.UntrustedIdentity;
 
@@ -79,19 +82,27 @@ public interface Signal extends DBusInterface {
     void deleteContact(final String recipient) throws Error.Failure;
 
     long sendGroupMessage(
-            String message, List<String> attachments, byte[] groupId
+            String message,
+            List<String> attachments,
+            byte[] groupId
     ) throws Error.GroupNotFound, Error.Failure, Error.AttachmentInvalid, Error.InvalidGroupId;
 
     void sendGroupTyping(
-            final byte[] groupId, final boolean stop
+            final byte[] groupId,
+            final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity;
 
     long sendGroupRemoteDeleteMessage(
-            long targetSentTimestamp, byte[] groupId
+            long targetSentTimestamp,
+            byte[] groupId
     ) throws Error.Failure, Error.GroupNotFound, Error.InvalidGroupId;
 
     long sendGroupMessageReaction(
-            String emoji, boolean remove, String targetAuthor, long targetSentTimestamp, byte[] groupId
+            String emoji,
+            boolean remove,
+            String targetAuthor,
+            long targetSentTimestamp,
+            byte[] groupId
     ) throws Error.GroupNotFound, Error.Failure, Error.InvalidNumber, Error.InvalidGroupId;
 
     String getContactName(String number) throws Error.InvalidNumber;
@@ -119,12 +130,17 @@ public interface Signal extends DBusInterface {
     List<String> getGroupMembers(byte[] groupId) throws Error.InvalidGroupId;
 
     byte[] createGroup(
-            String name, List<String> members, String avatar
+            String name,
+            List<String> members,
+            String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber;
 
     @Deprecated
     byte[] updateGroup(
-            byte[] groupId, String name, List<String> members, String avatar
+            byte[] groupId,
+            String name,
+            List<String> members,
+            String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber, Error.GroupNotFound, Error.InvalidGroupId;
 
     @Deprecated
@@ -156,7 +172,11 @@ public interface Signal extends DBusInterface {
     ) throws Error.Failure;
 
     void updateProfile(
-            String name, String about, String aboutEmoji, String avatarPath, boolean removeAvatar
+            String name,
+            String about,
+            String aboutEmoji,
+            String avatarPath,
+            boolean removeAvatar
     ) throws Error.Failure;
 
     void removePin();
diff --git a/src/main/java/org/asamk/SignalControl.java b/src/main/java/org/asamk/SignalControl.java
index fe51a7f7..3eea790f 100644
--- a/src/main/java/org/asamk/SignalControl.java
+++ b/src/main/java/org/asamk/SignalControl.java
@@ -13,11 +13,14 @@ import java.util.List;
 public interface SignalControl extends DBusInterface {
 
     void register(
-            String number, boolean voiceVerification
+            String number,
+            boolean voiceVerification
     ) throws Error.Failure, Error.InvalidNumber, Error.RequiresCaptcha;
 
     void registerWithCaptcha(
-            String number, boolean voiceVerification, String captcha
+            String number,
+            boolean voiceVerification,
+            String captcha
     ) throws Error.Failure, Error.InvalidNumber, Error.RequiresCaptcha;
 
     void verify(String number, String verificationCode) throws Error.Failure, Error.InvalidNumber;
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index f8585386..d3d74c3e 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -292,7 +292,8 @@ public class App {
     }
 
     private RegistrationManager loadRegistrationManager(
-            final String account, final SignalAccountFiles signalAccountFiles
+            final String account,
+            final SignalAccountFiles signalAccountFiles
     ) throws UnexpectedErrorException {
         try {
             return signalAccountFiles.initRegistrationManager(account);
@@ -306,7 +307,8 @@ public class App {
     }
 
     private Manager loadManager(
-            final String account, final SignalAccountFiles signalAccountFiles
+            final String account,
+            final SignalAccountFiles signalAccountFiles
     ) throws CommandException {
         logger.trace("Loading account file for {}", account);
         try {
diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index d96835a5..d7fd1104 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -101,9 +101,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         writer.println();
     }
 
-    private void printDataMessage(
-            PlainTextWriter writer, MessageEnvelope.Data message
-    ) {
+    private void printDataMessage(PlainTextWriter writer, MessageEnvelope.Data message) {
         writer.println("Message timestamp: {}", DateUtils.formatTimestamp(message.timestamp()));
         if (message.isViewOnce()) {
             writer.println("=VIEW ONCE=");
@@ -197,16 +195,12 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printEditMessage(
-            PlainTextWriter writer, MessageEnvelope.Edit message
-    ) {
+    private void printEditMessage(PlainTextWriter writer, MessageEnvelope.Edit message) {
         writer.println("Edit: Target message timestamp: {}", DateUtils.formatTimestamp(message.targetSentTimestamp()));
         printDataMessage(writer.indentedWriter(), message.dataMessage());
     }
 
-    private void printStoryMessage(
-            PlainTextWriter writer, MessageEnvelope.Story message
-    ) {
+    private void printStoryMessage(PlainTextWriter writer, MessageEnvelope.Story message) {
         writer.println("Story: with replies: {}", message.allowsReplies());
         if (message.groupId().isPresent()) {
             writer.println("Group info:");
@@ -226,9 +220,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printTypingMessage(
-            final PlainTextWriter writer, final MessageEnvelope.Typing typingMessage
-    ) {
+    private void printTypingMessage(final PlainTextWriter writer, final MessageEnvelope.Typing typingMessage) {
         writer.println("Action: {}", typingMessage.type());
         writer.println("Timestamp: {}", DateUtils.formatTimestamp(typingMessage.timestamp()));
         if (typingMessage.groupId().isPresent()) {
@@ -238,9 +230,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printReceiptMessage(
-            final PlainTextWriter writer, final MessageEnvelope.Receipt receiptMessage
-    ) {
+    private void printReceiptMessage(final PlainTextWriter writer, final MessageEnvelope.Receipt receiptMessage) {
         writer.println("When: {}", DateUtils.formatTimestamp(receiptMessage.when()));
         if (receiptMessage.type() == MessageEnvelope.Receipt.Type.DELIVERY) {
             writer.println("Is delivery receipt");
@@ -257,9 +247,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printCallMessage(
-            final PlainTextWriter writer, final MessageEnvelope.Call callMessage
-    ) {
+    private void printCallMessage(final PlainTextWriter writer, final MessageEnvelope.Call callMessage) {
         if (callMessage.destinationDeviceId().isPresent()) {
             final var deviceId = callMessage.destinationDeviceId().get();
             writer.println("Destination device id: {}", deviceId);
@@ -302,9 +290,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printSyncMessage(
-            final PlainTextWriter writer, final MessageEnvelope.Sync syncMessage
-    ) {
+    private void printSyncMessage(final PlainTextWriter writer, final MessageEnvelope.Sync syncMessage) {
         if (syncMessage.contacts().isPresent()) {
             final var contactsMessage = syncMessage.contacts().get();
             var type = contactsMessage.isComplete() ? "complete" : "partial";
@@ -392,9 +378,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printPreview(
-            final PlainTextWriter writer, final MessageEnvelope.Data.Preview preview
-    ) {
+    private void printPreview(final PlainTextWriter writer, final MessageEnvelope.Data.Preview preview) {
         writer.println("Title: {}", preview.title());
         writer.println("Description: {}", preview.description());
         writer.println("Date: {}", DateUtils.formatTimestamp(preview.date()));
@@ -405,25 +389,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printSticker(
-            final PlainTextWriter writer, final MessageEnvelope.Data.Sticker sticker
-    ) {
+    private void printSticker(final PlainTextWriter writer, final MessageEnvelope.Data.Sticker sticker) {
         writer.println("Pack id: {}", Hex.toStringCondensed(sticker.packId().serialize()));
         writer.println("Sticker id: {}", sticker.stickerId());
     }
 
-    private void printReaction(
-            final PlainTextWriter writer, final MessageEnvelope.Data.Reaction reaction
-    ) {
+    private void printReaction(final PlainTextWriter writer, final MessageEnvelope.Data.Reaction reaction) {
         writer.println("Emoji: {}", reaction.emoji());
         writer.println("Target author: {}", formatContact(reaction.targetAuthor()));
         writer.println("Target timestamp: {}", DateUtils.formatTimestamp(reaction.targetSentTimestamp()));
         writer.println("Is remove: {}", reaction.isRemove());
     }
 
-    private void printQuote(
-            final PlainTextWriter writer, final MessageEnvelope.Data.Quote quote
-    ) {
+    private void printQuote(final PlainTextWriter writer, final MessageEnvelope.Data.Quote quote) {
         writer.println("Id: {}", quote.id());
         writer.println("Author: {}", formatContact(quote.author()));
         if (quote.text().isPresent()) {
@@ -541,17 +519,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printGroupContext(
-            final PlainTextWriter writer, final MessageEnvelope.Data.GroupContext groupContext
-    ) {
+    private void printGroupContext(final PlainTextWriter writer, final MessageEnvelope.Data.GroupContext groupContext) {
         printGroupInfo(writer, groupContext.groupId());
         writer.println("Revision: {}", groupContext.revision());
         writer.println("Type: {}", groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER");
     }
 
-    private void printStoryContext(
-            final PlainTextWriter writer, final MessageEnvelope.Data.StoryContext storyContext
-    ) {
+    private void printStoryContext(final PlainTextWriter writer, final MessageEnvelope.Data.StoryContext storyContext) {
         writer.println("Sender: {}", formatContact(storyContext.author()));
         writer.println("Sent timestamp: {}", storyContext.sentTimestamp());
     }
@@ -567,15 +541,11 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
-    private void printMention(
-            PlainTextWriter writer, MessageEnvelope.Data.Mention mention
-    ) {
+    private void printMention(PlainTextWriter writer, MessageEnvelope.Data.Mention mention) {
         writer.println("- {}: {} (length: {})", formatContact(mention.recipient()), mention.start(), mention.length());
     }
 
-    private void printTextStyle(
-            PlainTextWriter writer, TextStyle textStyle
-    ) {
+    private void printTextStyle(PlainTextWriter writer, TextStyle textStyle) {
         writer.println("- {}: {} (length: {})", textStyle.style().name(), textStyle.start(), textStyle.length());
     }
 
diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index c40e4901..43e1a0b7 100644
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -38,7 +38,9 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final URI linkUri;
         try {
diff --git a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
index 89c82200..2d720362 100644
--- a/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddStickerPackCommand.java
@@ -36,7 +36,9 @@ public class AddStickerPackCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var uris = ns.<String>getList("uri");
         for (final var uri : uris) {
diff --git a/src/main/java/org/asamk/signal/commands/BlockCommand.java b/src/main/java/org/asamk/signal/commands/BlockCommand.java
index 1518c53a..e7d0af49 100644
--- a/src/main/java/org/asamk/signal/commands/BlockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/BlockCommand.java
@@ -35,7 +35,9 @@ public class BlockCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var contacts = ns.<String>getList("recipient");
         final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/CommandHandler.java b/src/main/java/org/asamk/signal/commands/CommandHandler.java
index 8e138b3f..86fede61 100644
--- a/src/main/java/org/asamk/signal/commands/CommandHandler.java
+++ b/src/main/java/org/asamk/signal/commands/CommandHandler.java
@@ -20,13 +20,15 @@ public class CommandHandler {
     }
 
     public void handleProvisioningCommand(
-            final ProvisioningCommand command, final ProvisioningManager provisioningManager
+            final ProvisioningCommand command,
+            final ProvisioningManager provisioningManager
     ) throws CommandException {
         command.handleCommand(ns, provisioningManager, outputWriter);
     }
 
     public void handleRegistrationCommand(
-            final RegistrationCommand command, final RegistrationManager registrationManager
+            final RegistrationCommand command,
+            final RegistrationManager registrationManager
     ) throws CommandException {
         command.handleCommand(ns, registrationManager);
     }
@@ -36,7 +38,8 @@ public class CommandHandler {
     }
 
     public void handleMultiLocalCommand(
-            final MultiLocalCommand command, MultiAccountManager multiAccountManager
+            final MultiLocalCommand command,
+            MultiAccountManager multiAccountManager
     ) throws CommandException {
         command.handleCommand(ns, multiAccountManager, outputWriter);
     }
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 59c2245e..197e1286 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -92,7 +92,9 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         Shutdown.installHandler();
         logger.info("Starting daemon in single-account mode for " + m.getSelfNumber());
@@ -117,7 +119,9 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter
     ) throws CommandException {
         Shutdown.installHandler();
         logger.info("Starting daemon in multi-account mode");
diff --git a/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java b/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java
index 51c8582d..71f8867c 100644
--- a/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DeleteLocalAccountDataCommand.java
@@ -60,7 +60,9 @@ public class DeleteLocalAccountDataCommand implements RegistrationCommand, JsonR
 
     @Override
     public void handleCommand(
-            Map<String, Object> request, RegistrationManager m, JsonWriter jsonWriter
+            Map<String, Object> request,
+            RegistrationManager m,
+            JsonWriter jsonWriter
     ) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
         handleCommand(commandNamespace, m);
diff --git a/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
index c2c18dde..8fce4dbf 100644
--- a/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
+++ b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
@@ -33,7 +33,9 @@ public class FinishChangeNumberCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var newNumber = ns.getString("number");
         final var verificationCode = ns.getString("verification-code");
diff --git a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
index a0fa0ab7..c9282616 100644
--- a/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/FinishLinkCommand.java
@@ -32,7 +32,9 @@ public class FinishLinkCommand implements JsonRpcMultiCommand<FinishLinkCommand.
 
     @Override
     public void handleCommand(
-            final FinishLinkParams request, final MultiAccountManager m, final JsonWriter jsonWriter
+            final FinishLinkParams request,
+            final MultiAccountManager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
         if (request.deviceLinkUri() == null) {
             throw new UserErrorException("Missing deviceLinkUri.");
diff --git a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
index 99ba1eca..cf716194 100644
--- a/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetAttachmentCommand.java
@@ -35,7 +35,9 @@ public class GetAttachmentCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
 
         final var id = ns.getString("id");
diff --git a/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java b/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java
index c7573465..7b2be6d4 100644
--- a/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetAvatarCommand.java
@@ -37,7 +37,9 @@ public class GetAvatarCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var contactRecipient = ns.getString("contact");
         final var profileRecipient = ns.getString("profile");
diff --git a/src/main/java/org/asamk/signal/commands/GetStickerCommand.java b/src/main/java/org/asamk/signal/commands/GetStickerCommand.java
index aba5b26c..efd79d94 100644
--- a/src/main/java/org/asamk/signal/commands/GetStickerCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetStickerCommand.java
@@ -35,7 +35,9 @@ public class GetStickerCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
 
         final var packId = StickerPackId.deserialize(Hex.toByteArray(ns.getString("pack-id")));
diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index 09adabd4..e3d36d85 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -43,7 +43,9 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         // Get a map of registration statuses
         Map<String, UserStatus> registered;
diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
index f9e9f513..1ecc5aca 100644
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -33,7 +33,9 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final GroupInviteLinkUrl linkUrl;
         var uri = ns.getString("uri");
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
index 0eb99351..5ce9daf4 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcDispatcherCommand.java
@@ -59,7 +59,9 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         Shutdown.installHandler();
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
@@ -79,7 +81,9 @@ public class JsonRpcDispatcherCommand implements LocalCommand, MultiLocalCommand
 
     @Override
     public void handleCommand(
-            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter
     ) throws CommandException {
         Shutdown.installHandler();
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
index d87b97cd..212c3e87 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcLocalCommand.java
@@ -18,9 +18,7 @@ public interface JsonRpcLocalCommand extends JsonRpcSingleCommand<Map<String, Ob
         return new TypeReference<>() {};
     }
 
-    default void handleCommand(
-            Map<String, Object> request, Manager m, JsonWriter jsonWriter
-    ) throws CommandException {
+    default void handleCommand(Map<String, Object> request, Manager m, JsonWriter jsonWriter) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
         handleCommand(commandNamespace, m, jsonWriter);
     }
diff --git a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java
index 6082f6c5..f14edeff 100644
--- a/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JsonRpcMultiLocalCommand.java
@@ -19,7 +19,9 @@ public interface JsonRpcMultiLocalCommand extends JsonRpcMultiCommand<Map<String
     }
 
     default void handleCommand(
-            Map<String, Object> request, MultiAccountManager c, JsonWriter jsonWriter
+            Map<String, Object> request,
+            MultiAccountManager c,
+            JsonWriter jsonWriter
     ) throws CommandException {
         Namespace commandNamespace = new JsonRpcNamespace(request == null ? Map.of() : request);
         handleCommand(commandNamespace, c, jsonWriter);
diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index ed0cc0ed..7c29a3a9 100644
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -33,7 +33,9 @@ public class LinkCommand implements ProvisioningCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final ProvisioningManager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final ProvisioningManager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var writer = (PlainTextWriter) outputWriter;
 
diff --git a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
index b19a1686..b9542934 100644
--- a/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListAccountsCommand.java
@@ -23,7 +23,9 @@ public class ListAccountsCommand implements JsonRpcMultiLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var accountNumbers = c.getAccountNumbers();
         switch (outputWriter) {
diff --git a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
index 3865d829..81a1bcb1 100644
--- a/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListContactsCommand.java
@@ -47,7 +47,9 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var allRecipients = Boolean.TRUE.equals(ns.getBoolean("all-recipients"));
         final var blocked = ns.getBoolean("blocked");
diff --git a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
index c4ae6e72..e9b03a17 100644
--- a/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListDevicesCommand.java
@@ -33,7 +33,9 @@ public class ListDevicesCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         List<Device> devices;
         try {
diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index debe4ad0..62bb4f14 100644
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -48,9 +48,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                 .collect(Collectors.toSet());
     }
 
-    private static void printGroupPlainText(
-            PlainTextWriter writer, Group group, boolean detailed
-    ) {
+    private static void printGroupPlainText(PlainTextWriter writer, Group group, boolean detailed) {
         if (detailed) {
             final var groupInviteLink = group.groupInviteLinkUrl();
 
@@ -79,7 +77,9 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var groups = m.getGroups();
 
diff --git a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
index 6b49a812..70b939d6 100644
--- a/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListIdentitiesCommand.java
@@ -46,7 +46,9 @@ public class ListIdentitiesCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var number = ns.getString("number");
 
diff --git a/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java b/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
index 233eb4b5..db081211 100644
--- a/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListStickerPacksCommand.java
@@ -27,7 +27,9 @@ public class ListStickerPacksCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager c,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var stickerPacks = c.getStickerPacks();
         switch (outputWriter) {
diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index f1b8ef5b..346398a5 100644
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -44,7 +44,9 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
 
diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index ba126f7e..37da35e1 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -66,7 +66,9 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         Shutdown.installHandler();
         final var timeout = ns.getDouble("timeout");
@@ -98,7 +100,9 @@ public class ReceiveCommand implements LocalCommand, JsonRpcSingleCommand<Receiv
 
     @Override
     public void handleCommand(
-            final ReceiveParams request, final Manager m, final JsonWriter jsonWriter
+            final ReceiveParams request,
+            final Manager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
         final var timeout = request.timeout() == null ? 3.0 : request.timeout();
         final var maxMessagesRaw = request.maxMessages() == null ? -1 : request.maxMessages();
diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index cd361218..e51129b6 100644
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -63,13 +63,18 @@ public class RegisterCommand implements RegistrationCommand, JsonRpcRegistration
 
     @Override
     public void handleCommand(
-            final RegistrationParams request, final RegistrationManager m, final JsonWriter jsonWriter
+            final RegistrationParams request,
+            final RegistrationManager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
         register(m, Boolean.TRUE.equals(request.voice()), request.captcha(), Boolean.TRUE.equals(request.reregister()));
     }
 
     private void register(
-            final RegistrationManager m, final boolean voiceVerification, final String captcha, final boolean reregister
+            final RegistrationManager m,
+            final boolean voiceVerification,
+            final String captcha,
+            final boolean reregister
     ) throws CommandException {
         try {
             m.register(voiceVerification, captcha, reregister);
diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
index 1b26396d..aafeb422 100644
--- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java
@@ -40,7 +40,9 @@ public class RemoteDeleteCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
diff --git a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
index aca52778..253cb7ad 100644
--- a/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveContactCommand.java
@@ -31,7 +31,9 @@ public class RemoveContactCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var recipientString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
index 68a53616..eab0a6be 100644
--- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
@@ -30,7 +30,9 @@ public class RemoveDeviceCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             final var deviceId = ns.getInt("device-id");
diff --git a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
index 8085bc65..bc55f9d2 100644
--- a/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemovePinCommand.java
@@ -27,7 +27,9 @@ public class RemovePinCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             m.setRegistrationLockPin(Optional.empty());
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 004ba506..9784171a 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -108,7 +108,9 @@ public class SendCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var notifySelf = Boolean.TRUE.equals(ns.getBoolean("notify-self"));
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
@@ -257,7 +259,8 @@ public class SendCommand implements JsonRpcLocalCommand {
     }
 
     private List<Message.Mention> parseMentions(
-            final String selfNumber, final List<String> mentionStrings
+            final String selfNumber,
+            final List<String> mentionStrings
     ) throws UserErrorException {
         final var mentionPattern = Pattern.compile("(\\d+):(\\d+):(.+)");
         final var mentions = new ArrayList<Message.Mention>();
diff --git a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
index a5128937..a67950c1 100644
--- a/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendContactsCommand.java
@@ -24,7 +24,9 @@ public class SendContactsCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             m.sendContacts();
diff --git a/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
index 53cd3ea7..732fd749 100644
--- a/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendMessageRequestResponseCommand.java
@@ -31,7 +31,9 @@ public class SendMessageRequestResponseCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
diff --git a/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java b/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java
index 77181e3e..0814658e 100644
--- a/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendPaymentNotificationCommand.java
@@ -31,7 +31,9 @@ public class SendPaymentNotificationCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientString = ns.getString("recipient");
         final var recipientIdentifier = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index 56fa81f2..da877d76 100644
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -53,7 +53,9 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var isNoteToSelf = Boolean.TRUE.equals(ns.getBoolean("note-to-self"));
         final var recipientStrings = ns.<String>getList("recipient");
diff --git a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
index adae7c4d..93c8a564 100644
--- a/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReceiptCommand.java
@@ -35,7 +35,9 @@ public class SendReceiptCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientString = ns.getString("recipient");
         final var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
index 1f35ba2b..eda364c0 100644
--- a/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendSyncRequestCommand.java
@@ -24,7 +24,9 @@ public class SendSyncRequestCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             m.requestAllSyncData();
diff --git a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
index 9293ec6a..a9e699cc 100644
--- a/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendTypingCommand.java
@@ -38,7 +38,9 @@ public class SendTypingCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var recipientStrings = ns.<String>getList("recipient");
         final var groupIdStrings = ns.<String>getList("group-id");
diff --git a/src/main/java/org/asamk/signal/commands/SetPinCommand.java b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
index f6b5f7ad..4d4a458f 100644
--- a/src/main/java/org/asamk/signal/commands/SetPinCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SetPinCommand.java
@@ -29,7 +29,9 @@ public class SetPinCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             var registrationLockPin = ns.getString("pin");
diff --git a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
index 84fcf527..c75b3077 100644
--- a/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
+++ b/src/main/java/org/asamk/signal/commands/StartChangeNumberCommand.java
@@ -39,7 +39,9 @@ public class StartChangeNumberCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var newNumber = ns.getString("number");
         final var voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice"));
diff --git a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
index ac269e95..895b5dae 100644
--- a/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/StartLinkCommand.java
@@ -23,7 +23,9 @@ public class StartLinkCommand implements JsonRpcMultiCommand<Void> {
 
     @Override
     public void handleCommand(
-            final Void request, final MultiAccountManager m, final JsonWriter jsonWriter
+            final Void request,
+            final MultiAccountManager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
         final URI deviceLinkUri;
         try {
diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java
index a130c03c..7f18507a 100644
--- a/src/main/java/org/asamk/signal/commands/TrustCommand.java
+++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java
@@ -33,7 +33,9 @@ public class TrustCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var recipientString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/UnblockCommand.java b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
index 1299d0db..a6b5e6b3 100644
--- a/src/main/java/org/asamk/signal/commands/UnblockCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnblockCommand.java
@@ -35,7 +35,9 @@ public class UnblockCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var contacts = ns.<String>getList("recipient");
         final var recipients = CommandUtil.getSingleRecipientIdentifiers(contacts, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
index 83694953..e044f691 100644
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -28,7 +28,9 @@ public class UnregisterCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         try {
             if (Boolean.TRUE.equals(ns.getBoolean("delete-account"))) {
diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index a750bc88..9c8c18b8 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -47,7 +47,9 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var deviceName = ns.getString("device-name");
         final var unrestrictedUnidentifiedSender = ns.getBoolean("unrestricted-unidentified-sender");
diff --git a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
index d1feff8a..03882e25 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateConfigurationCommand.java
@@ -38,7 +38,9 @@ public class UpdateConfigurationCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var readReceipts = ns.getBoolean("read-receipts");
         final var unidentifiedDeliveryIndicators = ns.getBoolean("unidentified-delivery-indicators");
diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index 7ff91e9b..815c15da 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -33,7 +33,9 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var recipientString = ns.getString("recipient");
         var recipient = CommandUtil.getSingleRecipientIdentifier(recipientString, m.getSelfNumber());
diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index f29f0732..1231d3d4 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -102,7 +102,9 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         final var groupIdString = ns.getString("group-id");
         var groupId = CommandUtil.getGroupId(groupIdString);
@@ -180,7 +182,9 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
     }
 
     private void outputResult(
-            final OutputWriter outputWriter, final SendGroupMessageResults results, final GroupId groupId
+            final OutputWriter outputWriter,
+            final SendGroupMessageResults results,
+            final GroupId groupId
     ) {
         switch (outputWriter) {
             case PlainTextWriter writer -> {
diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index cea2da0d..b122f58c 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -36,7 +36,9 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var givenName = ns.getString("given-name");
         var familyName = ns.getString("family-name");
diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index b4c09b41..710f4d35 100644
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -36,7 +36,9 @@ public class UploadStickerPackCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         var path = new File(ns.getString("path"));
 
diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
index 54d05a4d..a8543c5a 100644
--- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
@@ -55,13 +55,17 @@ public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCo
 
     @Override
     public void handleCommand(
-            final VerifyParams request, final RegistrationManager m, final JsonWriter jsonWriter
+            final VerifyParams request,
+            final RegistrationManager m,
+            final JsonWriter jsonWriter
     ) throws CommandException {
         verify(m, request.verificationCode(), request.pin());
     }
 
     private void verify(
-            final RegistrationManager m, final String verificationCode, final String pin
+            final RegistrationManager m,
+            final String verificationCode,
+            final String pin
     ) throws UserErrorException, IOErrorException {
         try {
             m.verifyAccount(verificationCode, pin);
diff --git a/src/main/java/org/asamk/signal/commands/VersionCommand.java b/src/main/java/org/asamk/signal/commands/VersionCommand.java
index 01f1a2d7..498e5e71 100644
--- a/src/main/java/org/asamk/signal/commands/VersionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VersionCommand.java
@@ -35,14 +35,18 @@ public class VersionCommand implements JsonRpcLocalCommand, JsonRpcMultiLocalCom
 
     @Override
     public void handleCommand(
-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter
     ) throws CommandException {
         outputVersion(outputWriter);
     }
 
     @Override
     public void handleCommand(
-            final Namespace ns, final MultiAccountManager c, final OutputWriter outputWriter
+            final Namespace ns,
+            final MultiAccountManager c,
+            final OutputWriter outputWriter
     ) throws CommandException {
         outputVersion(outputWriter);
     }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
index 5e272895..546a433f 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusCommandHandler.java
@@ -87,7 +87,8 @@ public class DbusCommandHandler {
     }
 
     private static String tryGetSingleAccountObjectPath(
-            final DBusConnection dBusConn, final String busname
+            final DBusConnection dBusConn,
+            final String busname
     ) throws DBusException, CommandException {
         var control = dBusConn.getRemoteObject(busname, DbusConfig.getObjectPath(), SignalControl.class);
         try {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusHandler.java b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
index e71d7281..b6799de7 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
@@ -28,7 +28,10 @@ public class DbusHandler implements AutoCloseable {
     private final boolean noReceiveOnStart;
 
     public DbusHandler(
-            final boolean isDbusSystem, final String busname, final Manager m, final boolean noReceiveOnStart
+            final boolean isDbusSystem,
+            final String busname,
+            final Manager m,
+            final boolean noReceiveOnStart
     ) {
         this.isDbusSystem = isDbusSystem;
         this.dbusRunner = (connection) -> {
diff --git a/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java b/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java
index d3c2ca83..73cfab67 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusInterfacePropertiesHandler.java
@@ -12,9 +12,7 @@ public class DbusInterfacePropertiesHandler {
     private final String interfaceName;
     private final List<DbusProperty<?>> properties;
 
-    public DbusInterfacePropertiesHandler(
-            final String interfaceName, final List<DbusProperty<?>> properties
-    ) {
+    public DbusInterfacePropertiesHandler(final String interfaceName, final List<DbusProperty<?>> properties) {
         this.interfaceName = interfaceName;
         this.properties = properties;
     }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index bd5bdfb2..159407e1 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -201,14 +201,18 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void startChangeNumber(
-            final String newNumber, final boolean voiceVerification, final String captcha
+            final String newNumber,
+            final boolean voiceVerification,
+            final String captcha
     ) throws RateLimitException, IOException, CaptchaRequiredException, NonNormalizedPhoneNumberException {
         throw new UnsupportedOperationException();
     }
 
     @Override
     public void finishChangeNumber(
-            final String newNumber, final String verificationCode, final String pin
+            final String newNumber,
+            final String verificationCode,
+            final String pin
     ) throws IncorrectPinException, PinLockedException, IOException {
         throw new UnsupportedOperationException();
     }
@@ -270,7 +274,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults quitGroup(
-            final GroupId groupId, final Set<RecipientIdentifier.Single> groupAdmins
+            final GroupId groupId,
+            final Set<RecipientIdentifier.Single> groupAdmins
     ) throws GroupNotFoundException, IOException, NotAGroupMemberException, LastGroupAdminException {
         if (!groupAdmins.isEmpty()) {
             throw new UnsupportedOperationException();
@@ -296,7 +301,9 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
-            final String name, final Set<RecipientIdentifier.Single> members, final String avatarFile
+            final String name,
+            final Set<RecipientIdentifier.Single> members,
+            final String avatarFile
     ) throws IOException, AttachmentInvalidException {
         final var newGroupId = signal.createGroup(emptyIfNull(name),
                 members.stream().map(RecipientIdentifier.Single::getIdentifier).toList(),
@@ -306,7 +313,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendGroupMessageResults updateGroup(
-            final GroupId groupId, final UpdateGroup updateGroup
+            final GroupId groupId,
+            final UpdateGroup updateGroup
     ) throws IOException, GroupNotFoundException, AttachmentInvalidException, NotAGroupMemberException, GroupSendingNotAllowedException {
         final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
         if (updateGroup.getName() != null) {
@@ -380,7 +388,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendTypingMessage(
-            final TypingAction action, final Set<RecipientIdentifier> recipients
+            final TypingAction action,
+            final Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients, numbers -> {
             numbers.forEach(n -> signal.sendTyping(n, action == TypingAction.STOP));
@@ -395,24 +404,22 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public SendMessageResults sendReadReceipt(
-            final RecipientIdentifier.Single sender, final List<Long> messageIds
-    ) {
+    public SendMessageResults sendReadReceipt(final RecipientIdentifier.Single sender, final List<Long> messageIds) {
         signal.sendReadReceipt(sender.getIdentifier(), messageIds);
         return new SendMessageResults(0, Map.of());
     }
 
     @Override
-    public SendMessageResults sendViewedReceipt(
-            final RecipientIdentifier.Single sender, final List<Long> messageIds
-    ) {
+    public SendMessageResults sendViewedReceipt(final RecipientIdentifier.Single sender, final List<Long> messageIds) {
         signal.sendViewedReceipt(sender.getIdentifier(), messageIds);
         return new SendMessageResults(0, Map.of());
     }
 
     @Override
     public SendMessageResults sendMessage(
-            final Message message, final Set<RecipientIdentifier> recipients, final boolean notifySelf
+            final Message message,
+            final Set<RecipientIdentifier> recipients,
+            final boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendMessage(message.messageText(), message.attachments(), numbers),
@@ -422,14 +429,17 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendEditMessage(
-            final Message message, final Set<RecipientIdentifier> recipients, final long editTargetTimestamp
+            final Message message,
+            final Set<RecipientIdentifier> recipients,
+            final long editTargetTimestamp
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
         throw new UnsupportedOperationException();
     }
 
     @Override
     public SendMessageResults sendRemoteDeleteMessage(
-            final long targetSentTimestamp, final Set<RecipientIdentifier> recipients
+            final long targetSentTimestamp,
+            final Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         return handleMessage(recipients,
                 numbers -> signal.sendRemoteDeleteMessage(targetSentTimestamp, numbers),
@@ -466,7 +476,9 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendPaymentNotificationMessage(
-            final byte[] receipt, final String note, final RecipientIdentifier.Single recipient
+            final byte[] receipt,
+            final String note,
+            final RecipientIdentifier.Single recipient
     ) throws IOException {
         final var timestamp = signal.sendPaymentNotification(receipt, note, recipient.getIdentifier());
         return new SendMessageResults(timestamp, Map.of());
@@ -502,14 +514,17 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setContactName(
-            final RecipientIdentifier.Single recipient, final String givenName, final String familyName
+            final RecipientIdentifier.Single recipient,
+            final String givenName,
+            final String familyName
     ) throws NotPrimaryDeviceException {
         signal.setContactName(recipient.getIdentifier(), givenName);
     }
 
     @Override
     public void setContactsBlocked(
-            final Collection<RecipientIdentifier.Single> recipients, final boolean blocked
+            final Collection<RecipientIdentifier.Single> recipients,
+            final boolean blocked
     ) throws NotPrimaryDeviceException, IOException {
         for (final var recipient : recipients) {
             signal.setContactBlocked(recipient.getIdentifier(), blocked);
@@ -518,7 +533,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setGroupsBlocked(
-            final Collection<GroupId> groupIds, final boolean blocked
+            final Collection<GroupId> groupIds,
+            final boolean blocked
     ) throws GroupNotFoundException, IOException {
         for (final var groupId : groupIds) {
             setGroupProperty(groupId, "IsBlocked", blocked);
@@ -532,7 +548,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void setExpirationTimer(
-            final RecipientIdentifier.Single recipient, final int messageExpirationTimer
+            final RecipientIdentifier.Single recipient,
+            final int messageExpirationTimer
     ) throws IOException {
         signal.setExpirationTimer(recipient.getIdentifier(), messageExpirationTimer);
     }
@@ -597,7 +614,9 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public void receiveMessages(
-            Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler
+            Optional<Duration> timeout,
+            Optional<Integer> maxMessages,
+            ReceiveMessageHandler handler
     ) throws IOException, AlreadyReceivingException {
         if (receiveThread != null) {
             throw new AlreadyReceivingException("Already receiving message.");
@@ -784,7 +803,8 @@ public class DbusManagerImpl implements Manager {
 
     @Override
     public boolean trustIdentityVerified(
-            final RecipientIdentifier.Single recipient, final IdentityVerificationCode verificationCode
+            final RecipientIdentifier.Single recipient,
+            final IdentityVerificationCode verificationCode
     ) {
         throw new UnsupportedOperationException();
     }
@@ -1124,9 +1144,7 @@ public class DbusManagerImpl implements Manager {
     }
 
     @SuppressWarnings("unchecked")
-    private <T> T getValue(
-            final Map<String, Variant<?>> stringVariantMap, final String field
-    ) {
+    private <T> T getValue(final Map<String, Variant<?>> stringVariantMap, final String field) {
         return (T) stringVariantMap.get(field).getValue();
     }
 }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
index 27e28779..2b9a0a77 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusMultiAccountManagerImpl.java
@@ -34,7 +34,9 @@ public class DbusMultiAccountManagerImpl implements MultiAccountManager {
     private final String busname;
 
     public DbusMultiAccountManagerImpl(
-            final SignalControl signalControl, DBusConnection connection, final String busname
+            final SignalControl signalControl,
+            DBusConnection connection,
+            final String busname
     ) {
         this.signalControl = signalControl;
         this.connection = connection;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java
index 2e026c8a..e3cf4c12 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusProvisioningManagerImpl.java
@@ -27,7 +27,9 @@ public class DbusProvisioningManagerImpl implements ProvisioningManager {
     }
 
     public DbusProvisioningManagerImpl(
-            final SignalControl signalControl, DBusConnection connection, URI deviceLinkUri
+            final SignalControl signalControl,
+            DBusConnection connection,
+            URI deviceLinkUri
     ) {
         this.signalControl = signalControl;
         this.connection = connection;
diff --git a/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
index 788e0c91..0c02c680 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusRegistrationManagerImpl.java
@@ -27,7 +27,9 @@ public class DbusRegistrationManagerImpl implements RegistrationManager {
 
     @Override
     public void register(
-            final boolean voiceVerification, final String captcha, final boolean forceRegister
+            final boolean voiceVerification,
+            final String captcha,
+            final boolean forceRegister
     ) throws IOException, CaptchaRequiredException {
         if (forceRegister) {
             throw new UnsupportedOperationException();
@@ -41,7 +43,8 @@ public class DbusRegistrationManagerImpl implements RegistrationManager {
 
     @Override
     public void verifyAccount(
-            final String verificationCode, final String pin
+            final String verificationCode,
+            final String pin
     ) throws IOException, PinLockedException, IncorrectPinException {
         if (pin == null) {
             signalControl.verify(number, verificationCode);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index def343a9..cf6999a9 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -49,14 +49,17 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public void register(
-            final String number, final boolean voiceVerification
+            final String number,
+            final boolean voiceVerification
     ) throws Error.Failure, Error.InvalidNumber {
         registerWithCaptcha(number, voiceVerification, null);
     }
 
     @Override
     public void registerWithCaptcha(
-            final String number, final boolean voiceVerification, final String captcha
+            final String number,
+            final boolean voiceVerification,
+            final String captcha
     ) throws Error.Failure, Error.InvalidNumber {
         if (!Manager.isValidNumber(number, null)) {
             throw new SignalControl.Error.InvalidNumber(
@@ -86,7 +89,9 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
 
     @Override
     public void verifyWithPin(
-            final String number, final String verificationCode, final String pin
+            final String number,
+            final String verificationCode,
+            final String pin
     ) throws Error.Failure, Error.InvalidNumber {
         try (final RegistrationManager registrationManager = c.getNewRegistrationManager(number)) {
             registrationManager.verifyAccount(verificationCode, pin);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index 1b8b7825..bbae26b5 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -81,7 +81,10 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     private static final Logger logger = LoggerFactory.getLogger(DbusSignalImpl.class);
 
     public DbusSignalImpl(
-            final Manager m, DBusConnection connection, final String objectPath, final boolean noReceiveOnStart
+            final Manager m,
+            DBusConnection connection,
+            final String objectPath,
+            final boolean noReceiveOnStart
     ) {
         this.m = m;
         this.connection = connection;
@@ -258,16 +261,12 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     }
 
     @Override
-    public long sendRemoteDeleteMessage(
-            final long targetSentTimestamp, final String recipient
-    ) {
+    public long sendRemoteDeleteMessage(final long targetSentTimestamp, final String recipient) {
         return sendRemoteDeleteMessage(targetSentTimestamp, List.of(recipient));
     }
 
     @Override
-    public long sendRemoteDeleteMessage(
-            final long targetSentTimestamp, final List<String> recipients
-    ) {
+    public long sendRemoteDeleteMessage(final long targetSentTimestamp, final List<String> recipients) {
         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
                     getSingleRecipientIdentifiers(recipients, m.getSelfNumber()).stream()
@@ -323,7 +322,9 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
 
     @Override
     public long sendPaymentNotification(
-            final byte[] receipt, final String note, final String recipient
+            final byte[] receipt,
+            final String note,
+            final String recipient
     ) throws Error.Failure {
         try {
             final var results = m.sendPaymentNotificationMessage(receipt,
@@ -338,7 +339,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
 
     @Override
     public void sendTyping(
-            final String recipient, final boolean stop
+            final String recipient,
+            final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
@@ -355,7 +357,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
 
     @Override
     public void sendReadReceipt(
-            final String recipient, final List<Long> messageIds
+            final String recipient,
+            final List<Long> messageIds
     ) throws Error.Failure, Error.UntrustedIdentity {
         final var results = m.sendReadReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
         checkSendMessageResults(results);
@@ -363,7 +366,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
 
     @Override
     public void sendViewedReceipt(
-            final String recipient, final List<Long> messageIds
+            final String recipient,
+            final List<Long> messageIds
     ) throws Error.Failure, Error.UntrustedIdentity {
         final var results = m.sendViewedReceipt(getSingleRecipientIdentifier(recipient, m.getSelfNumber()), messageIds);
         checkSendMessageResults(results);
@@ -389,7 +393,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
 
     @Override
     public long sendNoteToSelfMessage(
-            final String messageText, final List<String> attachments
+            final String messageText,
+            final List<String> attachments
     ) throws Error.AttachmentInvalid, Error.Failure, Error.UntrustedIdentity {
         try {
             final var message = new Message(messageText,
@@ -461,7 +466,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
 
     @Override
     public void sendGroupTyping(
-            final byte[] groupId, final boolean stop
+            final byte[] groupId,
+            final boolean stop
     ) throws Error.Failure, Error.GroupNotFound, Error.UntrustedIdentity {
         try {
             final var results = m.sendTypingMessage(stop ? TypingAction.STOP : TypingAction.START,
@@ -475,9 +481,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     }
 
     @Override
-    public long sendGroupRemoteDeleteMessage(
-            final long targetSentTimestamp, final byte[] groupId
-    ) {
+    public long sendGroupRemoteDeleteMessage(final long targetSentTimestamp, final byte[] groupId) {
         try {
             final var results = m.sendRemoteDeleteMessage(targetSentTimestamp,
                     Set.of(getGroupRecipientIdentifier(groupId)));
@@ -621,7 +625,9 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
 
     @Override
     public byte[] createGroup(
-            final String name, final List<String> members, final String avatar
+            final String name,
+            final List<String> members,
+            final String avatar
     ) throws Error.AttachmentInvalid, Error.Failure, Error.InvalidNumber {
         return updateGroupInternal(new byte[0], name, members, avatar);
     }
@@ -900,7 +906,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     }
 
     private static void checkGroupSendMessageResults(
-            long timestamp, Collection<SendMessageResult> results
+            long timestamp,
+            Collection<SendMessageResult> results
     ) throws DBusExecutionException {
         if (results.size() == 1) {
             checkSendMessageResult(timestamp, results.stream().findFirst().get());
@@ -927,7 +934,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     }
 
     private static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
-            final Collection<String> recipientStrings, final String localNumber
+            final Collection<String> recipientStrings,
+            final String localNumber
     ) throws DBusExecutionException {
         final var identifiers = new HashSet<RecipientIdentifier.Single>();
         for (var recipientString : recipientStrings) {
@@ -937,7 +945,8 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     }
 
     private static RecipientIdentifier.Single getSingleRecipientIdentifier(
-            final String recipientString, final String localNumber
+            final String recipientString,
+            final String localNumber
     ) throws DBusExecutionException {
         try {
             return RecipientIdentifier.Single.fromString(recipientString, localNumber);
diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index c9c8fa16..e1780665 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -240,7 +240,9 @@ public class HttpServerHandler implements AutoCloseable {
     }
 
     private List<Pair<Manager, Manager.ReceiveMessageHandler>> subscribeReceiveHandlers(
-            final List<Manager> managers, final ServerSentEventSender sender, Callable unsubscribe
+            final List<Manager> managers,
+            final ServerSentEventSender sender,
+            Callable unsubscribe
     ) {
         return managers.stream().map(m1 -> {
             final var receiveMessageHandler = new JsonReceiveMessageHandler(m1, s -> {
diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 7ba4b307..8ab8ea83 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -28,9 +28,7 @@ public record JsonMessageEnvelope(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonTypingMessage typingMessage
 ) {
 
-    public static JsonMessageEnvelope from(
-            MessageEnvelope envelope, Throwable exception, Manager m
-    ) {
+    public static JsonMessageEnvelope from(MessageEnvelope envelope, Throwable exception, Manager m) {
         final RecipientAddress sourceAddress;
         final Integer sourceDevice;
         if (envelope.sourceAddress().isPresent()) {
diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
index e90d740c..29866c1a 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcRequest.java
@@ -38,7 +38,9 @@ public final class JsonRpcRequest extends JsonRpcMessage {
     private ValueNode id;
 
     public static JsonRpcRequest forNotification(
-            final String method, final ContainerNode<?> params, final ValueNode id
+            final String method,
+            final ContainerNode<?> params,
+            final ValueNode id
     ) {
         return new JsonRpcRequest("2.0", method, params, id);
     }
@@ -47,7 +49,10 @@ public final class JsonRpcRequest extends JsonRpcMessage {
     }
 
     private JsonRpcRequest(
-            final String jsonrpc, final String method, final ContainerNode<?> params, final ValueNode id
+            final String jsonrpc,
+            final String method,
+            final ContainerNode<?> params,
+            final ValueNode id
     ) {
         this.jsonrpc = jsonrpc;
         this.method = method;
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 96456a4e..48eb4a45 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -56,7 +56,9 @@ public class SignalJsonRpcCommandHandler {
     }
 
     public JsonNode handleRequest(
-            final ObjectMapper objectMapper, final String method, ContainerNode<?> params
+            final ObjectMapper objectMapper,
+            final String method,
+            ContainerNode<?> params
     ) throws JsonRpcException {
         var command = getCommand(method);
         if (c != null) {
@@ -197,7 +199,9 @@ public class SignalJsonRpcCommandHandler {
     }
 
     private JsonNode runCommand(
-            final ObjectMapper objectMapper, final ContainerNode<?> params, final CommandRunner<?> command
+            final ObjectMapper objectMapper,
+            final ContainerNode<?> params,
+            final CommandRunner<?> command
     ) throws JsonRpcException {
         final Object[] result = {null};
         final JsonWriter commandJsonWriter = s -> {
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
index c8b4bc15..5d3fa261 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcDispatcherHandler.java
@@ -43,7 +43,9 @@ public class SignalJsonRpcDispatcherHandler {
     private SignalJsonRpcCommandHandler commandHandler;
 
     public SignalJsonRpcDispatcherHandler(
-            final JsonWriter jsonWriter, final Supplier<String> lineSupplier, final boolean noReceiveOnStart
+            final JsonWriter jsonWriter,
+            final Supplier<String> lineSupplier,
+            final boolean noReceiveOnStart
     ) {
         this.noReceiveOnStart = noReceiveOnStart;
         this.objectMapper = Util.createJsonObjectMapper();
@@ -167,7 +169,9 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
-                final Void request, final Manager m, final JsonWriter jsonWriter
+                final Void request,
+                final Manager m,
+                final JsonWriter jsonWriter
         ) throws CommandException {
             final var subscriptionId = subscribeReceive(m, false);
             jsonWriter.write(subscriptionId);
@@ -175,7 +179,9 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
-                final Void request, final MultiAccountManager c, final JsonWriter jsonWriter
+                final Void request,
+                final MultiAccountManager c,
+                final JsonWriter jsonWriter
         ) throws CommandException {
             final var subscriptionId = subscribeReceive(c.getManagers(), false);
             jsonWriter.write(subscriptionId);
@@ -196,7 +202,9 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
-                final JsonNode request, final Manager m, final JsonWriter jsonWriter
+                final JsonNode request,
+                final Manager m,
+                final JsonWriter jsonWriter
         ) throws CommandException {
             final var subscriptionId = getSubscriptionId(request);
             if (subscriptionId == null) {
@@ -210,7 +218,9 @@ public class SignalJsonRpcDispatcherHandler {
 
         @Override
         public void handleCommand(
-                final JsonNode request, final MultiAccountManager c, final JsonWriter jsonWriter
+                final JsonNode request,
+                final MultiAccountManager c,
+                final JsonWriter jsonWriter
         ) throws CommandException {
             final var subscriptionId = getSubscriptionId(request);
             if (subscriptionId == null) {
diff --git a/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java
index dc620bc8..2e0d50e4 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SocketHandler.java
@@ -39,7 +39,9 @@ public class SocketHandler implements AutoCloseable {
     }
 
     public SocketHandler(
-            final ServerSocketChannel serverChannel, final MultiAccountManager c, final boolean noReceiveOnStart
+            final ServerSocketChannel serverChannel,
+            final MultiAccountManager c,
+            final boolean noReceiveOnStart
     ) {
         this.serverChannel = serverChannel;
         this.socketHandler = channel -> getSignalJsonRpcDispatcherHandler(channel).handleConnection(c);
diff --git a/src/main/java/org/asamk/signal/logging/LogConfigurator.java b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
index f6e23b70..2ee7b5f0 100644
--- a/src/main/java/org/asamk/signal/logging/LogConfigurator.java
+++ b/src/main/java/org/asamk/signal/logging/LogConfigurator.java
@@ -83,7 +83,8 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
     }
 
     private ConsoleAppender<ILoggingEvent> createLoggingConsoleAppender(
-            final LoggerContext lc, final LayoutWrappingEncoder<ILoggingEvent> layoutEncoder
+            final LoggerContext lc,
+            final LayoutWrappingEncoder<ILoggingEvent> layoutEncoder
     ) {
         return new ConsoleAppender<>() {{
             setContext(lc);
@@ -95,7 +96,8 @@ public class LogConfigurator extends ContextAwareBase implements Configurator {
     }
 
     private FileAppender<ILoggingEvent> createLoggingFileAppender(
-            final LoggerContext lc, final LayoutWrappingEncoder<ILoggingEvent> layoutEncoder
+            final LoggerContext lc,
+            final LayoutWrappingEncoder<ILoggingEvent> layoutEncoder
     ) {
         return new FileAppender<>() {{
             setContext(lc);
diff --git a/src/main/java/org/asamk/signal/logging/Scrubber.java b/src/main/java/org/asamk/signal/logging/Scrubber.java
index 6078c6ba..9d796a64 100644
--- a/src/main/java/org/asamk/signal/logging/Scrubber.java
+++ b/src/main/java/org/asamk/signal/logging/Scrubber.java
@@ -249,9 +249,7 @@ public final class Scrubber {
         return scrub(in, IPV4_PATTERN, (matcher, output) -> output.append(IPV4_CENSOR));
     }
 
-    private static CharSequence scrub(
-            CharSequence in, Pattern pattern, ProcessMatch processMatch
-    ) {
+    private static CharSequence scrub(CharSequence in, Pattern pattern, ProcessMatch processMatch) {
         final StringBuilder output = new StringBuilder(in.length());
         final Matcher matcher = pattern.matcher(in);
 
diff --git a/src/main/java/org/asamk/signal/util/CommandUtil.java b/src/main/java/org/asamk/signal/util/CommandUtil.java
index 039ac2a7..61f5013e 100644
--- a/src/main/java/org/asamk/signal/util/CommandUtil.java
+++ b/src/main/java/org/asamk/signal/util/CommandUtil.java
@@ -84,7 +84,8 @@ public class CommandUtil {
     }
 
     public static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
-            final Collection<String> recipientStrings, final String localNumber
+            final Collection<String> recipientStrings,
+            final String localNumber
     ) throws UserErrorException {
         if (recipientStrings == null) {
             return Set.of();
@@ -97,7 +98,8 @@ public class CommandUtil {
     }
 
     public static RecipientIdentifier.Single getSingleRecipientIdentifier(
-            final String recipientString, final String localNumber
+            final String recipientString,
+            final String localNumber
     ) throws UserErrorException {
         try {
             return RecipientIdentifier.Single.fromString(recipientString, localNumber);
diff --git a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
index 76932402..a23e3c54 100644
--- a/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
+++ b/src/main/java/org/asamk/signal/util/SendMessageResultUtils.java
@@ -41,7 +41,8 @@ public class SendMessageResultUtils {
     }
 
     public static void outputResult(
-            final OutputWriter outputWriter, final SendMessageResults sendMessageResults
+            final OutputWriter outputWriter,
+            final SendMessageResults sendMessageResults
     ) throws CommandException {
         switch (outputWriter) {
             case PlainTextWriter writer -> {

From ff6cb5262ad3d987bd113fac18afd8722fca38a4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Nov 2024 22:29:01 +0100
Subject: [PATCH 533/672] Update libsignal-service

Support for storage encryption v2 and account entropy pool

Fixes #1632
---
 graalvm-config-dir/reflect-config.json        |  81 +++-
 gradle/libs.versions.toml                     |   2 +-
 .../signal/manager/api/MessageEnvelope.java   |  11 +-
 .../org/asamk/signal/manager/api/Profile.java |   3 +-
 .../signal/manager/config/LiveConfig.java     |   5 +-
 .../signal/manager/config/ServiceConfig.java  |   3 +-
 .../signal/manager/config/StagingConfig.java  |   5 +-
 .../signal/manager/helper/AccountHelper.java  |  40 +-
 .../signal/manager/helper/GroupV2Helper.java  |   4 +-
 .../helper/IncomingMessageHandler.java        |  29 +-
 .../signal/manager/helper/PreKeyHelper.java   |   2 +-
 .../signal/manager/helper/ProfileHelper.java  |  19 +-
 .../manager/helper/RecipientHelper.java       |   1 -
 .../signal/manager/helper/StorageHelper.java  | 365 +++++++++++-------
 .../signal/manager/helper/SyncHelper.java     |  16 +-
 .../manager/internal/SignalDependencies.java  |  18 +
 .../signal/manager/jobs/SyncStorageJob.java   |  16 +-
 .../signal/manager/storage/SignalAccount.java |  89 ++++-
 .../syncStorage/AccountRecordProcessor.java   | 183 ++++-----
 .../syncStorage/ContactRecordProcessor.java   | 323 ++++++++--------
 .../syncStorage/GroupV1RecordProcessor.java   |  54 ++-
 .../syncStorage/GroupV2RecordProcessor.java   |  78 ++--
 .../syncStorage/StorageSyncModels.java        | 133 ++++---
 .../syncStorage/StorageSyncValidations.java   |  52 +--
 .../syncStorage/WriteOperationResult.java     |   4 +-
 .../asamk/signal/manager/util/KeyUtils.java   |   5 +
 .../manager/util/NumberVerificationUtils.java |   2 +-
 .../signal/manager/util/ProfileUtils.java     |   3 +
 .../org/asamk/signal/manager/util/Utils.java  |  45 +++
 29 files changed, 952 insertions(+), 639 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index abe02ac4..230ede2f 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -124,6 +124,13 @@
   "name":"com.fasterxml.jackson.databind.ext.Java7SupportImpl",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"com.squareup.wire.Message",
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"com.squareup.wire.ProtoAdapter"
+},
 {
   "name":"com.squareup.wire.internal.ImmutableList",
   "allDeclaredFields":true,
@@ -209,9 +216,14 @@
 {
   "name":"java.io.FilePermission"
 },
+{
+  "name":"java.io.OutputStream"
+},
 {
   "name":"java.io.Serializable",
-  "allDeclaredMethods":true
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredClasses":true
 },
 {
   "name":"java.lang.Boolean",
@@ -577,6 +589,9 @@
 {
   "name":"kotlin.String"
 },
+{
+  "name":"kotlin.Unit"
+},
 {
   "name":"kotlin.collections.AbstractCollection",
   "allDeclaredFields":true,
@@ -629,6 +644,9 @@
 {
   "name":"long[]"
 },
+{
+  "name":"okio.BufferedSink"
+},
 {
   "name":"okio.ByteString"
 },
@@ -1025,7 +1043,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"groupId","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
+  "methods":[{"name":"groupId","parameterTypes":[] }, {"name":"groupName","parameterTypes":[] }, {"name":"revision","parameterTypes":[] }, {"name":"type","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonMention",
@@ -1247,7 +1265,7 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":["int","long","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"aciAccountData","parameterTypes":[] }, {"name":"deviceId","parameterTypes":[] }, {"name":"encryptedDeviceName","parameterTypes":[] }, {"name":"isMultiDevice","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"password","parameterTypes":[] }, {"name":"pinMasterKey","parameterTypes":[] }, {"name":"pniAccountData","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"registered","parameterTypes":[] }, {"name":"registrationLockPin","parameterTypes":[] }, {"name":"serviceEnvironment","parameterTypes":[] }, {"name":"storageKey","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"usernameLinkEntropy","parameterTypes":[] }, {"name":"usernameLinkServerId","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":["int","long","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","long","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["int","java.lang.String","boolean","java.lang.String","java.lang.String","java.lang.String","int","boolean","java.lang.String","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String","java.lang.String"] }, {"name":"accountEntropyPool","parameterTypes":[] }, {"name":"aciAccountData","parameterTypes":[] }, {"name":"deviceId","parameterTypes":[] }, {"name":"encryptedDeviceName","parameterTypes":[] }, {"name":"isMultiDevice","parameterTypes":[] }, {"name":"mediaRootBackupKey","parameterTypes":[] }, {"name":"number","parameterTypes":[] }, {"name":"password","parameterTypes":[] }, {"name":"pinMasterKey","parameterTypes":[] }, {"name":"pniAccountData","parameterTypes":[] }, {"name":"profileKey","parameterTypes":[] }, {"name":"registered","parameterTypes":[] }, {"name":"registrationLockPin","parameterTypes":[] }, {"name":"serviceEnvironment","parameterTypes":[] }, {"name":"storageKey","parameterTypes":[] }, {"name":"timestamp","parameterTypes":[] }, {"name":"username","parameterTypes":[] }, {"name":"usernameLinkEntropy","parameterTypes":[] }, {"name":"usernameLinkServerId","parameterTypes":[] }, {"name":"version","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.manager.storage.SignalAccount$Storage$AccountData",
@@ -2257,7 +2275,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getDeleteSync","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }, {"name":"getVersionedExpirationTimer","parameterTypes":[] }]
+  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getDeleteSync","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStorageServiceEncryptionV2","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }, {"name":"getVersionedExpirationTimer","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest",
@@ -2284,6 +2302,13 @@
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.TemporalCredential[]"
 },
+{
+  "name":"org.whispersystems.signalservice.api.link.LinkedDeviceVerificationCodeResponse",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
 {
   "name":"org.whispersystems.signalservice.api.messages.calls.HangupMessage",
   "allDeclaredFields":true,
@@ -2891,7 +2916,17 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
-  "allDeclaredFields":true
+  "allDeclaredFields":true,
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$Builder"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$Companion"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PhoneNumberSharingMode"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PinnedConversation",
@@ -2907,7 +2942,17 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
-  "allDeclaredFields":true
+  "allDeclaredFields":true,
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$Builder"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$Companion"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$IdentityState"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord$Name",
@@ -2915,11 +2960,28 @@
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV1Record",
-  "allDeclaredFields":true
+  "allDeclaredFields":true,
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV1Record$Builder"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV1Record$Companion"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
-  "allDeclaredFields":true
+  "allDeclaredFields":true,
+  "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record$Builder"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record$Companion"
+},
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record$StorySendMode"
 },
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ManifestRecord",
@@ -2929,6 +2991,9 @@
   "name":"org.whispersystems.signalservice.internal.storage.protos.ManifestRecord$Identifier",
   "fields":[{"name":"raw_"}, {"name":"type_"}]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.OptionalBool"
+},
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.Payments",
   "allDeclaredFields":true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d7d56d71..e52a4ae7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.12"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_110"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_111"
 sqlite = "org.xerial:sqlite-jdbc:3.47.0.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3"
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
index 5598d438..d8438f5d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java
@@ -611,11 +611,12 @@ public record MessageEnvelope(
                     RecipientResolver recipientResolver,
                     RecipientAddressResolver addressResolver
             ) {
-                return new Blocked(blockedListMessage.getAddresses()
-                        .stream()
-                        .map(d -> addressResolver.resolveRecipientAddress(recipientResolver.resolveRecipient(d))
-                                .toApiRecipientAddress())
-                        .toList(), blockedListMessage.getGroupIds().stream().map(GroupId::unknownVersion).toList());
+                return new Blocked(blockedListMessage.individuals.stream()
+                        .map(d -> new RecipientAddress(d.getAci() == null ? null : d.getAci().toString(),
+                                null,
+                                d.getE164(),
+                                null))
+                        .toList(), blockedListMessage.groupIds.stream().map(GroupId::unknownVersion).toList());
             }
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Profile.java b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
index 5b1ecf3a..acbaac11 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Profile.java
@@ -161,7 +161,8 @@ public class Profile {
     }
 
     public enum Capability {
-        storage;
+        storage,
+        storageServiceEncryptionV2Capability;
 
         public static Capability valueOfOrNull(String value) {
             try {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index f7859dae..8e844392 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -51,7 +51,7 @@ class LiveConfig {
     private static final byte[] backupServerPublicParams = Base64.getDecoder()
             .decode("AJwNSU55fsFCbgaxGRD11wO1juAs8Yr5GF8FPlGzzvdJJIKH5/4CC7ZJSOe3yL2vturVaRU2Cx0n751Vt8wkj1bozK3CBV1UokxV09GWf+hdVImLGjXGYLLhnI1J2TWEe7iWHyb553EEnRb5oxr9n3lUbNAJuRmFM7hrr0Al0F0wrDD4S8lo2mGaXe0MJCOM166F8oYRQqpFeEHfiLnxA1O8ZLh7vMdv4g9jI5phpRBTsJ5IjiJrWeP0zdIGHEssUeprDZ9OUJ14m0v61eYJMKsf59Bn+mAT2a7YfB+Don9O");
 
-    private static Environment LIBSIGNAL_NET_ENV = Environment.PRODUCTION;
+    private static final Environment LIBSIGNAL_NET_ENV = Environment.PRODUCTION;
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
@@ -71,7 +71,8 @@ class LiveConfig {
                 proxy,
                 zkGroupServerPublicParams,
                 genericServerPublicParams,
-                backupServerPublicParams);
+                backupServerPublicParams,
+                false);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 482e0f60..24365cfe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -29,7 +29,8 @@ public class ServiceConfig {
 
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var deleteSync = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(true, deleteSync, true);
+        final var storageEncryptionV2 = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(true, deleteSync, true, storageEncryptionV2);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index a3212c07..741afa16 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -51,7 +51,7 @@ class StagingConfig {
     private static final byte[] backupServerPublicParams = Base64.getDecoder()
             .decode("AHYrGb9IfugAAJiPKp+mdXUx+OL9zBolPYHYQz6GI1gWjpEu5me3zVNSvmYY4zWboZHif+HG1sDHSuvwFd0QszSwuSF4X4kRP3fJREdTZ5MCR0n55zUppTwfHRW2S4sdQ0JGz7YDQIJCufYSKh0pGNEHL6hv79Agrdnr4momr3oXdnkpVBIp3HWAQ6IbXQVSG18X36GaicI1vdT0UFmTwU2KTneluC2eyL9c5ff8PcmiS+YcLzh0OKYQXB5ZfQ06d6DiINvDQLy75zcfUOniLAj0lGJiHxGczin/RXisKSR8");
 
-    private static Network.Environment LIBSIGNAL_NET_ENV = Network.Environment.STAGING;
+    private static final Network.Environment LIBSIGNAL_NET_ENV = Network.Environment.STAGING;
 
     static SignalServiceConfiguration createDefaultServiceConfiguration(
             final List<Interceptor> interceptors
@@ -71,7 +71,8 @@ class StagingConfig {
                 proxy,
                 zkGroupServerPublicParams,
                 genericServerPublicParams,
-                backupServerPublicParams);
+                backupServerPublicParams,
+                false);
     }
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index d5e8581e..3eb2051d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -3,7 +3,6 @@ package org.asamk.signal.manager.helper;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.IncorrectPinException;
-import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
@@ -27,6 +26,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
+import org.whispersystems.signalservice.api.link.LinkedDeviceVerificationCodeResponse;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
@@ -56,6 +56,7 @@ import java.util.concurrent.TimeUnit;
 import okio.ByteString;
 
 import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_MAXIMUM_ID;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
 public class AccountHelper {
@@ -289,12 +290,11 @@ public class AccountHelper {
                 (sessionId1, verificationCode1, registrationLock) -> {
                     final var registrationApi = dependencies.getRegistrationApi();
                     try {
-                        Utils.handleResponseException(registrationApi.verifyAccount(sessionId1, verificationCode1));
+                        handleResponseException(registrationApi.verifyAccount(sessionId1, verificationCode1));
                     } catch (AlreadyVerifiedException e) {
                         // Already verified so can continue changing number
                     }
-                    return Utils.handleResponseException(registrationApi.changeNumber(new ChangePhoneNumberRequest(
-                            sessionId1,
+                    return handleResponseException(registrationApi.changeNumber(new ChangePhoneNumberRequest(sessionId1,
                             null,
                             newNumber,
                             registrationLock,
@@ -482,26 +482,28 @@ public class AccountHelper {
         dependencies.getAccountManager().setAccountAttributes(account.getAccountAttributes(null));
     }
 
-    public void addDevice(DeviceLinkUrl deviceLinkInfo) throws IOException, InvalidDeviceLinkException, org.asamk.signal.manager.api.DeviceLimitExceededException {
-        String verificationCode;
+    public void addDevice(DeviceLinkUrl deviceLinkInfo) throws IOException, org.asamk.signal.manager.api.DeviceLimitExceededException {
+        final var linkDeviceApi = dependencies.getLinkDeviceApi();
+        final LinkedDeviceVerificationCodeResponse verificationCode;
         try {
-            verificationCode = dependencies.getAccountManager().getNewDeviceVerificationCode();
+            verificationCode = handleResponseException(linkDeviceApi.getDeviceVerificationCode());
         } catch (DeviceLimitExceededException e) {
             throw new org.asamk.signal.manager.api.DeviceLimitExceededException("Too many linked devices", e);
         }
 
-        try {
-            dependencies.getAccountManager()
-                    .addDevice(deviceLinkInfo.deviceIdentifier(),
-                            deviceLinkInfo.deviceKey(),
-                            account.getAciIdentityKeyPair(),
-                            account.getPniIdentityKeyPair(),
-                            account.getProfileKey(),
-                            account.getOrCreatePinMasterKey(),
-                            verificationCode);
-        } catch (InvalidKeyException e) {
-            throw new InvalidDeviceLinkException("Invalid device link", e);
-        }
+        handleResponseException(dependencies.getLinkDeviceApi()
+                .linkDevice(account.getNumber(),
+                        account.getAci(),
+                        account.getPni(),
+                        deviceLinkInfo.deviceIdentifier(),
+                        deviceLinkInfo.deviceKey(),
+                        account.getAciIdentityKeyPair(),
+                        account.getPniIdentityKeyPair(),
+                        account.getProfileKey(),
+                        account.getOrCreatePinMasterKey(),
+                        account.getOrCreateMediaRootBackupKey(),
+                        verificationCode.getVerificationCode(),
+                        null));
         account.setMultiDevice(true);
         context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 05bc876a..a3330d5c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -82,7 +82,7 @@ class GroupV2Helper {
             final var groupsV2AuthorizationString = getGroupAuthForToday(groupSecretParams);
             return dependencies.getGroupsV2Api().getGroup(groupSecretParams, groupsV2AuthorizationString);
         } catch (NonSuccessfulResponseCodeException e) {
-            if (e.getCode() == 403) {
+            if (e.code == 403) {
                 throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);
             }
             logger.warn("Failed to retrieve Group V2 info, ignoring: {}", e.getMessage());
@@ -119,7 +119,7 @@ class GroupV2Helper {
                             false,
                             sendEndorsementsExpirationMs);
         } catch (NonSuccessfulResponseCodeException e) {
-            if (e.getCode() == 403) {
+            if (e.code == 403) {
                 throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);
             }
             logger.warn("Failed to retrieve Group V2 history, ignoring: {}", e.getMessage());
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 376a671b..5deffb3e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -31,6 +31,7 @@ import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.jobs.RetrieveStickerPackJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
+import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.signal.libsignal.metadata.ProtocolInvalidKeyException;
@@ -525,12 +526,12 @@ public final class IncomingMessageHandler {
         }
         if (syncMessage.getBlockedList().isPresent()) {
             final var blockedListMessage = syncMessage.getBlockedList().get();
-            for (var address : blockedListMessage.getAddresses()) {
-                context.getContactHelper()
-                        .setContactBlocked(account.getRecipientResolver().resolveRecipient(address), true);
+            for (var individual : blockedListMessage.individuals) {
+                final var address = new RecipientAddress(individual.getAci(), individual.getE164());
+                final var recipientId = account.getRecipientResolver().resolveRecipient(address);
+                context.getContactHelper().setContactBlocked(recipientId, true);
             }
-            for (var groupId : blockedListMessage.getGroupIds()
-                    .stream()
+            for (var groupId : blockedListMessage.groupIds.stream()
                     .map(GroupId::unknownVersion)
                     .collect(Collectors.toSet())) {
                 try {
@@ -585,14 +586,22 @@ public final class IncomingMessageHandler {
         }
         if (syncMessage.getKeys().isPresent()) {
             final var keysMessage = syncMessage.getKeys().get();
-            if (keysMessage.getStorageService().isPresent()) {
-                final var storageKey = keysMessage.getStorageService().get();
+            if (keysMessage.getAccountEntropyPool() != null) {
+                final var aep = keysMessage.getAccountEntropyPool();
+                account.setAccountEntropyPool(aep);
+                actions.add(SyncStorageDataAction.create());
+            } else if (keysMessage.getMaster() != null) {
+                final var masterKey = keysMessage.getMaster();
+                account.setMasterKey(masterKey);
+                actions.add(SyncStorageDataAction.create());
+            } else if (keysMessage.getStorageService() != null) {
+                final var storageKey = keysMessage.getStorageService();
                 account.setStorageKey(storageKey);
                 actions.add(SyncStorageDataAction.create());
             }
-            if (keysMessage.getMaster().isPresent()) {
-                final var masterKey = keysMessage.getMaster().get();
-                account.setMasterKey(masterKey);
+            if (keysMessage.getMediaRootBackupKey() != null) {
+                final var mrb = keysMessage.getMediaRootBackupKey();
+                account.setMediaRootBackupKey(mrb);
                 actions.add(SyncStorageDataAction.create());
             }
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index 339425c1..b17a9206 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -172,7 +172,7 @@ public class PreKeyHelper {
             // This can happen when the primary device has changed phone number
             logger.warn("Failed to updated pre keys: {}", e.getMessage());
         } catch (NonSuccessfulResponseCodeException e) {
-            if (serviceIdType != ServiceIdType.PNI || e.getCode() != 422) {
+            if (serviceIdType != ServiceIdType.PNI || e.code != 422) {
                 throw e;
             }
             logger.warn("Failed to set PNI pre keys, ignoring for now. Account needs to be reregistered to fix this.");
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 184eac6b..0905bb30 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -336,13 +336,6 @@ public final class ProfileHelper {
 
             final var profile = account.getProfileStore().getProfile(recipientId);
 
-            if (recipientId.equals(account.getSelfRecipientId())) {
-                final var isUnrestricted = encryptedProfile.isUnrestrictedUnidentifiedAccess();
-                if (account.isUnrestrictedUnidentifiedAccess() != isUnrestricted) {
-                    account.setUnrestrictedUnidentifiedAccess(isUnrestricted);
-                }
-            }
-
             Profile newProfile = null;
             if (profileKey.isPresent()) {
                 logger.trace("Decrypting profile");
@@ -358,6 +351,18 @@ public final class ProfileHelper {
                         .build();
             }
 
+            if (recipientId.equals(account.getSelfRecipientId())) {
+                final var isUnrestricted = encryptedProfile.isUnrestrictedUnidentifiedAccess();
+                if (account.isUnrestrictedUnidentifiedAccess() != isUnrestricted) {
+                    account.setUnrestrictedUnidentifiedAccess(isUnrestricted);
+                }
+                if (account.isPrimaryDevice() && profile != null && newProfile.getCapabilities()
+                        .contains(Profile.Capability.storageServiceEncryptionV2Capability) && !profile.getCapabilities()
+                        .contains(Profile.Capability.storageServiceEncryptionV2Capability)) {
+                    context.getJobExecutor().enqueueJob(new SyncStorageJob(true));
+                }
+            }
+
             try {
                 logger.trace("Storing identity");
                 final var identityKey = new IdentityKey(Base64.getDecoder().decode(encryptedProfile.getIdentityKey()));
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 6225b982..5da66b7e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -239,7 +239,6 @@ public class RecipientHelper {
                             newNumbers,
                             account.getRecipientStore().getServiceIdToProfileKeyMap(),
                             token,
-                            dependencies.getServiceEnvironmentConfig().cdsiMrenclave(),
                             null,
                             dependencies.getLibSignalNetwork(),
                             newToken -> {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 8c6b3c52..740c0b5e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.GroupIdV1;
 import org.asamk.signal.manager.api.GroupIdV2;
+import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.internal.SignalDependencies;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
@@ -17,11 +18,17 @@ import org.signal.core.util.SetUtil;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.storage.RecordIkm;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
 import org.whispersystems.signalservice.api.storage.StorageKey;
+import org.whispersystems.signalservice.api.storage.StorageRecordConvertersKt;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository.ManifestIfDifferentVersionResult;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository.WriteStorageRecordsResult;
 import org.whispersystems.signalservice.internal.storage.protos.ManifestRecord;
+import org.whispersystems.signalservice.internal.storage.protos.StorageRecord;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -32,9 +39,10 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
+
 public class StorageHelper {
 
     private static final Logger logger = LoggerFactory.getLogger(StorageHelper.class);
@@ -54,7 +62,7 @@ public class StorageHelper {
     }
 
     public void syncDataWithStorage() throws IOException {
-        final var storageKey = account.getOrCreateStorageKey();
+        var storageKey = account.getOrCreateStorageKey();
         if (storageKey == null) {
             if (!account.isPrimaryDevice()) {
                 logger.debug("Storage key unknown, requesting from primary device.");
@@ -65,52 +73,76 @@ public class StorageHelper {
 
         logger.trace("Reading manifest from remote storage");
         final var localManifestVersion = account.getStorageManifestVersion();
-        final var localManifest = account.getStorageManifest().orElse(SignalStorageManifest.EMPTY);
-        SignalStorageManifest remoteManifest;
-        try {
-            remoteManifest = dependencies.getAccountManager()
-                    .getStorageManifestIfDifferentVersion(storageKey, localManifestVersion)
-                    .orElse(localManifest);
-        } catch (InvalidKeyException e) {
-            logger.warn("Manifest couldn't be decrypted.");
-            if (account.isPrimaryDevice()) {
-                try {
-                    forcePushToStorage(storageKey);
-                } catch (RetryLaterException rle) {
-                    // TODO retry later
-                    return;
-                }
-            }
-            return;
-        }
-
-        logger.trace("Manifest versions: local {}, remote {}", localManifestVersion, remoteManifest.getVersion());
+        final var localManifest = account.getStorageManifest().orElse(SignalStorageManifest.Companion.getEMPTY());
+        final var storageServiceRepository = dependencies.getStorageServiceRepository();
+        final var result = storageServiceRepository.getStorageManifestIfDifferentVersion(storageKey,
+                localManifestVersion);
 
         var needsForcePush = false;
-        if (remoteManifest.getVersion() > localManifestVersion) {
-            logger.trace("Remote version was newer, reading records.");
-            needsForcePush = readDataFromStorage(storageKey, localManifest, remoteManifest);
-        } else if (remoteManifest.getVersion() < localManifest.getVersion()) {
-            logger.debug("Remote storage manifest version was older. User might have switched accounts.");
-        }
-        logger.trace("Done reading data from remote storage");
+        final var remoteManifest = switch (result) {
+            case ManifestIfDifferentVersionResult.DifferentVersion diff -> {
+                final var manifest = diff.getManifest();
+                storeManifestLocally(manifest);
+                yield manifest;
+            }
+            case ManifestIfDifferentVersionResult.DecryptionError ignore -> {
+                logger.warn("Manifest couldn't be decrypted.");
+                if (account.isPrimaryDevice()) {
+                    needsForcePush = true;
+                } else {
+                    context.getSyncHelper().requestSyncKeys();
+                }
+                yield null;
+            }
+            case ManifestIfDifferentVersionResult.SameVersion ignored -> localManifest;
+            case ManifestIfDifferentVersionResult.NetworkError e -> throw e.getException();
+            case ManifestIfDifferentVersionResult.StatusCodeError e -> throw e.getException();
+            default -> throw new RuntimeException("Unhandled ManifestIfDifferentVersionResult type");
+        };
 
-        if (localManifest != remoteManifest) {
-            storeManifestLocally(remoteManifest);
-        }
+        if (remoteManifest != null) {
+            logger.trace("Manifest versions: local {}, remote {}", localManifestVersion, remoteManifest.version);
 
-        readRecordsWithPreviouslyUnknownTypes(storageKey);
+            if (remoteManifest.version > localManifestVersion) {
+                logger.trace("Remote version was newer, reading records.");
+                needsForcePush = readDataFromStorage(storageKey, localManifest, remoteManifest);
+            } else if (remoteManifest.version < localManifest.version) {
+                logger.debug("Remote storage manifest version was older. User might have switched accounts.");
+            }
+            logger.trace("Done reading data from remote storage");
+
+            readRecordsWithPreviouslyUnknownTypes(storageKey, remoteManifest);
+        }
 
         logger.trace("Adding missing storageIds to local data");
         account.getRecipientStore().setMissingStorageIds();
         account.getGroupStore().setMissingStorageIds();
 
         var needsMultiDeviceSync = false;
-        try {
-            needsMultiDeviceSync = writeToStorage(storageKey, remoteManifest, needsForcePush);
-        } catch (RetryLaterException e) {
-            // TODO retry later
-            return;
+
+        if (account.needsStorageKeyMigration()) {
+            logger.debug("Storage needs force push due to new account entropy pool");
+            // Set new aep and reset previous master key and storage key
+            account.setAccountEntropyPool(account.getOrCreateAccountEntropyPool());
+            storageKey = account.getOrCreateStorageKey();
+            context.getSyncHelper().sendKeysMessage();
+            needsForcePush = true;
+        } else if (remoteManifest == null) {
+            if (account.isPrimaryDevice()) {
+                needsForcePush = true;
+            }
+        } else if (remoteManifest.recordIkm == null && account.getSelfRecipientProfile()
+                .getCapabilities()
+                .contains(Profile.Capability.storageServiceEncryptionV2Capability)) {
+            logger.debug("The SSRE2 capability is supported, but no recordIkm is set! Force pushing.");
+            needsForcePush = true;
+        } else {
+            try {
+                needsMultiDeviceSync = writeToStorage(storageKey, remoteManifest, needsForcePush);
+            } catch (RetryLaterException e) {
+                // TODO retry later
+                return;
+            }
         }
 
         if (needsForcePush) {
@@ -131,6 +163,23 @@ public class StorageHelper {
         logger.debug("Done syncing data with remote storage");
     }
 
+    public void forcePushToStorage() throws IOException {
+        if (!account.isPrimaryDevice()) {
+            return;
+        }
+
+        final var storageKey = account.getOrCreateStorageKey();
+        if (storageKey == null) {
+            return;
+        }
+
+        try {
+            forcePushToStorage(storageKey);
+        } catch (RetryLaterException e) {
+            // TODO retry later
+        }
+    }
+
     private boolean readDataFromStorage(
             final StorageKey storageKey,
             final SignalStorageManifest localManifest,
@@ -140,14 +189,14 @@ public class StorageHelper {
         try (final var connection = account.getAccountDatabase().getConnection()) {
             connection.setAutoCommit(false);
 
-            var idDifference = findIdDifference(remoteManifest.getStorageIds(), localManifest.getStorageIds());
+            var idDifference = findIdDifference(remoteManifest.storageIds, localManifest.storageIds);
 
             if (idDifference.hasTypeMismatches() && account.isPrimaryDevice()) {
                 logger.debug("Found type mismatches in the ID sets! Scheduling a force push after this sync completes.");
                 needsForcePush = true;
             }
 
-            logger.debug("Pre-Merge ID Difference :: " + idDifference);
+            logger.debug("Pre-Merge ID Difference :: {}", idDifference);
 
             if (!idDifference.localOnlyIds().isEmpty()) {
                 final var updated = account.getRecipientStore()
@@ -161,15 +210,15 @@ public class StorageHelper {
             }
 
             if (!idDifference.isEmpty()) {
-                final var remoteOnlyRecords = getSignalStorageRecords(storageKey, idDifference.remoteOnlyIds());
+                final var remoteOnlyRecords = getSignalStorageRecords(storageKey,
+                        remoteManifest,
+                        idDifference.remoteOnlyIds());
 
                 if (remoteOnlyRecords.size() != idDifference.remoteOnlyIds().size()) {
-                    logger.debug("Could not find all remote-only records! Requested: "
-                            + idDifference.remoteOnlyIds()
-                            .size()
-                            + ", Found: "
-                            + remoteOnlyRecords.size()
-                            + ". These stragglers should naturally get deleted during the sync.");
+                    logger.debug(
+                            "Could not find all remote-only records! Requested: {}, Found: {}. These stragglers should naturally get deleted during the sync.",
+                            idDifference.remoteOnlyIds().size(),
+                            remoteOnlyRecords.size());
                 }
 
                 final var unknownInserts = processKnownRecords(connection, remoteOnlyRecords);
@@ -194,18 +243,21 @@ public class StorageHelper {
         return needsForcePush;
     }
 
-    private void readRecordsWithPreviouslyUnknownTypes(final StorageKey storageKey) throws IOException {
+    private void readRecordsWithPreviouslyUnknownTypes(
+            final StorageKey storageKey,
+            final SignalStorageManifest remoteManifest
+    ) throws IOException {
         try (final var connection = account.getAccountDatabase().getConnection()) {
             connection.setAutoCommit(false);
             final var knownUnknownIds = account.getUnknownStorageIdStore()
                     .getUnknownStorageIds(connection, KNOWN_TYPES);
 
             if (!knownUnknownIds.isEmpty()) {
-                logger.debug("We have " + knownUnknownIds.size() + " unknown records that we can now process.");
+                logger.debug("We have {} unknown records that we can now process.", knownUnknownIds.size());
 
-                final var remote = getSignalStorageRecords(storageKey, knownUnknownIds);
+                final var remote = getSignalStorageRecords(storageKey, remoteManifest, knownUnknownIds);
 
-                logger.debug("Found " + remote.size() + " of the known-unknowns remotely.");
+                logger.debug("Found {} of the known-unknowns remotely.", remote.size());
 
                 processKnownRecords(connection, remote);
                 account.getUnknownStorageIdStore()
@@ -227,15 +279,16 @@ public class StorageHelper {
             connection.setAutoCommit(false);
 
             final var localStorageIds = getAllLocalStorageIds(connection);
-            final var idDifference = findIdDifference(remoteManifest.getStorageIds(), localStorageIds);
-            logger.debug("ID Difference :: " + idDifference);
+            final var idDifference = findIdDifference(remoteManifest.storageIds, localStorageIds);
+            logger.debug("ID Difference :: {}", idDifference);
 
             final var remoteDeletes = idDifference.remoteOnlyIds().stream().map(StorageId::getRaw).toList();
             final var remoteInserts = buildLocalStorageRecords(connection, idDifference.localOnlyIds());
             // TODO check if local storage record proto matches remote, then reset to remote storage_id
 
-            remoteWriteOperation = new WriteOperationResult(new SignalStorageManifest(remoteManifest.getVersion() + 1,
+            remoteWriteOperation = new WriteOperationResult(new SignalStorageManifest(remoteManifest.version + 1,
                     account.getDeviceId(),
+                    remoteManifest.recordIkm,
                     localStorageIds), remoteInserts, remoteDeletes);
 
             connection.commit();
@@ -244,39 +297,37 @@ public class StorageHelper {
         }
 
         if (remoteWriteOperation.isEmpty()) {
-            logger.debug("No remote writes needed. Still at version: " + remoteManifest.getVersion());
+            logger.debug("No remote writes needed. Still at version: {}", remoteManifest.version);
             return false;
         }
 
         logger.debug("We have something to write remotely.");
-        logger.debug("WriteOperationResult :: " + remoteWriteOperation);
+        logger.debug("WriteOperationResult :: {}", remoteWriteOperation);
 
         StorageSyncValidations.validate(remoteWriteOperation,
                 remoteManifest,
                 needsForcePush,
                 account.getSelfRecipientAddress());
 
-        final Optional<SignalStorageManifest> conflict;
-        try {
-            conflict = dependencies.getAccountManager()
-                    .writeStorageRecords(storageKey,
-                            remoteWriteOperation.manifest(),
-                            remoteWriteOperation.inserts(),
-                            remoteWriteOperation.deletes());
-        } catch (InvalidKeyException e) {
-            logger.warn("Failed to decrypt conflicting storage manifest: {}", e.getMessage());
-            throw new IOException(e);
+        final var result = dependencies.getStorageServiceRepository()
+                .writeStorageRecords(storageKey,
+                        remoteWriteOperation.manifest(),
+                        remoteWriteOperation.inserts(),
+                        remoteWriteOperation.deletes());
+        switch (result) {
+            case WriteStorageRecordsResult.ConflictError ignored -> {
+                logger.debug("Hit a conflict when trying to resolve the conflict! Retrying.");
+                throw new RetryLaterException();
+            }
+            case WriteStorageRecordsResult.NetworkError networkError -> throw networkError.getException();
+            case WriteStorageRecordsResult.StatusCodeError statusCodeError -> throw statusCodeError.getException();
+            case WriteStorageRecordsResult.Success ignored -> {
+                logger.debug("Saved new manifest. Now at version: {}", remoteWriteOperation.manifest().version);
+                storeManifestLocally(remoteWriteOperation.manifest());
+                return true;
+            }
+            default -> throw new IllegalStateException("Unexpected value: " + result);
         }
-
-        if (conflict.isPresent()) {
-            logger.debug("Hit a conflict when trying to resolve the conflict! Retrying.");
-            throw new RetryLaterException();
-        }
-
-        logger.debug("Saved new manifest. Now at version: " + remoteWriteOperation.manifest().getVersion());
-        storeManifestLocally(remoteWriteOperation.manifest());
-
-        return true;
     }
 
     private void forcePushToStorage(
@@ -284,7 +335,8 @@ public class StorageHelper {
     ) throws IOException, RetryLaterException {
         logger.debug("Force pushing local state to remote storage");
 
-        final var currentVersion = dependencies.getAccountManager().getStorageManifestVersion();
+        final var currentVersion = handleResponseException(dependencies.getStorageServiceRepository()
+                .getManifestVersion());
         final var newVersion = currentVersion + 1;
         final var newStorageRecords = new ArrayList<SignalStorageRecord>();
         final Map<RecipientId, StorageId> newContactStorageIds;
@@ -302,15 +354,16 @@ public class StorageHelper {
                     final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
                     final var accountRecord = StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
                             recipient,
-                            account.getUsernameLink(),
-                            storageId.getRaw());
-                    newStorageRecords.add(accountRecord);
+                            account.getUsernameLink());
+                    newStorageRecords.add(new SignalStorageRecord(storageId,
+                            new StorageRecord.Builder().account(accountRecord).build()));
                 } else {
                     final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
                     final var address = recipient.getAddress().getIdentifier();
                     final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, address);
-                    final var record = StorageSyncModels.localToRemoteRecord(recipient, identity, storageId.getRaw());
-                    newStorageRecords.add(record);
+                    final var record = StorageSyncModels.localToRemoteRecord(recipient, identity);
+                    newStorageRecords.add(new SignalStorageRecord(storageId,
+                            new StorageRecord.Builder().contact(record).build()));
                 }
             }
 
@@ -319,8 +372,9 @@ public class StorageHelper {
             for (final var groupId : groupV1Ids) {
                 final var storageId = newGroupV1StorageIds.get(groupId);
                 final var group = account.getGroupStore().getGroup(connection, groupId);
-                final var record = StorageSyncModels.localToRemoteRecord(group, storageId.getRaw());
-                newStorageRecords.add(record);
+                final var record = StorageSyncModels.localToRemoteRecord(group);
+                newStorageRecords.add(new SignalStorageRecord(storageId,
+                        new StorageRecord.Builder().groupV1(record).build()));
             }
 
             final var groupV2Ids = account.getGroupStore().getGroupV2Ids(connection);
@@ -328,8 +382,9 @@ public class StorageHelper {
             for (final var groupId : groupV2Ids) {
                 final var storageId = newGroupV2StorageIds.get(groupId);
                 final var group = account.getGroupStore().getGroup(connection, groupId);
-                final var record = StorageSyncModels.localToRemoteRecord(group, storageId.getRaw());
-                newStorageRecords.add(record);
+                final var record = StorageSyncModels.localToRemoteRecord(group);
+                newStorageRecords.add(new SignalStorageRecord(storageId,
+                        new StorageRecord.Builder().groupV2(record).build()));
             }
 
             connection.commit();
@@ -338,34 +393,46 @@ public class StorageHelper {
         }
         final var newStorageIds = newStorageRecords.stream().map(SignalStorageRecord::getId).toList();
 
-        final var manifest = new SignalStorageManifest(newVersion, account.getDeviceId(), newStorageIds);
+        final RecordIkm recordIkm;
+        if (account.getSelfRecipientProfile()
+                .getCapabilities()
+                .contains(Profile.Capability.storageServiceEncryptionV2Capability)) {
+            logger.debug("Generating and including a new recordIkm.");
+            recordIkm = RecordIkm.Companion.generate();
+        } else {
+            logger.debug("SSRE2 not yet supported. Not including recordIkm.");
+            recordIkm = null;
+        }
+
+        final var manifest = new SignalStorageManifest(newVersion, account.getDeviceId(), recordIkm, newStorageIds);
 
         StorageSyncValidations.validateForcePush(manifest, newStorageRecords, account.getSelfRecipientAddress());
 
-        final Optional<SignalStorageManifest> conflict;
-        try {
-            if (newVersion > 1) {
-                logger.trace("Force-pushing data. Inserting {} IDs.", newStorageRecords.size());
-                conflict = dependencies.getAccountManager()
-                        .resetStorageRecords(storageServiceKey, manifest, newStorageRecords);
-            } else {
-                logger.trace("First version, normal push. Inserting {} IDs.", newStorageRecords.size());
-                conflict = dependencies.getAccountManager()
-                        .writeStorageRecords(storageServiceKey, manifest, newStorageRecords, Collections.emptyList());
+        final WriteStorageRecordsResult result;
+        if (newVersion > 1) {
+            logger.trace("Force-pushing data. Inserting {} IDs.", newStorageRecords.size());
+            result = dependencies.getStorageServiceRepository()
+                    .resetAndWriteStorageRecords(storageServiceKey, manifest, newStorageRecords);
+        } else {
+            logger.trace("First version, normal push. Inserting {} IDs.", newStorageRecords.size());
+            result = dependencies.getStorageServiceRepository()
+                    .writeStorageRecords(storageServiceKey, manifest, newStorageRecords, Collections.emptyList());
+        }
+
+        switch (result) {
+            case WriteStorageRecordsResult.ConflictError ignored -> {
+                logger.debug("Hit a conflict. Trying again.");
+                throw new RetryLaterException();
             }
-        } catch (InvalidKeyException e) {
-            logger.debug("Hit an invalid key exception, which likely indicates a conflict.", e);
-            throw new RetryLaterException();
+            case WriteStorageRecordsResult.NetworkError networkError -> throw networkError.getException();
+            case WriteStorageRecordsResult.StatusCodeError statusCodeError -> throw statusCodeError.getException();
+            case WriteStorageRecordsResult.Success ignored -> {
+                logger.debug("Force push succeeded. Updating local manifest version to: {}", manifest.version);
+                storeManifestLocally(manifest);
+            }
+            default -> throw new IllegalStateException("Unexpected value: " + result);
         }
 
-        if (conflict.isPresent()) {
-            logger.debug("Hit a conflict. Trying again.");
-            throw new RetryLaterException();
-        }
-
-        logger.debug("Force push succeeded. Updating local manifest version to: " + manifest.getVersion());
-        storeManifestLocally(manifest);
-
         try (final var connection = account.getAccountDatabase().getConnection()) {
             connection.setAutoCommit(false);
             account.getRecipientStore().updateStorageIds(connection, newContactStorageIds);
@@ -405,22 +472,35 @@ public class StorageHelper {
     private void storeManifestLocally(
             final SignalStorageManifest remoteManifest
     ) {
-        account.setStorageManifestVersion(remoteManifest.getVersion());
+        account.setStorageManifestVersion(remoteManifest.version);
         account.setStorageManifest(remoteManifest);
     }
 
     private List<SignalStorageRecord> getSignalStorageRecords(
             final StorageKey storageKey,
+            final SignalStorageManifest manifest,
             final List<StorageId> storageIds
     ) throws IOException {
-        List<SignalStorageRecord> records;
-        try {
-            records = dependencies.getAccountManager().readStorageRecords(storageKey, storageIds);
-        } catch (InvalidKeyException e) {
-            logger.warn("Failed to read storage records, ignoring.");
-            return List.of();
-        }
-        return records;
+        final var result = dependencies.getStorageServiceRepository()
+                .readStorageRecords(storageKey, manifest.recordIkm, storageIds);
+        return switch (result) {
+            case StorageServiceRepository.StorageRecordResult.DecryptionError decryptionError -> {
+                if (decryptionError.getException() instanceof InvalidKeyException) {
+                    logger.warn("Failed to read storage records, ignoring.");
+                    yield List.of();
+                } else if (decryptionError.getException() instanceof IOException ioe) {
+                    throw ioe;
+                } else {
+                    throw new IOException(decryptionError.getException());
+                }
+            }
+            case StorageServiceRepository.StorageRecordResult.NetworkError networkError ->
+                    throw networkError.getException();
+            case StorageServiceRepository.StorageRecordResult.StatusCodeError statusCodeError ->
+                    throw statusCodeError.getException();
+            case StorageServiceRepository.StorageRecordResult.Success success -> success.getRecords();
+            default -> throw new IllegalStateException("Unexpected value: " + result);
+        };
     }
 
     private List<StorageId> getAllLocalStorageIds(final Connection connection) throws SQLException {
@@ -436,12 +516,10 @@ public class StorageHelper {
             final Connection connection,
             final List<StorageId> storageIds
     ) throws SQLException {
-        final var records = new ArrayList<SignalStorageRecord>();
+        final var records = new ArrayList<SignalStorageRecord>(storageIds.size());
         for (final var storageId : storageIds) {
             final var record = buildLocalStorageRecord(connection, storageId);
-            if (record != null) {
-                records.add(record);
-            }
+            records.add(record);
         }
         return records;
     }
@@ -455,25 +533,31 @@ public class StorageHelper {
                 final var recipient = account.getRecipientStore().getRecipient(connection, storageId);
                 final var address = recipient.getAddress().getIdentifier();
                 final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, address);
-                yield StorageSyncModels.localToRemoteRecord(recipient, identity, storageId.getRaw());
+                final var record = StorageSyncModels.localToRemoteRecord(recipient, identity);
+                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().contact(record).build());
             }
             case ManifestRecord.Identifier.Type.GROUPV1 -> {
                 final var groupV1 = account.getGroupStore().getGroupV1(connection, storageId);
-                yield StorageSyncModels.localToRemoteRecord(groupV1, storageId.getRaw());
+                final var record = StorageSyncModels.localToRemoteRecord(groupV1);
+                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().groupV1(record).build());
             }
             case ManifestRecord.Identifier.Type.GROUPV2 -> {
                 final var groupV2 = account.getGroupStore().getGroupV2(connection, storageId);
-                yield StorageSyncModels.localToRemoteRecord(groupV2, storageId.getRaw());
+                final var record = StorageSyncModels.localToRemoteRecord(groupV2);
+                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().groupV2(record).build());
             }
             case ManifestRecord.Identifier.Type.ACCOUNT -> {
                 final var selfRecipient = account.getRecipientStore()
                         .getRecipient(connection, account.getSelfRecipientId());
-                yield StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
+
+                final var record = StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
                         selfRecipient,
-                        account.getUsernameLink(),
-                        storageId.getRaw());
+                        account.getUsernameLink());
+                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().account(record).build());
+            }
+            case null, default -> {
+                throw new AssertionError("Got unknown local storage record type: " + storageId);
             }
-            case null, default -> throw new AssertionError("Got unknown local storage record type: " + storageId);
         };
     }
 
@@ -537,13 +621,24 @@ public class StorageHelper {
         final var groupV2RecordProcessor = new GroupV2RecordProcessor(account, connection);
 
         for (final var record : records) {
-            logger.debug("Reading record of type {}", record.getType());
-            switch (ManifestRecord.Identifier.Type.fromValue(record.getType())) {
-                case ACCOUNT -> accountRecordProcessor.process(record.getAccount().get());
-                case GROUPV1 -> groupV1RecordProcessor.process(record.getGroupV1().get());
-                case GROUPV2 -> groupV2RecordProcessor.process(record.getGroupV2().get());
-                case CONTACT -> contactRecordProcessor.process(record.getContact().get());
-                case null, default -> unknownRecords.add(record.getId());
+            if (record.getProto().account != null) {
+                logger.debug("Reading record {} of type account", record.getId());
+                accountRecordProcessor.process(StorageRecordConvertersKt.toSignalAccountRecord(record.getProto().account,
+                        record.getId()));
+            } else if (record.getProto().groupV1 != null) {
+                logger.debug("Reading record {} of type groupV1", record.getId());
+                groupV1RecordProcessor.process(StorageRecordConvertersKt.toSignalGroupV1Record(record.getProto().groupV1,
+                        record.getId()));
+            } else if (record.getProto().groupV2 != null) {
+                logger.debug("Reading record {} of type groupV2", record.getId());
+                groupV2RecordProcessor.process(StorageRecordConvertersKt.toSignalGroupV2Record(record.getProto().groupV2,
+                        record.getId()));
+            } else if (record.getProto().contact != null) {
+                logger.debug("Reading record {} of type contact", record.getId());
+                contactRecordProcessor.process(StorageRecordConvertersKt.toSignalContactRecord(record.getProto().contact,
+                        record.getId()));
+            } else {
+                unknownRecords.add(record.getId());
             }
         }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 70427f00..39726df8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -247,10 +247,14 @@ public class SyncHelper {
     }
 
     public SendMessageResult sendBlockedList() {
-        var addresses = new ArrayList<SignalServiceAddress>();
+        var addresses = new ArrayList<BlockedListMessage.Individual>();
         for (var record : account.getContactStore().getContacts()) {
             if (record.second().isBlocked()) {
-                addresses.add(context.getRecipientHelper().resolveSignalServiceAddress(record.first()));
+                final var address = account.getRecipientAddressResolver().resolveRecipientAddress(record.first());
+                if (address.aci().isPresent() || address.number().isPresent()) {
+                    addresses.add(new BlockedListMessage.Individual(address.aci().orElse(null),
+                            address.number().orElse(null)));
+                }
             }
         }
         var groupIds = new ArrayList<byte[]>();
@@ -276,8 +280,10 @@ public class SyncHelper {
     }
 
     public SendMessageResult sendKeysMessage() {
-        var keysMessage = new KeysMessage(Optional.ofNullable(account.getOrCreateStorageKey()),
-                Optional.ofNullable(account.getOrCreatePinMasterKey()));
+        var keysMessage = new KeysMessage(account.getOrCreateStorageKey(),
+                account.getOrCreatePinMasterKey(),
+                account.getOrCreateAccountEntropyPool(),
+                account.getOrCreateMediaRootBackupKey());
         return context.getSendHelper().sendSyncMessage(SignalServiceSyncMessage.forKeys(keysMessage));
     }
 
@@ -405,7 +411,7 @@ public class SyncHelper {
                     builder.withMessageExpirationTimeVersion(c.getExpirationTimerVersion().get());
                 } else {
                     logger.debug(
-                            "[ContactSync] {} was synced with an old expiration timer. Ignoring. Received: {} Current: ${}",
+                            "[ContactSync] {} was synced with an old expiration timer. Ignoring. Received: {} Current: {}",
                             recipientId,
                             c.getExpirationTimerVersion(),
                             contact == null ? 1 : contact.messageExpirationTimeVersion());
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 7ee2b39e..90e3b159 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -15,10 +15,13 @@ import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.link.LinkDeviceApi;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.api.services.ProfileService;
+import org.whispersystems.signalservice.api.storage.StorageServiceApi;
+import org.whispersystems.signalservice.api.storage.StorageServiceRepository;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
@@ -49,6 +52,8 @@ public class SignalDependencies {
     private SignalServiceAccountManager accountManager;
     private GroupsV2Api groupsV2Api;
     private RegistrationApi registrationApi;
+    private LinkDeviceApi linkDeviceApi;
+    private StorageServiceApi storageServiceApi;
     private GroupsV2Operations groupsV2Operations;
     private ClientZkOperations clientZkOperations;
 
@@ -155,6 +160,19 @@ public class SignalDependencies {
         return getOrCreate(() -> registrationApi, () -> registrationApi = getAccountManager().getRegistrationApi());
     }
 
+    public LinkDeviceApi getLinkDeviceApi() {
+        return getOrCreate(() -> linkDeviceApi, () -> linkDeviceApi = new LinkDeviceApi(getPushServiceSocket()));
+    }
+
+    private StorageServiceApi getStorageServiceApi() {
+        return getOrCreate(() -> storageServiceApi,
+                () -> storageServiceApi = new StorageServiceApi(getPushServiceSocket()));
+    }
+
+    public StorageServiceRepository getStorageServiceRepository() {
+        return new StorageServiceRepository(getStorageServiceApi());
+    }
+
     public GroupsV2Operations getGroupsV2Operations() {
         return getOrCreate(() -> groupsV2Operations,
                 () -> groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
diff --git a/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java b/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java
index 85cfbe2c..d695c7b1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java
+++ b/lib/src/main/java/org/asamk/signal/manager/jobs/SyncStorageJob.java
@@ -8,13 +8,27 @@ import java.io.IOException;
 
 public class SyncStorageJob implements Job {
 
+    private final boolean forcePush;
+
     private static final Logger logger = LoggerFactory.getLogger(SyncStorageJob.class);
 
+    public SyncStorageJob() {
+        this.forcePush = false;
+    }
+
+    public SyncStorageJob(final boolean forcePush) {
+        this.forcePush = forcePush;
+    }
+
     @Override
     public void run(Context context) {
         logger.trace("Running storage sync job");
         try {
-            context.getStorageHelper().syncDataWithStorage();
+            if (forcePush) {
+                context.getStorageHelper().forcePushToStorage();
+            } else {
+                context.getStorageHelper().syncDataWithStorage();
+            }
         } catch (IOException e) {
             logger.warn("Failed to sync storage data", e);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 5c8a5530..2529ad4a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -65,10 +65,12 @@ import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.AccountEntropyPool;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
+import org.whispersystems.signalservice.api.backup.MediaRootBackupKey;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.ServiceId;
@@ -138,6 +140,8 @@ public class SignalAccount implements Closeable {
     private String registrationLockPin;
     private MasterKey pinMasterKey;
     private StorageKey storageKey;
+    private AccountEntropyPool accountEntropyPool;
+    private MediaRootBackupKey mediaRootBackupKey;
     private ProfileKey profileKey;
 
     private Settings settings;
@@ -305,6 +309,7 @@ public class SignalAccount implements Closeable {
         this.isMultiDevice = true;
         setLastReceiveTimestamp(0L);
         this.pinMasterKey = masterKey;
+        this.accountEntropyPool = null;
         getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
         this.storageKey = null;
@@ -339,6 +344,7 @@ public class SignalAccount implements Closeable {
             final PreKeyCollection pniPreKeys
     ) {
         this.pinMasterKey = masterKey;
+        this.accountEntropyPool = null;
         getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
         this.storageKey = null;
@@ -499,6 +505,12 @@ public class SignalAccount implements Closeable {
             if (storage.storageKey != null) {
                 storageKey = new StorageKey(base64.decode(storage.storageKey));
             }
+            if (storage.accountEntropyPool != null) {
+                accountEntropyPool = new AccountEntropyPool(storage.accountEntropyPool);
+            }
+            if (storage.mediaRootBackupKey != null) {
+                mediaRootBackupKey = new MediaRootBackupKey(base64.decode(storage.mediaRootBackupKey));
+            }
             if (storage.profileKey != null) {
                 try {
                     profileKey = new ProfileKey(base64.decode(storage.profileKey));
@@ -981,6 +993,8 @@ public class SignalAccount implements Closeable {
                     registrationLockPin,
                     pinMasterKey == null ? null : base64.encodeToString(pinMasterKey.serialize()),
                     storageKey == null ? null : base64.encodeToString(storageKey.serialize()),
+                    accountEntropyPool == null ? null : accountEntropyPool.getValue(),
+                    mediaRootBackupKey == null ? null : base64.encodeToString(mediaRootBackupKey.getValue()),
                     profileKey == null ? null : base64.encodeToString(profileKey.serialize()),
                     usernameLink == null ? null : base64.encodeToString(usernameLink.getEntropy()),
                     usernameLink == null ? null : usernameLink.getServerId().toString());
@@ -1442,6 +1456,10 @@ public class SignalAccount implements Closeable {
         return selfRecipientId;
     }
 
+    public Profile getSelfRecipientProfile() {
+        return recipientStore.getProfile(selfRecipientId);
+    }
+
     public String getSessionId(final String forNumber) {
         final var keyValueStore = getKeyValueStore();
         final var sessionNumber = keyValueStore.getEntry(verificationSessionNumber);
@@ -1512,31 +1530,50 @@ public class SignalAccount implements Closeable {
     public MasterKey getPinBackedMasterKey() {
         if (registrationLockPin == null) {
             return null;
+        } else if (!isPrimaryDevice()) {
+            return getMasterKey();
         }
-        return pinMasterKey;
+        return getOrCreatePinMasterKey();
     }
 
     public MasterKey getOrCreatePinMasterKey() {
-        if (pinMasterKey == null) {
-            pinMasterKey = KeyUtils.createMasterKey();
-            save();
+        final var key = getMasterKey();
+        if (key != null) {
+            return key;
         }
+
+        pinMasterKey = KeyUtils.createMasterKey();
+        save();
         return pinMasterKey;
     }
 
+    private MasterKey getMasterKey() {
+        if (pinMasterKey != null) {
+            return pinMasterKey;
+        } else if (accountEntropyPool != null) {
+            return accountEntropyPool.deriveMasterKey();
+        }
+        return null;
+    }
+
     public void setMasterKey(MasterKey masterKey) {
         if (isPrimaryDevice()) {
             return;
         }
         this.pinMasterKey = masterKey;
+        if (masterKey != null) {
+            this.storageKey = null;
+        }
         save();
     }
 
     public StorageKey getOrCreateStorageKey() {
-        if (pinMasterKey != null) {
-            return pinMasterKey.deriveStorageServiceKey();
-        } else if (storageKey != null) {
+        if (storageKey != null) {
             return storageKey;
+        } else if (pinMasterKey != null) {
+            return pinMasterKey.deriveStorageServiceKey();
+        } else if (accountEntropyPool != null) {
+            return accountEntropyPool.deriveMasterKey().deriveStorageServiceKey();
         } else if (!isPrimaryDevice() || !isMultiDevice()) {
             // Only upload storage, if a pin master key already exists or linked devices exist
             return null;
@@ -1553,6 +1590,40 @@ public class SignalAccount implements Closeable {
         save();
     }
 
+    public AccountEntropyPool getOrCreateAccountEntropyPool() {
+        if (accountEntropyPool == null) {
+            accountEntropyPool = AccountEntropyPool.Companion.generate();
+            save();
+        }
+        return accountEntropyPool;
+    }
+
+    public void setAccountEntropyPool(final AccountEntropyPool accountEntropyPool) {
+        this.accountEntropyPool = accountEntropyPool;
+        if (accountEntropyPool != null) {
+            this.storageKey = null;
+            this.pinMasterKey = null;
+        }
+        save();
+    }
+
+    public boolean needsStorageKeyMigration() {
+        return isPrimaryDevice() && (storageKey != null || pinMasterKey != null);
+    }
+
+    public MediaRootBackupKey getOrCreateMediaRootBackupKey() {
+        if (mediaRootBackupKey == null) {
+            mediaRootBackupKey = KeyUtils.createMediaRootBackupKey();
+            save();
+        }
+        return mediaRootBackupKey;
+    }
+
+    public void setMediaRootBackupKey(final MediaRootBackupKey mediaRootBackupKey) {
+        this.mediaRootBackupKey = mediaRootBackupKey;
+        save();
+    }
+
     public String getRecoveryPassword() {
         final var masterKey = getPinBackedMasterKey();
         if (masterKey == null) {
@@ -1575,7 +1646,7 @@ public class SignalAccount implements Closeable {
             return Optional.empty();
         }
         try (var inputStream = new FileInputStream(storageManifestFile)) {
-            return Optional.of(SignalStorageManifest.deserialize(inputStream.readAllBytes()));
+            return Optional.of(SignalStorageManifest.Companion.deserialize(inputStream.readAllBytes()));
         } catch (IOException e) {
             logger.warn("Failed to read local storage manifest.", e);
             return Optional.empty();
@@ -1882,6 +1953,8 @@ public class SignalAccount implements Closeable {
             String registrationLockPin,
             String pinMasterKey,
             String storageKey,
+            String accountEntropyPool,
+            String mediaRootBackupKey,
             String profileKey,
             String usernameLinkEntropy,
             String usernameLinkServerId
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 18dd1869..b2f7dd29 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -12,8 +12,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
-import org.whispersystems.signalservice.api.util.OptionalUtil;
+import org.whispersystems.signalservice.api.storage.StorageId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
 import org.whispersystems.signalservice.internal.storage.protos.OptionalBool;
 
 import java.sql.Connection;
@@ -21,6 +22,9 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Optional;
 
+import static org.asamk.signal.manager.util.Utils.firstNonEmpty;
+import static org.asamk.signal.manager.util.Utils.firstNonNull;
+
 /**
  * Processes {@link SignalAccountRecord}s.
  */
@@ -43,10 +47,10 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var selfRecipientId = account.getSelfRecipientId();
         final var recipient = account.getRecipientStore().getRecipient(connection, selfRecipientId);
         final var storageId = account.getRecipientStore().getSelfStorageId(connection);
-        this.localAccountRecord = StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
-                recipient,
-                account.getUsernameLink(),
-                storageId.getRaw()).getAccount().get();
+        this.localAccountRecord = new SignalAccountRecord(storageId,
+                StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
+                        recipient,
+                        account.getUsernameLink()));
     }
 
     @Override
@@ -60,99 +64,73 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
     }
 
     @Override
-    protected SignalAccountRecord merge(SignalAccountRecord remote, SignalAccountRecord local) {
+    protected SignalAccountRecord merge(SignalAccountRecord remoteRecord, SignalAccountRecord localRecord) {
+        final var remote = remoteRecord.getProto();
+        final var local = localRecord.getProto();
         String givenName;
         String familyName;
-        if (remote.getGivenName().isPresent() || remote.getFamilyName().isPresent()) {
-            givenName = remote.getGivenName().orElse("");
-            familyName = remote.getFamilyName().orElse("");
+        if (!remote.givenName.isEmpty() || !remote.familyName.isEmpty()) {
+            givenName = remote.givenName;
+            familyName = remote.familyName;
         } else {
-            givenName = local.getGivenName().orElse("");
-            familyName = local.getFamilyName().orElse("");
+            givenName = local.givenName;
+            familyName = local.familyName;
         }
 
-        final var payments = remote.getPayments().getEntropy().isPresent() ? remote.getPayments() : local.getPayments();
-        final var subscriber = remote.getSubscriber().getId().isPresent()
-                ? remote.getSubscriber()
-                : local.getSubscriber();
-        final var storyViewReceiptsState = remote.getStoryViewReceiptsState() == OptionalBool.UNSET
-                ? local.getStoryViewReceiptsState()
-                : remote.getStoryViewReceiptsState();
-        final var unknownFields = remote.serializeUnknownFields();
-        final var avatarUrlPath = OptionalUtil.or(remote.getAvatarUrlPath(), local.getAvatarUrlPath()).orElse("");
-        final var profileKey = OptionalUtil.or(remote.getProfileKey(), local.getProfileKey()).orElse(null);
-        final var noteToSelfArchived = remote.isNoteToSelfArchived();
-        final var noteToSelfForcedUnread = remote.isNoteToSelfForcedUnread();
-        final var readReceipts = remote.isReadReceiptsEnabled();
-        final var typingIndicators = remote.isTypingIndicatorsEnabled();
-        final var sealedSenderIndicators = remote.isSealedSenderIndicatorsEnabled();
-        final var linkPreviews = remote.isLinkPreviewsEnabled();
-        final var unlisted = remote.isPhoneNumberUnlisted();
-        final var pinnedConversations = remote.getPinnedConversations();
-        final var phoneNumberSharingMode = remote.getPhoneNumberSharingMode();
-        final var preferContactAvatars = remote.isPreferContactAvatars();
-        final var universalExpireTimer = remote.getUniversalExpireTimer();
-        final var e164 = account.isPrimaryDevice() ? local.getE164() : remote.getE164();
-        final var defaultReactions = !remote.getDefaultReactions().isEmpty()
-                ? remote.getDefaultReactions()
-                : local.getDefaultReactions();
-        final var displayBadgesOnProfile = remote.isDisplayBadgesOnProfile();
-        final var subscriptionManuallyCancelled = remote.isSubscriptionManuallyCancelled();
-        final var keepMutedChatsArchived = remote.isKeepMutedChatsArchived();
-        final var hasSetMyStoriesPrivacy = remote.hasSetMyStoriesPrivacy();
-        final var hasViewedOnboardingStory = remote.hasViewedOnboardingStory() || local.hasViewedOnboardingStory();
-        final var storiesDisabled = remote.isStoriesDisabled();
-        final var hasSeenGroupStoryEducation = remote.hasSeenGroupStoryEducationSheet()
-                || local.hasSeenGroupStoryEducationSheet();
-        boolean hasSeenUsernameOnboarding = remote.hasCompletedUsernameOnboarding()
-                || local.hasCompletedUsernameOnboarding();
-        final var username = remote.getUsername();
-        final var usernameLink = remote.getUsernameLink();
-
-        final var mergedBuilder = new SignalAccountRecord.Builder(remote.getId().getRaw(), unknownFields).setGivenName(
-                        givenName)
-                .setFamilyName(familyName)
-                .setAvatarUrlPath(avatarUrlPath)
-                .setProfileKey(profileKey)
-                .setNoteToSelfArchived(noteToSelfArchived)
-                .setNoteToSelfForcedUnread(noteToSelfForcedUnread)
-                .setReadReceiptsEnabled(readReceipts)
-                .setTypingIndicatorsEnabled(typingIndicators)
-                .setSealedSenderIndicatorsEnabled(sealedSenderIndicators)
-                .setLinkPreviewsEnabled(linkPreviews)
-                .setUnlistedPhoneNumber(unlisted)
-                .setPhoneNumberSharingMode(phoneNumberSharingMode)
-                .setPinnedConversations(pinnedConversations)
-                .setPreferContactAvatars(preferContactAvatars)
-                .setPayments(payments.isEnabled(), payments.getEntropy().orElse(null))
-                .setUniversalExpireTimer(universalExpireTimer)
-                .setDefaultReactions(defaultReactions)
-                .setSubscriber(subscriber)
-                .setDisplayBadgesOnProfile(displayBadgesOnProfile)
-                .setSubscriptionManuallyCancelled(subscriptionManuallyCancelled)
-                .setKeepMutedChatsArchived(keepMutedChatsArchived)
-                .setHasSetMyStoriesPrivacy(hasSetMyStoriesPrivacy)
-                .setHasViewedOnboardingStory(hasViewedOnboardingStory)
-                .setStoriesDisabled(storiesDisabled)
-                .setHasSeenGroupStoryEducationSheet(hasSeenGroupStoryEducation)
-                .setHasCompletedUsernameOnboarding(hasSeenUsernameOnboarding)
-                .setStoryViewReceiptsState(storyViewReceiptsState)
-                .setUsername(username)
-                .setUsernameLink(usernameLink)
-                .setE164(e164);
+        final var mergedBuilder = SignalAccountRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
+                .givenName(givenName)
+                .familyName(familyName)
+                .avatarUrlPath(firstNonEmpty(remote.avatarUrlPath, local.avatarUrlPath))
+                .profileKey(firstNonEmpty(remote.profileKey, local.profileKey))
+                .noteToSelfArchived(remote.noteToSelfArchived)
+                .noteToSelfMarkedUnread(remote.noteToSelfMarkedUnread)
+                .readReceipts(remote.readReceipts)
+                .typingIndicators(remote.typingIndicators)
+                .sealedSenderIndicators(remote.sealedSenderIndicators)
+                .linkPreviews(remote.linkPreviews)
+                .unlistedPhoneNumber(remote.unlistedPhoneNumber)
+                .phoneNumberSharingMode(remote.phoneNumberSharingMode)
+                .pinnedConversations(remote.pinnedConversations)
+                .preferContactAvatars(remote.preferContactAvatars)
+                .universalExpireTimer(remote.universalExpireTimer)
+                .preferredReactionEmoji(firstNonEmpty(remote.preferredReactionEmoji, local.preferredReactionEmoji))
+                .subscriberId(firstNonEmpty(remote.subscriberId, local.subscriberId))
+                .subscriberCurrencyCode(firstNonEmpty(remote.subscriberCurrencyCode, local.subscriberCurrencyCode))
+                .backupsSubscriberId(firstNonEmpty(remote.backupsSubscriberId, local.backupsSubscriberId))
+                .backupsSubscriberCurrencyCode(firstNonEmpty(remote.backupsSubscriberCurrencyCode,
+                        local.backupsSubscriberCurrencyCode))
+                .displayBadgesOnProfile(remote.displayBadgesOnProfile)
+                .subscriptionManuallyCancelled(remote.subscriptionManuallyCancelled)
+                .keepMutedChatsArchived(remote.keepMutedChatsArchived)
+                .hasSetMyStoriesPrivacy(remote.hasSetMyStoriesPrivacy)
+                .hasViewedOnboardingStory(remote.hasViewedOnboardingStory || local.hasViewedOnboardingStory)
+                .storiesDisabled(remote.storiesDisabled)
+                .hasSeenGroupStoryEducationSheet(remote.hasSeenGroupStoryEducationSheet
+                        || local.hasSeenGroupStoryEducationSheet)
+                .hasCompletedUsernameOnboarding(remote.hasCompletedUsernameOnboarding
+                        || local.hasCompletedUsernameOnboarding)
+                .storyViewReceiptsEnabled(remote.storyViewReceiptsEnabled == OptionalBool.UNSET
+                        ? local.storyViewReceiptsEnabled
+                        : remote.storyViewReceiptsEnabled)
+                .username(remote.username)
+                .usernameLink(remote.usernameLink)
+                .e164(account.isPrimaryDevice() ? local.e164 : remote.e164);
+        if (firstNonNull(remote.payments, local.payments) != null) {
+            mergedBuilder.payments(firstNonNull(remote.payments, local.payments));
+        }
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
         if (matchesRemote) {
-            return remote;
+            return remoteRecord;
         }
 
         final var matchesLocal = doProtosMatch(merged, local);
         if (matchesLocal) {
-            return local;
+            return localRecord;
         }
 
-        return mergedBuilder.setId(KeyUtils.createRawStorageId()).build();
+        return new SignalAccountRecord(StorageId.forAccount(KeyUtils.createRawStorageId()), mergedBuilder.build());
     }
 
     @Override
@@ -164,56 +142,55 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
     @Override
     protected void updateLocal(StorageRecordUpdate<SignalAccountRecord> update) throws SQLException {
         final var accountRecord = update.newRecord();
+        final var accountProto = accountRecord.getProto();
 
-        if (!accountRecord.getE164().equals(account.getNumber())) {
+        if (!accountProto.e164.equals(account.getNumber())) {
             jobExecutor.enqueueJob(new CheckWhoAmIJob());
         }
 
-        account.getConfigurationStore().setReadReceipts(connection, accountRecord.isReadReceiptsEnabled());
-        account.getConfigurationStore().setTypingIndicators(connection, accountRecord.isTypingIndicatorsEnabled());
+        account.getConfigurationStore().setReadReceipts(connection, accountProto.readReceipts);
+        account.getConfigurationStore().setTypingIndicators(connection, accountProto.typingIndicators);
         account.getConfigurationStore()
-                .setUnidentifiedDeliveryIndicators(connection, accountRecord.isSealedSenderIndicatorsEnabled());
-        account.getConfigurationStore().setLinkPreviews(connection, accountRecord.isLinkPreviewsEnabled());
+                .setUnidentifiedDeliveryIndicators(connection, accountProto.sealedSenderIndicators);
+        account.getConfigurationStore().setLinkPreviews(connection, accountProto.linkPreviews);
         account.getConfigurationStore()
                 .setPhoneNumberSharingMode(connection,
-                        StorageSyncModels.remoteToLocal(accountRecord.getPhoneNumberSharingMode()));
-        account.getConfigurationStore().setPhoneNumberUnlisted(connection, accountRecord.isPhoneNumberUnlisted());
+                        StorageSyncModels.remoteToLocal(accountProto.phoneNumberSharingMode));
+        account.getConfigurationStore().setPhoneNumberUnlisted(connection, accountProto.unlistedPhoneNumber);
 
-        account.setUsername(accountRecord.getUsername() != null && !accountRecord.getUsername().isEmpty()
-                ? accountRecord.getUsername()
-                : null);
-        if (accountRecord.getUsernameLink() != null) {
-            final var usernameLink = accountRecord.getUsernameLink();
+        account.setUsername(!accountProto.username.isEmpty() ? accountProto.username : null);
+        if (accountProto.usernameLink != null) {
+            final var usernameLink = accountProto.usernameLink;
             account.setUsernameLink(new UsernameLinkComponents(usernameLink.entropy.toByteArray(),
                     UuidUtil.parseOrThrow(usernameLink.serverId.toByteArray())));
             account.getConfigurationStore().setUsernameLinkColor(connection, usernameLink.color.name());
         }
 
-        if (accountRecord.getProfileKey().isPresent()) {
+        if (accountProto.profileKey.size() > 0) {
             ProfileKey profileKey;
             try {
-                profileKey = new ProfileKey(accountRecord.getProfileKey().get());
+                profileKey = new ProfileKey(accountProto.profileKey.toByteArray());
             } catch (InvalidInputException e) {
                 logger.debug("Received invalid profile key from storage");
                 profileKey = null;
             }
             if (profileKey != null) {
                 account.setProfileKey(profileKey);
-                final var avatarPath = accountRecord.getAvatarUrlPath().orElse(null);
+                final var avatarPath = accountProto.avatarUrlPath.isEmpty() ? null : accountProto.avatarUrlPath;
                 jobExecutor.enqueueJob(new DownloadProfileAvatarJob(avatarPath));
             }
         }
 
         final var profile = account.getRecipientStore().getProfile(connection, account.getSelfRecipientId());
         final var builder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
-        builder.withGivenName(accountRecord.getGivenName().orElse(null));
-        builder.withFamilyName(accountRecord.getFamilyName().orElse(null));
+        builder.withGivenName(accountProto.givenName);
+        builder.withFamilyName(accountProto.familyName);
         account.getRecipientStore().storeProfile(connection, account.getSelfRecipientId(), builder.build());
         account.getRecipientStore()
                 .storeStorageRecord(connection,
                         account.getSelfRecipientId(),
                         accountRecord.getId(),
-                        accountRecord.toProto().encode());
+                        accountProto.encode());
     }
 
     @Override
@@ -221,7 +198,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         return 0;
     }
 
-    private static boolean doProtosMatch(SignalAccountRecord merged, SignalAccountRecord other) {
-        return Arrays.equals(merged.toProto().encode(), other.toProto().encode());
+    private static boolean doProtosMatch(AccountRecord merged, AccountRecord other) {
+        return Arrays.equals(merged.encode(), other.encode());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 3fa8598f..ee4b04fe 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -17,7 +17,8 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.storage.SignalContactRecord;
-import org.whispersystems.signalservice.api.util.OptionalUtil;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
 
 import java.sql.Connection;
@@ -27,6 +28,11 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
 
+import okio.ByteString;
+
+import static org.asamk.signal.manager.util.Utils.firstNonEmpty;
+import static org.asamk.signal.manager.util.Utils.nullIfEmpty;
+
 public class ContactRecordProcessor extends DefaultStorageRecordProcessor<SignalContactRecord> {
 
     private static final Logger logger = LoggerFactory.getLogger(ContactRecordProcessor.class);
@@ -55,20 +61,24 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
      * - You can't have a contact record for yourself. That should be an account record.
      */
     @Override
-    protected boolean isInvalid(SignalContactRecord remote) {
-        boolean hasAci = remote.getAci().isPresent() && remote.getAci().get().isValid();
-        boolean hasPni = remote.getPni().isPresent() && remote.getPni().get().isValid();
+    protected boolean isInvalid(SignalContactRecord remoteRecord) {
+        final var remote = remoteRecord.getProto();
+        final var aci = ACI.parseOrNull(remote.aci);
+        final var pni = PNI.parseOrNull(remote.pni);
+        final var e164 = nullIfEmpty(remote.e164);
+        boolean hasAci = aci != null && aci.isValid();
+        boolean hasPni = pni != null && pni.isValid();
 
         if (!hasAci && !hasPni) {
             logger.debug("Found a ContactRecord with neither an ACI nor a PNI -- marking as invalid.");
             return true;
-        } else if (selfAci != null && selfAci.equals(remote.getAci().orElse(null)) || (
-                selfPni != null && selfPni.equals(remote.getPni().orElse(null))
-        ) || (selfNumber != null && selfNumber.equals(remote.getNumber().orElse(null)))) {
+        } else if (selfAci != null && selfAci.equals(aci) || (
+                selfPni != null && selfPni.equals(pni)
+        ) || (selfNumber != null && selfNumber.equals(e164))) {
             logger.debug("Found a ContactRecord for ourselves -- marking as invalid.");
             return true;
-        } else if (remote.getNumber().isPresent() && !isValidE164(remote.getNumber().get())) {
-            logger.debug("Found a record with an invalid E164. Marking as invalid.");
+        } else if (e164 != null && !isValidE164(e164)) {
+            logger.debug("Found a record with an invalid E164 ({}). Marking as invalid.", e164);
             return true;
         } else {
             return false;
@@ -77,7 +87,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
 
     @Override
     protected Optional<SignalContactRecord> getMatching(SignalContactRecord remote) throws SQLException {
-        final var address = getRecipientAddress(remote);
+        final var address = getRecipientAddress(remote.getProto());
         final var recipientId = account.getRecipientStore().resolveRecipient(connection, address);
         final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
 
@@ -85,141 +95,120 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var identity = account.getIdentityKeyStore().getIdentityInfo(connection, identifier);
         final var storageId = account.getRecipientStore().getStorageId(connection, recipientId);
 
-        return Optional.of(StorageSyncModels.localToRemoteRecord(recipient, identity, storageId.getRaw())
-                .getContact()
-                .get());
+        return Optional.of(new SignalContactRecord(storageId,
+                StorageSyncModels.localToRemoteRecord(recipient, identity)));
     }
 
     @Override
-    protected SignalContactRecord merge(SignalContactRecord remote, SignalContactRecord local) {
+    protected SignalContactRecord merge(SignalContactRecord remoteRecord, SignalContactRecord localRecord) {
+        final var remote = remoteRecord.getProto();
+        final var local = localRecord.getProto();
+
         String profileGivenName;
         String profileFamilyName;
-        if (remote.getProfileGivenName().isPresent() || remote.getProfileFamilyName().isPresent()) {
-            profileGivenName = remote.getProfileGivenName().orElse("");
-            profileFamilyName = remote.getProfileFamilyName().orElse("");
+        if (!remote.givenName.isEmpty() || !remote.familyName.isEmpty()) {
+            profileGivenName = remote.givenName;
+            profileFamilyName = remote.familyName;
         } else {
-            profileGivenName = local.getProfileGivenName().orElse("");
-            profileFamilyName = local.getProfileFamilyName().orElse("");
+            profileGivenName = local.givenName;
+            profileFamilyName = local.familyName;
         }
 
         IdentityState identityState;
-        byte[] identityKey;
-        if (remote.getIdentityKey().isPresent() && (
-                remote.getIdentityState() != local.getIdentityState()
-                        || local.getIdentityKey().isEmpty()
-                        || !account.isPrimaryDevice()
+        ByteString identityKey;
+        if (remote.identityKey.size() > 0 && (
+                !account.isPrimaryDevice()
+                        || remote.identityState != local.identityState
+                        || local.identityKey.size() == 0
 
         )) {
-            identityState = remote.getIdentityState();
-            identityKey = remote.getIdentityKey().get();
+            identityState = remote.identityState;
+            identityKey = remote.identityKey;
         } else {
-            identityState = local.getIdentityState();
-            identityKey = local.getIdentityKey().orElse(null);
+            identityState = local.identityState;
+            identityKey = local.identityKey.size() > 0 ? local.identityKey : ByteString.EMPTY;
         }
 
-        if (local.getAci().isPresent()
-                && local.getIdentityKey().isPresent()
-                && remote.getIdentityKey().isPresent()
-                && !Arrays.equals(local.getIdentityKey().get(), remote.getIdentityKey().get())) {
+        if (!local.aci.isEmpty()
+                && local.identityKey.size() > 0
+                && remote.identityKey.size() > 0
+                && !local.identityKey.equals(remote.identityKey)) {
             logger.debug("The local and remote identity keys do not match for {}. Enqueueing a profile fetch.",
-                    local.getAci().orElse(null));
+                    local.aci);
             final var address = getRecipientAddress(local);
             jobExecutor.enqueueJob(new DownloadProfileJob(address));
         }
 
-        final var e164sMatchButPnisDont = local.getNumber().isPresent()
-                && local.getNumber()
-                .get()
-                .equals(remote.getNumber().orElse(null))
-                && local.getPni().isPresent()
-                && remote.getPni().isPresent()
-                && !local.getPni().get().equals(remote.getPni().get());
-
-        final var pnisMatchButE164sDont = local.getPni().isPresent()
-                && local.getPni()
-                .get()
-                .equals(remote.getPni().orElse(null))
-                && local.getNumber().isPresent()
-                && remote.getNumber().isPresent()
-                && !local.getNumber().get().equals(remote.getNumber().get());
-
-        PNI pni;
+        String pni;
         String e164;
-        if (!account.isPrimaryDevice() && (e164sMatchButPnisDont || pnisMatchButE164sDont)) {
-            if (e164sMatchButPnisDont) {
-                logger.debug("Matching E164s, but the PNIs differ! Trusting our local pair.");
-            } else if (pnisMatchButE164sDont) {
-                logger.debug("Matching PNIs, but the E164s differ! Trusting our local pair.");
+        if (account.isPrimaryDevice()) {
+            final var e164sMatchButPnisDont = !local.e164.isEmpty()
+                    && local.e164.equals(remote.e164)
+                    && !local.pni.isEmpty()
+                    && !remote.pni.isEmpty()
+                    && !local.pni.equals(remote.pni);
+
+            final var pnisMatchButE164sDont = !local.pni.isEmpty()
+                    && local.pni.equals(remote.pni)
+                    && !local.e164.isEmpty()
+                    && !remote.e164.isEmpty()
+                    && !local.e164.equals(remote.e164);
+
+            if (e164sMatchButPnisDont || pnisMatchButE164sDont) {
+                if (e164sMatchButPnisDont) {
+                    logger.debug("Matching E164s, but the PNIs differ! Trusting our local pair.");
+                } else if (pnisMatchButE164sDont) {
+                    logger.debug("Matching PNIs, but the E164s differ! Trusting our local pair.");
+                }
+                jobExecutor.enqueueJob(new RefreshRecipientsJob());
+                pni = local.pni;
+                e164 = local.e164;
+            } else {
+                pni = firstNonEmpty(remote.pni, local.pni);
+                e164 = firstNonEmpty(remote.e164, local.e164);
             }
-            jobExecutor.enqueueJob(new RefreshRecipientsJob());
-            pni = local.getPni().get();
-            e164 = local.getNumber().get();
         } else {
-            pni = OptionalUtil.or(remote.getPni(), local.getPni()).orElse(null);
-            e164 = OptionalUtil.or(remote.getNumber(), local.getNumber()).orElse(null);
+            pni = firstNonEmpty(remote.pni, local.pni);
+            e164 = firstNonEmpty(remote.e164, local.e164);
         }
 
-        final var unknownFields = remote.serializeUnknownFields();
-        final var aci = local.getAci().isEmpty() ? remote.getAci().orElse(null) : local.getAci().get();
-        final var profileKey = OptionalUtil.or(remote.getProfileKey(), local.getProfileKey()).orElse(null);
-        final var username = OptionalUtil.or(remote.getUsername(), local.getUsername()).orElse("");
-        final var blocked = remote.isBlocked();
-        final var profileSharing = remote.isProfileSharingEnabled();
-        final var archived = remote.isArchived();
-        final var forcedUnread = remote.isForcedUnread();
-        final var muteUntil = remote.getMuteUntil();
-        final var hideStory = remote.shouldHideStory();
-        final var unregisteredTimestamp = remote.getUnregisteredTimestamp();
-        final var hidden = remote.isHidden();
-        final var systemGivenName = account.isPrimaryDevice()
-                ? local.getSystemGivenName().orElse("")
-                : remote.getSystemGivenName().orElse("");
-        final var systemFamilyName = account.isPrimaryDevice()
-                ? local.getSystemFamilyName().orElse("")
-                : remote.getSystemFamilyName().orElse("");
-        final var systemNickname = remote.getSystemNickname().orElse("");
-        final var nicknameGivenName = remote.getNicknameGivenName().orElse("");
-        final var nicknameFamilyName = remote.getNicknameFamilyName().orElse("");
-        final var pniSignatureVerified = remote.isPniSignatureVerified() || local.isPniSignatureVerified();
-        final var note = remote.getNote().or(local::getNote).orElse("");
-
-        final var mergedBuilder = new SignalContactRecord.Builder(remote.getId().getRaw(), aci, unknownFields).setE164(
-                        e164)
-                .setPni(pni)
-                .setProfileGivenName(profileGivenName)
-                .setProfileFamilyName(profileFamilyName)
-                .setSystemGivenName(systemGivenName)
-                .setSystemFamilyName(systemFamilyName)
-                .setSystemNickname(systemNickname)
-                .setProfileKey(profileKey)
-                .setUsername(username)
-                .setIdentityState(identityState)
-                .setIdentityKey(identityKey)
-                .setBlocked(blocked)
-                .setProfileSharingEnabled(profileSharing)
-                .setArchived(archived)
-                .setForcedUnread(forcedUnread)
-                .setMuteUntil(muteUntil)
-                .setHideStory(hideStory)
-                .setUnregisteredTimestamp(unregisteredTimestamp)
-                .setHidden(hidden)
-                .setPniSignatureVerified(pniSignatureVerified)
-                .setNicknameGivenName(nicknameGivenName)
-                .setNicknameFamilyName(nicknameFamilyName)
-                .setNote(note);
+        final var mergedBuilder = SignalContactRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
+                .aci(local.aci.isEmpty() ? remote.aci : local.aci)
+                .e164(e164)
+                .pni(pni)
+                .givenName(profileGivenName)
+                .familyName(profileFamilyName)
+                .systemGivenName(account.isPrimaryDevice() ? local.systemGivenName : remote.systemGivenName)
+                .systemFamilyName(account.isPrimaryDevice() ? local.systemFamilyName : remote.systemFamilyName)
+                .systemNickname(remote.systemNickname)
+                .profileKey(firstNonEmpty(remote.profileKey, local.profileKey))
+                .username(firstNonEmpty(remote.username, local.username))
+                .identityState(identityState)
+                .identityKey(identityKey)
+                .blocked(remote.blocked)
+                .whitelisted(remote.whitelisted)
+                .archived(remote.archived)
+                .markedUnread(remote.markedUnread)
+                .mutedUntilTimestamp(remote.mutedUntilTimestamp)
+                .hideStory(remote.hideStory)
+                .unregisteredAtTimestamp(remote.unregisteredAtTimestamp)
+                .hidden(remote.hidden)
+                .pniSignatureVerified(remote.pniSignatureVerified || local.pniSignatureVerified)
+                .nickname(remote.nickname)
+                .note(remote.note);
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
         if (matchesRemote) {
-            return remote;
+            return remoteRecord;
         }
 
         final var matchesLocal = doProtosMatch(merged, local);
         if (matchesLocal) {
-            return local;
+            return localRecord;
         }
 
-        return mergedBuilder.setId(KeyUtils.createRawStorageId()).build();
+        return new SignalContactRecord(StorageId.forContact(KeyUtils.createRawStorageId()), mergedBuilder.build());
     }
 
     @Override
@@ -231,7 +220,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
     @Override
     protected void updateLocal(StorageRecordUpdate<SignalContactRecord> update) throws SQLException {
         final var contactRecord = update.newRecord();
-        final var address = getRecipientAddress(contactRecord);
+        final var contactProto = contactRecord.getProto();
+        final var address = getRecipientAddress(contactProto);
         final var recipientId = account.getRecipientStore().resolveRecipientTrusted(connection, address);
         final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
 
@@ -251,95 +241,92 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var contactNickGivenName = contact == null ? null : contact.nickNameGivenName();
         final var contactNickFamilyName = contact == null ? null : contact.nickNameFamilyName();
         final var contactNote = contact == null ? null : contact.note();
-        if (blocked != contactRecord.isBlocked()
-                || profileShared != contactRecord.isProfileSharingEnabled()
-                || archived != contactRecord.isArchived()
-                || hidden != contactRecord.isHidden()
-                || hideStory != contactRecord.shouldHideStory()
-                || muteUntil != contactRecord.getMuteUntil()
-                || unregisteredTimestamp != contactRecord.getUnregisteredTimestamp()
-                || !Objects.equals(contactRecord.getSystemGivenName().orElse(null), contactGivenName)
-                || !Objects.equals(contactRecord.getSystemFamilyName().orElse(null), contactFamilyName)
-                || !Objects.equals(contactRecord.getSystemNickname().orElse(null), contactNickName)
-                || !Objects.equals(contactRecord.getNicknameGivenName().orElse(null), contactNickGivenName)
-                || !Objects.equals(contactRecord.getNicknameFamilyName().orElse(null), contactNickFamilyName)
-                || !Objects.equals(contactRecord.getNote().orElse(null), contactNote)) {
+        if (blocked != contactProto.blocked
+                || profileShared != contactProto.whitelisted
+                || archived != contactProto.archived
+                || hidden != contactProto.hidden
+                || hideStory != contactProto.hideStory
+                || muteUntil != contactProto.mutedUntilTimestamp
+                || unregisteredTimestamp != contactProto.unregisteredAtTimestamp
+                || !Objects.equals(nullIfEmpty(contactProto.systemGivenName), contactGivenName)
+                || !Objects.equals(nullIfEmpty(contactProto.systemFamilyName), contactFamilyName)
+                || !Objects.equals(nullIfEmpty(contactProto.systemNickname), contactNickName)
+                || !Objects.equals(nullIfEmpty(contactProto.nickname == null ? "" : contactProto.nickname.given),
+                contactNickGivenName)
+                || !Objects.equals(nullIfEmpty(contactProto.nickname == null ? "" : contactProto.nickname.family),
+                contactNickFamilyName)
+                || !Objects.equals(nullIfEmpty(contactProto.note), contactNote)) {
             logger.debug("Storing new or updated contact {}", recipientId);
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
-            final var newContact = contactBuilder.withIsBlocked(contactRecord.isBlocked())
-                    .withIsProfileSharingEnabled(contactRecord.isProfileSharingEnabled())
-                    .withIsArchived(contactRecord.isArchived())
-                    .withIsHidden(contactRecord.isHidden())
-                    .withMuteUntil(contactRecord.getMuteUntil())
-                    .withHideStory(contactRecord.shouldHideStory())
-                    .withGivenName(contactRecord.getSystemGivenName().orElse(null))
-                    .withFamilyName(contactRecord.getSystemFamilyName().orElse(null))
-                    .withNickName(contactRecord.getSystemNickname().orElse(null))
-                    .withNickNameGivenName(contactRecord.getNicknameGivenName().orElse(null))
-                    .withNickNameFamilyName(contactRecord.getNicknameFamilyName().orElse(null))
-                    .withNote(contactRecord.getNote().orElse(null))
-                    .withUnregisteredTimestamp(contactRecord.getUnregisteredTimestamp() == 0
-                            ? null
-                            : contactRecord.getUnregisteredTimestamp());
+            final var newContact = contactBuilder.withIsBlocked(contactProto.blocked)
+                    .withIsProfileSharingEnabled(contactProto.whitelisted)
+                    .withIsArchived(contactProto.archived)
+                    .withIsHidden(contactProto.hidden)
+                    .withMuteUntil(contactProto.mutedUntilTimestamp)
+                    .withHideStory(contactProto.hideStory)
+                    .withGivenName(nullIfEmpty(contactProto.systemGivenName))
+                    .withFamilyName(nullIfEmpty(contactProto.systemFamilyName))
+                    .withNickName(nullIfEmpty(contactProto.systemNickname))
+                    .withNickNameGivenName(nullIfEmpty(contactProto.givenName))
+                    .withNickNameFamilyName(nullIfEmpty(contactProto.familyName))
+                    .withNote(nullIfEmpty(contactProto.note))
+                    .withUnregisteredTimestamp(contactProto.unregisteredAtTimestamp);
             account.getRecipientStore().storeContact(connection, recipientId, newContact.build());
         }
 
         final var profile = recipient.getProfile();
         final var profileGivenName = profile == null ? null : profile.getGivenName();
         final var profileFamilyName = profile == null ? null : profile.getFamilyName();
-        if (!Objects.equals(contactRecord.getProfileGivenName().orElse(null), profileGivenName) || !Objects.equals(
-                contactRecord.getProfileFamilyName().orElse(null),
-                profileFamilyName)) {
+        if (!Objects.equals(nullIfEmpty(contactProto.givenName), profileGivenName) || !Objects.equals(nullIfEmpty(
+                contactProto.familyName), profileFamilyName)) {
             final var profileBuilder = profile == null ? Profile.newBuilder() : Profile.newBuilder(profile);
-            final var newProfile = profileBuilder.withGivenName(contactRecord.getProfileGivenName().orElse(null))
-                    .withFamilyName(contactRecord.getProfileFamilyName().orElse(null))
+            final var newProfile = profileBuilder.withGivenName(nullIfEmpty(contactProto.givenName))
+                    .withFamilyName(nullIfEmpty(contactProto.familyName))
                     .build();
             account.getRecipientStore().storeProfile(connection, recipientId, newProfile);
         }
-        if (contactRecord.getProfileKey().isPresent()) {
+        if (contactProto.profileKey.size() > 0) {
             try {
                 logger.trace("Storing profile key {}", recipientId);
-                final var profileKey = new ProfileKey(contactRecord.getProfileKey().get());
+                final var profileKey = new ProfileKey(contactProto.profileKey.toByteArray());
                 account.getRecipientStore().storeProfileKey(connection, recipientId, profileKey);
             } catch (InvalidInputException e) {
                 logger.warn("Received invalid contact profile key from storage");
             }
         }
-        if (contactRecord.getIdentityKey().isPresent() && contactRecord.getAci().isPresent()) {
+        if (contactProto.identityKey.size() > 0 && address.aci().isPresent()) {
             try {
                 logger.trace("Storing identity key {}", recipientId);
-                final var identityKey = new IdentityKey(contactRecord.getIdentityKey().get());
-                account.getIdentityKeyStore()
-                        .saveIdentity(connection, contactRecord.getAci().orElse(null), identityKey);
+                final var identityKey = new IdentityKey(contactProto.identityKey.toByteArray());
+                account.getIdentityKeyStore().saveIdentity(connection, address.aci().get(), identityKey);
 
-                final var trustLevel = StorageSyncModels.remoteToLocal(contactRecord.getIdentityState());
+                final var trustLevel = StorageSyncModels.remoteToLocal(contactProto.identityState);
                 if (trustLevel != null) {
                     account.getIdentityKeyStore()
-                            .setIdentityTrustLevel(connection,
-                                    contactRecord.getAci().orElse(null),
-                                    identityKey,
-                                    trustLevel);
+                            .setIdentityTrustLevel(connection, address.aci().get(), identityKey, trustLevel);
                 }
             } catch (InvalidKeyException e) {
                 logger.warn("Received invalid contact identity key from storage");
             }
         }
         account.getRecipientStore()
-                .storeStorageRecord(connection, recipientId, contactRecord.getId(), contactRecord.toProto().encode());
+                .storeStorageRecord(connection, recipientId, contactRecord.getId(), contactProto.encode());
     }
 
-    private static RecipientAddress getRecipientAddress(final SignalContactRecord contactRecord) {
-        return new RecipientAddress(contactRecord.getAci().orElse(null),
-                contactRecord.getPni().orElse(null),
-                contactRecord.getNumber().orElse(null),
-                contactRecord.getUsername().orElse(null));
+    private static RecipientAddress getRecipientAddress(final ContactRecord contactRecord) {
+        return new RecipientAddress(ACI.parseOrNull(contactRecord.aci),
+                PNI.parseOrNull(contactRecord.pni),
+                nullIfEmpty(contactRecord.e164),
+                nullIfEmpty(contactRecord.username));
     }
 
     @Override
-    public int compare(SignalContactRecord lhs, SignalContactRecord rhs) {
-        if ((lhs.getAci().isPresent() && Objects.equals(lhs.getAci(), rhs.getAci())) || (
-                lhs.getNumber().isPresent() && Objects.equals(lhs.getNumber(), rhs.getNumber())
-        ) || (lhs.getPni().isPresent() && Objects.equals(lhs.getPni(), rhs.getPni()))) {
+    public int compare(SignalContactRecord lhsRecord, SignalContactRecord rhsRecord) {
+        final var lhs = lhsRecord.getProto();
+        final var rhs = rhsRecord.getProto();
+        if ((!lhs.aci.isEmpty() && Objects.equals(lhs.aci, rhs.aci)) || (
+                !lhs.e164.isEmpty() && Objects.equals(lhs.e164, rhs.e164)
+        ) || (!lhs.pni.isEmpty() && Objects.equals(lhs.pni, rhs.pni))) {
             return 0;
         } else {
             return 1;
@@ -350,7 +337,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
         return E164_PATTERN.matcher(value).matches();
     }
 
-    private static boolean doProtosMatch(SignalContactRecord merged, SignalContactRecord other) {
-        return Arrays.equals(merged.toProto().encode(), other.toProto().encode());
+    private static boolean doProtosMatch(ContactRecord merged, ContactRecord other) {
+        return Arrays.equals(merged.encode(), other.encode());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
index 14d3c882..22d18c8b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
@@ -8,6 +8,8 @@ import org.asamk.signal.manager.util.KeyUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.internal.storage.protos.GroupV1Record;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -36,7 +38,7 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
     @Override
     protected boolean isInvalid(SignalGroupV1Record remote) throws SQLException {
         try {
-            final var id = GroupId.unknownVersion(remote.getGroupId());
+            final var id = GroupId.unknownVersion(remote.getProto().id.toByteArray());
             if (!(id instanceof GroupIdV1)) {
                 return true;
             }
@@ -56,7 +58,7 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
 
     @Override
     protected Optional<SignalGroupV1Record> getMatching(SignalGroupV1Record remote) throws SQLException {
-        final var id = GroupId.v1(remote.getGroupId());
+        final var id = GroupId.v1(remote.getProto().id.toByteArray());
         final var group = account.getGroupStore().getGroup(connection, id);
 
         if (group == null) {
@@ -64,39 +66,35 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
         }
 
         final var storageId = account.getGroupStore().getGroupStorageId(connection, id);
-        return Optional.of(StorageSyncModels.localToRemoteRecord(group, storageId.getRaw()).getGroupV1().get());
+        return Optional.of(new SignalGroupV1Record(storageId, StorageSyncModels.localToRemoteRecord(group)));
     }
 
     @Override
-    protected SignalGroupV1Record merge(SignalGroupV1Record remote, SignalGroupV1Record local) {
-        final var unknownFields = remote.serializeUnknownFields();
-        final var blocked = remote.isBlocked();
-        final var profileSharing = remote.isProfileSharingEnabled();
-        final var archived = remote.isArchived();
-        final var forcedUnread = remote.isForcedUnread();
-        final var muteUntil = remote.getMuteUntil();
+    protected SignalGroupV1Record merge(SignalGroupV1Record remoteRecord, SignalGroupV1Record localRecord) {
+        final var remote = remoteRecord.getProto();
+        final var local = localRecord.getProto();
 
-        final var mergedBuilder = new SignalGroupV1Record.Builder(remote.getId().getRaw(),
-                remote.getGroupId(),
-                unknownFields).setBlocked(blocked)
-                .setProfileSharingEnabled(profileSharing)
-                .setForcedUnread(forcedUnread)
-                .setMuteUntil(muteUntil)
-                .setArchived(archived);
+        final var mergedBuilder = SignalGroupV1Record.Companion.newBuilder(remote.unknownFields().toByteArray())
+                .id(remote.id)
+                .blocked(remote.blocked)
+                .whitelisted(remote.whitelisted)
+                .markedUnread(remote.markedUnread)
+                .mutedUntilTimestamp(remote.mutedUntilTimestamp)
+                .archived(remote.archived);
 
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
         if (matchesRemote) {
-            return remote;
+            return remoteRecord;
         }
 
         final var matchesLocal = doProtosMatch(merged, local);
         if (matchesLocal) {
-            return local;
+            return localRecord;
         }
 
-        return mergedBuilder.setId(KeyUtils.createRawStorageId()).build();
+        return new SignalGroupV1Record(StorageId.forGroupV1(KeyUtils.createRawStorageId()), mergedBuilder.build());
     }
 
     @Override
@@ -110,30 +108,28 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
     @Override
     protected void updateLocal(StorageRecordUpdate<SignalGroupV1Record> update) throws SQLException {
         final var groupV1Record = update.newRecord();
-        final var groupIdV1 = GroupId.v1(groupV1Record.getGroupId());
+        final var groupV1Proto = groupV1Record.getProto();
+        final var groupIdV1 = GroupId.v1(groupV1Proto.id.toByteArray());
 
         final var group = account.getGroupStore().getOrCreateGroupV1(connection, groupIdV1);
         if (group != null) {
-            group.setBlocked(groupV1Record.isBlocked());
+            group.setBlocked(groupV1Proto.blocked);
             account.getGroupStore().updateGroup(connection, group);
             account.getGroupStore()
-                    .storeStorageRecord(connection,
-                            group.getGroupId(),
-                            groupV1Record.getId(),
-                            groupV1Record.toProto().encode());
+                    .storeStorageRecord(connection, group.getGroupId(), groupV1Record.getId(), groupV1Proto.encode());
         }
     }
 
     @Override
     public int compare(SignalGroupV1Record lhs, SignalGroupV1Record rhs) {
-        if (Arrays.equals(lhs.getGroupId(), rhs.getGroupId())) {
+        if (lhs.getProto().id.equals(rhs.getProto().id)) {
             return 0;
         } else {
             return 1;
         }
     }
 
-    private static boolean doProtosMatch(SignalGroupV1Record merged, SignalGroupV1Record other) {
-        return Arrays.equals(merged.toProto().encode(), other.toProto().encode());
+    private static boolean doProtosMatch(GroupV1Record merged, GroupV1Record other) {
+        return Arrays.equals(merged.encode(), other.encode());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
index 1b182769..af77e857 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
@@ -3,16 +3,22 @@ package org.asamk.signal.manager.syncStorage;
 import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
+import org.jetbrains.annotations.NotNull;
+import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
+import org.whispersystems.signalservice.api.storage.StorageId;
+import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Optional;
 
+import okio.ByteString;
+
 public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<SignalGroupV2Record> {
 
     private static final Logger logger = LoggerFactory.getLogger(GroupV2RecordProcessor.class);
@@ -26,12 +32,12 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
 
     @Override
     protected boolean isInvalid(SignalGroupV2Record remote) {
-        return remote.getMasterKeyBytes().length != GroupMasterKey.SIZE;
+        return remote.getProto().masterKey.size() != GroupMasterKey.SIZE;
     }
 
     @Override
     protected Optional<SignalGroupV2Record> getMatching(SignalGroupV2Record remote) throws SQLException {
-        final var id = GroupUtils.getGroupIdV2(remote.getMasterKeyOrThrow());
+        final var id = GroupUtils.getGroupIdV2(getGroupMasterKeyOrThrow(remote.getProto().masterKey));
         final var group = account.getGroupStore().getGroup(connection, id);
 
         if (group == null) {
@@ -39,44 +45,37 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
         }
 
         final var storageId = account.getGroupStore().getGroupStorageId(connection, id);
-        return Optional.of(StorageSyncModels.localToRemoteRecord(group, storageId.getRaw()).getGroupV2().get());
+        return Optional.of(new SignalGroupV2Record(storageId, StorageSyncModels.localToRemoteRecord(group)));
     }
 
     @Override
-    protected SignalGroupV2Record merge(SignalGroupV2Record remote, SignalGroupV2Record local) {
-        final var unknownFields = remote.serializeUnknownFields();
-        final var blocked = remote.isBlocked();
-        final var profileSharing = remote.isProfileSharingEnabled();
-        final var archived = remote.isArchived();
-        final var forcedUnread = remote.isForcedUnread();
-        final var muteUntil = remote.getMuteUntil();
-        final var notifyForMentionsWhenMuted = remote.notifyForMentionsWhenMuted();
-        final var hideStory = remote.shouldHideStory();
-        final var storySendMode = remote.getStorySendMode();
+    protected SignalGroupV2Record merge(SignalGroupV2Record remoteRecord, SignalGroupV2Record localRecord) {
+        final var remote = remoteRecord.getProto();
+        final var local = localRecord.getProto();
 
-        final var mergedBuilder = new SignalGroupV2Record.Builder(remote.getId().getRaw(),
-                remote.getMasterKeyBytes(),
-                unknownFields).setBlocked(blocked)
-                .setProfileSharingEnabled(profileSharing)
-                .setArchived(archived)
-                .setForcedUnread(forcedUnread)
-                .setMuteUntil(muteUntil)
-                .setNotifyForMentionsWhenMuted(notifyForMentionsWhenMuted)
-                .setHideStory(hideStory)
-                .setStorySendMode(storySendMode);
+        final var mergedBuilder = SignalGroupV2Record.Companion.newBuilder(remote.unknownFields().toByteArray())
+                .masterKey(remote.masterKey)
+                .blocked(remote.blocked)
+                .whitelisted(remote.whitelisted)
+                .archived(remote.archived)
+                .markedUnread(remote.markedUnread)
+                .mutedUntilTimestamp(remote.mutedUntilTimestamp)
+                .dontNotifyForMentionsIfMuted(remote.dontNotifyForMentionsIfMuted)
+                .hideStory(remote.hideStory)
+                .storySendMode(remote.storySendMode);
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
         if (matchesRemote) {
-            return remote;
+            return remoteRecord;
         }
 
         final var matchesLocal = doProtosMatch(merged, local);
         if (matchesLocal) {
-            return local;
+            return localRecord;
         }
 
-        return mergedBuilder.setId(KeyUtils.createRawStorageId()).build();
+        return new SignalGroupV2Record(StorageId.forGroupV2(KeyUtils.createRawStorageId()), mergedBuilder.build());
     }
 
     @Override
@@ -88,29 +87,36 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
     @Override
     protected void updateLocal(StorageRecordUpdate<SignalGroupV2Record> update) throws SQLException {
         final var groupV2Record = update.newRecord();
-        final var groupMasterKey = groupV2Record.getMasterKeyOrThrow();
+        final var groupV2Proto = groupV2Record.getProto();
+        final var groupMasterKey = getGroupMasterKeyOrThrow(groupV2Proto.masterKey);
 
         final var group = account.getGroupStore().getGroupOrPartialMigrate(connection, groupMasterKey);
-        group.setBlocked(groupV2Record.isBlocked());
-        group.setProfileSharingEnabled(groupV2Record.isProfileSharingEnabled());
+        group.setBlocked(groupV2Proto.blocked);
+        group.setProfileSharingEnabled(groupV2Proto.whitelisted);
         account.getGroupStore().updateGroup(connection, group);
         account.getGroupStore()
-                .storeStorageRecord(connection,
-                        group.getGroupId(),
-                        groupV2Record.getId(),
-                        groupV2Record.toProto().encode());
+                .storeStorageRecord(connection, group.getGroupId(), groupV2Record.getId(), groupV2Proto.encode());
+    }
+
+    @NotNull
+    private static GroupMasterKey getGroupMasterKeyOrThrow(final ByteString masterKey) {
+        try {
+            return new GroupMasterKey(masterKey.toByteArray());
+        } catch (InvalidInputException e) {
+            throw new AssertionError(e);
+        }
     }
 
     @Override
     public int compare(SignalGroupV2Record lhs, SignalGroupV2Record rhs) {
-        if (Arrays.equals(lhs.getMasterKeyBytes(), rhs.getMasterKeyBytes())) {
+        if (lhs.getProto().masterKey.equals(rhs.getProto().masterKey)) {
             return 0;
         } else {
             return 1;
         }
     }
 
-    private static boolean doProtosMatch(SignalGroupV2Record merged, SignalGroupV2Record other) {
-        return Arrays.equals(merged.toProto().encode(), other.toProto().encode());
+    private static boolean doProtosMatch(GroupV2Record merged, GroupV2Record other) {
+        return Arrays.equals(merged.encode(), other.encode());
     }
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index 9c6b7b53..ceea180c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -7,21 +7,27 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.identities.IdentityInfo;
 import org.asamk.signal.manager.storage.recipients.Recipient;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalContactRecord;
 import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
 import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
-import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 import org.whispersystems.signalservice.internal.storage.protos.AccountRecord;
 import org.whispersystems.signalservice.internal.storage.protos.AccountRecord.UsernameLink;
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord;
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.IdentityState;
+import org.whispersystems.signalservice.internal.storage.protos.GroupV1Record;
+import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record;
 
 import java.util.Optional;
 
 import okio.ByteString;
 
+import static org.signal.core.util.StringExtensionsKt.emptyIfNull;
+
 public final class StorageSyncModels {
 
     private StorageSyncModels() {
@@ -42,104 +48,97 @@ public final class StorageSyncModels {
         };
     }
 
-    public static SignalStorageRecord localToRemoteRecord(
+    public static AccountRecord localToRemoteRecord(
             ConfigurationStore configStore,
             Recipient self,
-            UsernameLinkComponents usernameLinkComponents,
-            byte[] rawStorageId
+            UsernameLinkComponents usernameLinkComponents
     ) {
-        final var builder = new SignalAccountRecord.Builder(rawStorageId, self.getStorageRecord());
+        final var builder = SignalAccountRecord.Companion.newBuilder(self.getStorageRecord());
         if (self.getProfileKey() != null) {
-            builder.setProfileKey(self.getProfileKey().serialize());
+            builder.profileKey(ByteString.of(self.getProfileKey().serialize()));
         }
         if (self.getProfile() != null) {
-            builder.setGivenName(self.getProfile().getGivenName())
-                    .setFamilyName(self.getProfile().getFamilyName())
-                    .setAvatarUrlPath(self.getProfile().getAvatarUrlPath());
+            builder.givenName(emptyIfNull(self.getProfile().getGivenName()))
+                    .familyName(emptyIfNull(self.getProfile().getFamilyName()))
+                    .avatarUrlPath(emptyIfNull(self.getProfile().getAvatarUrlPath()));
         }
-        builder.setTypingIndicatorsEnabled(Optional.ofNullable(configStore.getTypingIndicators()).orElse(true))
-                .setReadReceiptsEnabled(Optional.ofNullable(configStore.getReadReceipts()).orElse(true))
-                .setSealedSenderIndicatorsEnabled(Optional.ofNullable(configStore.getUnidentifiedDeliveryIndicators())
+        builder.typingIndicators(Optional.ofNullable(configStore.getTypingIndicators()).orElse(true))
+                .readReceipts(Optional.ofNullable(configStore.getReadReceipts()).orElse(true))
+                .sealedSenderIndicators(Optional.ofNullable(configStore.getUnidentifiedDeliveryIndicators())
                         .orElse(true))
-                .setLinkPreviewsEnabled(Optional.ofNullable(configStore.getLinkPreviews()).orElse(true))
-                .setUnlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted()).orElse(false))
-                .setPhoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
+                .linkPreviews(Optional.ofNullable(configStore.getLinkPreviews()).orElse(true))
+                .unlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted()).orElse(false))
+                .phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
                         .map(StorageSyncModels::localToRemote)
                         .orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))
-                .setE164(self.getAddress().number().orElse(""))
-                .setUsername(self.getAddress().username().orElse(null));
+                .e164(self.getAddress().number().orElse(""))
+                .username(self.getAddress().username().orElse(""));
         if (usernameLinkComponents != null) {
             final var linkColor = configStore.getUsernameLinkColor();
-            builder.setUsernameLink(new UsernameLink.Builder().entropy(ByteString.of(usernameLinkComponents.getEntropy()))
+            builder.usernameLink(new UsernameLink.Builder().entropy(ByteString.of(usernameLinkComponents.getEntropy()))
                     .serverId(UuidUtil.toByteString(usernameLinkComponents.getServerId()))
                     .color(linkColor == null ? UsernameLink.Color.UNKNOWN : UsernameLink.Color.valueOf(linkColor))
                     .build());
         }
 
-        return SignalStorageRecord.forAccount(builder.build());
+        return builder.build();
     }
 
-    public static SignalStorageRecord localToRemoteRecord(
-            Recipient recipient,
-            IdentityInfo identity,
-            byte[] rawStorageId
-    ) {
+    public static ContactRecord localToRemoteRecord(Recipient recipient, IdentityInfo identity) {
         final var address = recipient.getAddress();
-        final var builder = new SignalContactRecord.Builder(rawStorageId,
-                address.aci().orElse(null),
-                recipient.getStorageRecord()).setE164(address.number().orElse(null))
-                .setPni(address.pni().orElse(null))
-                .setUsername(address.username().orElse(null))
-                .setProfileKey(recipient.getProfileKey() == null ? null : recipient.getProfileKey().serialize());
+        final var builder = SignalContactRecord.Companion.newBuilder(recipient.getStorageRecord())
+                .aci(address.aci().map(ACI::toString).orElse(""))
+                .e164(address.number().orElse(""))
+                .pni(address.pni().map(PNI::toString).orElse(""))
+                .username(address.username().orElse(""))
+                .profileKey(recipient.getProfileKey() == null
+                        ? ByteString.EMPTY
+                        : ByteString.of(recipient.getProfileKey().serialize()));
         if (recipient.getProfile() != null) {
-            builder.setProfileGivenName(recipient.getProfile().getGivenName())
-                    .setProfileFamilyName(recipient.getProfile().getFamilyName());
+            builder.givenName(emptyIfNull(recipient.getProfile().getGivenName()))
+                    .familyName(emptyIfNull(recipient.getProfile().getFamilyName()));
         }
         if (recipient.getContact() != null) {
-            builder.setSystemGivenName(recipient.getContact().givenName())
-                    .setSystemFamilyName(recipient.getContact().familyName())
-                    .setSystemNickname(recipient.getContact().nickName())
-                    .setNicknameGivenName(recipient.getContact().nickNameGivenName() == null
-                            ? ""
-                            : recipient.getContact().nickNameGivenName())
-                    .setNicknameFamilyName(recipient.getContact().nickNameFamilyName() == null
-                            ? ""
-                            : recipient.getContact().nickNameFamilyName())
-                    .setNote(recipient.getContact().note())
-                    .setBlocked(recipient.getContact().isBlocked())
-                    .setProfileSharingEnabled(recipient.getContact().isProfileSharingEnabled())
-                    .setMuteUntil(recipient.getContact().muteUntil())
-                    .setHideStory(recipient.getContact().hideStory())
-                    .setUnregisteredTimestamp(recipient.getContact().unregisteredTimestamp() == null
+            builder.systemGivenName(emptyIfNull(recipient.getContact().givenName()))
+                    .systemFamilyName(emptyIfNull(recipient.getContact().familyName()))
+                    .systemNickname(emptyIfNull(recipient.getContact().nickName()))
+                    .nickname(new ContactRecord.Name.Builder().given(emptyIfNull(recipient.getContact()
+                                    .nickNameGivenName()))
+                            .family(emptyIfNull(recipient.getContact().nickNameFamilyName()))
+                            .build())
+                    .note(emptyIfNull(recipient.getContact().note()))
+                    .blocked(recipient.getContact().isBlocked())
+                    .whitelisted(recipient.getContact().isProfileSharingEnabled())
+                    .mutedUntilTimestamp(recipient.getContact().muteUntil())
+                    .hideStory(recipient.getContact().hideStory())
+                    .unregisteredAtTimestamp(recipient.getContact().unregisteredTimestamp() == null
                             ? 0
                             : recipient.getContact().unregisteredTimestamp())
-                    .setArchived(recipient.getContact().isArchived())
-                    .setHidden(recipient.getContact().isHidden());
+                    .archived(recipient.getContact().isArchived())
+                    .hidden(recipient.getContact().isHidden());
         }
         if (identity != null) {
-            builder.setIdentityKey(identity.getIdentityKey().serialize())
-                    .setIdentityState(localToRemote(identity.getTrustLevel()));
+            builder.identityKey(ByteString.of(identity.getIdentityKey().serialize()))
+                    .identityState(localToRemote(identity.getTrustLevel()));
         }
-        return SignalStorageRecord.forContact(builder.build());
+        return builder.build();
     }
 
-    public static SignalStorageRecord localToRemoteRecord(GroupInfoV1 group, byte[] rawStorageId) {
-        final var builder = new SignalGroupV1Record.Builder(rawStorageId,
-                group.getGroupId().serialize(),
-                group.getStorageRecord());
-        builder.setBlocked(group.isBlocked());
-        builder.setArchived(group.archived);
-        builder.setProfileSharingEnabled(true);
-        return SignalStorageRecord.forGroupV1(builder.build());
+    public static GroupV1Record localToRemoteRecord(GroupInfoV1 group) {
+        final var builder = SignalGroupV1Record.Companion.newBuilder(group.getStorageRecord());
+        builder.id(ByteString.of(group.getGroupId().serialize()));
+        builder.blocked(group.isBlocked());
+        builder.archived(group.archived);
+        builder.whitelisted(true);
+        return builder.build();
     }
 
-    public static SignalStorageRecord localToRemoteRecord(GroupInfoV2 group, byte[] rawStorageId) {
-        final var builder = new SignalGroupV2Record.Builder(rawStorageId,
-                group.getMasterKey(),
-                group.getStorageRecord());
-        builder.setBlocked(group.isBlocked());
-        builder.setProfileSharingEnabled(group.isProfileSharingEnabled());
-        return SignalStorageRecord.forGroupV2(builder.build());
+    public static GroupV2Record localToRemoteRecord(GroupInfoV2 group) {
+        final var builder = SignalGroupV2Record.Companion.newBuilder(group.getStorageRecord());
+        builder.masterKey(ByteString.of(group.getMasterKey().serialize()));
+        builder.blocked(group.isBlocked());
+        builder.whitelisted(group.isProfileSharingEnabled());
+        return builder.build();
     }
 
     public static TrustLevel remoteToLocal(IdentityState identityState) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
index b9b7025a..249a792d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java
@@ -5,6 +5,8 @@ import org.signal.core.util.Base64;
 import org.signal.core.util.SetUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
@@ -32,9 +34,7 @@ public final class StorageSyncValidations {
         validateManifestAndInserts(result.manifest(), result.inserts(), self);
 
         if (!result.deletes().isEmpty()) {
-            Set<String> allSetEncoded = result.manifest()
-                    .getStorageIds()
-                    .stream()
+            Set<String> allSetEncoded = result.manifest().storageIds.stream()
                     .map(StorageId::getRaw)
                     .map(Base64::encodeWithPadding)
                     .collect(Collectors.toSet());
@@ -47,13 +47,13 @@ public final class StorageSyncValidations {
             }
         }
 
-        if (previousManifest.getVersion() == 0) {
+        if (previousManifest.version == 0) {
             logger.debug(
                     "Previous manifest is empty, not bothering with additional validations around the diffs between the two manifests.");
             return;
         }
 
-        if (result.manifest().getVersion() != previousManifest.getVersion() + 1) {
+        if (result.manifest().version != previousManifest.version + 1) {
             throw new IncorrectManifestVersionError();
         }
 
@@ -63,13 +63,10 @@ public final class StorageSyncValidations {
             return;
         }
 
-        Set<ByteBuffer> previousIds = previousManifest.getStorageIds()
-                .stream()
+        Set<ByteBuffer> previousIds = previousManifest.storageIds.stream()
                 .map(id -> ByteBuffer.wrap(id.getRaw()))
                 .collect(Collectors.toSet());
-        Set<ByteBuffer> newIds = result.manifest()
-                .getStorageIds()
-                .stream()
+        Set<ByteBuffer> newIds = result.manifest().storageIds.stream()
                 .map(id -> ByteBuffer.wrap(id.getRaw()))
                 .collect(Collectors.toSet());
 
@@ -83,12 +80,12 @@ public final class StorageSyncValidations {
         Set<ByteBuffer> declaredDeletes = result.deletes().stream().map(ByteBuffer::wrap).collect(Collectors.toSet());
 
         if (declaredInserts.size() > manifestInserts.size()) {
-            logger.debug("DeclaredInserts: " + declaredInserts.size() + ", ManifestInserts: " + manifestInserts.size());
+            logger.debug("DeclaredInserts: {}, ManifestInserts: {}", declaredInserts.size(), manifestInserts.size());
             throw new MoreInsertsThanExpectedError();
         }
 
         if (declaredInserts.size() < manifestInserts.size()) {
-            logger.debug("DeclaredInserts: " + declaredInserts.size() + ", ManifestInserts: " + manifestInserts.size());
+            logger.debug("DeclaredInserts: {}, ManifestInserts: {}", declaredInserts.size(), manifestInserts.size());
             throw new LessInsertsThanExpectedError();
         }
 
@@ -97,12 +94,12 @@ public final class StorageSyncValidations {
         }
 
         if (declaredDeletes.size() > manifestDeletes.size()) {
-            logger.debug("DeclaredDeletes: " + declaredDeletes.size() + ", ManifestDeletes: " + manifestDeletes.size());
+            logger.debug("DeclaredDeletes: {}, ManifestDeletes: {}", declaredDeletes.size(), manifestDeletes.size());
             throw new MoreDeletesThanExpectedError();
         }
 
         if (declaredDeletes.size() < manifestDeletes.size()) {
-            logger.debug("DeclaredDeletes: " + declaredDeletes.size() + ", ManifestDeletes: " + manifestDeletes.size());
+            logger.debug("DeclaredDeletes: {}, ManifestDeletes: {}", declaredDeletes.size(), manifestDeletes.size());
             throw new LessDeletesThanExpectedError();
         }
 
@@ -125,7 +122,7 @@ public final class StorageSyncValidations {
             RecipientAddress self
     ) {
         int accountCount = 0;
-        for (StorageId id : manifest.getStorageIds()) {
+        for (StorageId id : manifest.storageIds) {
             accountCount += id.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue() ? 1 : 0;
         }
 
@@ -137,11 +134,11 @@ public final class StorageSyncValidations {
             throw new MissingAccountError();
         }
 
-        Set<StorageId> allSet = new HashSet<>(manifest.getStorageIds());
+        Set<StorageId> allSet = new HashSet<>(manifest.storageIds);
         Set<StorageId> insertSet = inserts.stream().map(SignalStorageRecord::getId).collect(Collectors.toSet());
         Set<ByteBuffer> rawIdSet = allSet.stream().map(id -> ByteBuffer.wrap(id.getRaw())).collect(Collectors.toSet());
 
-        if (allSet.size() != manifest.getStorageIds().size()) {
+        if (allSet.size() != manifest.storageIds.size()) {
             throw new DuplicateStorageIdError();
         }
 
@@ -166,6 +163,11 @@ public final class StorageSyncValidations {
                 throw new DuplicateDistributionListIdError();
             }
 
+            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.CALL_LINK.getValue());
+            if (ids.size() != new HashSet<>(ids).size()) {
+                throw new DuplicateCallLinkError();
+            }
+
             throw new DuplicateRawIdAcrossTypesError();
         }
 
@@ -182,18 +184,18 @@ public final class StorageSyncValidations {
                 throw new UnknownInsertError();
             }
 
-            if (insert.getContact().isPresent()) {
-                final var contact = insert.getContact().get();
-                final var aci = contact.getAci();
-                final var pni = contact.getPni();
-                final var number = contact.getNumber();
-                final var username = contact.getUsername();
+            if (insert.getProto().contact != null) {
+                final var contact = insert.getProto().contact;
+                final var aci = ACI.parseOrNull(contact.aci);
+                final var pni = PNI.parseOrNull(contact.pni);
+                final var number = contact.e164.isEmpty() ? null : contact.e164;
+                final var username = contact.username.isEmpty() ? null : contact.username;
                 final var address = new RecipientAddress(aci, pni, number, username);
                 if (self.matches(address)) {
                     throw new SelfAddedAsContactError();
                 }
             }
-            if (insert.getAccount().isPresent() && insert.getAccount().get().getProfileKey().isEmpty()) {
+            if (insert.getProto().account != null && insert.getProto().account.profileKey.size() == 0) {
                 logger.debug("Uploading a null profile key in our AccountRecord!");
             }
         }
@@ -211,6 +213,8 @@ public final class StorageSyncValidations {
 
     private static final class DuplicateDistributionListIdError extends Error {}
 
+    private static final class DuplicateCallLinkError extends Error {}
+
     private static final class DuplicateInsertInWriteError extends Error {}
 
     private static final class InsertNotPresentInFullIdSetError extends Error {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java
index 97e3579a..5bbd996e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/WriteOperationResult.java
@@ -21,8 +21,8 @@ public record WriteOperationResult(
         } else {
             return String.format(Locale.ROOT,
                     "ManifestVersion: %d, Total Keys: %d, Inserts: %d, Deletes: %d",
-                    manifest.getVersion(),
-                    manifest.getStorageIds().size(),
+                    manifest.version,
+                    manifest.storageIds.size(),
                     inserts.size(),
                     deletes.size());
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index c3dcf3fe..21c8aa96 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -14,6 +14,7 @@ import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
+import org.whispersystems.signalservice.api.backup.MediaRootBackupKey;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 
 import java.security.SecureRandom;
@@ -112,6 +113,10 @@ public class KeyUtils {
         return MasterKey.createNew(secureRandom);
     }
 
+    public static MediaRootBackupKey createMediaRootBackupKey() {
+        return new MediaRootBackupKey(getSecretBytes(32));
+    }
+
     public static byte[] createRawStorageId() {
         return getSecretBytes(16);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index e27ba980..e0c4b619 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -184,7 +184,7 @@ public class NumberVerificationUtils {
                  TokenNotAcceptedException _e) {
             throw new CaptchaRequiredException("Captcha not accepted");
         } catch (NonSuccessfulResponseCodeException e) {
-            if (e.getCode() == 400) {
+            if (e.code == 400) {
                 throw new CaptchaRequiredException("Captcha has invalid format");
             }
             throw e;
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
index def75049..0b5b418a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/ProfileUtils.java
@@ -84,6 +84,9 @@ public class ProfileUtils {
         if (encryptedProfile.getCapabilities().isStorage()) {
             capabilities.add(Profile.Capability.storage);
         }
+        if (encryptedProfile.getCapabilities().isStorageServiceEncryptionV2()) {
+            capabilities.add(Profile.Capability.storageServiceEncryptionV2Capability);
+        }
 
         return capabilities;
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index ee1f608f..945b2756 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -18,6 +18,7 @@ import java.io.InputStream;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
@@ -30,6 +31,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import okio.ByteString;
+
 public class Utils {
 
     private static final Logger logger = LoggerFactory.getLogger(Utils.class);
@@ -157,4 +160,46 @@ public class Utils {
         }
         return response.successOrThrow();
     }
+
+    public static ByteString firstNonEmpty(ByteString... strings) {
+        for (final var s : strings) {
+            if (s.size() > 0) {
+                return s;
+            }
+        }
+        return ByteString.EMPTY;
+    }
+
+    @SafeVarargs
+    public static <T> List<T> firstNonEmpty(List<T>... values) {
+        for (final var s : values) {
+            if (!s.isEmpty()) {
+                return s;
+            }
+        }
+        return List.of();
+    }
+
+    public static String firstNonEmpty(String... strings) {
+        for (final var s : strings) {
+            if (!s.isEmpty()) {
+                return s;
+            }
+        }
+        return "";
+    }
+
+    @SafeVarargs
+    public static <T> T firstNonNull(T... values) {
+        for (final var v : values) {
+            if (v != null) {
+                return v;
+            }
+        }
+        return null;
+    }
+
+    public static String nullIfEmpty(String string) {
+        return string == null || string.isEmpty() ? null : string;
+    }
 }

From 6a5ea5fc01b2865ca9d665d1696e045c1f4f3971 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Nov 2024 23:20:45 +0100
Subject: [PATCH 534/672] Workaround issue with invalid address in recipient
 store

---
 .../storage/recipients/InvalidAddress.java      |  8 ++++++++
 .../storage/recipients/RecipientAddress.java    |  2 +-
 .../storage/recipients/RecipientStore.java      | 17 +++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/storage/recipients/InvalidAddress.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/InvalidAddress.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/InvalidAddress.java
new file mode 100644
index 00000000..991bc166
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/InvalidAddress.java
@@ -0,0 +1,8 @@
+package org.asamk.signal.manager.storage.recipients;
+
+public class InvalidAddress extends AssertionError {
+
+    InvalidAddress(String message) {
+        super(message);
+    }
+}
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 56adb0a6..b80f81da 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
@@ -27,7 +27,7 @@ public record RecipientAddress(
             pni = Optional.empty();
         }
         if (aci.isEmpty() && pni.isEmpty() && number.isEmpty() && username.isEmpty()) {
-            throw new AssertionError("Must have either a ServiceId, username or E164 number!");
+            throw new InvalidAddress("Must have either a ServiceId, username or E164 number!");
         }
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 00048560..aa245369 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -339,7 +339,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
                 SELECT r._id, r.given_name, r.family_name, r.nick_name, r.nick_name_given_name, r.nick_name_family_name, r.note, r.expiration_time, r.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.archived, r.hidden, r.unregistered_timestamp
                 FROM %s r
-                WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
+                WHERE (r.number IS NOT NULL OR r.pni IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
                 """
         ).formatted(TABLE_RECIPIENT, SQL_IS_CONTACT);
         try (final var connection = database.getConnection()) {
@@ -392,6 +392,15 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setBytes(1, storageId.getRaw());
             return Utils.executeQuerySingleRow(statement, this::getRecipientFromResultSet);
+        } catch (InvalidAddress e) {
+            try (final var statement = connection.prepareStatement("""
+                                                                   UPDATE %s SET aci=NULL, pni=NULL, username=NULL, number=NULL, storage_id=NULL WHERE storage_id = ?
+                                                                   """.formatted(TABLE_RECIPIENT))) {
+                statement.setBytes(1, storageId.getRaw());
+                statement.executeUpdate();
+            }
+            connection.commit();
+            throw e;
         }
     }
 
@@ -426,7 +435,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                        r.discoverable,
                        r.storage_record
                 FROM %s r
-                WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL) AND %s
+                WHERE (r.number IS NOT NULL OR r.pni IS NOT NULL OR r.aci IS NOT NULL) AND %s
                 """
         ).formatted(TABLE_RECIPIENT, sqlWhere.isEmpty() ? "TRUE" : String.join(" AND ", sqlWhere));
         final var selfAddress = selfAddressProvider.getSelfAddress();
@@ -512,7 +521,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
                 SELECT r._id
                 FROM %s r
-                WHERE (r.number IS NOT NULL OR r.aci IS NOT NULL)
+                WHERE (r.aci IS NOT NULL OR r.pni IS NOT NULL)
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
@@ -525,7 +534,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
                 SELECT r._id
                 FROM %s r
-                WHERE r.storage_id IS NULL AND r.unregistered_timestamp IS NULL
+                WHERE r.storage_id IS NULL AND r.unregistered_timestamp IS NULL AND (r.aci IS NOT NULL OR r.pni IS NOT NULL)
                 """
         ).formatted(TABLE_RECIPIENT);
         final var updateSql = (

From 10ee295ea37f0329aea95257c43380770f0aff10 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Nov 2024 23:32:49 +0100
Subject: [PATCH 535/672] Fix receiving shared contacts in graalvm mode

Fixes #1629
---
 graalvm-config-dir/reflect-config.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 230ede2f..cdbf5817 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -42,6 +42,15 @@
 {
   "name":"[Lorg.asamk.signal.json.JsonAttachment;"
 },
+{
+  "name":"[Lorg.asamk.signal.json.JsonContactAddress;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonContactEmail;"
+},
+{
+  "name":"[Lorg.asamk.signal.json.JsonContactPhone;"
+},
 {
   "name":"[Lorg.asamk.signal.json.JsonMention;"
 },
@@ -51,6 +60,9 @@
 {
   "name":"[Lorg.asamk.signal.json.JsonQuotedAttachment;"
 },
+{
+  "name":"[Lorg.asamk.signal.json.JsonSharedContact;"
+},
 {
   "name":"[Lorg.asamk.signal.json.JsonSyncReadMessage;"
 },
@@ -1008,7 +1020,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"display","parameterTypes":[] }, {"name":"family","parameterTypes":[] }, {"name":"given","parameterTypes":[] }, {"name":"middle","parameterTypes":[] }, {"name":"prefix","parameterTypes":[] }, {"name":"suffix","parameterTypes":[] }]
+  "methods":[{"name":"display","parameterTypes":[] }, {"name":"family","parameterTypes":[] }, {"name":"given","parameterTypes":[] }, {"name":"middle","parameterTypes":[] }, {"name":"nickname","parameterTypes":[] }, {"name":"prefix","parameterTypes":[] }, {"name":"suffix","parameterTypes":[] }]
 },
 {
   "name":"org.asamk.signal.json.JsonContactPhone",

From 26b5a4c582b1e13fcfd30fe909758015a6be72cb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 23 Nov 2024 23:54:39 +0100
Subject: [PATCH 536/672] Small code improvement

---
 .../manager/syncStorage/DefaultStorageRecordProcessor.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
index 68b5f9cc..e9e4ef7f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
@@ -20,7 +20,7 @@ import java.util.TreeSet;
  * our local store). We use it for a {@link TreeSet}, so mainly it's just important that the '0'
  * case is correct. Other cases are whatever, just make it something stable.
  */
-abstract class DefaultStorageRecordProcessor<E extends SignalRecord> implements StorageRecordProcessor<E>, Comparator<E> {
+abstract class DefaultStorageRecordProcessor<E extends SignalRecord<?>> implements StorageRecordProcessor<E>, Comparator<E> {
 
     private static final Logger logger = LoggerFactory.getLogger(DefaultStorageRecordProcessor.class);
     private final Set<E> matchedRecords = new TreeSet<>(this);
@@ -76,7 +76,7 @@ abstract class DefaultStorageRecordProcessor<E extends SignalRecord> implements
     }
 
     private void debug(StorageId i, E record, String message) {
-        logger.debug("[" + i + "][" + record.getClass().getSimpleName() + "] " + message);
+        logger.debug("[{}][{}] {}", i, record.getClass().getSimpleName(), message);
     }
 
     /**

From fe752e0c7998bc8ca66c46d981624e6fbce7abf9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 24 Nov 2024 11:51:54 +0100
Subject: [PATCH 537/672] Add simplification for single recipient reactions

---
 .../asamk/signal/commands/SendReactionCommand.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
index da877d76..a95a0b5a 100644
--- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java
@@ -11,6 +11,7 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.GroupNotFoundException;
 import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
 import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.RecipientIdentifier;
 import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.util.CommandUtil;
@@ -74,10 +75,18 @@ public class SendReactionCommand implements JsonRpcLocalCommand {
         final var targetTimestamp = ns.getLong("target-timestamp");
         final var isStory = Boolean.TRUE.equals(ns.getBoolean("story"));
 
+        final RecipientIdentifier.Single targetAuthorIdentifier;
+        if (targetAuthor == null && recipientIdentifiers.size() == 1 && recipientIdentifiers.stream()
+                .findFirst()
+                .get() instanceof RecipientIdentifier.Single single) {
+            targetAuthorIdentifier = single;
+        } else {
+            targetAuthorIdentifier = CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber());
+        }
         try {
             final var results = m.sendMessageReaction(emoji,
                     isRemove,
-                    CommandUtil.getSingleRecipientIdentifier(targetAuthor, m.getSelfNumber()),
+                    targetAuthorIdentifier,
                     targetTimestamp,
                     recipientIdentifiers,
                     isStory);

From 68c9d84d1989f2ea162dae909a0a5b985b0b0832 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 24 Nov 2024 12:37:42 +0100
Subject: [PATCH 538/672] Update libsignal-service

Fixes #1633
---
 graalvm-config-dir/jni-config.json                 |  4 ++++
 graalvm-config-dir/reflect-config.json             | 10 ++++++++++
 gradle/libs.versions.toml                          |  2 +-
 .../asamk/signal/manager/helper/AccountHelper.java |  1 +
 .../manager/internal/ProvisioningManagerImpl.java  |  4 +++-
 .../signal/manager/storage/SignalAccount.java      | 14 +++++++++++---
 run_tests.sh                                       |  1 +
 src/main/java/org/asamk/signal/BaseConfig.java     |  2 +-
 8 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 381dca9e..fc76b7f9 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -228,6 +228,10 @@
   "name":"org.signal.libsignal.usernames.CannotBeEmptyException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"org.signal.libsignal.usernames.DiscriminatorCannotBeZeroException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.signal.libsignal.usernames.MissingSeparatorException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index cdbf5817..13b9194a 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -450,6 +450,12 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true
 },
+{
+  "name":"java.util.ImmutableCollections$List12",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"java.util.ImmutableCollections$ListN",
   "allDeclaredFields":true,
@@ -2929,6 +2935,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
   "allDeclaredFields":true,
+  "fields":[{"name":"avatarUrlPath"}, {"name":"backupsSubscriberCurrencyCode"}, {"name":"backupsSubscriberId"}, {"name":"displayBadgesOnProfile"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hasCompletedUsernameOnboarding"}, {"name":"hasSeenGroupStoryEducationSheet"}, {"name":"hasSetMyStoriesPrivacy"}, {"name":"hasViewedOnboardingStory"}, {"name":"keepMutedChatsArchived"}, {"name":"linkPreviews"}, {"name":"noteToSelfArchived"}, {"name":"noteToSelfMarkedUnread"}, {"name":"payments"}, {"name":"phoneNumberSharingMode"}, {"name":"pinnedConversations"}, {"name":"preferContactAvatars"}, {"name":"preferredReactionEmoji"}, {"name":"primarySendsSms"}, {"name":"profileKey"}, {"name":"readReceipts"}, {"name":"sealedSenderIndicators"}, {"name":"storiesDisabled"}, {"name":"storyViewReceiptsEnabled"}, {"name":"subscriberCurrencyCode"}, {"name":"subscriberId"}, {"name":"subscriptionManuallyCancelled"}, {"name":"typingIndicators"}, {"name":"universalExpireTimer"}, {"name":"unlistedPhoneNumber"}, {"name":"username"}, {"name":"usernameLink"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -2955,6 +2962,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,
+  "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -2973,6 +2981,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV1Record",
   "allDeclaredFields":true,
+  "fields":[{"name":"archived"}, {"name":"blocked"}, {"name":"id"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -2984,6 +2993,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
+  "fields":[{"name":"archived"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e52a4ae7..483ea244 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.12"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_111"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_112"
 sqlite = "org.xerial:sqlite-jdbc:3.47.0.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3"
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 3eb2051d..209ca711 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -502,6 +502,7 @@ public class AccountHelper {
                         account.getProfileKey(),
                         account.getOrCreatePinMasterKey(),
                         account.getOrCreateMediaRootBackupKey(),
+                        account.getOrCreateAccountEntropyPool(),
                         verificationCode.getVerificationCode(),
                         null));
         account.setMultiDevice(true);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index 2204b743..fcef536a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -150,7 +150,9 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
                     ret.getAciIdentity(),
                     ret.getPniIdentity(),
                     profileKey,
-                    ret.getMasterKey());
+                    ret.getMasterKey(),
+                    ret.getAccountEntropyPool(),
+                    ret.getMediaRootBackupKey());
 
             account.getConfigurationStore().setReadReceipts(ret.isReadReceipts());
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 2529ad4a..c4cf1484 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -292,7 +292,9 @@ public class SignalAccount implements Closeable {
             final IdentityKeyPair aciIdentity,
             final IdentityKeyPair pniIdentity,
             final ProfileKey profileKey,
-            final MasterKey masterKey
+            final MasterKey masterKey,
+            final AccountEntropyPool accountEntropyPool,
+            final MediaRootBackupKey mediaRootBackupKey
     ) {
         this.deviceId = 0;
         this.number = number;
@@ -308,8 +310,14 @@ public class SignalAccount implements Closeable {
         this.registered = false;
         this.isMultiDevice = true;
         setLastReceiveTimestamp(0L);
-        this.pinMasterKey = masterKey;
-        this.accountEntropyPool = null;
+        if (accountEntropyPool != null) {
+            this.pinMasterKey = null;
+            this.accountEntropyPool = accountEntropyPool;
+        } else {
+            this.pinMasterKey = masterKey;
+            this.accountEntropyPool = null;
+        }
+        this.mediaRootBackupKey = mediaRootBackupKey;
         getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
         this.storageKey = null;
diff --git a/run_tests.sh b/run_tests.sh
index 0e5ff4be..036ba370 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -149,6 +149,7 @@ exec 3<> "$FIFO_FILE"
   echo '{"jsonrpc":"2.0","id":7,"method":"sendTyping","params":{"recipient":"'"$NUMBER_1"'"}}' >&3
   echo '{"jsonrpc":"2.0","id":7,"method":"send","params":{"recipient":"'"$NUMBER_1"'","message":"some text"}}' >&3
   echo '{"jsonrpc":"2.0","id":7,"method":"send","params":{"recipients":["'"$NUMBER_1"'","'"$NUMBER_2"'"],"message":"some other text"}}' >&3
+  echo '{"jsonrpc":"2.0","id":7,"method":"sendReaction","params":{"recipients":["'"$NUMBER_2"'"],"targetAuthor":"'"$NUMBER_1"'","emoji":"👍","targetTimestamp":4756473756}}' >&3
   echo '{"jsonrpc":"2.0","id":7,"method":"updateProfile","params":{"givenName":"n1","familyName":"n2","about":"ABA","aboutEmoji":"EMO","avatar":"LICENSE"}}' >&3
   echo '{"jsonrpc":"2.0","id":7,"method":"getUserStatus","params":{"recipient":"'"$NUMBER_1"'"}}' >&3
 
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 7b182351..e25bfa14 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.21.4");
+            .orElse("Signal-Android/7.26.1");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 2c68b5a9e19ccc8632d448166de2aa62d268d4c8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 29 Nov 2024 21:10:37 +0100
Subject: [PATCH 539/672] Add support for using PNI as recipient

---
 .../manager/api/InvalidNumberException.java      |  4 ++++
 .../signal/manager/api/RecipientIdentifier.java  | 16 ++++++++++++----
 .../signal/manager/helper/RecipientHelper.java   |  2 +-
 .../signal/manager/internal/ManagerImpl.java     |  2 +-
 .../storage/recipients/RecipientAddress.java     |  4 ++--
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java b/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
index ba71ef2e..8e6a8064 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
@@ -2,6 +2,10 @@ package org.asamk.signal.manager.api;
 
 public class InvalidNumberException extends Exception {
 
+    InvalidNumberException(String message) {
+        super(message);
+    }
+
     InvalidNumberException(String message, Throwable e) {
         super(message, e);
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
index 794672a4..53da2aad 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
@@ -29,6 +29,14 @@ public sealed interface RecipientIdentifier {
                     return new Uuid(UUID.fromString(identifier));
                 }
 
+                if (identifier.startsWith("PNI:")) {
+                    final var pni = identifier.substring(4);
+                    if (!UuidUtil.isUuid(pni)) {
+                        throw new InvalidNumberException("Invalid PNI");
+                    }
+                    return new Pni(UUID.fromString(pni));
+                }
+
                 if (identifier.startsWith("u:")) {
                     return new Username(identifier.substring(2));
                 }
@@ -50,7 +58,7 @@ public sealed interface RecipientIdentifier {
             } else if (address.aci().isPresent()) {
                 return new Uuid(UUID.fromString(address.aci().get()));
             } else if (address.pni().isPresent()) {
-                return new Pni(address.pni().get());
+                return new Pni(UUID.fromString(address.pni().get().substring(4)));
             } else if (address.username().isPresent()) {
                 return new Username(address.username().get());
             }
@@ -73,16 +81,16 @@ public sealed interface RecipientIdentifier {
         }
     }
 
-    record Pni(String pni) implements Single {
+    record Pni(UUID pni) implements Single {
 
         @Override
         public String getIdentifier() {
-            return pni;
+            return "PNI:" + pni.toString();
         }
 
         @Override
         public RecipientAddress toPartialRecipientAddress() {
-            return new RecipientAddress(null, pni, null, null);
+            return new RecipientAddress(null, getIdentifier(), null, null);
         }
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 5da66b7e..125fa0d8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -79,7 +79,7 @@ public class RecipientHelper {
         if (recipient instanceof RecipientIdentifier.Uuid uuidRecipient) {
             return account.getRecipientResolver().resolveRecipient(ACI.from(uuidRecipient.uuid()));
         } else if (recipient instanceof RecipientIdentifier.Pni pniRecipient) {
-            return account.getRecipientResolver().resolveRecipient(PNI.parseOrThrow(pniRecipient.pni()));
+            return account.getRecipientResolver().resolveRecipient(PNI.from(pniRecipient.pni()));
         } else if (recipient instanceof RecipientIdentifier.Number numberRecipient) {
             final var number = numberRecipient.number();
             return account.getRecipientStore().resolveRecipientByNumber(number, () -> {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 2f2ba3db..dcdead73 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -888,7 +888,7 @@ public class ManagerImpl implements Manager {
                         .deleteEntryForRecipientNonGroup(targetSentTimestamp, ACI.from(u.uuid()));
             } else if (recipient instanceof RecipientIdentifier.Pni pni) {
                 account.getMessageSendLogStore()
-                        .deleteEntryForRecipientNonGroup(targetSentTimestamp, PNI.parseOrThrow(pni.pni()));
+                        .deleteEntryForRecipientNonGroup(targetSentTimestamp, PNI.from(pni.pni()));
             } else if (recipient instanceof RecipientIdentifier.Single r) {
                 try {
                     final var recipientId = context.getRecipientHelper().resolveRecipient(r);
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 b80f81da..ba2b9f26 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
@@ -69,8 +69,8 @@ public record RecipientAddress(
     }
 
     public RecipientAddress(org.asamk.signal.manager.api.RecipientAddress address) {
-        this(address.aci().map(ACI::parseOrNull),
-                address.pni().map(PNI::parseOrNull),
+        this(address.aci().map(ACI::parseOrThrow),
+                address.pni().map(PNI::parseOrThrow),
                 address.number(),
                 address.username());
     }

From 77a5c454b7fea9375de9fbaa4adf6f5f22f6a5ae Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 29 Nov 2024 20:53:28 +0100
Subject: [PATCH 540/672] Improve documentation for recipient arguments

Fixes #1639
---
 man/signal-cli.1.adoc | 78 +++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index a892a296..4196f991 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -26,7 +26,13 @@ For this use-case, it has a dbus and a JSON-RPC interface, that can be used to s
 Originally the Signal protocol only allowed sending messages to other phone numbers.
 Now with the introduction of phone number privacy, the phone number of a recipient is not always known.
 Only the recipient's ServiceId, ACI/PNI (a special UUID) is known.
-This special identifier can be used instead of the phone number in signal-cli's interface.
+
+In all places where a RECIPIENT argument is expected in signal-cli's interface, one of the following can be used:
+
+- The phone number
+- The ACI, just a UUID
+- The PNI, just a UUID, with "PNI:" prefix
+- The username, with "u:" prefix, e.g. "u:test.000"
 
 For some functionality the Signal protocol requires that all messages have been received from the server.
 The `receive` command should be regularly executed.
@@ -181,7 +187,7 @@ Indicates if Signal should share its phone number when sending a message.
 Change an account to a new phone number with SMS or voice verification.
 Use the finishChangeNumber command to complete the verification.
 
-NUMBER::
+RECIPIENT::
 The new phone number.
 
 *-v*, *--voice*::
@@ -198,7 +204,7 @@ After solving the captcha, right-click on the "Open Signal" link and copy the li
 
 Verify the number using the code received via SMS or voice.
 
-NUMBER::
+RECIPIENT::
 The new phone number.
 
 *-v*, *--verification-code*::
@@ -227,7 +233,7 @@ Indicates if Signal should generate link previews.
 
 === setPin
 
-Set a registration lock pin, to prevent others from registering this number.
+Set a registration lock pin, to prevent others from registering your account's phone number.
 
 REGISTRATION_LOCK_PIN::
 The registration lock PIN, that will be required for new registrations (resets after 7 days of inactivity)
@@ -286,7 +292,7 @@ One or more usernames to check.
 Send a message to another user or group.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *--note-to-self*::
 Send the message to self without notification.
@@ -332,7 +338,7 @@ e.g.: `-m "Something BIG!" --text-style "10:3:BOLD"` or for a mixed text style `
 Specify the timestamp of a previous message with the recipient or group to add a quote to the new message.
 
 *--quote-author*::
-Specify the number of the author of the original message.
+Specify the author of the original message.
 
 *--quote-message*::
 Specify the message of the original message.
@@ -363,7 +369,7 @@ Specify the image file for the link preview (optional).
 Specify the timestamp of a story to reply to.
 
 *--story-author*::
-Specify the number of the author of the story.
+Specify the author of the story.
 
 *-e*, *--end-session*::
 Clear session state and send end session message.
@@ -376,7 +382,7 @@ Specify the timestamp of a previous message with the recipient or group to send
 Send response to a message request to linked devices.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
@@ -392,7 +398,7 @@ Type of message request response (accept, delete)
 Send a payment notification.
 
 RECIPIENT::
-Specify the recipient’s phone number.
+Specify the recipient.
 
 *--receipt* RECEIPT::
 The base64 encoded receipt blob.
@@ -405,7 +411,7 @@ Specify a note for the payment notification.
 Send reaction to a previously received or sent message.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
@@ -416,8 +422,8 @@ Specify the recipient username or username link.
 *-e* EMOJI, *--emoji* EMOJI::
 Specify the emoji, should be a single unicode grapheme cluster.
 
-*-a* NUMBER, *--target-author* NUMBER::
-Specify the number of the author of the message to which to react.
+*-a* RECIPIENT, *--target-author* RECIPIENT::
+Specify the author of the message to which to react.
 
 *-t* TIMESTAMP, *--target-timestamp* TIMESTAMP::
 Specify the timestamp of the message to which to react.
@@ -433,7 +439,7 @@ React to a story instead of a normal message
 Send a read or viewed receipt to a previously received message.
 
 RECIPIENT::
-Specify the sender’s phone number.
+Specify the sender.
 
 *-t* TIMESTAMP, *--target-timestamp* TIMESTAMP::
 Specify the timestamp of the message to which to react.
@@ -447,7 +453,7 @@ Send typing message to trigger a typing indicator for the recipient.
 Indicator will be shown for 15seconds unless a typing STOP message is sent first.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
@@ -460,7 +466,7 @@ Send a typing STOP message.
 Remotely delete a previously sent message.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-g* GROUP, *--group-id* GROUP::
 Specify the recipient group ID in base64 encoding.
@@ -586,7 +592,7 @@ Show a list of known contacts with names and profiles.
 When a specific recipient is given, its profile will be refreshed.
 
 RECIPIENT::
-Specify the recipients’ phone number.
+Specify the recipients.
 
 *-a*, *--all-recipients*::
 Include all known recipients, not only contacts.
@@ -608,17 +614,17 @@ Include internal information that's normally not user visible
 
 List all known identity keys and their trust status, fingerprint and safety number.
 
-*-n* NUMBER, *--number* NUMBER::
-Only show identity keys for the given phone number.
+*-n* RECIPIENT, *--number* RECIPIENT::
+Only show identity keys for the given recipient.
 
 === trust
 
-Set the trust level of a given number.
-The first time a key for a number is seen, it is trusted by default (TOFU).
+Set the trust level of a given recipient.
+The first time a key for a recipient is seen, it is trusted by default (TOFU).
 If the key changes, the new key must be trusted manually.
 
-number::
-Specify the phone number, for which to set the trust.
+RECIPIENT::
+Specify the recipient, for which to set the trust.
 
 *-a*, *--trust-all-known-keys*::
 Trust all known keys of this user, only use this for testing.
@@ -656,12 +662,12 @@ New MobileCoin address (Base64 encoded public address)
 
 === updateContact
 
-Update the info associated to a number on our contact list.
+Update the info associated to a recipient on our contact list.
 This change is only local but can be synchronized to other devices by using `sendContacts` (see below).
 If the contact doesn't exist yet, it will be added.
 
-NUMBER::
-Specify the contact phone number.
+RECIPIENT::
+Specify the recipient.
 
 *--given-name* NAME, *--name* NAME::
 New (given) name.
@@ -677,8 +683,8 @@ To disable expiration set expiration time to 0.
 
 Remove the info of a given contact
 
-NUMBER::
-Specify the contact phone number.
+RECIPIENT::
+Specify the recipient.
 
 *--hide*::
 Hide the contact in the contact list, but keep the data.
@@ -691,8 +697,8 @@ Delete all data associated with this contact, including identity keys and sessio
 Block the given contacts or groups (no messages will be received).
 This change is only local but can be synchronized to other devices by using `sendContacts` (see below).
 
-[CONTACT [CONTACT ...]]::
-Specify the phone numbers of contacts that should be blocked.
+[RECIPIENT [RECIPIENT ...]]::
+Specify the contacts that should be blocked.
 
 *-g* [GROUP [GROUP ...]], *--group-id* [GROUP [GROUP ...]]::
 Specify the group IDs that should be blocked in base64 encoding.
@@ -702,8 +708,8 @@ Specify the group IDs that should be blocked in base64 encoding.
 Unblock the given contacts or groups (messages will be received again).
 This change is only local but can be synchronized to other devices by using `sendContacts` (see below).
 
-[CONTACT [CONTACT ...]]::
-Specify the phone numbers of contacts that should be unblocked.
+[RECIPIENT [RECIPIENT ...]]::
+Specify the contacts that should be unblocked.
 
 *-g* [GROUP [GROUP ...]], *--group-id* [GROUP [GROUP ...]]::
 Specify the group IDs that should be unblocked in base64 encoding.
@@ -776,7 +782,7 @@ The attachment data is returned as a Base64 String.
 The ID of the attachment as given in the attachment list of the message.
 
 *--recipient* [RECIPIENT]::
-Specify the number which sent the attachment.
+Specify the recipient which sent the attachment.
 Referred to generally as recipient.
 
 *-g* [GROUP], *--group-id* [GROUP]::
@@ -788,10 +794,10 @@ Gets the raw data for a specified contact, contact's profile or group avatar.
 The attachment data is returned as a Base64 String.
 
 *--contact* [RECIPIENT]::
-Specify the number of a recipient.
+Specify the recipient.
 
 *--profile* [RECIPIENT]::
-Specify the number of a recipient.
+Specify the recipient.
 
 *-g* [GROUP], *--group-id* [GROUP]::
 Alternatively, specify the group ID for which to get the avatar.
@@ -912,10 +918,10 @@ Send a message to a group::
 signal-cli -a ACCOUNT send -m "This is a message" -g GROUP_ID
 
 Trust new key, after having verified it::
-signal-cli -a ACCOUNT trust -v SAFETY_NUMBER NUMBER
+signal-cli -a ACCOUNT trust -v SAFETY_NUMBER RECIPIENT
 
 Trust new key, without having verified it. Only use this if you don't care about security::
-signal-cli -a ACCOUNT trust -a NUMBER
+signal-cli -a ACCOUNT trust -a RECIPIENT
 
 == Exit codes
 

From ba147a48f848636850f32ad664c2414885865c2e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 30 Nov 2024 15:45:26 +0100
Subject: [PATCH 541/672] Update reflect config

---
 graalvm-config-dir/reflect-config.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 13b9194a..7a8fe2a1 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -42,6 +42,9 @@
 {
   "name":"[Lorg.asamk.signal.json.JsonAttachment;"
 },
+{
+  "name":"[Lorg.asamk.signal.json.JsonCallMessage$IceUpdate;"
+},
 {
   "name":"[Lorg.asamk.signal.json.JsonContactAddress;"
 },
@@ -2935,7 +2938,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
   "allDeclaredFields":true,
-  "fields":[{"name":"avatarUrlPath"}, {"name":"backupsSubscriberCurrencyCode"}, {"name":"backupsSubscriberId"}, {"name":"displayBadgesOnProfile"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hasCompletedUsernameOnboarding"}, {"name":"hasSeenGroupStoryEducationSheet"}, {"name":"hasSetMyStoriesPrivacy"}, {"name":"hasViewedOnboardingStory"}, {"name":"keepMutedChatsArchived"}, {"name":"linkPreviews"}, {"name":"noteToSelfArchived"}, {"name":"noteToSelfMarkedUnread"}, {"name":"payments"}, {"name":"phoneNumberSharingMode"}, {"name":"pinnedConversations"}, {"name":"preferContactAvatars"}, {"name":"preferredReactionEmoji"}, {"name":"primarySendsSms"}, {"name":"profileKey"}, {"name":"readReceipts"}, {"name":"sealedSenderIndicators"}, {"name":"storiesDisabled"}, {"name":"storyViewReceiptsEnabled"}, {"name":"subscriberCurrencyCode"}, {"name":"subscriberId"}, {"name":"subscriptionManuallyCancelled"}, {"name":"typingIndicators"}, {"name":"universalExpireTimer"}, {"name":"unlistedPhoneNumber"}, {"name":"username"}, {"name":"usernameLink"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -2962,7 +2964,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,
-  "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -2993,7 +2994,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
-  "fields":[{"name":"archived"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {

From 0a296e77a0c44484e7197ca17bbe455743e6be28 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 30 Nov 2024 16:14:53 +0100
Subject: [PATCH 542/672] Bump version to 0.13.10

---
 CHANGELOG.md                          | 10 +++++++++-
 build.gradle.kts                      |  2 +-
 data/org.asamk.SignalCli.metainfo.xml |  3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd44885b..87bc620a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.10] - 2024-11-30
+
+### Fixed
+
+- Fix receiving some unusual contact sync messages
+- Fix receiving expiration timer updates
+
+### Improved
+- Add support for new storage encryption scheme
 
 ## [0.13.9] - 2024-10-28
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c205612e..76034b85 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
-version = "0.13.10-SNAPSHOT"
+version = "0.13.10"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 46921033..63f55e4d 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.10" date="2024-11-30">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.10</url>
+        </release>
         <release version="0.13.9" date="2024-10-28">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.9</url>
         </release>

From 24d344fda46e81436478d6a73fb9f47ce4c4697d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 543/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87bc620a..0b034449 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.10] - 2024-11-30
 
 ### Fixed
diff --git a/build.gradle.kts b/build.gradle.kts
index 76034b85..9d4724c0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.3"
 }
 
-version = "0.13.10"
+version = "0.13.11-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From f2df600d388e44ee82c4f5a476d19d71ad341b0b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 1 Dec 2024 10:12:46 +0100
Subject: [PATCH 544/672] Update CHANGELOG.md

Fixes #1641
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b034449..a6d3d435 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ## [0.13.10] - 2024-11-30
 
+Requires libsignal-client version 0.62.0.
+
 ### Fixed
 
 - Fix receiving some unusual contact sync messages

From 9d92a3e06bd7f7fb94e2b80bf3927e0ddbe3da26 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 15 Dec 2024 21:13:59 +0100
Subject: [PATCH 545/672] Update libsignal-service

---
 gradle/libs.versions.toml                                | 2 +-
 .../org/asamk/signal/manager/helper/GroupV2Helper.java   | 9 ++++++---
 .../syncStorage/DefaultStorageRecordProcessor.java       | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 483ea244..84f2d8fc 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.12"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_112"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_113"
 sqlite = "org.xerial:sqlite-jdbc:3.47.0.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3"
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index a3330d5c..900d7ea9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -28,6 +28,7 @@ import org.signal.storageservice.protos.groups.local.DecryptedMember;
 import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.groupsv2.DecryptChangeVerificationMode;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupResponse;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
 import org.whispersystems.signalservice.api.groupsv2.GroupCandidate;
@@ -652,11 +653,13 @@ class GroupV2Helper {
 
     DecryptedGroupChange getDecryptedGroupChange(byte[] signedGroupChange, GroupMasterKey groupMasterKey) {
         if (signedGroupChange != null) {
-            var groupOperations = dependencies.getGroupsV2Operations()
-                    .forGroup(GroupSecretParams.deriveFromMasterKey(groupMasterKey));
+            final var groupSecretParams = GroupSecretParams.deriveFromMasterKey(groupMasterKey);
+            final var groupOperations = dependencies.getGroupsV2Operations().forGroup(groupSecretParams);
+            final var groupId = groupSecretParams.getPublicParams().getGroupIdentifier();
 
             try {
-                return groupOperations.decryptChange(GroupChange.ADAPTER.decode(signedGroupChange), true).orElse(null);
+                return groupOperations.decryptChange(GroupChange.ADAPTER.decode(signedGroupChange),
+                        DecryptChangeVerificationMode.verify(groupId)).orElse(null);
             } catch (VerificationFailedException | InvalidGroupStateException | IOException e) {
                 return null;
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
index e9e4ef7f..87acb991 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/DefaultStorageRecordProcessor.java
@@ -49,7 +49,7 @@ abstract class DefaultStorageRecordProcessor<E extends SignalRecord<?>> implemen
         final var local = getMatching(remote);
 
         if (local.isEmpty()) {
-            debug(remote.getId(), remote, "No matching local record. Inserting.");
+            debug(remote.getId(), remote, "[Local Insert] No matching local record. Inserting.");
             insertLocal(remote);
             return;
         }
@@ -70,7 +70,7 @@ abstract class DefaultStorageRecordProcessor<E extends SignalRecord<?>> implemen
 
         if (!merged.equals(local.get())) {
             final var update = new StorageRecordUpdate<>(local.get(), merged);
-            debug(remote.getId(), remote, "[Local Update] " + update);
+            debug(remote.getId(), remote, "[Local Update] " + local.get().describeDiff(merged));
             updateLocal(update);
         }
     }

From c3f8d68ceb9def96048cfcb1b4c9c4b98ede1e45 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 15 Dec 2024 21:14:40 +0100
Subject: [PATCH 546/672] Create account entropy pool instead of master key

---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java | 4 +---
 .../main/java/org/asamk/signal/manager/util/KeyUtils.java    | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index c4cf1484..4d43d15d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -1550,9 +1550,7 @@ public class SignalAccount implements Closeable {
             return key;
         }
 
-        pinMasterKey = KeyUtils.createMasterKey();
-        save();
-        return pinMasterKey;
+        return getOrCreateAccountEntropyPool().deriveMasterKey();
     }
 
     private MasterKey getMasterKey() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 21c8aa96..37a0bf82 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -15,7 +15,6 @@ import org.signal.libsignal.zkgroup.InvalidInputException;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
 import org.whispersystems.signalservice.api.backup.MediaRootBackupKey;
-import org.whispersystems.signalservice.api.kbs.MasterKey;
 
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -109,10 +108,6 @@ public class KeyUtils {
         return getSecretBytes(32);
     }
 
-    public static MasterKey createMasterKey() {
-        return MasterKey.createNew(secureRandom);
-    }
-
     public static MediaRootBackupKey createMediaRootBackupKey() {
         return new MediaRootBackupKey(getSecretBytes(32));
     }

From f00b8523d917e129f30697d6dd85c0cc38ae6a52 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 15 Dec 2024 21:18:02 +0100
Subject: [PATCH 547/672] Update dependencies

---
 build.gradle.kts          | 2 +-
 gradle/libs.versions.toml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9d4724c0..26e96b29 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.10.3"
+    id("org.graalvm.buildtools.native") version "0.10.4"
 }
 
 version = "0.13.11-SNAPSHOT"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 84f2d8fc..3a76c9c8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ slf4j = "2.0.16"
 
 [libraries]
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.79"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.1"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.2"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
@@ -11,7 +11,7 @@ slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.12"
 
 signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_113"
-sqlite = "org.xerial:sqlite-jdbc:3.47.0.0"
+sqlite = "org.xerial:sqlite-jdbc:3.47.1.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.3"

From ac145e6a27d30ccea5d5359b98735b539ac036ef Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 25 Dec 2024 16:23:31 +0100
Subject: [PATCH 548/672] Ignore destination if it's an empty uuid

Fixes #1643
---
 .../org/asamk/signal/manager/helper/IncomingMessageHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 5deffb3e..90d67a36 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -962,7 +962,7 @@ public final class IncomingMessageHandler {
 
     private DeviceAddress getDestination(SignalServiceEnvelope envelope) {
         final var destination = envelope.getDestinationServiceId();
-        if (destination == null) {
+        if (destination == null || destination.isUnknown()) {
             return new DeviceAddress(account.getSelfRecipientId(), account.getAci(), account.getDeviceId());
         }
         return new DeviceAddress(account.getRecipientResolver().resolveRecipient(destination),

From c05b47e4d0e95971969a4f31c38cc65d8f23aa46 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 25 Dec 2024 17:19:33 +0100
Subject: [PATCH 549/672] Delete storage id of unregistered recipients after
 remote update

---
 .../signal/manager/helper/StorageHelper.java  | 23 ++++++++++---------
 .../storage/recipients/RecipientStore.java    |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 740c0b5e..5f52585e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -198,17 +198,6 @@ public class StorageHelper {
 
             logger.debug("Pre-Merge ID Difference :: {}", idDifference);
 
-            if (!idDifference.localOnlyIds().isEmpty()) {
-                final var updated = account.getRecipientStore()
-                        .removeStorageIdsFromLocalOnlyUnregisteredRecipients(connection, idDifference.localOnlyIds());
-
-                if (updated > 0) {
-                    logger.warn(
-                            "Found {} records that were deleted remotely but only marked unregistered locally. Removed those from local store.",
-                            updated);
-                }
-            }
-
             if (!idDifference.isEmpty()) {
                 final var remoteOnlyRecords = getSignalStorageRecords(storageKey,
                         remoteManifest,
@@ -227,6 +216,18 @@ public class StorageHelper {
                         .filter(id -> !KNOWN_TYPES.contains(id.getType()))
                         .toList();
 
+                if (!idDifference.localOnlyIds().isEmpty()) {
+                    final var updated = account.getRecipientStore()
+                            .removeStorageIdsFromLocalOnlyUnregisteredRecipients(connection,
+                                    idDifference.localOnlyIds());
+
+                    if (updated > 0) {
+                        logger.warn(
+                                "Found {} records that were deleted remotely but only marked unregistered locally. Removed those from local store.",
+                                updated);
+                    }
+                }
+
                 logger.debug("Storage ids with unknown type: {} inserts, {} deletes",
                         unknownInserts.size(),
                         unknownDeletes.size());
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index aa245369..8d006416 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -934,7 +934,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     }
 
     public void markUndiscoverablePossiblyUnregistered(final Set<String> numbers) {
-        logger.debug("Marking {} numbers as unregistered", numbers.size());
+        logger.debug("Marking {} numbers as undiscoverable", numbers.size());
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
             for (final var number : numbers) {

From 22a0ff976a233448bf7d0f2a064c12e836119e9a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 26 Dec 2024 20:14:53 +0100
Subject: [PATCH 550/672] Update libsignal-service

---
 gradle/libs.versions.toml                      | 2 +-
 src/main/java/org/asamk/signal/BaseConfig.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3a76c9c8..faf2fd57 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.12"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_113"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_114"
 sqlite = "org.xerial:sqlite-jdbc:3.47.1.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3"
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index e25bfa14..35a5a0a2 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.26.1");
+            .orElse("Signal-Android/7.28.4");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 11d38f29efb46c60c582c9a5bac9e61a83044752 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 26 Dec 2024 20:15:19 +0100
Subject: [PATCH 551/672] Improve splitting of long message bodies

---
 .../signal/manager/config/ServiceConfig.java  |  2 +-
 .../signal/manager/internal/ManagerImpl.java  | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index 24365cfe..fed6f457 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -20,7 +20,7 @@ public class ServiceConfig {
 
     public static final int MAX_ATTACHMENT_SIZE = 150 * 1024 * 1024;
     public static final long MAX_ENVELOPE_SIZE = 0;
-    public static final int MAX_MESSAGE_BODY_SIZE = 2000;
+    public static final int MAX_MESSAGE_SIZE_BYTES = 2000;
     public static final long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
     public static final boolean AUTOMATIC_NETWORK_RETRY = true;
     public static final int GROUP_MAX_SIZE = 1001;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index dcdead73..4315f50b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -68,7 +68,6 @@ import org.asamk.signal.manager.api.UserStatus;
 import org.asamk.signal.manager.api.UsernameLinkUrl;
 import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
-import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.helper.AccountFileUpdater;
 import org.asamk.signal.manager.helper.Context;
@@ -140,6 +139,10 @@ import java.util.stream.Stream;
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import okio.Utf8;
+
+import static org.asamk.signal.manager.config.ServiceConfig.MAX_MESSAGE_SIZE_BYTES;
+import static org.signal.core.util.StringExtensionsKt.splitByByteLength;
 
 public class ManagerImpl implements Manager {
 
@@ -763,17 +766,24 @@ public class ManagerImpl implements Manager {
             final Message message
     ) throws AttachmentInvalidException, IOException, UnregisteredRecipientException, InvalidStickerException {
         final var additionalAttachments = new ArrayList<SignalServiceAttachment>();
-        if (message.messageText().length() > ServiceConfig.MAX_MESSAGE_BODY_SIZE) {
-            final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8);
-            final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
-            final var streamDetails = new StreamDetails(new ByteArrayInputStream(messageBytes),
-                    MimeUtils.LONG_TEXT,
-                    messageBytes.length);
-            final var textAttachment = AttachmentUtils.createAttachmentStream(streamDetails,
-                    Optional.empty(),
-                    uploadSpec);
-            messageBuilder.withBody(message.messageText().substring(0, ServiceConfig.MAX_MESSAGE_BODY_SIZE));
-            additionalAttachments.add(context.getAttachmentHelper().uploadAttachment(textAttachment));
+        if (Utf8.size(message.messageText()) > MAX_MESSAGE_SIZE_BYTES) {
+            final var result = splitByByteLength(message.messageText(), MAX_MESSAGE_SIZE_BYTES);
+            final var trimmed = result.getFirst();
+            final var remainder = result.getSecond();
+            if (remainder != null) {
+                final var messageBytes = message.messageText().getBytes(StandardCharsets.UTF_8);
+                final var uploadSpec = dependencies.getMessageSender().getResumableUploadSpec();
+                final var streamDetails = new StreamDetails(new ByteArrayInputStream(messageBytes),
+                        MimeUtils.LONG_TEXT,
+                        messageBytes.length);
+                final var textAttachment = AttachmentUtils.createAttachmentStream(streamDetails,
+                        Optional.empty(),
+                        uploadSpec);
+                messageBuilder.withBody(trimmed);
+                additionalAttachments.add(context.getAttachmentHelper().uploadAttachment(textAttachment));
+            } else {
+                messageBuilder.withBody(message.messageText());
+            }
         } else {
             messageBuilder.withBody(message.messageText());
         }

From 4a781656b40e819d085cda0203867d09c30fb44d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 26 Dec 2024 20:23:08 +0100
Subject: [PATCH 552/672] Update dependencies

---
 gradle/libs.versions.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index faf2fd57..784a2a43 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,10 +8,10 @@ argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
-logback = "ch.qos.logback:logback-classic:1.5.12"
+logback = "ch.qos.logback:logback-classic:1.5.15"
 
 signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_114"
 sqlite = "org.xerial:sqlite-jdbc:3.47.1.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.3"
-junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.3"
+junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
+junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.4"

From a3776c88bdc22ca4aef301be6787b012719709cb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 26 Dec 2024 20:31:28 +0100
Subject: [PATCH 553/672] Bump version to 0.13.11

---
 CHANGELOG.md                          | 7 ++++++-
 build.gradle.kts                      | 2 +-
 data/org.asamk.SignalCli.metainfo.xml | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6d3d435..0b45ac66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.11] - 2024-12-26
+
+Requires libsignal-client version 0.64.0.
+
+### Fixed
+- Fix issue with receiving messages that have an invalid destination
 
 ## [0.13.10] - 2024-11-30
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 26e96b29..ffb5eef4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.4"
 }
 
-version = "0.13.11-SNAPSHOT"
+version = "0.13.11"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 63f55e4d..702cb636 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.11" date="2024-12-26">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.11</url>
+        </release>
         <release version="0.13.10" date="2024-11-30">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.10</url>
         </release>

From c55ee85c5c9fe13b0392777dae8a6af69accd48f Mon Sep 17 00:00:00 2001
From: Slayer <dukhaSlayer@pm.me>
Date: Tue, 14 Jan 2025 11:25:57 +0200
Subject: [PATCH 554/672] Fixing RW connections deadlock on SQLite

Without this change we're getting a connection in the same thread we hold one already.
---
 .../asamk/signal/manager/storage/keyValue/KeyValueStore.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index e5bbc188..ac43c9c5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -78,7 +78,7 @@ public class KeyValueStore {
             final KeyValueEntry<T> key,
             final T value
     ) throws SQLException {
-        final var entry = getEntry(key);
+        final var entry = getEntry(connection, key);
         if (Objects.equals(entry, value)) {
             return false;
         }

From f91ca82902f4d4625b314b7e8535d1a7c6efa06a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 555/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b45ac66..5a670acf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.11] - 2024-12-26
 
 Requires libsignal-client version 0.64.0.
diff --git a/build.gradle.kts b/build.gradle.kts
index ffb5eef4..964d01a0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.4"
 }
 
-version = "0.13.11"
+version = "0.13.12-SNAPSHOT"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From d9826332150548c077293b161cb55c1fe7e1cb93 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 17:31:15 +0100
Subject: [PATCH 556/672] Update dependencies

---
 graalvm-config-dir/reflect-config.json        |  3 ++
 gradle/libs.versions.toml                     |  6 +--
 .../syncStorage/AccountRecordProcessor.java   | 48 ++++++++++++++++---
 .../syncStorage/StorageRecordProcessor.java   |  2 +-
 .../syncStorage/StorageRecordUpdate.java      |  2 +-
 5 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 7a8fe2a1..30ace9e3 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2946,6 +2946,9 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$Companion"
 },
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$IAPSubscriberData"
+},
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PhoneNumberSharingMode"
 },
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 784a2a43..9a5d4fee 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,10 +8,10 @@ argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
-logback = "ch.qos.logback:logback-classic:1.5.15"
+logback = "ch.qos.logback:logback-classic:1.5.16"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_114"
-sqlite = "org.xerial:sqlite-jdbc:3.47.1.0"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_115"
+sqlite = "org.xerial:sqlite-jdbc:3.47.2.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.4"
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index b2f7dd29..5b1efbd6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -11,6 +11,7 @@ import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
+import org.whispersystems.signalservice.api.storage.IAPSubscriptionId;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.StorageId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
@@ -22,8 +23,12 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Optional;
 
+import okio.ByteString;
+
 import static org.asamk.signal.manager.util.Utils.firstNonEmpty;
-import static org.asamk.signal.manager.util.Utils.firstNonNull;
+import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetBackupsSubscriber;
+import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetPayments;
+import static org.whispersystems.signalservice.api.storage.AccountRecordExtensionsKt.safeSetSubscriber;
 
 /**
  * Processes {@link SignalAccountRecord}s.
@@ -77,6 +82,35 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
             familyName = local.familyName;
         }
 
+        final var payments = remote.payments != null && remote.payments.entropy.size() > 0
+                ? remote.payments
+                : local.payments;
+
+        final ByteString donationSubscriberId;
+        final String donationSubscriberCurrencyCode;
+
+        if (remote.subscriberId.size() > 0) {
+            donationSubscriberId = remote.subscriberId;
+            donationSubscriberCurrencyCode = remote.subscriberCurrencyCode;
+        } else {
+            donationSubscriberId = local.subscriberId;
+            donationSubscriberCurrencyCode = local.subscriberCurrencyCode;
+        }
+
+        final ByteString backupsSubscriberId;
+        final IAPSubscriptionId backupsPurchaseToken;
+
+        final var remoteBackupSubscriberData = remote.backupSubscriberData;
+        if (remoteBackupSubscriberData != null && remoteBackupSubscriberData.subscriberId.size() > 0) {
+            backupsSubscriberId = remoteBackupSubscriberData.subscriberId;
+            backupsPurchaseToken = IAPSubscriptionId.Companion.from(remoteBackupSubscriberData);
+        } else {
+            backupsSubscriberId = local.backupSubscriberData != null
+                    ? local.backupSubscriberData.subscriberId
+                    : ByteString.EMPTY;
+            backupsPurchaseToken = IAPSubscriptionId.Companion.from(local.backupSubscriberData);
+        }
+
         final var mergedBuilder = SignalAccountRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
                 .givenName(givenName)
                 .familyName(familyName)
@@ -96,9 +130,6 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .preferredReactionEmoji(firstNonEmpty(remote.preferredReactionEmoji, local.preferredReactionEmoji))
                 .subscriberId(firstNonEmpty(remote.subscriberId, local.subscriberId))
                 .subscriberCurrencyCode(firstNonEmpty(remote.subscriberCurrencyCode, local.subscriberCurrencyCode))
-                .backupsSubscriberId(firstNonEmpty(remote.backupsSubscriberId, local.backupsSubscriberId))
-                .backupsSubscriberCurrencyCode(firstNonEmpty(remote.backupsSubscriberCurrencyCode,
-                        local.backupsSubscriberCurrencyCode))
                 .displayBadgesOnProfile(remote.displayBadgesOnProfile)
                 .subscriptionManuallyCancelled(remote.subscriptionManuallyCancelled)
                 .keepMutedChatsArchived(remote.keepMutedChatsArchived)
@@ -115,9 +146,12 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .username(remote.username)
                 .usernameLink(remote.usernameLink)
                 .e164(account.isPrimaryDevice() ? local.e164 : remote.e164);
-        if (firstNonNull(remote.payments, local.payments) != null) {
-            mergedBuilder.payments(firstNonNull(remote.payments, local.payments));
-        }
+        safeSetPayments(mergedBuilder,
+                payments != null && payments.enabled,
+                payments == null ? null : payments.entropy.toByteArray());
+        safeSetSubscriber(mergedBuilder, donationSubscriberId, donationSubscriberCurrencyCode);
+        safeSetBackupsSubscriber(mergedBuilder, backupsSubscriberId, backupsPurchaseToken);
+
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
index 45a99562..2e14f648 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessor.java
@@ -8,7 +8,7 @@ import java.sql.SQLException;
  * Handles processing a remote record, which involves applying any local changes that need to be
  * made based on the remote records.
  */
-interface StorageRecordProcessor<E extends SignalRecord> {
+interface StorageRecordProcessor<E extends SignalRecord<?>> {
 
     void process(E remoteRecord) throws SQLException;
 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
index 8dcb7b34..da8ccaf6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageRecordUpdate.java
@@ -5,7 +5,7 @@ import org.whispersystems.signalservice.api.storage.SignalRecord;
 /**
  * Represents a pair of records: one old, and one new. The new record should replace the old.
  */
-record StorageRecordUpdate<E extends SignalRecord>(E oldRecord, E newRecord) {
+record StorageRecordUpdate<E extends SignalRecord<?>>(E oldRecord, E newRecord) {
 
     @Override
     public String toString() {

From bd95373a709df83c4c37063f124997de31c2d747 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 20:18:42 +0100
Subject: [PATCH 557/672] Parse unregisteredAtTimestamp correctly

Fixes #1651
Fixes #1646
---
 .../signal/manager/syncStorage/ContactRecordProcessor.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index ee4b04fe..12740fbd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -270,7 +270,9 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                     .withNickNameGivenName(nullIfEmpty(contactProto.givenName))
                     .withNickNameFamilyName(nullIfEmpty(contactProto.familyName))
                     .withNote(nullIfEmpty(contactProto.note))
-                    .withUnregisteredTimestamp(contactProto.unregisteredAtTimestamp);
+                    .withUnregisteredTimestamp(contactProto.unregisteredAtTimestamp == 0
+                            ? null
+                            : contactProto.unregisteredAtTimestamp);
             account.getRecipientStore().storeContact(connection, recipientId, newContact.build());
         }
 

From cbd92654cf22446369f931b59237b9d386b9bb2e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 20:23:09 +0100
Subject: [PATCH 558/672] Store pni correctly in storage record

---
 .../org/asamk/signal/manager/syncStorage/StorageSyncModels.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index ceea180c..9eeaf53a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -89,7 +89,7 @@ public final class StorageSyncModels {
         final var builder = SignalContactRecord.Companion.newBuilder(recipient.getStorageRecord())
                 .aci(address.aci().map(ACI::toString).orElse(""))
                 .e164(address.number().orElse(""))
-                .pni(address.pni().map(PNI::toString).orElse(""))
+                .pni(address.pni().map(PNI::toStringWithoutPrefix).orElse(""))
                 .username(address.username().orElse(""))
                 .profileKey(recipient.getProfileKey() == null
                         ? ByteString.EMPTY

From 7a25ae5b9c435e28988449a911c79045bad8c719 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 20:24:05 +0100
Subject: [PATCH 559/672] Fix reading nickname from storage record

Fixes #1664
---
 .../manager/syncStorage/ContactRecordProcessor.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 12740fbd..2863874b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -267,8 +267,12 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                     .withGivenName(nullIfEmpty(contactProto.systemGivenName))
                     .withFamilyName(nullIfEmpty(contactProto.systemFamilyName))
                     .withNickName(nullIfEmpty(contactProto.systemNickname))
-                    .withNickNameGivenName(nullIfEmpty(contactProto.givenName))
-                    .withNickNameFamilyName(nullIfEmpty(contactProto.familyName))
+                    .withNickNameGivenName(nullIfEmpty(contactProto.nickname == null
+                            ? null
+                            : contactProto.nickname.given))
+                    .withNickNameFamilyName(nullIfEmpty(contactProto.nickname == null
+                            ? null
+                            : contactProto.nickname.family))
                     .withNote(nullIfEmpty(contactProto.note))
                     .withUnregisteredTimestamp(contactProto.unregisteredAtTimestamp == 0
                             ? null

From 94269744ad6ffa34e088a3e5dc21399a8782b60d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 20:28:44 +0100
Subject: [PATCH 560/672] Improve final address when merging recipients

---
 .../recipients/MergeRecipientHelper.java      |  6 ++---
 .../storage/recipients/RecipientAddress.java  | 10 ++++-----
 .../recipients/MergeRecipientHelperTest.java  | 22 ++++++++++---------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index 95c17102..0a96785b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -39,7 +39,7 @@ public class MergeRecipientHelper {
                     )
             ) || recipient.address().aci().equals(address.aci())) {
                 logger.debug("Got existing recipient {}, updating with high trust address", recipient.id());
-                store.updateRecipientAddress(recipient.id(), recipient.address().withIdentifiersFrom(address));
+                store.updateRecipientAddress(recipient.id(), address.withOtherIdentifiersFrom(recipient.address()));
                 return new Pair<>(recipient.id(), List.of());
             }
 
@@ -93,14 +93,14 @@ public class MergeRecipientHelper {
             if (finalAddress == null) {
                 finalAddress = recipient.address();
             } else {
-                finalAddress = finalAddress.withIdentifiersFrom(recipient.address());
+                finalAddress = finalAddress.withOtherIdentifiersFrom(recipient.address());
             }
             store.removeRecipientAddress(recipient.id());
         }
         if (finalAddress == null) {
             finalAddress = address;
         } else {
-            finalAddress = finalAddress.withIdentifiersFrom(address);
+            finalAddress = address.withOtherIdentifiersFrom(finalAddress);
         }
 
         for (final var recipient : recipientsToBeStripped) {
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 ba2b9f26..25dc3a3f 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
@@ -79,11 +79,11 @@ public record RecipientAddress(
         this(Optional.of(serviceId), Optional.empty());
     }
 
-    public RecipientAddress withIdentifiersFrom(RecipientAddress address) {
-        return new RecipientAddress(address.aci.or(this::aci),
-                address.pni.or(this::pni),
-                address.number.or(this::number),
-                address.username.or(this::username));
+    public RecipientAddress withOtherIdentifiersFrom(RecipientAddress address) {
+        return new RecipientAddress(this.aci.or(address::aci),
+                this.pni.or(address::pni),
+                this.number.or(address::number),
+                this.username.or(address::username));
     }
 
     public RecipientAddress removeIdentifiersFrom(RecipientAddress address) {
diff --git a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
index 0931b008..f2f427c1 100644
--- a/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
+++ b/lib/src/test/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelperTest.java
@@ -111,18 +111,20 @@ class MergeRecipientHelperTest {
             new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
                     ADDR_A.FULL,
                     Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.ACI.withIdentifiersFrom(ADDR_B.PNI)), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
-                    ADDR_A.FULL,
-                    Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.ACI.withIdentifiersFrom(ADDR_B.NUM)), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM)),
-                    ADDR_A.FULL,
-                    Set.of(rec(1, ADDR_A.FULL))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI), rec(3, ADDR_A.NUM.withIdentifiersFrom(ADDR_B.ACI))),
+            new T(Set.of(rec(1, ADDR_B.PNI.withOtherIdentifiersFrom(ADDR_A.ACI)),
+                    rec(2, ADDR_A.PNI),
+                    rec(3, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_B.NUM.withOtherIdentifiersFrom(ADDR_A.ACI)),
+                    rec(2, ADDR_A.PNI),
+                    rec(3, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL))),
+            new T(Set.of(rec(1, ADDR_A.ACI),
+                    rec(2, ADDR_A.PNI),
+                    rec(3, ADDR_B.ACI.withOtherIdentifiersFrom(ADDR_A.NUM))),
                     ADDR_A.FULL,
                     Set.of(rec(1, ADDR_A.FULL), rec(3, ADDR_B.ACI))),
-            new T(Set.of(rec(1, ADDR_A.ACI), rec(2, ADDR_A.PNI.withIdentifiersFrom(ADDR_B.ACI)), rec(3, ADDR_A.NUM)),
-                    ADDR_A.FULL,
-                    Set.of(rec(1, ADDR_A.FULL), rec(2, ADDR_B.ACI))),
+            new T(Set.of(rec(1, ADDR_A.ACI),
+                    rec(2, ADDR_B.ACI.withOtherIdentifiersFrom(ADDR_A.PNI)),
+                    rec(3, ADDR_A.NUM)), ADDR_A.FULL, Set.of(rec(1, ADDR_A.FULL), rec(2, ADDR_B.ACI))),
     };
 
     @ParameterizedTest

From 5ac5938c8b7b92e53b57dad705bcbf15e1197d44 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 20:41:04 +0100
Subject: [PATCH 561/672] Reduce log level of invalid sync contact address

Fixes #1663
---
 .../main/java/org/asamk/signal/manager/helper/SyncHelper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 39726df8..2d074014 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -366,7 +366,7 @@ public class SyncHelper {
                 c = s.read();
             } catch (IOException e) {
                 if (e.getMessage() != null && e.getMessage().contains("Missing contact address!")) {
-                    logger.warn("Sync contacts contained invalid contact, ignoring: {}", e.getMessage());
+                    logger.debug("Sync contacts contained invalid contact, ignoring: {}", e.getMessage());
                     continue;
                 } else {
                     throw e;

From e4af0be0ad9627e763719f085bd1c2b8a9681d2d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 21:33:12 +0100
Subject: [PATCH 562/672] Use existing connection to read configuration during
 storage sync

---
 .../signal/manager/helper/StorageHelper.java  |  6 ++--
 .../configuration/ConfigurationStore.java     | 28 +++++++++++++++++++
 .../storage/keyValue/KeyValueStore.java       |  2 +-
 .../syncStorage/AccountRecordProcessor.java   |  3 +-
 .../syncStorage/StorageSyncModels.java        | 19 +++++++------
 5 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index 5f52585e..bb53479b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -353,7 +353,8 @@ public class StorageHelper {
                 final var storageId = newContactStorageIds.get(recipientId);
                 if (storageId.getType() == ManifestRecord.Identifier.Type.ACCOUNT.getValue()) {
                     final var recipient = account.getRecipientStore().getRecipient(connection, recipientId);
-                    final var accountRecord = StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
+                    final var accountRecord = StorageSyncModels.localToRemoteRecord(connection,
+                            account.getConfigurationStore(),
                             recipient,
                             account.getUsernameLink());
                     newStorageRecords.add(new SignalStorageRecord(storageId,
@@ -551,7 +552,8 @@ public class StorageHelper {
                 final var selfRecipient = account.getRecipientStore()
                         .getRecipient(connection, account.getSelfRecipientId());
 
-                final var record = StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
+                final var record = StorageSyncModels.localToRemoteRecord(connection,
+                        account.getConfigurationStore(),
                         selfRecipient,
                         account.getUsernameLink());
                 yield new SignalStorageRecord(storageId, new StorageRecord.Builder().account(record).build());
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
index ef4a4545..88f05725 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/configuration/ConfigurationStore.java
@@ -36,6 +36,10 @@ public class ConfigurationStore {
         return keyValueStore.getEntry(readReceipts);
     }
 
+    public Boolean getReadReceipts(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, readReceipts);
+    }
+
     public void setReadReceipts(final boolean value) {
         if (keyValueStore.storeEntry(readReceipts, value)) {
             recipientStore.rotateSelfStorageId();
@@ -52,6 +56,10 @@ public class ConfigurationStore {
         return keyValueStore.getEntry(unidentifiedDeliveryIndicators);
     }
 
+    public Boolean getUnidentifiedDeliveryIndicators(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, unidentifiedDeliveryIndicators);
+    }
+
     public void setUnidentifiedDeliveryIndicators(final boolean value) {
         if (keyValueStore.storeEntry(unidentifiedDeliveryIndicators, value)) {
             recipientStore.rotateSelfStorageId();
@@ -71,6 +79,10 @@ public class ConfigurationStore {
         return keyValueStore.getEntry(typingIndicators);
     }
 
+    public Boolean getTypingIndicators(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, typingIndicators);
+    }
+
     public void setTypingIndicators(final boolean value) {
         if (keyValueStore.storeEntry(typingIndicators, value)) {
             recipientStore.rotateSelfStorageId();
@@ -87,6 +99,10 @@ public class ConfigurationStore {
         return keyValueStore.getEntry(linkPreviews);
     }
 
+    public Boolean getLinkPreviews(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, linkPreviews);
+    }
+
     public void setLinkPreviews(final boolean value) {
         if (keyValueStore.storeEntry(linkPreviews, value)) {
             recipientStore.rotateSelfStorageId();
@@ -103,6 +119,10 @@ public class ConfigurationStore {
         return keyValueStore.getEntry(phoneNumberUnlisted);
     }
 
+    public Boolean getPhoneNumberUnlisted(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, phoneNumberUnlisted);
+    }
+
     public void setPhoneNumberUnlisted(final boolean value) {
         if (keyValueStore.storeEntry(phoneNumberUnlisted, value)) {
             recipientStore.rotateSelfStorageId();
@@ -119,6 +139,10 @@ public class ConfigurationStore {
         return keyValueStore.getEntry(phoneNumberSharingMode);
     }
 
+    public PhoneNumberSharingMode getPhoneNumberSharingMode(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, phoneNumberSharingMode);
+    }
+
     public void setPhoneNumberSharingMode(final PhoneNumberSharingMode value) {
         if (keyValueStore.storeEntry(phoneNumberSharingMode, value)) {
             recipientStore.rotateSelfStorageId();
@@ -138,6 +162,10 @@ public class ConfigurationStore {
         return keyValueStore.getEntry(usernameLinkColor);
     }
 
+    public String getUsernameLinkColor(final Connection connection) throws SQLException {
+        return keyValueStore.getEntry(connection, usernameLinkColor);
+    }
+
     public void setUsernameLinkColor(final String color) {
         if (keyValueStore.storeEntry(usernameLinkColor, color)) {
             recipientStore.rotateSelfStorageId();
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index ac43c9c5..17135d10 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -52,7 +52,7 @@ public class KeyValueStore {
         }
     }
 
-    private <T> T getEntry(final Connection connection, final KeyValueEntry<T> key) throws SQLException {
+    public <T> T getEntry(final Connection connection, final KeyValueEntry<T> key) throws SQLException {
         final var sql = (
                 """
                 SELECT key, value
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 5b1efbd6..656297bf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -53,7 +53,8 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var recipient = account.getRecipientStore().getRecipient(connection, selfRecipientId);
         final var storageId = account.getRecipientStore().getSelfStorageId(connection);
         this.localAccountRecord = new SignalAccountRecord(storageId,
-                StorageSyncModels.localToRemoteRecord(account.getConfigurationStore(),
+                StorageSyncModels.localToRemoteRecord(connection,
+                        account.getConfigurationStore(),
                         recipient,
                         account.getUsernameLink()));
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index 9eeaf53a..b5d702b4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -22,6 +22,8 @@ import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.Id
 import org.whispersystems.signalservice.internal.storage.protos.GroupV1Record;
 import org.whispersystems.signalservice.internal.storage.protos.GroupV2Record;
 
+import java.sql.Connection;
+import java.sql.SQLException;
 import java.util.Optional;
 
 import okio.ByteString;
@@ -49,10 +51,11 @@ public final class StorageSyncModels {
     }
 
     public static AccountRecord localToRemoteRecord(
+            final Connection connection,
             ConfigurationStore configStore,
             Recipient self,
             UsernameLinkComponents usernameLinkComponents
-    ) {
+    ) throws SQLException {
         final var builder = SignalAccountRecord.Companion.newBuilder(self.getStorageRecord());
         if (self.getProfileKey() != null) {
             builder.profileKey(ByteString.of(self.getProfileKey().serialize()));
@@ -62,19 +65,19 @@ public final class StorageSyncModels {
                     .familyName(emptyIfNull(self.getProfile().getFamilyName()))
                     .avatarUrlPath(emptyIfNull(self.getProfile().getAvatarUrlPath()));
         }
-        builder.typingIndicators(Optional.ofNullable(configStore.getTypingIndicators()).orElse(true))
-                .readReceipts(Optional.ofNullable(configStore.getReadReceipts()).orElse(true))
-                .sealedSenderIndicators(Optional.ofNullable(configStore.getUnidentifiedDeliveryIndicators())
+        builder.typingIndicators(Optional.ofNullable(configStore.getTypingIndicators(connection)).orElse(true))
+                .readReceipts(Optional.ofNullable(configStore.getReadReceipts(connection)).orElse(true))
+                .sealedSenderIndicators(Optional.ofNullable(configStore.getUnidentifiedDeliveryIndicators(connection))
                         .orElse(true))
-                .linkPreviews(Optional.ofNullable(configStore.getLinkPreviews()).orElse(true))
-                .unlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted()).orElse(false))
-                .phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode())
+                .linkPreviews(Optional.ofNullable(configStore.getLinkPreviews(connection)).orElse(true))
+                .unlistedPhoneNumber(Optional.ofNullable(configStore.getPhoneNumberUnlisted(connection)).orElse(false))
+                .phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode(connection))
                         .map(StorageSyncModels::localToRemote)
                         .orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))
                 .e164(self.getAddress().number().orElse(""))
                 .username(self.getAddress().username().orElse(""));
         if (usernameLinkComponents != null) {
-            final var linkColor = configStore.getUsernameLinkColor();
+            final var linkColor = configStore.getUsernameLinkColor(connection);
             builder.usernameLink(new UsernameLink.Builder().entropy(ByteString.of(usernameLinkComponents.getEntropy()))
                     .serverId(UuidUtil.toByteString(usernameLinkComponents.getServerId()))
                     .color(linkColor == null ? UsernameLink.Color.UNKNOWN : UsernameLink.Color.valueOf(linkColor))

From 74c2604dc80616292c8cb06ed88c2c694d843fdb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 22:31:36 +0100
Subject: [PATCH 563/672] Set sqlite PRAGMA via Url

---
 .../main/java/org/asamk/signal/manager/storage/Database.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
index 2fb09a4f..938bb010 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
@@ -95,10 +95,9 @@ public abstract class Database implements AutoCloseable {
         sqliteConfig.setTransactionMode(SQLiteConfig.TransactionMode.IMMEDIATE);
 
         HikariConfig config = new HikariConfig();
-        config.setJdbcUrl("jdbc:sqlite:" + databaseFile);
+        config.setJdbcUrl("jdbc:sqlite:" + databaseFile + "?foreign_keys=ON");
         config.setDataSourceProperties(sqliteConfig.toProperties());
         config.setMinimumIdle(1);
-        config.setConnectionInitSql("PRAGMA foreign_keys=ON");
         return new HikariDataSource(config);
     }
 }

From e11e0930209e330649af182eaa0317d2d987d4e8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 22:35:45 +0100
Subject: [PATCH 564/672] Enable sqlite WAL journal_mode

Related #1670
---
 .../main/java/org/asamk/signal/manager/storage/Database.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
index 938bb010..5099662e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
@@ -95,7 +95,7 @@ public abstract class Database implements AutoCloseable {
         sqliteConfig.setTransactionMode(SQLiteConfig.TransactionMode.IMMEDIATE);
 
         HikariConfig config = new HikariConfig();
-        config.setJdbcUrl("jdbc:sqlite:" + databaseFile + "?foreign_keys=ON");
+        config.setJdbcUrl("jdbc:sqlite:" + databaseFile + "?foreign_keys=ON&journal_mode=wal");
         config.setDataSourceProperties(sqliteConfig.toProperties());
         config.setMinimumIdle(1);
         return new HikariDataSource(config);

From 6acf16ef4ee8f7139ab8cdf97f598bc7b8fb96b3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 14 Jan 2025 23:12:45 +0100
Subject: [PATCH 565/672] Improve tests

---
 graalvm-config-dir/reflect-config.json | 3 +++
 run_tests.sh                           | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 30ace9e3..e508c382 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2938,6 +2938,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
   "allDeclaredFields":true,
+  "fields":[{"name":"avatarUrlPath"}, {"name":"backupSubscriberData"}, {"name":"backupTier"}, {"name":"displayBadgesOnProfile"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hasBackup"}, {"name":"hasCompletedUsernameOnboarding"}, {"name":"hasSeenGroupStoryEducationSheet"}, {"name":"hasSetMyStoriesPrivacy"}, {"name":"hasViewedOnboardingStory"}, {"name":"keepMutedChatsArchived"}, {"name":"linkPreviews"}, {"name":"noteToSelfArchived"}, {"name":"noteToSelfMarkedUnread"}, {"name":"payments"}, {"name":"phoneNumberSharingMode"}, {"name":"pinnedConversations"}, {"name":"preferContactAvatars"}, {"name":"preferredReactionEmoji"}, {"name":"primarySendsSms"}, {"name":"profileKey"}, {"name":"readReceipts"}, {"name":"sealedSenderIndicators"}, {"name":"storiesDisabled"}, {"name":"storyViewReceiptsEnabled"}, {"name":"subscriberCurrencyCode"}, {"name":"subscriberId"}, {"name":"subscriptionManuallyCancelled"}, {"name":"typingIndicators"}, {"name":"universalExpireTimer"}, {"name":"unlistedPhoneNumber"}, {"name":"username"}, {"name":"usernameLink"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -2967,6 +2968,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,
+  "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -2997,6 +2999,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
+  "fields":[{"name":"archived"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/run_tests.sh b/run_tests.sh
index 036ba370..253532ec 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 if [ $# -ne 2 ]; then
   echo "Usage: $0 NUMBER_1 NUMBER_2"
   exit 1
@@ -133,7 +133,7 @@ mkfifo "$FIFO_FILE"
 run_main -a "$NUMBER_1" send "$NUMBER_2" -m hi
 run_main -a "$NUMBER_2" jsonRpc < "$FIFO_FILE" &
 
-exec 3<> "$FIFO_FILE"
+exec 3> "$FIFO_FILE"
   echo '{"jsonrpc":"2.0","id":"id","method":"updateContact","params":{"recipient":"'"$NUMBER_1"'","name":"NUMBER_1","expiration":10}}' >&3
   echo '{"jsonrpc":"2.0","id":5,"method":"block","params":{"recipient":"'"$NUMBER_1"'"}}' >&3
   echo '{"jsonrpc":"2.0","id":null,"method":"unblock","params":{"recipient":"'"$NUMBER_1"'"}}' >&3

From a5d2e1ea23ab043f1ab3643294bcf7796af35d60 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 17 Jan 2025 16:03:00 +0100
Subject: [PATCH 566/672] Use getRawQuery to prevent double decoding the query

Fixes #1682
---
 src/main/java/org/asamk/signal/http/HttpServerHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/http/HttpServerHandler.java b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
index e1780665..542d928b 100644
--- a/src/main/java/org/asamk/signal/http/HttpServerHandler.java
+++ b/src/main/java/org/asamk/signal/http/HttpServerHandler.java
@@ -156,7 +156,7 @@ public class HttpServerHandler implements AutoCloseable {
         }
 
         try {
-            final var queryString = httpExchange.getRequestURI().getQuery();
+            final var queryString = httpExchange.getRequestURI().getRawQuery();
             final var query = queryString == null ? Map.<String, String>of() : Util.getQueryMap(queryString);
 
             List<Manager> managers = getManagerFromQuery(query);

From c25468a71e4a1c095b0fee5e91bdff43bb9e5469 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 17 Jan 2025 16:09:39 +0100
Subject: [PATCH 567/672] Update reflect-config.json

---
 graalvm-config-dir/reflect-config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index e508c382..a94d7ed6 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -75,6 +75,9 @@
 {
   "name":"[Lorg.asamk.signal.manager.storage.accounts.AccountsStorage$Account;"
 },
+{
+  "name":"[Lorg.asamk.signal.manager.storage.stickerPacks.JsonStickerPack$JsonSticker;"
+},
 {
   "name":"[Lorg.whispersystems.signalservice.api.groupsv2.TemporalCredential;"
 },

From 78cd0b13dea508b80887c049fa240061b7aed7d4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 16:08:43 +0100
Subject: [PATCH 568/672] Update dependencies

---
 graalvm-config-dir/reflect-config.json                |  2 --
 gradle/libs.versions.toml                             |  6 +++---
 .../signal/manager/util/NumberVerificationUtils.java  | 11 ++++-------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index a94d7ed6..84fba606 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2941,7 +2941,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
   "allDeclaredFields":true,
-  "fields":[{"name":"avatarUrlPath"}, {"name":"backupSubscriberData"}, {"name":"backupTier"}, {"name":"displayBadgesOnProfile"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hasBackup"}, {"name":"hasCompletedUsernameOnboarding"}, {"name":"hasSeenGroupStoryEducationSheet"}, {"name":"hasSetMyStoriesPrivacy"}, {"name":"hasViewedOnboardingStory"}, {"name":"keepMutedChatsArchived"}, {"name":"linkPreviews"}, {"name":"noteToSelfArchived"}, {"name":"noteToSelfMarkedUnread"}, {"name":"payments"}, {"name":"phoneNumberSharingMode"}, {"name":"pinnedConversations"}, {"name":"preferContactAvatars"}, {"name":"preferredReactionEmoji"}, {"name":"primarySendsSms"}, {"name":"profileKey"}, {"name":"readReceipts"}, {"name":"sealedSenderIndicators"}, {"name":"storiesDisabled"}, {"name":"storyViewReceiptsEnabled"}, {"name":"subscriberCurrencyCode"}, {"name":"subscriberId"}, {"name":"subscriptionManuallyCancelled"}, {"name":"typingIndicators"}, {"name":"universalExpireTimer"}, {"name":"unlistedPhoneNumber"}, {"name":"username"}, {"name":"usernameLink"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -2971,7 +2970,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,
-  "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9a5d4fee..14dc6066 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 slf4j = "2.0.16"
 
 [libraries]
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.79"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.80"
 jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.2"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
@@ -10,8 +10,8 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.16"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_115"
-sqlite = "org.xerial:sqlite-jdbc:3.47.2.0"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_116"
+sqlite = "org.xerial:sqlite-jdbc:3.48.0.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.4"
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index e0c4b619..388333ad 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -11,9 +11,9 @@ import org.asamk.signal.manager.helper.PinHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
+import org.whispersystems.signalservice.api.push.exceptions.ChallengeRequiredException;
 import org.whispersystems.signalservice.api.push.exceptions.NoSuchSessionException;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.signalservice.api.push.exceptions.PushChallengeRequiredException;
 import org.whispersystems.signalservice.api.push.exceptions.TokenNotAcceptedException;
 import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.internal.push.LockedException;
@@ -39,8 +39,7 @@ public class NumberVerificationUtils {
         RegistrationSessionMetadataResponse sessionResponse;
         try {
             sessionResponse = getValidSession(registrationApi, sessionId);
-        } catch (PushChallengeRequiredException |
-                 org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) {
+        } catch (ChallengeRequiredException e) {
             if (captcha != null) {
                 sessionResponse = submitCaptcha(registrationApi, sessionId, captcha);
             } else {
@@ -99,7 +98,7 @@ public class NumberVerificationUtils {
                 voiceVerification ? VerificationCodeTransport.VOICE : VerificationCodeTransport.SMS);
         try {
             Utils.handleResponseException(response);
-        } catch (org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException e) {
+        } catch (ChallengeRequiredException e) {
             throw new CaptchaRequiredException(e.getMessage(), e);
         } catch (org.whispersystems.signalservice.api.push.exceptions.NonNormalizedPhoneNumberException e) {
             throw new NonNormalizedPhoneNumberException("Phone number is not normalized ("
@@ -179,9 +178,7 @@ public class NumberVerificationUtils {
         captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
         try {
             return Utils.handleResponseException(registrationApi.submitCaptchaToken(sessionId, captcha));
-        } catch (PushChallengeRequiredException |
-                 org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException |
-                 TokenNotAcceptedException _e) {
+        } catch (ChallengeRequiredException | TokenNotAcceptedException _e) {
             throw new CaptchaRequiredException("Captcha not accepted");
         } catch (NonSuccessfulResponseCodeException e) {
             if (e.code == 400) {

From a1378507b2a869353bdbbc7304e3f86a7d3f55c0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 16:30:07 +0100
Subject: [PATCH 569/672] Rename lib to libsignal-cli

---
 build.gradle.kts    | 2 +-
 settings.gradle.kts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 964d01a0..2982728b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -51,7 +51,7 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.slf4j.jul)
     implementation(libs.logback)
-    implementation(project(":lib"))
+    implementation(project(":libsignal-cli"))
 }
 
 configurations {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fe7c45a9..45e6390c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,4 +6,6 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "signal-cli"
-include("lib")
+
+include("libsignal-cli")
+project(":libsignal-cli").projectDir = file("lib")

From 05cd6aee6ab76e056b561706993167928114d966 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 16:30:28 +0100
Subject: [PATCH 570/672] Add version and group to all modules

---
 build.gradle.kts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2982728b..b5689013 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,10 @@ plugins {
     id("org.graalvm.buildtools.native") version "0.10.4"
 }
 
-version = "0.13.12-SNAPSHOT"
+allprojects {
+    group = "org.asamk"
+    version = "0.13.12-SNAPSHOT"
+}
 
 java {
     sourceCompatibility = JavaVersion.VERSION_21

From 407a20d4bbca21ffbc250b687b36428f72899ba4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 16:53:09 +0100
Subject: [PATCH 571/672] Update client dependencies

---
 client/Cargo.lock | 790 ++++++++++++++++++++++++++++------------------
 client/Cargo.toml |   2 +-
 2 files changed, 485 insertions(+), 307 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index 5118fb2a..b85be350 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -1,27 +1,27 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -34,49 +34,50 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.87"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "async-trait"
-version = "0.1.82"
+version = "0.1.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
+checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -91,23 +92,23 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -118,21 +119,21 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cc"
-version = "1.1.18"
+version = "1.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
 dependencies = [
  "shlex",
 ]
@@ -151,9 +152,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.17"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -161,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.17"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
 dependencies = [
  "anstream",
  "anstyle",
@@ -174,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -186,15 +187,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "combine"
@@ -222,6 +223,17 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -230,12 +242,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -255,24 +267,24 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -281,15 +293,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-timer"
@@ -299,9 +311,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -325,15 +337,15 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "h2"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -350,9 +362,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "heck"
@@ -360,17 +372,11 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -402,15 +408,15 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -428,9 +434,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.3"
+version = "0.27.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
 dependencies = [
  "futures-util",
  "http",
@@ -446,9 +452,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -459,26 +465,154 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -492,9 +626,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jni"
@@ -506,7 +640,7 @@ dependencies = [
  "combine",
  "jni-sys",
  "log",
- "thiserror",
+ "thiserror 1.0.69",
  "walkdir",
 ]
 
@@ -518,9 +652,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jsonrpsee"
-version = "0.24.3"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ec465b607a36dc5dd45d48b7689bc83f679f66a3ac6b6b21cc787a11e0f8685"
+checksum = "c5c71d8c1a731cc4227c2f698d377e7848ca12c8a48866fc5e6951c43a4db843"
 dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-http-client",
@@ -531,9 +665,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.24.3"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e942c55635fbf5dc421938b8558a8141c7e773720640f4f1dbe1f4164ca4e221"
+checksum = "f2882f6f8acb9fdaec7cefc4fd607119a9bd709831df7d7672a1d3b644628280"
 dependencies = [
  "async-trait",
  "bytes",
@@ -547,7 +681,7 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -555,9 +689,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.24.3"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33774602df12b68a2310b38a535733c477ca4a498751739f89fe8dbbb62ec4c"
+checksum = "b3638bc4617f96675973253b3a45006933bde93c2fd8a6170b33c777cc389e5b"
 dependencies = [
  "async-trait",
  "base64",
@@ -571,7 +705,7 @@ dependencies = [
  "rustls-platform-verifier",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "tokio",
  "tower",
  "tracing",
@@ -580,9 +714,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.24.3"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b07a2daf52077ab1b197aea69a5c990c060143835bf04c77070e98903791715"
+checksum = "c06c01ae0007548e73412c08e2285ffe5d723195bf268bce67b1b77c3bb2a14d"
 dependencies = [
  "heck",
  "proc-macro-crate",
@@ -593,33 +727,39 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.24.3"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b67d6e008164f027afbc2e7bb79662650158d26df200040282d2aa1cbb093b"
+checksum = "a178c60086f24cc35bb82f57c651d0d25d99c4742b4d335de04e97fa1f08a8a1"
 dependencies = [
  "http",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "memchr"
@@ -629,20 +769,19 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
@@ -678,18 +817,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "openssl-probe"
@@ -705,18 +844,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -725,9 +864,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -746,18 +885,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -785,28 +924,28 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustix"
-version = "0.38.36"
+version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
+checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
  "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.12"
+version = "0.23.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8"
 dependencies = [
  "log",
  "once_cell",
@@ -832,19 +971,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.3"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
 dependencies = [
- "base64",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.8.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
+checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
 
 [[package]]
 name = "rustls-platform-verifier"
@@ -875,9 +1013,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.7"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -901,9 +1039,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -924,9 +1062,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -934,18 +1072,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -954,9 +1092,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
 dependencies = [
  "itoa",
  "memchr",
@@ -982,7 +1120,7 @@ dependencies = [
  "log",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 2.0.11",
  "tokio",
  "tokio-util",
 ]
@@ -1004,9 +1142,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1018,6 +1156,12 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -1032,9 +1176,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1042,29 +1186,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "terminal_size"
-version = "0.3.0"
+name = "synstructure"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-dependencies = [
- "rustix",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.63"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1072,25 +1197,70 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "terminal_size"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
 dependencies = [
- "tinyvec_macros",
+ "rustix",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
+name = "thiserror"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+dependencies = [
+ "thiserror-impl 2.0.11",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1104,9 +1274,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1115,20 +1285,19 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
  "rustls",
- "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -1137,9 +1306,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1156,9 +1325,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1175,7 +1344,6 @@ dependencies = [
  "futures-util",
  "pin-project",
  "pin-project-lite",
- "tokio",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -1195,9 +1363,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -1207,9 +1375,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1218,9 +1386,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -1231,26 +1399,11 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
-dependencies = [
- "tinyvec",
-]
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "untrusted"
@@ -1260,15 +1413,27 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -1302,9 +1467,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.5"
+version = "0.26.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
+checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -1340,22 +1505,13 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -1364,22 +1520,7 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -1388,46 +1529,28 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -1440,48 +1563,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -1490,15 +1589,94 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.6.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
 dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/client/Cargo.toml b/client/Cargo.toml
index b60f2041..c435149f 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -20,4 +20,4 @@ jsonrpsee = { version = "0.24", features = [
 bytes = "1"
 tokio-util = "0.7"
 futures-util = "0.3"
-thiserror = "1"
+thiserror = "2"

From 055a8ee8b9f936c4d2f49949e0d2d7021ee4d5d7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 16:59:25 +0100
Subject: [PATCH 572/672] Add general description for global/subcommand
 arguments

Fixes #1649
---
 src/main/java/org/asamk/signal/App.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index d3d74c3e..e494d201 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -99,6 +99,9 @@ public class App {
                 .help("Disable message send log (for resending messages that recipient couldn't decrypt)")
                 .action(Arguments.storeTrue());
 
+        parser.epilog(
+                "The global arguments are shown with 'signal-cli -h' and need to come before the subcommand, while the subcommand-specific arguments (shown with 'signal-cli SUBCOMMAND -h') need to be given after the subcommand.");
+
         var subparsers = parser.addSubparsers().title("subcommands").dest("command");
 
         Commands.getCommandSubparserAttachers().forEach((key, value) -> {

From 2d1ba6b4caeeee03d9a7933f0e5f072a716fa014 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 19:56:23 +0100
Subject: [PATCH 573/672] Extend man Makefile

---
 man/Makefile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/man/Makefile b/man/Makefile
index 55d27fd3..e3aca110 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,4 +1,6 @@
 A2X = a2x
+MKDIR = mkdir
+GZIP = gzip
 
 MANPAGESRC = signal-cli.1 signal-cli-dbus.5 signal-cli-jsonrpc.5
 
@@ -8,3 +10,13 @@ all: $(MANPAGESRC)
 %: %.adoc
 	@echo "Generating manpage for $@"
 	$(A2X) --no-xmllint --doctype manpage --format manpage "$^"
+
+.PHONY: install
+install: all
+	$(MKDIR) -p man1 man5
+	for f in *.1; do $(GZIP) < "$$f" > man1/"$$f".gz ; done
+	for f in *.5; do $(GZIP) < "$$f" > man5/"$$f".gz ; done
+
+.PHONY: clean
+clean:
+	rm -rf *.1 *.5 man1 man5

From 148bf7dee2aed75308957a7add0f06498a790cb1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 19:56:56 +0100
Subject: [PATCH 574/672] Add man page to build tar file

Fixes #1660
---
 .github/workflows/ci.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 75d892a8..490b8541 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,8 +29,19 @@ jobs:
         uses: gradle/gradle-build-action@v2
         with:
           dependency-graph: generate-and-submit
+      - name: Install asciidoc
+        run: sudo apt --no-install-recommends install -y asciidoc-base
       - name: Build with Gradle
         run: ./gradlew --no-daemon build
+      - name: Build man page
+        run: |
+          cd man
+          make install
+      - name: Add man page to archive
+        run: |
+          version=$(tar tf build/distributions/signal-cli-*.tar | head -n1 | sed 's|signal-cli-\([^/]*\)/.*|\1|')
+          echo $version
+          tar --transform="flags=r;s|man|signal-cli-${version}/man|" -rf build/distributions/signal-cli-${version}.tar man/man{1,5}
       - name: Compress archive
         run: gzip -n -9 build/distributions/signal-cli-*.tar
       - name: Archive production artifacts

From 71d3b83a1ca8c40a7d32f088caea14a774075852 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 20:24:01 +0100
Subject: [PATCH 575/672] Update user agent

---
 src/main/java/org/asamk/signal/BaseConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 35a5a0a2..52df0235 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.28.4");
+            .orElse("Signal-Android/7.30.1");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From f14c204764f8a42e9388d3dd9ece334f1615f7a3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 18 Jan 2025 20:53:46 +0100
Subject: [PATCH 576/672] Bump version to 0.13.12

---
 CHANGELOG.md                          | 15 ++++++++++++++-
 build.gradle.kts                      |  2 +-
 data/org.asamk.SignalCli.metainfo.xml |  3 +++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a670acf..758b593a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.12] - 2025-01-18
+
+Requires libsignal-client version 0.65.2.
+
+### Fixed
+
+- Fix sync of contact nick name
+- Fix incorrectly marking recipients as unregistered after sync
+- Fix cause of database deadlock (Thanks @dukhaSlayer)
+- Fix parsing of account query param in events http endpoint
+
+### Changed
+
+- Enable sqlite WAL journal\_mode for improved performance
 
 ## [0.13.11] - 2024-12-26
 
diff --git a/build.gradle.kts b/build.gradle.kts
index b5689013..77786967 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.12-SNAPSHOT"
+    version = "0.13.12"
 }
 
 java {
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 702cb636..098e95d6 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.12" date="2025-01-18">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.12</url>
+        </release>
         <release version="0.13.11" date="2024-12-26">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.11</url>
         </release>

From 70313c45a9b0731e8ec6f274ce256e1161dcef02 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 19 Jan 2025 13:25:08 +0100
Subject: [PATCH 577/672] Update reflect-config.json

Fixes #1686
---
 graalvm-config-dir/reflect-config.json | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 84fba606..f44e58fc 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2916,7 +2916,28 @@
   "allDeclaredFields":true,
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","org.whispersystems.signalservice.internal.push.WhoAmIResponse$Entitlements"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.String","java.lang.String","java.lang.String","org.whispersystems.signalservice.internal.push.WhoAmIResponse$Entitlements","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.WhoAmIResponse$BackupEntitlement",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.Long","java.lang.Long"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.WhoAmIResponse$BadgeEntitlement",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.Boolean","java.lang.Long"] }, {"name":"<init>","parameterTypes":["java.lang.String","java.lang.Boolean","java.lang.Long","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
+},
+{
+  "name":"org.whispersystems.signalservice.internal.push.WhoAmIResponse$Entitlements",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.util.List","org.whispersystems.signalservice.internal.push.WhoAmIResponse$BackupEntitlement"] }, {"name":"<init>","parameterTypes":["java.util.List","org.whispersystems.signalservice.internal.push.WhoAmIResponse$BackupEntitlement","int","kotlin.jvm.internal.DefaultConstructorMarker"] }]
 },
 {
   "name":"org.whispersystems.signalservice.internal.serialize.protos.AddressProto",

From d57442bd2aba13dd168c9da009c89cb2a54ffaa7 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 578/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 758b593a..32c2f971 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.12] - 2025-01-18
 
 Requires libsignal-client version 0.65.2.
diff --git a/build.gradle.kts b/build.gradle.kts
index 77786967..f51d9f1c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.12"
+    version = "0.13.13-SNAPSHOT"
 }
 
 java {

From 5e16123632d839bc0fa0648d8fabbec48c03a7f9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 23 Jan 2025 17:11:33 +0100
Subject: [PATCH 579/672] Extend updateContact command with nick given/family
 name and note

---
 .../java/org/asamk/signal/manager/Manager.java |  9 ++++++---
 .../signal/manager/helper/ContactHelper.java   | 18 +++++++++++++++++-
 .../signal/manager/internal/ManagerImpl.java   | 16 ++++++++++++----
 man/signal-cli.1.adoc                          | 15 ++++++++++++---
 .../signal/commands/UpdateContactCommand.java  | 18 ++++++++++++++----
 .../org/asamk/signal/dbus/DbusManagerImpl.java |  5 ++++-
 .../org/asamk/signal/dbus/DbusSignalImpl.java  |  2 +-
 7 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 85644f61..bdb3dbc9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -237,9 +237,12 @@ public interface Manager extends Closeable {
     void deleteContact(RecipientIdentifier.Single recipient);
 
     void setContactName(
-            RecipientIdentifier.Single recipient,
-            String givenName,
-            final String familyName
+            final RecipientIdentifier.Single recipient,
+            final String givenName,
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
     ) throws NotPrimaryDeviceException, UnregisteredRecipientException;
 
     void setContactsBlocked(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
index fafb9ffe..8461fbe0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java
@@ -17,7 +17,14 @@ public class ContactHelper {
         return sourceContact != null && sourceContact.isBlocked();
     }
 
-    public void setContactName(final RecipientId recipientId, final String givenName, final String familyName) {
+    public void setContactName(
+            final RecipientId recipientId,
+            final String givenName,
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
+    ) {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
         builder.withIsHidden(false);
@@ -27,6 +34,15 @@ public class ContactHelper {
         if (familyName != null) {
             builder.withFamilyName(familyName);
         }
+        if (nickGivenName != null) {
+            builder.withNickNameGivenName(nickGivenName);
+        }
+        if (nickFamilyName != null) {
+            builder.withNickNameFamilyName(nickFamilyName);
+        }
+        if (note != null) {
+            builder.withNote(note);
+        }
         account.getContactStore().storeContact(recipientId, builder.build());
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 4315f50b..403b9adf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -1049,15 +1049,23 @@ public class ManagerImpl implements Manager {
 
     @Override
     public void setContactName(
-            RecipientIdentifier.Single recipient,
-            String givenName,
-            final String familyName
+            final RecipientIdentifier.Single recipient,
+            final String givenName,
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
     ) throws NotPrimaryDeviceException, UnregisteredRecipientException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
         }
         context.getContactHelper()
-                .setContactName(context.getRecipientHelper().resolveRecipient(recipient), givenName, familyName);
+                .setContactName(context.getRecipientHelper().resolveRecipient(recipient),
+                        givenName,
+                        familyName,
+                        nickGivenName,
+                        nickFamilyName,
+                        note);
         syncRemoteStorage();
     }
 
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 4196f991..48b821df 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -669,11 +669,20 @@ If the contact doesn't exist yet, it will be added.
 RECIPIENT::
 Specify the recipient.
 
-*--given-name* NAME, *--name* NAME::
-New (given) name.
+*--given-name* GIVEN_NAME, *--name* NAME::
+New system given name.
 
 *--family-name* FAMILY_NAME::
-New family name.
+New system family name.
+
+*--nick-given-name* NICK_GIVEN_NAME::
+New nick given name.
+
+*--nick-family-name* NICK_FAMILY_NAME::
+New nick family name.
+
+*--note* NOTE::
+New note.
 
 *-e*, *--expiration* EXPIRATION_SECONDS::
 Set expiration time of messages (seconds).
diff --git a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
index 815c15da..312ac8e8 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateContactCommand.java
@@ -26,8 +26,11 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
         subparser.help("Update the details of a given contact");
         subparser.addArgument("recipient").help("Contact number");
         subparser.addArgument("-n", "--name").help("New contact name");
-        subparser.addArgument("--given-name").help("New contact given name");
-        subparser.addArgument("--family-name").help("New contact family name");
+        subparser.addArgument("--given-name").help("New system given name");
+        subparser.addArgument("--family-name").help("New system family name");
+        subparser.addArgument("--nick-given-name").help("New nick given name");
+        subparser.addArgument("--nick-family-name").help("New nick family name");
+        subparser.addArgument("--note").help("New note");
         subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
     }
 
@@ -54,8 +57,15 @@ public class UpdateContactCommand implements JsonRpcLocalCommand {
                     familyName = "";
                 }
             }
-            if (givenName != null || familyName != null) {
-                m.setContactName(recipient, givenName, familyName);
+            var nickGivenName = ns.getString("nick-given-name");
+            var nickFamilyName = ns.getString("nick-family-name");
+            var note = ns.getString("note");
+            if (givenName != null
+                    || familyName != null
+                    || nickGivenName != null
+                    || nickFamilyName != null
+                    || note != null) {
+                m.setContactName(recipient, givenName, familyName, nickGivenName, nickFamilyName, note);
             }
         } catch (IOException e) {
             throw new IOErrorException("Update contact error: " + e.getMessage(), e);
diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 159407e1..5658d0d3 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -516,7 +516,10 @@ public class DbusManagerImpl implements Manager {
     public void setContactName(
             final RecipientIdentifier.Single recipient,
             final String givenName,
-            final String familyName
+            final String familyName,
+            final String nickGivenName,
+            final String nickFamilyName,
+            final String note
     ) throws NotPrimaryDeviceException {
         signal.setContactName(recipient.getIdentifier(), givenName);
     }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index bbae26b5..ac77df99 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -531,7 +531,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
     @Override
     public void setContactName(final String number, final String name) {
         try {
-            m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "");
+            m.setContactName(getSingleRecipientIdentifier(number, m.getSelfNumber()), name, "", null, null, null);
         } catch (NotPrimaryDeviceException e) {
             throw new Error.Failure("This command doesn't work on linked devices.");
         } catch (UnregisteredRecipientException e) {

From b8d8413a2215ff9a7ecbf47f376aae89015bab51 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 23 Jan 2025 17:12:40 +0100
Subject: [PATCH 580/672] Fix creating builder from contact

Fixes #1678
---
 lib/src/main/java/org/asamk/signal/manager/api/Contact.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
index 91cf82df..3eef0117 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -49,8 +49,12 @@ public record Contact(
         builder.givenName = copy.givenName();
         builder.familyName = copy.familyName();
         builder.nickName = copy.nickName();
+        builder.nickNameGivenName = copy.nickNameGivenName();
+        builder.nickNameFamilyName = copy.nickNameFamilyName();
+        builder.note = copy.note();
         builder.color = copy.color();
         builder.messageExpirationTime = copy.messageExpirationTime();
+        builder.messageExpirationTimeVersion = copy.messageExpirationTimeVersion();
         builder.muteUntil = copy.muteUntil();
         builder.hideStory = copy.hideStory();
         builder.isBlocked = copy.isBlocked();

From 47d65586cd82e5b948b88e558b102baef7e5d6e9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 30 Jan 2025 19:57:44 +0100
Subject: [PATCH 581/672] Improve handling of unknown storage records

Fixes #1696
---
 .../signal/manager/helper/StorageHelper.java  | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
index bb53479b..14db7c13 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java
@@ -210,12 +210,6 @@ public class StorageHelper {
                             remoteOnlyRecords.size());
                 }
 
-                final var unknownInserts = processKnownRecords(connection, remoteOnlyRecords);
-                final var unknownDeletes = idDifference.localOnlyIds()
-                        .stream()
-                        .filter(id -> !KNOWN_TYPES.contains(id.getType()))
-                        .toList();
-
                 if (!idDifference.localOnlyIds().isEmpty()) {
                     final var updated = account.getRecipientStore()
                             .removeStorageIdsFromLocalOnlyUnregisteredRecipients(connection,
@@ -228,6 +222,12 @@ public class StorageHelper {
                     }
                 }
 
+                final var unknownInserts = processKnownRecords(connection, remoteOnlyRecords);
+                final var unknownDeletes = idDifference.localOnlyIds()
+                        .stream()
+                        .filter(id -> !KNOWN_TYPES.contains(id.getType()))
+                        .toList();
+
                 logger.debug("Storage ids with unknown type: {} inserts, {} deletes",
                         unknownInserts.size(),
                         unknownDeletes.size());
@@ -279,10 +279,22 @@ public class StorageHelper {
         try (final var connection = account.getAccountDatabase().getConnection()) {
             connection.setAutoCommit(false);
 
-            final var localStorageIds = getAllLocalStorageIds(connection);
-            final var idDifference = findIdDifference(remoteManifest.storageIds, localStorageIds);
+            var localStorageIds = getAllLocalStorageIds(connection);
+            var idDifference = findIdDifference(remoteManifest.storageIds, localStorageIds);
             logger.debug("ID Difference :: {}", idDifference);
 
+            final var unknownOnlyLocal = idDifference.localOnlyIds()
+                    .stream()
+                    .filter(id -> !KNOWN_TYPES.contains(id.getType()))
+                    .toList();
+
+            if (!unknownOnlyLocal.isEmpty()) {
+                logger.debug("Storage ids with unknown type: {} to delete", unknownOnlyLocal.size());
+                account.getUnknownStorageIdStore().deleteUnknownStorageIds(connection, unknownOnlyLocal);
+                localStorageIds = getAllLocalStorageIds(connection);
+                idDifference = findIdDifference(remoteManifest.storageIds, localStorageIds);
+            }
+
             final var remoteDeletes = idDifference.remoteOnlyIds().stream().map(StorageId::getRaw).toList();
             final var remoteInserts = buildLocalStorageRecords(connection, idDifference.localOnlyIds());
             // TODO check if local storage record proto matches remote, then reset to remote storage_id
@@ -595,7 +607,7 @@ public class StorageHelper {
             final var remote = remoteByRawId.get(rawId);
             final var local = localByRawId.get(rawId);
 
-            if (remote.getType() != local.getType() && local.getType() != 0) {
+            if (remote.getType() != local.getType() && KNOWN_TYPES.contains(local.getType())) {
                 remoteOnlyRawIds.remove(rawId);
                 localOnlyRawIds.remove(rawId);
                 hasTypeMismatch = true;

From a6ec71dc315e5b259a7bfe70cad46b7780b73fa9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 30 Jan 2025 20:18:07 +0100
Subject: [PATCH 582/672] Add --mobilecoin-address as alias to updateProfile

Closes #1638
---
 client/src/cli.rs                                              | 2 +-
 man/signal-cli.1.adoc                                          | 2 +-
 .../java/org/asamk/signal/commands/UpdateProfileCommand.java   | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index a64ab511..4ff9d458 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -413,7 +413,7 @@ pub enum CliCommands {
         #[arg(long = "about-emoji")]
         about_emoji: Option<String>,
 
-        #[arg(long = "mobile-coin-address")]
+        #[arg(long = "mobile-coin-address", visible_alias = "mobilecoin-address")]
         mobile_coin_address: Option<String>,
 
         #[arg(long)]
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 48b821df..32321095 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -657,7 +657,7 @@ Path to the new avatar image file.
 *--remove-avatar*::
 Remove the avatar
 
-*--mobile-coin-address*::
+*--mobile-coin-address*, **--mobilecoin-address**::
 New MobileCoin address (Base64 encoded public address)
 
 === updateContact
diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index b122f58c..7a3281fe 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -27,7 +27,8 @@ public class UpdateProfileCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--family-name").help("New profile family name (optional)");
         subparser.addArgument("--about").help("New profile about text");
         subparser.addArgument("--about-emoji").help("New profile about emoji");
-        subparser.addArgument("--mobile-coin-address").help("New MobileCoin address (Base64 encoded public address)");
+        subparser.addArgument("--mobile-coin-address", "--mobilecoin-address")
+                .help("New MobileCoin address (Base64 encoded public address)");
 
         final var avatarOptions = subparser.addMutuallyExclusiveGroup();
         avatarOptions.addArgument("--avatar").help("Path to new profile avatar");

From f04f789231cb82e2186268d5d726d9166f2e246c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 31 Jan 2025 16:45:47 +0100
Subject: [PATCH 583/672] Update gradle action

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 490b8541..ddb2ebbd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v4
         with:
           dependency-graph: generate-and-submit
       - name: Install asciidoc

From dfa886fae938f126a845b62f1c8b5d64888160f9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 7 Feb 2025 17:31:29 +0100
Subject: [PATCH 584/672] Update dependencies

---
 build.gradle.kts                              |  2 +-
 graalvm-config-dir/jni-config.json            |  6 +++++-
 graalvm-config-dir/resource-config.json       |  2 ++
 gradle/libs.versions.toml                     |  4 ++--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 gradlew                                       |  3 +--
 .../manager/util/NumberVerificationUtils.java | 20 +++++++++----------
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f51d9f1c..3f728938 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.10.4"
+    id("org.graalvm.buildtools.native") version "0.10.5"
 }
 
 allprojects {
diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index fc76b7f9..7c68c6d6 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -88,7 +88,7 @@
 },
 {
   "name":"org.signal.libsignal.internal.CompletableFuture",
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }]
 },
 {
   "name":"org.signal.libsignal.net.CdsiLookupResponse",
@@ -110,6 +110,10 @@
 {
   "name":"org.signal.libsignal.net.ChatService$ResponseAndDebugInfo"
 },
+{
+  "name":"org.signal.libsignal.net.NetworkException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
 {
   "name":"org.signal.libsignal.protocol.DuplicateMessageException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index 8bd8a7af..b9ead797 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -188,6 +188,8 @@
     "pattern":"\\Qlibsignal_jni_amd64.dylib\\E"
   }, {
     "pattern":"\\Qlibsignal_jni_amd64.so\\E"
+  }, {
+    "pattern":"\\Qlibsignal_jni_testing_amd64.so\\E"
   }, {
     "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
   }, {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 14dc6066..be95c8bb 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,8 +10,8 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.16"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_116"
-sqlite = "org.xerial:sqlite-jdbc:3.48.0.0"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_117"
+sqlite = "org.xerial:sqlite-jdbc:3.49.0.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.4"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df97d72b..cea7a793 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d..f3b75f3b 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 388333ad..921d7fc1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -47,38 +47,38 @@ public class NumberVerificationUtils {
             }
         }
 
-        sessionId = sessionResponse.getBody().getId();
+        sessionId = sessionResponse.getMetadata().getId();
         sessionIdSaver.accept(sessionId);
 
-        if (sessionResponse.getBody().getVerified()) {
+        if (sessionResponse.getMetadata().getVerified()) {
             return sessionId;
         }
 
-        if (sessionResponse.getBody().getAllowedToRequestCode()) {
+        if (sessionResponse.getMetadata().getAllowedToRequestCode()) {
             return sessionId;
         }
 
         final var nextAttempt = voiceVerification
-                ? sessionResponse.getBody().getNextCall()
-                : sessionResponse.getBody().getNextSms();
+                ? sessionResponse.getMetadata().getNextCall()
+                : sessionResponse.getMetadata().getNextSms();
         if (nextAttempt == null) {
             throw new VerificationMethodNotAvailableException();
         } else if (nextAttempt > 0) {
-            final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextAttempt * 1000;
+            final var timestamp = sessionResponse.getClientReceivedAtMilliseconds() + nextAttempt * 1000;
             throw new RateLimitException(timestamp);
         }
 
-        final var nextVerificationAttempt = sessionResponse.getBody().getNextVerificationAttempt();
+        final var nextVerificationAttempt = sessionResponse.getMetadata().getNextVerificationAttempt();
         if (nextVerificationAttempt != null && nextVerificationAttempt > 0) {
-            final var timestamp = sessionResponse.getHeaders().getTimestamp() + nextVerificationAttempt * 1000;
+            final var timestamp = sessionResponse.getClientReceivedAtMilliseconds() + nextVerificationAttempt * 1000;
             throw new CaptchaRequiredException(timestamp);
         }
 
-        if (sessionResponse.getBody().getRequestedInformation().contains("captcha")) {
+        if (sessionResponse.getMetadata().getRequestedInformation().contains("captcha")) {
             if (captcha != null) {
                 sessionResponse = submitCaptcha(registrationApi, sessionId, captcha);
             }
-            if (!sessionResponse.getBody().getAllowedToRequestCode()) {
+            if (!sessionResponse.getMetadata().getAllowedToRequestCode()) {
                 throw new CaptchaRequiredException("Captcha Required");
             }
         }

From b57993584696068ede584c9d9e6825a69cc0e420 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 7 Feb 2025 17:39:31 +0100
Subject: [PATCH 585/672] Update README

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 03455d12..bf61ea90 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,10 @@ For this use-case, it has a daemon mode with JSON-RPC interface ([man page](http
 and D-BUS interface ([man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli-dbus.5.adoc)) .
 For the JSON-RPC interface there's also a simple [example client](https://github.com/AsamK/signal-cli/tree/master/client), written in Rust.
 
+signal-cli needs to be kept up-to-date to keep up with Signal-Server changes.
+The official Signal clients expire after three months and then the Signal-Server can make incompatible changes.
+So signal-cli releases older than three months may not work correctly.
+
 ## Installation
 
 You can [build signal-cli](#building) yourself or use

From 8aa71c132fbff1ad58e3e3e1fd81f1013c2802c8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 7 Feb 2025 18:21:24 +0100
Subject: [PATCH 586/672] Fix log message

---
 .../asamk/signal/manager/storage/keyValue/KeyValueStore.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index 17135d10..e9338afc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -40,7 +40,7 @@ public class KeyValueStore {
         try (final var connection = database.getConnection()) {
             return getEntry(connection, key);
         } catch (SQLException e) {
-            throw new RuntimeException("Failed read from pre_key store", e);
+            throw new RuntimeException("Failed read from key_value store", e);
         }
     }
 

From 3cd07ae9cd9a1a6f4a2a9d91f84ec4345680ebd4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 7 Feb 2025 18:29:59 +0100
Subject: [PATCH 587/672] Set libsignal network proxy to match java proxy

Fixes #1523
---
 .../manager/internal/SignalDependencies.java  | 38 ++++++++++++++++++-
 .../org/asamk/signal/manager/util/Utils.java  | 19 ++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 90e3b159..427c1025 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -2,9 +2,12 @@ package org.asamk.signal.manager.internal;
 
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
+import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.signal.libsignal.net.Network;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
@@ -31,6 +34,9 @@ import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
@@ -38,6 +44,8 @@ import java.util.function.Supplier;
 
 public class SignalDependencies {
 
+    private static final Logger logger = LoggerFactory.getLogger(SignalDependencies.class);
+
     private final Object LOCK = new Object();
 
     private final ServiceEnvironmentConfig serviceEnvironmentConfig;
@@ -129,8 +137,34 @@ public class SignalDependencies {
     }
 
     public Network getLibSignalNetwork() {
-        return getOrCreate(() -> libSignalNetwork,
-                () -> libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment(), userAgent));
+        return getOrCreate(() -> libSignalNetwork, () -> {
+            libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment(), userAgent);
+            setSignalNetworkProxy(libSignalNetwork);
+        });
+    }
+
+    private void setSignalNetworkProxy(Network libSignalNetwork) {
+        final var proxy = Utils.getHttpsProxy();
+        if (proxy.address() instanceof InetSocketAddress addr) {
+            switch (proxy.type()) {
+                case Proxy.Type.DIRECT -> {
+                }
+                case Proxy.Type.HTTP -> {
+                    try {
+                        libSignalNetwork.setProxy("http", addr.getHostName(), addr.getPort(), null, null);
+                    } catch (IOException e) {
+                        logger.warn("Failed to set http proxy", e);
+                    }
+                }
+                case Proxy.Type.SOCKS -> {
+                    try {
+                        libSignalNetwork.setProxy("socks", addr.getHostName(), addr.getPort(), null, null);
+                    } catch (IOException e) {
+                        logger.warn("Failed to set socks proxy", e);
+                    }
+                }
+            }
+        }
     }
 
     public SignalServiceAccountManager getAccountManager() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 945b2756..b90a7873 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -15,6 +15,10 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.Proxy;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -202,4 +206,19 @@ public class Utils {
     public static String nullIfEmpty(String string) {
         return string == null || string.isEmpty() ? null : string;
     }
+
+    public static Proxy getHttpsProxy() {
+        final URI uri;
+        try {
+            uri = new URI("https://example");
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+        }
+        final var proxies = ProxySelector.getDefault().select(uri);
+        if (proxies.isEmpty()) {
+            return Proxy.NO_PROXY;
+        } else {
+            return proxies.getFirst();
+        }
+    }
 }

From 90145655f4b48da7e5950ff3dcbf5b1449491be1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 7 Feb 2025 19:15:55 +0100
Subject: [PATCH 588/672] Update CHANGELOG.md

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32c2f971..81fecdaa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+Requires libsignal-client version 0.65.6.
+
+### Added
+- Allow setting nickname and note with `updateContact` command
+
+### Fixed
+- Fix syncing nickname, note and expiration timer
+- Fix check for registered users with a proxy
+
 ## [0.13.12] - 2025-01-18
 
 Requires libsignal-client version 0.65.2.

From a089a5ef04c2023854204128c506a8bfb9750d66 Mon Sep 17 00:00:00 2001
From: "Enguerran P." <contact@epoulain.fr>
Date: Fri, 7 Feb 2025 22:22:42 +0100
Subject: [PATCH 589/672] Update README > landline procedure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update landline (`--voice`) registration procedure.

This closes #1666 (🤘)
---
 README.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bf61ea90..e6d6e5ff 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,15 @@ of all country codes.)
 
       signal-cli -a ACCOUNT register
 
-  You can register Signal using a landline number. In this case you can skip SMS verification process and jump directly
-  to the voice call verification by adding the `--voice` switch at the end of above register command.
+  You can register Signal using a landline number. In this case, you need to follow the procedure below:
+   * Attempt a SMS verification process first (`signal-cli -a ACCOUNT register`)
+     * You will get an error `400 (InvalidTransportModeException)`, this is normal
+   * Wait 60 seconds
+   * Attempt a voice call verification by adding the `--voice` switch and wait for the call:
+
+     ```sh
+     signal-cli -a ACCOUNT register --voice
+     ```
 
   Registering may require solving a CAPTCHA
   challenge: [Registration with captcha](https://github.com/AsamK/signal-cli/wiki/Registration-with-captcha)

From ed79e0b37717a51ff83114a07202c25fcc274206 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 27 Feb 2025 11:14:54 +0100
Subject: [PATCH 590/672] Check if required quote-author parameter is missing

Fixes #1716
---
 src/main/java/org/asamk/signal/commands/SendCommand.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 9784171a..39be74ee 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -179,6 +179,9 @@ public class SendCommand implements JsonRpcLocalCommand {
         final var quoteTimestamp = ns.getLong("quote-timestamp");
         if (quoteTimestamp != null) {
             final var quoteAuthor = ns.getString("quote-author");
+            if (quoteAuthor == null) {
+                throw new UserErrorException("Quote author parameter is missing");
+            }
             final var quoteMessage = ns.getString("quote-message");
             final var quoteMentionStrings = ns.<String>getList("quote-mention");
             final var quoteMentions = quoteMentionStrings == null

From cf5c943127e90c6168c4ea54cb57b449cc93f71a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 27 Feb 2025 11:34:23 +0100
Subject: [PATCH 591/672] Remove legacy SVR2 enclave

---
 .../main/java/org/asamk/signal/manager/config/LiveConfig.java  | 3 +--
 .../java/org/asamk/signal/manager/config/StagingConfig.java    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 8e844392..6a707fa5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -29,7 +29,6 @@ class LiveConfig {
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
     private static final String SVR2_MRENCLAVE = "9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570";
-    private static final String SVR2_LEGACY_MRENCLAVE = "a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97";
 
     private static final String URL = "https://chat.signal.org";
     private static final String CDN_URL = "https://cdn.signal.org";
@@ -89,7 +88,7 @@ class LiveConfig {
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_LEGACY_MRENCLAVE));
+                List.of(SVR2_MRENCLAVE));
     }
 
     private LiveConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 741afa16..7eb04b3c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -29,7 +29,6 @@ class StagingConfig {
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
     private static final String SVR2_MRENCLAVE = "38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3";
-    private static final String SVR2_LEGACY_MRENCLAVE = "acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482";
 
     private static final String URL = "https://chat.staging.signal.org";
     private static final String CDN_URL = "https://cdn-staging.signal.org";
@@ -89,7 +88,7 @@ class StagingConfig {
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_LEGACY_MRENCLAVE));
+                List.of(SVR2_MRENCLAVE));
     }
 
     private StagingConfig() {

From e1f4dae5c20b2cb98975e6ba16bc73f2a45423e6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 27 Feb 2025 11:39:31 +0100
Subject: [PATCH 592/672] Show better error message when receiving an empty
 JSON RPC line

Fixes #1715
---
 src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
index 84805e10..327342a2 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/JsonRpcReader.java
@@ -151,6 +151,13 @@ public class JsonRpcReader {
     }
 
     private JsonRpcMessage parseJsonRpcMessage(final String input) {
+        if (input.trim().isEmpty()) {
+            jsonRpcSender.sendResponse(JsonRpcResponse.forError(new JsonRpcResponse.Error(JsonRpcResponse.Error.PARSE_ERROR,
+                    "Empty input line",
+                    null), null));
+            return null;
+        }
+
         final JsonNode jsonNode;
         try {
             jsonNode = objectMapper.readTree(input);

From d3d2caac5a947384850e6b5b30b4bf1c43d684ff Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 27 Feb 2025 14:52:28 +0100
Subject: [PATCH 593/672] Tweak hikari config

---
 .../main/java/org/asamk/signal/manager/storage/Database.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
index 5099662e..1d84daef 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/Database.java
@@ -98,6 +98,9 @@ public abstract class Database implements AutoCloseable {
         config.setJdbcUrl("jdbc:sqlite:" + databaseFile + "?foreign_keys=ON&journal_mode=wal");
         config.setDataSourceProperties(sqliteConfig.toProperties());
         config.setMinimumIdle(1);
+        config.setConnectionTimeout(90_000);
+        config.setMaximumPoolSize(50);
+        config.setMaxLifetime(0);
         return new HikariDataSource(config);
     }
 }

From 141d3326abd5cfa71db3c53c36a71efedbb69733 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 27 Feb 2025 16:41:59 +0100
Subject: [PATCH 594/672] Add in-memory cache to KeyValueStore

---
 .../storage/keyValue/KeyValueStore.java       | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
index e9338afc..2f59c9d2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/keyValue/KeyValueStore.java
@@ -10,6 +10,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.HashMap;
 import java.util.Objects;
 
 public class KeyValueStore {
@@ -18,6 +19,7 @@ public class KeyValueStore {
     private static final Logger logger = LoggerFactory.getLogger(KeyValueStore.class);
 
     private final Database database;
+    private final HashMap<KeyValueEntry<?>, Object> cache = new HashMap<>();
 
     public static void createSql(Connection connection) throws SQLException {
         // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
@@ -36,7 +38,14 @@ public class KeyValueStore {
         this.database = database;
     }
 
+    @SuppressWarnings("unchecked")
     public <T> T getEntry(KeyValueEntry<T> key) {
+        synchronized (cache) {
+            if (cache.containsKey(key)) {
+                logger.trace("Got entry for key {} from cache", key.key());
+                return (T) cache.get(key);
+            }
+        }
         try (final var connection = database.getConnection()) {
             return getEntry(connection, key);
         } catch (SQLException e) {
@@ -63,11 +72,17 @@ public class KeyValueStore {
         try (final var statement = connection.prepareStatement(sql)) {
             statement.setString(1, key.key());
 
-            final var result = Utils.executeQueryForOptional(statement,
-                    resultSet -> readValueFromResultSet(key, resultSet)).orElse(null);
+            var result = Utils.executeQueryForOptional(statement, resultSet -> readValueFromResultSet(key, resultSet))
+                    .orElse(null);
 
             if (result == null) {
-                return key.defaultValue();
+                logger.trace("Got entry for key {} from default value", key.key());
+                result = key.defaultValue();
+            } else {
+                logger.trace("Got entry for key {} from db", key.key());
+            }
+            synchronized (cache) {
+                cache.put(key, result);
             }
             return result;
         }
@@ -95,6 +110,9 @@ public class KeyValueStore {
             setParameterValue(statement, 2, key.clazz(), value);
             statement.executeUpdate();
         }
+        synchronized (cache) {
+            cache.put(key, value);
+        }
         return true;
     }
 

From dba8cf7a6f26463cd35802b051a98d228793e070 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 27 Feb 2025 18:01:21 +0100
Subject: [PATCH 595/672] Update reflect-config

---
 graalvm-config-dir/reflect-config.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index f44e58fc..481999d3 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2037,7 +2037,10 @@
   "name":"org.signal.libsignal.protocol.IdentityKey"
 },
 {
-  "name":"org.signal.libsignal.protocol.ServiceId"
+  "name":"org.signal.libsignal.protocol.ServiceId",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
 },
 {
   "name":"org.signal.libsignal.protocol.SignalProtocolAddress"
@@ -3021,7 +3024,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
-  "fields":[{"name":"archived"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {

From 5693d871f73143072f6f2a5a152f33bc28eb3708 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 27 Feb 2025 22:08:12 +0100
Subject: [PATCH 596/672] Update dependencies

---
 gradle/libs.versions.toml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index be95c8bb..35a3e917 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-slf4j = "2.0.16"
+slf4j = "2.0.17"
 
 [libraries]
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.80"
@@ -8,10 +8,10 @@ argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
-logback = "ch.qos.logback:logback-classic:1.5.16"
+logback = "ch.qos.logback:logback-classic:1.5.17"
 
 signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_117"
-sqlite = "org.xerial:sqlite-jdbc:3.49.0.0"
+sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
-junit-launcher = "org.junit.platform:junit-platform-launcher:1.11.4"
+junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
+junit-launcher = "org.junit.platform:junit-platform-launcher:1.12.0"

From 985af6e445fd2b6f88743ac14c903c9ac2e10aee Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 27 Feb 2025 22:08:57 +0100
Subject: [PATCH 597/672] Update libsignal-service

---
 gradle/libs.versions.toml                     |  2 +-
 .../signal/manager/helper/AccountHelper.java  |  2 +-
 .../signal/manager/helper/SyncHelper.java     | 50 ++-----------------
 .../signal/manager/util/PaymentUtils.java     | 12 +++--
 .../java/org/asamk/signal/BaseConfig.java     |  2 +-
 5 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 35a3e917..d0ac967c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.17"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_117"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_118"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 209ca711..0710b50c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -102,7 +102,7 @@ public class AccountHelper {
                 checkWhoAmiI();
             }
             if (!account.isPrimaryDevice() && account.getPniIdentityKeyPair() == null) {
-                context.getSyncHelper().requestSyncPniIdentity();
+                throw new IOException("Missing PNI identity key, relinking required");
             }
             if (account.getPreviousStorageVersion() < 4
                     && account.isPrimaryDevice()
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
index 2d074014..108ba1a4 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java
@@ -70,17 +70,12 @@ public class SyncHelper {
         requestSyncData(SyncMessage.Request.Type.BLOCKED);
         requestSyncData(SyncMessage.Request.Type.CONFIGURATION);
         requestSyncKeys();
-        requestSyncPniIdentity();
     }
 
     public void requestSyncKeys() {
         requestSyncData(SyncMessage.Request.Type.KEYS);
     }
 
-    public void requestSyncPniIdentity() {
-        requestSyncData(SyncMessage.Request.Type.PNI_IDENTITY);
-    }
-
     public SendMessageResult sendSyncFetchProfileMessage() {
         return context.getSendHelper()
                 .sendSyncMessage(SignalServiceSyncMessage.forFetchLatest(SignalServiceSyncMessage.FetchType.LOCAL_PROFILE));
@@ -165,7 +160,7 @@ public class SyncHelper {
                     final var contact = contactPair.second();
                     final var address = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId);
 
-                    final var deviceContact = getDeviceContact(address, recipientId, contact);
+                    final var deviceContact = getDeviceContact(address, contact);
                     out.write(deviceContact);
                     deviceContact.getAvatar().ifPresent(a -> {
                         try {
@@ -180,7 +175,7 @@ public class SyncHelper {
                     final var address = account.getSelfRecipientAddress();
                     final var recipientId = account.getSelfRecipientId();
                     final var contact = account.getContactStore().getContact(recipientId);
-                    final var deviceContact = getDeviceContact(address, recipientId, contact);
+                    final var deviceContact = getDeviceContact(address, contact);
                     out.write(deviceContact);
                     deviceContact.getAvatar().ifPresent(a -> {
                         try {
@@ -216,34 +211,14 @@ public class SyncHelper {
     }
 
     @NotNull
-    private DeviceContact getDeviceContact(
-            final RecipientAddress address,
-            final RecipientId recipientId,
-            final Contact contact
-    ) throws IOException {
-        var currentIdentity = address.serviceId().isEmpty()
-                ? null
-                : account.getIdentityKeyStore().getIdentityInfo(address.serviceId().get());
-        VerifiedMessage verifiedMessage = null;
-        if (currentIdentity != null) {
-            verifiedMessage = new VerifiedMessage(address.toSignalServiceAddress(),
-                    currentIdentity.getIdentityKey(),
-                    currentIdentity.getTrustLevel().toVerifiedState(),
-                    currentIdentity.getDateAddedTimestamp());
-        }
-
-        var profileKey = account.getProfileStore().getProfileKey(recipientId);
+    private DeviceContact getDeviceContact(final RecipientAddress address, final Contact contact) throws IOException {
         return new DeviceContact(address.aci(),
                 address.number(),
                 Optional.ofNullable(contact == null ? null : contact.getName()),
                 createContactAvatarAttachment(address),
-                Optional.ofNullable(contact == null ? null : contact.color()),
-                Optional.ofNullable(verifiedMessage),
-                Optional.ofNullable(profileKey),
                 Optional.ofNullable(contact == null ? null : contact.messageExpirationTime()),
                 Optional.ofNullable(contact == null ? null : contact.messageExpirationTimeVersion()),
-                Optional.empty(),
-                contact != null && contact.isArchived());
+                Optional.empty());
     }
 
     public SendMessageResult sendBlockedList() {
@@ -376,9 +351,6 @@ public class SyncHelper {
                 break;
             }
             final var address = new RecipientAddress(c.getAci(), Optional.empty(), c.getE164(), Optional.empty());
-            if (address.matches(account.getSelfRecipientAddress()) && c.getProfileKey().isPresent()) {
-                account.setProfileKey(c.getProfileKey().get());
-            }
             final var recipientId = account.getRecipientTrustedResolver().resolveRecipientTrusted(address);
             var contact = account.getContactStore().getContact(recipientId);
             final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
@@ -390,19 +362,6 @@ public class SyncHelper {
                 builder.withGivenName(c.getName().get());
                 builder.withFamilyName(null);
             }
-            if (c.getColor().isPresent()) {
-                builder.withColor(c.getColor().get());
-            }
-            if (c.getProfileKey().isPresent()) {
-                account.getProfileStore().storeProfileKey(recipientId, c.getProfileKey().get());
-            }
-            if (c.getVerified().isPresent()) {
-                final var verifiedMessage = c.getVerified().get();
-                account.getIdentityKeyStore()
-                        .setIdentityTrustLevel(verifiedMessage.getDestination().getServiceId(),
-                                verifiedMessage.getIdentityKey(),
-                                TrustLevel.fromVerifiedState(verifiedMessage.getVerified()));
-            }
             if (c.getExpirationTimer().isPresent()) {
                 if (c.getExpirationTimerVersion().isPresent() && (
                         contact == null || c.getExpirationTimerVersion().get() > contact.messageExpirationTimeVersion()
@@ -417,7 +376,6 @@ public class SyncHelper {
                             contact == null ? 1 : contact.messageExpirationTimeVersion());
                 }
             }
-            builder.withIsArchived(c.isArchived());
             account.getContactStore().storeContact(recipientId, builder.build());
 
             if (c.getAvatar().isPresent()) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
index 36275d8f..fd8e46ef 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
@@ -23,8 +23,8 @@ public class PaymentUtils {
     public static PaymentAddress signPaymentsAddress(byte[] publicAddressBytes, ECPrivateKey privateKey) {
         byte[] signature = privateKey.calculateSignature(publicAddressBytes);
 
-        return new PaymentAddress.Builder().mobileCoinAddress(new PaymentAddress.MobileCoinAddress.Builder().address(
-                ByteString.of(publicAddressBytes)).signature(ByteString.of(signature)).build()).build();
+        return new PaymentAddress.Builder().mobileCoin(new PaymentAddress.MobileCoin.Builder().publicAddress(ByteString.of(
+                publicAddressBytes)).signature(ByteString.of(signature)).build()).build();
     }
 
     /**
@@ -33,13 +33,15 @@ public class PaymentUtils {
      * Returns the validated bytes if so, otherwise returns null.
      */
     public static byte[] verifyPaymentsAddress(PaymentAddress paymentAddress, ECPublicKey publicKey) {
-        final var mobileCoinAddress = paymentAddress.mobileCoinAddress;
-        if (mobileCoinAddress == null || mobileCoinAddress.address == null || mobileCoinAddress.signature == null) {
+        final var mobileCoinAddress = paymentAddress.mobileCoin;
+        if (mobileCoinAddress == null
+                || mobileCoinAddress.publicAddress == null
+                || mobileCoinAddress.signature == null) {
             logger.debug("Got payment address without mobile coin address, ignoring.");
             return null;
         }
 
-        byte[] bytes = mobileCoinAddress.address.toByteArray();
+        byte[] bytes = mobileCoinAddress.publicAddress.toByteArray();
         byte[] signature = mobileCoinAddress.signature.toByteArray();
 
         if (signature.length != 64 || !publicKey.verifySignature(bytes, signature)) {
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 52df0235..9218fe5f 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.30.1");
+            .orElse("Signal-Android/7.35.0");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 93d281e7121734fda8d98e4de92fc3d0376973a9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 28 Feb 2025 09:36:27 +0100
Subject: [PATCH 598/672] Bump version to 0.13.13

---
 CHANGELOG.md                          | 6 ++++--
 build.gradle.kts                      | 2 +-
 data/org.asamk.SignalCli.metainfo.xml | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81fecdaa..e43ff34d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.13] - 2025-02-28
 
-Requires libsignal-client version 0.65.6.
+Requires libsignal-client version 0.66.2.
 
 ### Added
 - Allow setting nickname and note with `updateContact` command
@@ -10,6 +10,8 @@ Requires libsignal-client version 0.65.6.
 ### Fixed
 - Fix syncing nickname, note and expiration timer
 - Fix check for registered users with a proxy
+- Improve handling of storage records not yet supported by signal-cli
+- Fix contact sync for networks requiring proxy
 
 ## [0.13.12] - 2025-01-18
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 3f728938..4c4df536 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.13-SNAPSHOT"
+    version = "0.13.13"
 }
 
 java {
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 098e95d6..a0af7892 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.13" date="2025-02-28">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.13</url>
+        </release>
         <release version="0.13.12" date="2025-01-18">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.12</url>
         </release>

From 26fd3e379ab3af4b109aa5bbdb38939a61568343 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 599/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e43ff34d..40ff89f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.13] - 2025-02-28
 
 Requires libsignal-client version 0.66.2.
diff --git a/build.gradle.kts b/build.gradle.kts
index 4c4df536..8d8840bf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.13"
+    version = "0.13.14-SNAPSHOT"
 }
 
 java {

From 4eb34c7a93b08140a4cd61e7048c68b0414b8a70 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 28 Feb 2025 09:46:45 +0100
Subject: [PATCH 600/672] Update apt repository before installing packages

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ddb2ebbd..4f27b4e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
         with:
           dependency-graph: generate-and-submit
       - name: Install asciidoc
-        run: sudo apt --no-install-recommends install -y asciidoc-base
+        run: sudo apt update && sudo apt --no-install-recommends install -y asciidoc-base
       - name: Build with Gradle
         run: ./gradlew --no-daemon build
       - name: Build man page

From 4feba68afd1be83a61bacb83e4432ecad3200d77 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 4 Mar 2025 08:29:05 +0100
Subject: [PATCH 601/672] Replace deprecated gradle api

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 8d8840bf..e491dd7d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -83,7 +83,7 @@ tasks.withType<Jar> {
     }
 }
 
-task("fatJar", type = Jar::class) {
+tasks.register("fatJar", type = Jar::class) {
     archiveBaseName.set("${project.name}-fat")
     exclude(
         "META-INF/*.SF",

From 68b7416e572ce36f27a38d2fc7e195cb508cf00d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 4 Mar 2025 08:32:56 +0100
Subject: [PATCH 602/672] Update gradle wrapper

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43583 -> 43705 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index a4b76b9530d66f5e68d973ea569d8e19de379189..9bbc975c742b298b441bfb90dbc124400a3751b9 100644
GIT binary patch
delta 34744
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

delta 34727
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
a%EQ2*fnt2><os0*Ttd7I4B~S^wgLca-h3he

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a793..37f853b1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f3b75f3b..faf93008 100755
--- a/gradlew
+++ b/gradlew
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

From b92cbc6a7c93124afe07d1d14e9a4b3d255a5e2e Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 4 Mar 2025 10:04:34 +0100
Subject: [PATCH 603/672] Exclude libsignal-client testing libraries

---
 build.gradle.kts                              | 40 +++++++++++++-
 .../src/main/kotlin/ExcludeFileFromJar.kt     | 53 +++++++++++++++++++
 graalvm-config-dir/resource-config.json       |  2 -
 3 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 buildSrc/src/main/kotlin/ExcludeFileFromJar.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index e491dd7d..67a180fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -46,7 +46,41 @@ graalvmNative {
     }
 }
 
+val artifactType = Attribute.of("artifactType", String::class.java)
+val minified = Attribute.of("minified", Boolean::class.javaObjectType)
 dependencies {
+    attributesSchema {
+        attribute(minified)
+    }
+    artifactTypes.getByName("jar") {
+        attributes.attribute(minified, false)
+    }
+}
+
+configurations.runtimeClasspath.configure {
+    attributes {
+        attribute(minified, true)
+    }
+}
+val excludePatterns = mapOf(
+    "libsignal-client" to setOf(
+        "libsignal_jni_testing_amd64.so",
+        "signal_jni_testing_amd64.dll",
+        "libsignal_jni_testing_amd64.dylib",
+        "libsignal_jni_testing_aarch64.dylib",
+    )
+)
+
+dependencies {
+    registerTransform(JarFileExcluder::class) {
+        from.attribute(minified, false).attribute(artifactType, "jar")
+        to.attribute(minified, true).attribute(artifactType, "jar")
+
+        parameters {
+            excludeFilesByArtifact = excludePatterns
+        }
+    }
+
     implementation(libs.bouncycastle)
     implementation(libs.jackson.databind)
     implementation(libs.argparse4j)
@@ -92,9 +126,11 @@ tasks.register("fatJar", type = Jar::class) {
         "META-INF/NOTICE*",
         "META-INF/LICENSE*",
         "META-INF/INDEX.LIST",
-        "**/module-info.class"
+        "**/module-info.class",
     )
     duplicatesStrategy = DuplicatesStrategy.WARN
-    from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    doFirst {
+        from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
+    }
     with(tasks.jar.get())
 }
diff --git a/buildSrc/src/main/kotlin/ExcludeFileFromJar.kt b/buildSrc/src/main/kotlin/ExcludeFileFromJar.kt
new file mode 100644
index 00000000..25862cc9
--- /dev/null
+++ b/buildSrc/src/main/kotlin/ExcludeFileFromJar.kt
@@ -0,0 +1,53 @@
+import org.gradle.api.artifacts.transform.*
+import org.gradle.api.file.FileSystemLocation
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+@CacheableTransform
+abstract class JarFileExcluder : TransformAction<JarFileExcluder.Parameters> {
+    interface Parameters : TransformParameters {
+        @get:Input
+        var excludeFilesByArtifact: Map<String, Set<String>>
+    }
+
+    @get:PathSensitive(PathSensitivity.NAME_ONLY)
+    @get:InputArtifact
+    abstract val inputArtifact: Provider<FileSystemLocation>
+
+    override
+    fun transform(outputs: TransformOutputs) {
+        val fileName = inputArtifact.get().asFile.name
+        for (entry in parameters.excludeFilesByArtifact) {
+            if (fileName.startsWith(entry.key)) {
+                val nameWithoutExtension = fileName.substring(0, fileName.lastIndexOf("."))
+                excludeFiles(inputArtifact.get().asFile, entry.value, outputs.file("${nameWithoutExtension}.jar"))
+                return
+            }
+        }
+        outputs.file(inputArtifact)
+    }
+
+    private fun excludeFiles(artifact: File, excludeFiles: Set<String>, jarFile: File) {
+        ZipInputStream(FileInputStream(artifact)).use { input ->
+            ZipOutputStream(FileOutputStream(jarFile)).use { output ->
+                var entry = input.nextEntry
+                while (entry != null) {
+                    if (!excludeFiles.contains(entry.name)) {
+                        output.putNextEntry(entry)
+                        input.copyTo(output)
+                        output.closeEntry()
+                    }
+
+                    entry = input.nextEntry
+                }
+            }
+        }
+    }
+}
diff --git a/graalvm-config-dir/resource-config.json b/graalvm-config-dir/resource-config.json
index b9ead797..8bd8a7af 100644
--- a/graalvm-config-dir/resource-config.json
+++ b/graalvm-config-dir/resource-config.json
@@ -188,8 +188,6 @@
     "pattern":"\\Qlibsignal_jni_amd64.dylib\\E"
   }, {
     "pattern":"\\Qlibsignal_jni_amd64.so\\E"
-  }, {
-    "pattern":"\\Qlibsignal_jni_testing_amd64.so\\E"
   }, {
     "pattern":"\\Qorg/asamk/signal/manager/config/ias.store\\E"
   }, {

From 7aede7c17f4a3314768e6eb14f3debcb6139858b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 16 Mar 2025 12:18:59 +0100
Subject: [PATCH 604/672] Remove previous prekeys when importing legacy prekeys

---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 4d43d15d..ab7c16d8 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -829,6 +829,7 @@ public class SignalAccount implements Closeable {
             logger.debug("Migrating legacy pre key store.");
             for (var entry : legacySignalProtocolStore.getLegacyPreKeyStore().getPreKeys().entrySet()) {
                 try {
+                    aciAccountData.getPreKeyStore().removeAllPreKeys();
                     aciAccountData.getPreKeyStore().storePreKey(entry.getKey(), new PreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate pre key, ignoring", e);
@@ -840,6 +841,7 @@ public class SignalAccount implements Closeable {
             logger.debug("Migrating legacy signed pre key store.");
             for (var entry : legacySignalProtocolStore.getLegacySignedPreKeyStore().getSignedPreKeys().entrySet()) {
                 try {
+                    aciAccountData.getSignedPreKeyStore().removeAllSignedPreKeys();
                     aciAccountData.getSignedPreKeyStore()
                             .storeSignedPreKey(entry.getKey(), new SignedPreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {

From 2b150112ff3ac72b4c715927dc85a4c7e6f41071 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 16 Mar 2025 12:18:59 +0100
Subject: [PATCH 605/672] Remove previous prekeys when importing legacy prekeys

---
 .../java/org/asamk/signal/manager/storage/SignalAccount.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index ab7c16d8..8d2fbd0f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -827,9 +827,9 @@ public class SignalAccount implements Closeable {
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacyPreKeyStore() != null) {
             logger.debug("Migrating legacy pre key store.");
+            aciAccountData.getPreKeyStore().removeAllPreKeys();
             for (var entry : legacySignalProtocolStore.getLegacyPreKeyStore().getPreKeys().entrySet()) {
                 try {
-                    aciAccountData.getPreKeyStore().removeAllPreKeys();
                     aciAccountData.getPreKeyStore().storePreKey(entry.getKey(), new PreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate pre key, ignoring", e);
@@ -839,9 +839,9 @@ public class SignalAccount implements Closeable {
 
         if (legacySignalProtocolStore != null && legacySignalProtocolStore.getLegacySignedPreKeyStore() != null) {
             logger.debug("Migrating legacy signed pre key store.");
+            aciAccountData.getSignedPreKeyStore().removeAllSignedPreKeys();
             for (var entry : legacySignalProtocolStore.getLegacySignedPreKeyStore().getSignedPreKeys().entrySet()) {
                 try {
-                    aciAccountData.getSignedPreKeyStore().removeAllSignedPreKeys();
                     aciAccountData.getSignedPreKeyStore()
                             .storeSignedPreKey(entry.getKey(), new SignedPreKeyRecord(entry.getValue()));
                 } catch (InvalidMessageException e) {

From f26a0d2891d0702bb6f5ed1e7cf9ddea839dfdb5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 16 Mar 2025 22:06:58 +0100
Subject: [PATCH 606/672] Update libsignal-service

---
 gradle/libs.versions.toml                     |   2 +-
 .../org/asamk/signal/manager/Manager.java     |   5 +-
 .../manager/api/InvalidNumberException.java   |   2 +-
 .../manager/api/RecipientIdentifier.java      |  48 ++--
 .../signal/manager/helper/AccountHelper.java  |  73 ++++--
 .../signal/manager/helper/ReceiveHelper.java  |  10 +-
 .../manager/helper/RecipientHelper.java       |  18 +-
 .../signal/manager/internal/ManagerImpl.java  |  26 +--
 .../internal/ProvisioningManagerImpl.java     |  18 +-
 .../internal/ReentrantSignalSessionLock.java  |  16 ++
 .../internal/RegistrationManagerImpl.java     |  32 +--
 .../manager/internal/SignalDependencies.java  | 113 +++++----
 .../SignalWebSocketHealthMonitor.java         | 220 +++++++-----------
 .../storage/accounts/AccountsStore.java       |   4 +-
 .../syncStorage/ContactRecordProcessor.java   |   3 +-
 .../syncStorage/GroupV2RecordProcessor.java   |   3 +-
 .../manager/util/PhoneNumberFormatter.java    |  59 +++++
 .../org/asamk/signal/manager/util/Utils.java  |   6 +-
 18 files changed, 371 insertions(+), 287 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/internal/ReentrantSignalSessionLock.java
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/util/PhoneNumberFormatter.java

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d0ac967c..b8d57a12 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.17"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_118"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_119"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.2.1"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index bdb3dbc9..affbaa9d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -1,5 +1,7 @@
 package org.asamk.signal.manager;
 
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+
 import org.asamk.signal.manager.api.AlreadyReceivingException;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.api.CaptchaRejectedException;
@@ -49,7 +51,6 @@ import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.Closeable;
 import java.io.File;
@@ -65,7 +66,7 @@ import java.util.Set;
 public interface Manager extends Closeable {
 
     static boolean isValidNumber(final String e164Number, final String countryCode) {
-        return PhoneNumberFormatter.isValidNumber(e164Number, countryCode);
+        return PhoneNumberUtil.getInstance().isPossibleNumber(e164Number, countryCode);
     }
 
     static boolean isSignalClientAvailable() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java b/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
index 8e6a8064..14f37966 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/InvalidNumberException.java
@@ -2,7 +2,7 @@ package org.asamk.signal.manager.api;
 
 public class InvalidNumberException extends Exception {
 
-    InvalidNumberException(String message) {
+    public InvalidNumberException(String message) {
         super(message);
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
index 53da2aad..b1a3ad61 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/RecipientIdentifier.java
@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.api;
 
+import org.asamk.signal.manager.util.PhoneNumberFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.util.UUID;
@@ -24,32 +24,28 @@ public sealed interface RecipientIdentifier {
     sealed interface Single extends RecipientIdentifier {
 
         static Single fromString(String identifier, String localNumber) throws InvalidNumberException {
-            try {
-                if (UuidUtil.isUuid(identifier)) {
-                    return new Uuid(UUID.fromString(identifier));
-                }
-
-                if (identifier.startsWith("PNI:")) {
-                    final var pni = identifier.substring(4);
-                    if (!UuidUtil.isUuid(pni)) {
-                        throw new InvalidNumberException("Invalid PNI");
-                    }
-                    return new Pni(UUID.fromString(pni));
-                }
-
-                if (identifier.startsWith("u:")) {
-                    return new Username(identifier.substring(2));
-                }
-
-                final var normalizedNumber = PhoneNumberFormatter.formatNumber(identifier, localNumber);
-                if (!normalizedNumber.equals(identifier)) {
-                    final Logger logger = LoggerFactory.getLogger(RecipientIdentifier.class);
-                    logger.debug("Normalized number {} to {}.", identifier, normalizedNumber);
-                }
-                return new Number(normalizedNumber);
-            } catch (org.whispersystems.signalservice.api.util.InvalidNumberException e) {
-                throw new InvalidNumberException(e.getMessage(), e);
+            if (UuidUtil.isUuid(identifier)) {
+                return new Uuid(UUID.fromString(identifier));
             }
+
+            if (identifier.startsWith("PNI:")) {
+                final var pni = identifier.substring(4);
+                if (!UuidUtil.isUuid(pni)) {
+                    throw new InvalidNumberException("Invalid PNI");
+                }
+                return new Pni(UUID.fromString(pni));
+            }
+
+            if (identifier.startsWith("u:")) {
+                return new Username(identifier.substring(2));
+            }
+
+            final var normalizedNumber = PhoneNumberFormatter.formatNumber(identifier, localNumber);
+            if (!normalizedNumber.equals(identifier)) {
+                final Logger logger = LoggerFactory.getLogger(RecipientIdentifier.class);
+                logger.debug("Normalized number {} to {}.", identifier, normalizedNumber);
+            }
+            return new Number(normalizedNumber);
         }
 
         static Single fromAddress(RecipientAddress address) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 0710b50c..7d40f99c 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -32,6 +32,7 @@ import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
@@ -50,7 +51,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import okio.ByteString;
@@ -289,12 +290,13 @@ public class AccountHelper {
                 context.getPinHelper(),
                 (sessionId1, verificationCode1, registrationLock) -> {
                     final var registrationApi = dependencies.getRegistrationApi();
+                    final var accountApi = dependencies.getAccountApi();
                     try {
                         handleResponseException(registrationApi.verifyAccount(sessionId1, verificationCode1));
                     } catch (AlreadyVerifiedException e) {
                         // Already verified so can continue changing number
                     }
-                    return handleResponseException(registrationApi.changeNumber(new ChangePhoneNumberRequest(sessionId1,
+                    return handleResponseException(accountApi.changeNumber(new ChangePhoneNumberRequest(sessionId1,
                             null,
                             newNumber,
                             registrationLock,
@@ -378,7 +380,7 @@ public class AccountHelper {
             candidateHashes.add(Base64.encodeUrlSafeWithoutPadding(candidate.getHash()));
         }
 
-        final var response = dependencies.getAccountManager().reserveUsername(candidateHashes);
+        final var response = handleResponseException(dependencies.getAccountApi().reserveUsername(candidateHashes));
         final var hashIndex = candidateHashes.indexOf(response.getUsernameHash());
         if (hashIndex == -1) {
             logger.warn("[reserveUsername] The response hash could not be found in our set of candidateHashes.");
@@ -388,7 +390,7 @@ public class AccountHelper {
         logger.debug("[reserveUsername] Successfully reserved username.");
         final var username = candidates.get(hashIndex);
 
-        final var linkComponents = dependencies.getAccountManager().confirmUsernameAndCreateNewLink(username);
+        final var linkComponents = confirmUsernameAndCreateNewLink(username);
         account.setUsername(username.getUsername());
         account.setUsernameLink(linkComponents);
         account.getRecipientStore().resolveSelfRecipientTrusted(account.getSelfRecipientAddress());
@@ -396,6 +398,40 @@ public class AccountHelper {
         logger.debug("[confirmUsername] Successfully confirmed username.");
     }
 
+    public UsernameLinkComponents createUsernameLink(Username username) throws IOException {
+        try {
+            Username.UsernameLink link = username.generateLink();
+            return handleResponseException(dependencies.getAccountApi().createUsernameLink(link));
+        } catch (BaseUsernameException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private UsernameLinkComponents confirmUsernameAndCreateNewLink(Username username) throws IOException {
+        try {
+            Username.UsernameLink link = username.generateLink();
+            UUID serverId = handleResponseException(dependencies.getAccountApi().confirmUsername(username, link));
+
+            return new UsernameLinkComponents(link.getEntropy(), serverId);
+        } catch (BaseUsernameException e) {
+            throw new AssertionError(e);
+        }
+    }
+
+    private UsernameLinkComponents reclaimUsernameAndLink(
+            Username username,
+            UsernameLinkComponents linkComponents
+    ) throws IOException {
+        try {
+            Username.UsernameLink link = username.generateLink(linkComponents.getEntropy());
+            UUID serverId = handleResponseException(dependencies.getAccountApi().confirmUsername(username, link));
+
+            return new UsernameLinkComponents(link.getEntropy(), serverId);
+        } catch (BaseUsernameException e) {
+            throw new AssertionError(e);
+        }
+    }
+
     public void refreshCurrentUsername() throws IOException, BaseUsernameException {
         final var localUsername = account.getUsername();
         if (localUsername == null) {
@@ -438,14 +474,14 @@ public class AccountHelper {
         final var usernameLink = account.getUsernameLink();
 
         if (usernameLink == null) {
-            dependencies.getAccountManager()
-                    .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash())));
+            handleResponseException(dependencies.getAccountApi()
+                    .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash()))));
             logger.debug("[reserveUsername] Successfully reserved existing username.");
-            final var linkComponents = dependencies.getAccountManager().confirmUsernameAndCreateNewLink(username);
+            final var linkComponents = confirmUsernameAndCreateNewLink(username);
             account.setUsernameLink(linkComponents);
             logger.debug("[confirmUsername] Successfully confirmed existing username.");
         } else {
-            final var linkComponents = dependencies.getAccountManager().reclaimUsernameAndLink(username, usernameLink);
+            final var linkComponents = reclaimUsernameAndLink(username, usernameLink);
             account.setUsernameLink(linkComponents);
             logger.debug("[confirmUsername] Successfully reclaimed existing username and link.");
         }
@@ -455,7 +491,7 @@ public class AccountHelper {
     private void tryToSetUsernameLink(Username username) {
         for (var i = 1; i < 4; i++) {
             try {
-                final var linkComponents = dependencies.getAccountManager().createUsernameLink(username);
+                final var linkComponents = createUsernameLink(username);
                 account.setUsernameLink(linkComponents);
                 break;
             } catch (IOException e) {
@@ -465,9 +501,8 @@ public class AccountHelper {
     }
 
     public void deleteUsername() throws IOException {
-        dependencies.getAccountManager().deleteUsernameLink();
+        handleResponseException(dependencies.getAccountApi().deleteUsername());
         account.setUsernameLink(null);
-        dependencies.getAccountManager().deleteUsername();
         account.setUsername(null);
         logger.debug("[deleteUsername] Successfully deleted the username.");
     }
@@ -479,7 +514,7 @@ public class AccountHelper {
     }
 
     public void updateAccountAttributes() throws IOException {
-        dependencies.getAccountManager().setAccountAttributes(account.getAccountAttributes(null));
+        handleResponseException(dependencies.getAccountApi().setAccountAttributes(account.getAccountAttributes(null)));
     }
 
     public void addDevice(DeviceLinkUrl deviceLinkInfo) throws IOException, org.asamk.signal.manager.api.DeviceLimitExceededException {
@@ -510,8 +545,8 @@ public class AccountHelper {
     }
 
     public void removeLinkedDevices(int deviceId) throws IOException {
-        dependencies.getAccountManager().removeDevice(deviceId);
-        var devices = dependencies.getAccountManager().getDevices();
+        handleResponseException(dependencies.getLinkDeviceApi().removeDevice(deviceId));
+        var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
         account.setMultiDevice(devices.size() > 1);
     }
 
@@ -519,14 +554,16 @@ public class AccountHelper {
         var masterKey = account.getOrCreatePinMasterKey();
 
         context.getPinHelper().migrateRegistrationLockPin(account.getRegistrationLockPin(), masterKey);
-        dependencies.getAccountManager().enableRegistrationLock(masterKey);
+        handleResponseException(dependencies.getAccountApi()
+                .enableRegistrationLock(masterKey.deriveRegistrationLock()));
     }
 
     public void setRegistrationPin(String pin) throws IOException {
         var masterKey = account.getOrCreatePinMasterKey();
 
         context.getPinHelper().setRegistrationLockPin(pin, masterKey);
-        dependencies.getAccountManager().enableRegistrationLock(masterKey);
+        handleResponseException(dependencies.getAccountApi()
+                .enableRegistrationLock(masterKey.deriveRegistrationLock()));
 
         account.setRegistrationLockPin(pin);
         updateAccountAttributes();
@@ -535,7 +572,7 @@ public class AccountHelper {
     public void removeRegistrationPin() throws IOException {
         // Remove KBS Pin
         context.getPinHelper().removeRegistrationLockPin();
-        dependencies.getAccountManager().disableRegistrationLock();
+        handleResponseException(dependencies.getAccountApi().disableRegistrationLock());
 
         account.setRegistrationLockPin(null);
     }
@@ -544,7 +581,7 @@ public class AccountHelper {
         // When setting an empty GCM id, the Signal-Server also sets the fetchesMessages property to false.
         // If this is the primary device, other users can't send messages to this number anymore.
         // If this is a linked device, other users can still send messages, but this device doesn't receive them anymore.
-        dependencies.getAccountManager().setGcmId(Optional.empty());
+        handleResponseException(dependencies.getAccountApi().clearFcmToken());
 
         account.setRegistered(false);
         unregisteredListener.call();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index ab75bd16..eb935188 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -11,10 +11,10 @@ import org.asamk.signal.manager.storage.messageCache.CachedMessage;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalWebSocket;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
+import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
 import org.whispersystems.signalservice.api.websocket.WebSocketUnavailableException;
 
@@ -28,7 +28,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeoutException;
 
-import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class ReceiveHelper {
@@ -94,9 +93,8 @@ public class ReceiveHelper {
         // Use a Map here because java Set doesn't have a get method ...
         Map<HandleAction, HandleAction> queuedActions = new HashMap<>();
 
-        final var signalWebSocket = dependencies.getSignalWebSocket();
-        final var webSocketStateDisposable = Observable.merge(signalWebSocket.getUnidentifiedWebSocketState(),
-                        signalWebSocket.getWebSocketState())
+        final var signalWebSocket = dependencies.getAuthenticatedSignalWebSocket();
+        final var webSocketStateDisposable = signalWebSocket.getState()
                 .subscribeOn(Schedulers.computation())
                 .observeOn(Schedulers.computation())
                 .distinctUntilChanged()
@@ -116,7 +114,7 @@ public class ReceiveHelper {
     }
 
     private void receiveMessagesInternal(
-            final SignalWebSocket signalWebSocket,
+            final SignalWebSocket.AuthenticatedWebSocket signalWebSocket,
             Duration timeout,
             boolean returnOnTimeout,
             Integer maxMessages,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 125fa0d8..58e7ba59 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -10,13 +10,13 @@ import org.signal.libsignal.usernames.BaseUsernameException;
 import org.signal.libsignal.usernames.Username;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.cds.CdsiV2Service;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidArgumentException;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException;
-import org.whispersystems.signalservice.api.services.CdsiV2Service;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -27,6 +27,7 @@ import java.util.Optional;
 import java.util.Set;
 
 import static org.asamk.signal.manager.config.ServiceConfig.MAXIMUM_ONE_OFF_REQUEST_SIZE;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
 
 public class RecipientHelper {
 
@@ -108,7 +109,7 @@ public class RecipientHelper {
         }
         if (forceRefresh) {
             try {
-                final var aci = dependencies.getAccountManager().getAciByUsername(finalUsername);
+                final var aci = handleResponseException(dependencies.getUsernameApi().getAciByUsername(finalUsername));
                 return account.getRecipientStore().resolveRecipientTrusted(aci, finalUsername.getUsername());
             } catch (IOException e) {
                 throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
@@ -119,7 +120,7 @@ public class RecipientHelper {
         }
         return account.getRecipientStore().resolveRecipientByUsername(finalUsername.getUsername(), () -> {
             try {
-                return dependencies.getAccountManager().getAciByUsername(finalUsername);
+                return handleResponseException(dependencies.getUsernameApi().getAciByUsername(finalUsername));
             } catch (Exception e) {
                 return null;
             }
@@ -130,8 +131,8 @@ public class RecipientHelper {
         try {
             final var usernameLinkUrl = UsernameLinkUrl.fromUri(username);
             final var components = usernameLinkUrl.getComponents();
-            final var encryptedUsername = dependencies.getAccountManager()
-                    .getEncryptedUsernameFromLinkServerId(components.getServerId());
+            final var encryptedUsername = handleResponseException(dependencies.getUsernameApi()
+                    .getEncryptedUsernameFromLinkServerId(components.getServerId()));
             final var link = new Username.UsernameLink(components.getEntropy(), encryptedUsername);
 
             return Username.fromLink(link);
@@ -234,13 +235,14 @@ public class RecipientHelper {
 
         final CdsiV2Service.Response response;
         try {
-            response = dependencies.getAccountManager()
-                    .getRegisteredUsersWithCdsi(token.isEmpty() ? Set.of() : previousNumbers,
+            response = handleResponseException(dependencies.getCdsApi()
+                    .getRegisteredUsers(token.isEmpty() ? Set.of() : previousNumbers,
                             newNumbers,
                             account.getRecipientStore().getServiceIdToProfileKeyMap(),
                             token,
                             null,
                             dependencies.getLibSignalNetwork(),
+                            false,
                             newToken -> {
                                 if (isPartialRefresh) {
                                     account.getCdsiStore().updateAfterPartialCdsQuery(newNumbers);
@@ -256,7 +258,7 @@ public class RecipientHelper {
                                     account.setCdsiToken(newToken);
                                     account.setLastRecipientsRefresh(System.currentTimeMillis());
                                 }
-                            });
+                            }));
         } catch (CdsiInvalidTokenException | CdsiInvalidArgumentException e) {
             account.setCdsiToken(null);
             account.getCdsiStore().clearAll();
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 403b9adf..c5a7552f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -35,6 +35,7 @@ import org.asamk.signal.manager.api.IdentityVerificationCode;
 import org.asamk.signal.manager.api.InactiveGroupLinkException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.manager.api.InvalidNumberException;
 import org.asamk.signal.manager.api.InvalidStickerException;
 import org.asamk.signal.manager.api.InvalidUsernameException;
 import org.asamk.signal.manager.api.LastGroupAdminException;
@@ -87,12 +88,12 @@ import org.asamk.signal.manager.storage.stickers.StickerPack;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.MimeUtils;
+import org.asamk.signal.manager.util.PhoneNumberFormatter;
 import org.asamk.signal.manager.util.StickerUtils;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServicePreview;
@@ -106,8 +107,6 @@ import org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhauste
 import org.whispersystems.signalservice.api.push.exceptions.UsernameMalformedException;
 import org.whispersystems.signalservice.api.push.exceptions.UsernameTakenException;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 import org.whispersystems.signalservice.internal.util.Hex;
 import org.whispersystems.signalservice.internal.util.Util;
@@ -132,7 +131,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -142,6 +140,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
 import okio.Utf8;
 
 import static org.asamk.signal.manager.config.ServiceConfig.MAX_MESSAGE_SIZE_BYTES;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
 import static org.signal.core.util.StringExtensionsKt.splitByByteLength;
 
 public class ManagerImpl implements Manager {
@@ -171,15 +170,7 @@ public class ManagerImpl implements Manager {
     ) {
         this.account = account;
 
-        final var sessionLock = new SignalSessionLock() {
-            private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
-
-            @Override
-            public Lock acquire() {
-                LEGACY_LOCK.lock();
-                return LEGACY_LOCK::unlock;
-            }
-        };
+        final var sessionLock = new ReentrantSignalSessionLock();
         this.dependencies = new SignalDependencies(serviceEnvironmentConfig,
                 userAgent,
                 account.getCredentialsProvider(),
@@ -457,10 +448,10 @@ public class ManagerImpl implements Manager {
             String challenge,
             String captcha
     ) throws IOException, CaptchaRejectedException {
-        captcha = captcha == null ? null : captcha.replace("signalcaptcha://", "");
+        captcha = captcha == null ? "" : captcha.replace("signalcaptcha://", "");
 
         try {
-            dependencies.getAccountManager().submitRateLimitRecaptchaChallenge(challenge, captcha);
+            handleResponseException(dependencies.getRateLimitChallengeApi().submitCaptchaChallenge(challenge, captcha));
         } catch (org.whispersystems.signalservice.internal.push.exceptions.CaptchaRejectedException ignored) {
             throw new CaptchaRejectedException();
         }
@@ -468,7 +459,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public List<Device> getLinkedDevices() throws IOException {
-        var devices = dependencies.getAccountManager().getDevices();
+        var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
         account.setMultiDevice(devices.size() > 1);
         var identityKey = account.getAciIdentityKeyPair().getPrivateKey();
         return devices.stream().map(d -> {
@@ -1594,7 +1585,8 @@ public class ManagerImpl implements Manager {
         context.close();
         executor.close();
 
-        dependencies.getSignalWebSocket().disconnect();
+        dependencies.getAuthenticatedSignalWebSocket().disconnect();
+        dependencies.getUnauthenticatedSignalWebSocket().disconnect();
         dependencies.getPushServiceSocket().close();
         disposable.dispose();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index fcef536a..e5a381e1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -29,12 +29,11 @@ import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.signalservice.api.registration.ProvisioningApi;
 import org.whispersystems.signalservice.api.util.DeviceNameUtil;
 import org.whispersystems.signalservice.internal.push.ProvisioningSocket;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
@@ -58,7 +57,7 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
     private final Consumer<Manager> newManagerListener;
     private final AccountsStore accountsStore;
 
-    private final SignalServiceAccountManager accountManager;
+    private final ProvisioningApi provisioningApi;
     private final IdentityKeyPair tempIdentityKey;
     private final String password;
 
@@ -78,7 +77,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
         tempIdentityKey = KeyUtils.generateIdentityKeyPair();
         password = KeyUtils.createPassword();
         final var clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration());
-        final var groupsV2Operations = new GroupsV2Operations(clientZkOperations, ServiceConfig.GROUP_MAX_SIZE);
         final var credentialsProvider = new DynamicCredentialsProvider(null,
                 null,
                 null,
@@ -89,21 +87,21 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
                 userAgent,
                 clientZkOperations.getProfileOperations(),
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
-        accountManager = new SignalServiceAccountManager(pushServiceSocket,
-                new ProvisioningSocket(serviceEnvironmentConfig.signalServiceConfiguration(), userAgent),
-                groupsV2Operations);
+        final var provisioningSocket = new ProvisioningSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                userAgent);
+        this.provisioningApi = new ProvisioningApi(pushServiceSocket, provisioningSocket, credentialsProvider);
     }
 
     @Override
     public URI getDeviceLinkUri() throws TimeoutException, IOException {
-        var deviceUuid = accountManager.getNewDeviceUuid();
+        var deviceUuid = provisioningApi.getNewDeviceUuid();
 
         return new DeviceLinkUrl(deviceUuid, tempIdentityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
     }
 
     @Override
     public String finishDeviceLink(String deviceName) throws IOException, TimeoutException, UserAlreadyExistsException {
-        var ret = accountManager.getNewDeviceRegistration(tempIdentityKey);
+        var ret = provisioningApi.getNewDeviceRegistration(tempIdentityKey);
         var number = ret.getNumber();
         var aci = ret.getAci();
         var pni = ret.getPni();
@@ -160,7 +158,7 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
             final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
 
             logger.debug("Finishing new device registration");
-            var deviceId = accountManager.finishNewDeviceRegistration(ret.getProvisioningCode(),
+            var deviceId = provisioningApi.finishNewDeviceRegistration(ret.getProvisioningCode(),
                     account.getAccountAttributes(null),
                     aciPreKeys,
                     pniPreKeys);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ReentrantSignalSessionLock.java b/lib/src/main/java/org/asamk/signal/manager/internal/ReentrantSignalSessionLock.java
new file mode 100644
index 00000000..78304469
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ReentrantSignalSessionLock.java
@@ -0,0 +1,16 @@
+package org.asamk.signal.manager.internal;
+
+import org.whispersystems.signalservice.api.SignalSessionLock;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+class ReentrantSignalSessionLock implements SignalSessionLock {
+
+    private final ReentrantLock LEGACY_LOCK = new ReentrantLock();
+
+    @Override
+    public Lock acquire() {
+        LEGACY_LOCK.lock();
+        return LEGACY_LOCK::unlock;
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 5faf1371..e103fec3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -32,14 +32,11 @@ import org.asamk.signal.manager.helper.PinHelper;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
-import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.usernames.BaseUsernameException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.account.PreKeyCollection;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
-import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId.PNI;
@@ -48,13 +45,13 @@ import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AlreadyVerifiedException;
 import org.whispersystems.signalservice.api.push.exceptions.DeprecatedVersionException;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
-import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse;
 
 import java.io.IOException;
 import java.util.function.Consumer;
 
 import static org.asamk.signal.manager.util.KeyUtils.generatePreKeysForType;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
 
 public class RegistrationManagerImpl implements RegistrationManager {
 
@@ -199,7 +196,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
             final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
             final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
             final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
-            final var response = Utils.handleResponseException(registrationApi.registerAccount(null,
+            final var response = handleResponseException(registrationApi.registerAccount(null,
                     recoveryPassword,
                     account.getAccountAttributes(null),
                     aciPreKeys,
@@ -221,8 +218,14 @@ public class RegistrationManagerImpl implements RegistrationManager {
 
     private boolean attemptReactivateAccount() {
         try {
-            final var accountManager = createAuthenticatedSignalServiceAccountManager();
-            accountManager.setAccountAttributes(account.getAccountAttributes(null));
+            final var dependencies = new SignalDependencies(serviceEnvironmentConfig,
+                    userAgent,
+                    account.getCredentialsProvider(),
+                    account.getSignalServiceDataStore(),
+                    null,
+                    new ReentrantSignalSessionLock());
+            handleResponseException(dependencies.getAccountApi()
+                    .setAccountAttributes(account.getAccountAttributes(null)));
             account.setRegistered(true);
             logger.info("Reactivated existing account, verify is not necessary.");
             if (newManagerListener != null) {
@@ -241,17 +244,6 @@ public class RegistrationManagerImpl implements RegistrationManager {
         return false;
     }
 
-    private SignalServiceAccountManager createAuthenticatedSignalServiceAccountManager() {
-        final var clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration());
-        final var pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
-                account.getCredentialsProvider(),
-                userAgent,
-                clientZkOperations.getProfileOperations(),
-                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
-        final var groupsV2Operations = new GroupsV2Operations(clientZkOperations, ServiceConfig.GROUP_MAX_SIZE);
-        return new SignalServiceAccountManager(pushServiceSocket, null, groupsV2Operations);
-    }
-
     private VerifyAccountResponse verifyAccountWithCode(
             final String sessionId,
             final String verificationCode,
@@ -261,11 +253,11 @@ public class RegistrationManagerImpl implements RegistrationManager {
     ) throws IOException {
         final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
         try {
-            Utils.handleResponseException(registrationApi.verifyAccount(sessionId, verificationCode));
+            handleResponseException(registrationApi.verifyAccount(sessionId, verificationCode));
         } catch (AlreadyVerifiedException e) {
             // Already verified so can continue registering
         }
-        return Utils.handleResponseException(registrationApi.registerAccount(sessionId,
+        return handleResponseException(registrationApi.registerAccount(sessionId,
                 null,
                 account.getAccountAttributes(registrationLock),
                 aciPreKeys,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 427c1025..972b422f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -13,7 +13,8 @@ import org.whispersystems.signalservice.api.SignalServiceDataStore;
 import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.SignalSessionLock;
-import org.whispersystems.signalservice.api.SignalWebSocket;
+import org.whispersystems.signalservice.api.account.AccountApi;
+import org.whispersystems.signalservice.api.cds.CdsApi;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
@@ -21,18 +22,18 @@ import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
 import org.whispersystems.signalservice.api.link.LinkDeviceApi;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.ratelimit.RateLimitChallengeApi;
 import org.whispersystems.signalservice.api.registration.RegistrationApi;
 import org.whispersystems.signalservice.api.services.ProfileService;
 import org.whispersystems.signalservice.api.storage.StorageServiceApi;
 import org.whispersystems.signalservice.api.storage.StorageServiceRepository;
 import org.whispersystems.signalservice.api.svr.SecureValueRecovery;
+import org.whispersystems.signalservice.api.username.UsernameApi;
 import org.whispersystems.signalservice.api.util.CredentialsProvider;
 import org.whispersystems.signalservice.api.util.UptimeSleepTimer;
-import org.whispersystems.signalservice.api.websocket.WebSocketFactory;
-import org.whispersystems.signalservice.internal.push.ProvisioningSocket;
+import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.internal.push.PushServiceSocket;
 import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
-import org.whispersystems.signalservice.internal.websocket.WebSocketConnection;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -58,6 +59,10 @@ public class SignalDependencies {
     private boolean allowStories = true;
 
     private SignalServiceAccountManager accountManager;
+    private AccountApi accountApi;
+    private RateLimitChallengeApi rateLimitChallengeApi;
+    private CdsApi cdsApi;
+    private UsernameApi usernameApi;
     private GroupsV2Api groupsV2Api;
     private RegistrationApi registrationApi;
     private LinkDeviceApi linkDeviceApi;
@@ -66,9 +71,9 @@ public class SignalDependencies {
     private ClientZkOperations clientZkOperations;
 
     private PushServiceSocket pushServiceSocket;
-    private ProvisioningSocket provisioningSocket;
     private Network libSignalNetwork;
-    private SignalWebSocket signalWebSocket;
+    private SignalWebSocket.AuthenticatedWebSocket authenticatedSignalWebSocket;
+    private SignalWebSocket.UnauthenticatedWebSocket unauthenticatedSignalWebSocket;
     private SignalServiceMessageReceiver messageReceiver;
     private SignalServiceMessageSender messageSender;
 
@@ -103,7 +108,12 @@ public class SignalDependencies {
             this.registrationApi = null;
             this.secureValueRecovery = null;
         }
-        getSignalWebSocket().forceNewWebSockets();
+        if (this.authenticatedSignalWebSocket != null) {
+            this.authenticatedSignalWebSocket.forceNewWebSocket();
+        }
+        if (this.unauthenticatedSignalWebSocket != null) {
+            this.unauthenticatedSignalWebSocket.forceNewWebSocket();
+        }
     }
 
     /**
@@ -130,12 +140,6 @@ public class SignalDependencies {
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
-    public ProvisioningSocket getProvisioningSocket() {
-        return getOrCreate(() -> provisioningSocket,
-                () -> provisioningSocket = new ProvisioningSocket(getServiceEnvironmentConfig().signalServiceConfiguration(),
-                        userAgent));
-    }
-
     public Network getLibSignalNetwork() {
         return getOrCreate(() -> libSignalNetwork, () -> {
             libSignalNetwork = new Network(serviceEnvironmentConfig.netEnvironment(), userAgent);
@@ -169,8 +173,8 @@ public class SignalDependencies {
 
     public SignalServiceAccountManager getAccountManager() {
         return getOrCreate(() -> accountManager,
-                () -> accountManager = new SignalServiceAccountManager(getPushServiceSocket(),
-                        getProvisioningSocket(),
+                () -> accountManager = new SignalServiceAccountManager(getAccountApi(),
+                        getPushServiceSocket(),
                         getGroupsV2Operations()));
     }
 
@@ -186,6 +190,23 @@ public class SignalDependencies {
                 ServiceConfig.GROUP_MAX_SIZE);
     }
 
+    public AccountApi getAccountApi() {
+        return getOrCreate(() -> accountApi, () -> accountApi = new AccountApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    public RateLimitChallengeApi getRateLimitChallengeApi() {
+        return getOrCreate(() -> rateLimitChallengeApi,
+                () -> rateLimitChallengeApi = new RateLimitChallengeApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    public CdsApi getCdsApi() {
+        return getOrCreate(() -> cdsApi, () -> cdsApi = new CdsApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    public UsernameApi getUsernameApi() {
+        return getOrCreate(() -> usernameApi, () -> usernameApi = new UsernameApi(getUnauthenticatedSignalWebSocket()));
+    }
+
     public GroupsV2Api getGroupsV2Api() {
         return getOrCreate(() -> groupsV2Api, () -> groupsV2Api = getAccountManager().getGroupsV2Api());
     }
@@ -195,12 +216,14 @@ public class SignalDependencies {
     }
 
     public LinkDeviceApi getLinkDeviceApi() {
-        return getOrCreate(() -> linkDeviceApi, () -> linkDeviceApi = new LinkDeviceApi(getPushServiceSocket()));
+        return getOrCreate(() -> linkDeviceApi,
+                () -> linkDeviceApi = new LinkDeviceApi(getAuthenticatedSignalWebSocket()));
     }
 
     private StorageServiceApi getStorageServiceApi() {
         return getOrCreate(() -> storageServiceApi,
-                () -> storageServiceApi = new StorageServiceApi(getPushServiceSocket()));
+                () -> storageServiceApi = new StorageServiceApi(getAuthenticatedSignalWebSocket(),
+                        getPushServiceSocket()));
     }
 
     public StorageServiceRepository getStorageServiceRepository() {
@@ -223,33 +246,35 @@ public class SignalDependencies {
         return clientZkOperations.getProfileOperations();
     }
 
-    public SignalWebSocket getSignalWebSocket() {
-        return getOrCreate(() -> signalWebSocket, () -> {
+    public SignalWebSocket.AuthenticatedWebSocket getAuthenticatedSignalWebSocket() {
+        return getOrCreate(() -> authenticatedSignalWebSocket, () -> {
             final var timer = new UptimeSleepTimer();
             final var healthMonitor = new SignalWebSocketHealthMonitor(timer);
-            final var webSocketFactory = new WebSocketFactory() {
-                @Override
-                public WebSocketConnection createWebSocket() {
-                    return new OkHttpWebSocketConnection("normal",
-                            serviceEnvironmentConfig.signalServiceConfiguration(),
-                            Optional.of(credentialsProvider),
-                            userAgent,
-                            healthMonitor,
-                            allowStories);
-                }
 
-                @Override
-                public WebSocketConnection createUnidentifiedWebSocket() {
-                    return new OkHttpWebSocketConnection("unidentified",
-                            serviceEnvironmentConfig.signalServiceConfiguration(),
-                            Optional.empty(),
-                            userAgent,
-                            healthMonitor,
-                            allowStories);
-                }
-            };
-            signalWebSocket = new SignalWebSocket(webSocketFactory);
-            healthMonitor.monitor(signalWebSocket);
+            authenticatedSignalWebSocket = new SignalWebSocket.AuthenticatedWebSocket(() -> new OkHttpWebSocketConnection(
+                    "normal",
+                    serviceEnvironmentConfig.signalServiceConfiguration(),
+                    Optional.of(credentialsProvider),
+                    userAgent,
+                    healthMonitor,
+                    allowStories));
+            healthMonitor.monitor(authenticatedSignalWebSocket);
+        });
+    }
+
+    public SignalWebSocket.UnauthenticatedWebSocket getUnauthenticatedSignalWebSocket() {
+        return getOrCreate(() -> unauthenticatedSignalWebSocket, () -> {
+            final var timer = new UptimeSleepTimer();
+            final var healthMonitor = new SignalWebSocketHealthMonitor(timer);
+
+            unauthenticatedSignalWebSocket = new SignalWebSocket.UnauthenticatedWebSocket(() -> new OkHttpWebSocketConnection(
+                    "unidentified",
+                    serviceEnvironmentConfig.signalServiceConfiguration(),
+                    Optional.empty(),
+                    userAgent,
+                    healthMonitor,
+                    allowStories));
+            healthMonitor.monitor(unauthenticatedSignalWebSocket);
         });
     }
 
@@ -263,7 +288,8 @@ public class SignalDependencies {
                 () -> messageSender = new SignalServiceMessageSender(getPushServiceSocket(),
                         dataStore,
                         sessionLock,
-                        getSignalWebSocket(),
+                        getAuthenticatedSignalWebSocket(),
+                        getUnauthenticatedSignalWebSocket(),
                         Optional.empty(),
                         executor,
                         ServiceConfig.MAX_ENVELOPE_SIZE));
@@ -281,7 +307,8 @@ public class SignalDependencies {
         return getOrCreate(() -> profileService,
                 () -> profileService = new ProfileService(getClientZkProfileOperations(),
                         getMessageReceiver(),
-                        getSignalWebSocket()));
+                        getAuthenticatedSignalWebSocket(),
+                        getUnauthenticatedSignalWebSocket()));
     }
 
     public SignalServiceCipher getCipher(ServiceIdType serviceIdType) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index 0fb1585a..b5b855ac 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -2,195 +2,155 @@ package org.asamk.signal.manager.internal;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalWebSocket;
 import org.whispersystems.signalservice.api.util.Preconditions;
 import org.whispersystems.signalservice.api.util.SleepTimer;
 import org.whispersystems.signalservice.api.websocket.HealthMonitor;
+import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
 import org.whispersystems.signalservice.internal.websocket.OkHttpWebSocketConnection;
 
-import java.util.Arrays;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import kotlin.Unit;
 
-/**
- * Monitors the health of the identified and unidentified WebSockets. If either one appears to be
- * unhealthy, will trigger restarting both.
- * <p>
- * The monitor is also responsible for sending heartbeats/keep-alive messages to prevent
- * timeouts.
- */
 final class SignalWebSocketHealthMonitor implements HealthMonitor {
 
     private static final Logger logger = LoggerFactory.getLogger(SignalWebSocketHealthMonitor.class);
 
+    /**
+     * This is the amount of time in between sent keep alives. Must be greater than [KEEP_ALIVE_TIMEOUT]
+     */
     private static final long KEEP_ALIVE_SEND_CADENCE = TimeUnit.SECONDS.toMillis(OkHttpWebSocketConnection.KEEPALIVE_FREQUENCY_SECONDS);
-    private static final long MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE = KEEP_ALIVE_SEND_CADENCE * 3;
 
-    private SignalWebSocket signalWebSocket;
+    /**
+     * This is the amount of time we will wait for a response to the keep alive before we consider the websockets dead.
+     * It is required that this value be less than [KEEP_ALIVE_SEND_CADENCE]
+     */
+    private static final long KEEP_ALIVE_TIMEOUT = TimeUnit.SECONDS.toMillis(20);
+
+    private final Executor executor = Executors.newSingleThreadExecutor();
     private final SleepTimer sleepTimer;
-
-    private volatile KeepAliveSender keepAliveSender;
-
-    private final HealthState identified = new HealthState();
-    private final HealthState unidentified = new HealthState();
+    private SignalWebSocket webSocket = null;
+    private volatile KeepAliveSender keepAliveSender = null;
+    private boolean needsKeepAlive = false;
+    private long lastKeepAliveReceived = 0;
 
     public SignalWebSocketHealthMonitor(SleepTimer sleepTimer) {
         this.sleepTimer = sleepTimer;
     }
 
-    public void monitor(SignalWebSocket signalWebSocket) {
-        Preconditions.checkNotNull(signalWebSocket);
-        Preconditions.checkArgument(this.signalWebSocket == null, "monitor can only be called once");
+    void monitor(SignalWebSocket webSocket) {
+        Preconditions.checkNotNull(webSocket);
+        Preconditions.checkArgument(this.webSocket == null, "monitor can only be called once");
 
-        this.signalWebSocket = signalWebSocket;
+        executor.execute(() -> {
 
-        //noinspection ResultOfMethodCallIgnored
-        signalWebSocket.getWebSocketState()
-                .subscribeOn(Schedulers.computation())
-                .observeOn(Schedulers.computation())
-                .distinctUntilChanged()
-                .subscribe(s -> onStateChange(s, identified));
+            this.webSocket = webSocket;
 
-        //noinspection ResultOfMethodCallIgnored
-        signalWebSocket.getUnidentifiedWebSocketState()
-                .subscribeOn(Schedulers.computation())
-                .observeOn(Schedulers.computation())
-                .distinctUntilChanged()
-                .subscribe(s -> onStateChange(s, unidentified));
+            webSocket.getState()
+                    .subscribeOn(Schedulers.computation())
+                    .observeOn(Schedulers.computation())
+                    .distinctUntilChanged()
+                    .subscribe(this::onStateChanged);
+
+            webSocket.setKeepAliveChangedListener(this::updateKeepAliveSenderStatus);
+        });
     }
 
-    private synchronized void onStateChange(WebSocketConnectionState connectionState, HealthState healthState) {
-        switch (connectionState) {
-            case CONNECTED -> logger.debug("WebSocket is now connected");
-            case AUTHENTICATION_FAILED -> logger.debug("WebSocket authentication failed");
-            case FAILED -> logger.debug("WebSocket connection failed");
-        }
+    private void onStateChanged(WebSocketConnectionState connectionState) {
+        executor.execute(() -> {
+            needsKeepAlive = connectionState == WebSocketConnectionState.CONNECTED;
 
-        healthState.needsKeepAlive = connectionState == WebSocketConnectionState.CONNECTED;
-
-        if (keepAliveSender == null && isKeepAliveNecessary()) {
-            keepAliveSender = new KeepAliveSender();
-            keepAliveSender.start();
-        } else if (keepAliveSender != null && !isKeepAliveNecessary()) {
-            keepAliveSender.shutdown();
-            keepAliveSender = null;
-        }
+            updateKeepAliveSenderStatus();
+        });
     }
 
     @Override
     public void onKeepAliveResponse(long sentTimestamp, boolean isIdentifiedWebSocket) {
-        if (isIdentifiedWebSocket) {
-            identified.lastKeepAliveReceived = System.currentTimeMillis();
-        } else {
-            unidentified.lastKeepAliveReceived = System.currentTimeMillis();
-        }
+        final var keepAliveTime = System.currentTimeMillis();
+        executor.execute(() -> lastKeepAliveReceived = keepAliveTime);
     }
 
     @Override
     public void onMessageError(int status, boolean isIdentifiedWebSocket) {
-        if (status == 409) {
-            HealthState healthState = (isIdentifiedWebSocket ? identified : unidentified);
-            if (healthState.mismatchErrorTracker.addSample(System.currentTimeMillis())) {
-                logger.warn("Received too many mismatch device errors, forcing new websockets.");
-                signalWebSocket.forceNewWebSockets();
-                signalWebSocket.connect();
-            }
+    }
+
+    private Unit updateKeepAliveSenderStatus() {
+        if (keepAliveSender == null && sendKeepAlives()) {
+            keepAliveSender = new KeepAliveSender();
+            keepAliveSender.start();
+        } else if (keepAliveSender != null && !sendKeepAlives()) {
+            keepAliveSender.shutdown();
+            keepAliveSender = null;
         }
+        return Unit.INSTANCE;
     }
 
-    private boolean isKeepAliveNecessary() {
-        return identified.needsKeepAlive || unidentified.needsKeepAlive;
-    }
-
-    private static class HealthState {
-
-        private final HttpErrorTracker mismatchErrorTracker = new HttpErrorTracker(5, TimeUnit.MINUTES.toMillis(1));
-
-        private volatile boolean needsKeepAlive;
-        private volatile long lastKeepAliveReceived;
+    private boolean sendKeepAlives() {
+        return needsKeepAlive && webSocket != null && webSocket.getShouldSendKeepAlives();
     }
 
     /**
-     * Sends periodic heartbeats/keep-alives over both WebSockets to prevent connection timeouts. If
-     * either WebSocket fails 3 times to get a return heartbeat both are forced to be recreated.
+     * Sends periodic heartbeats/keep-alives over the WebSocket to prevent connection timeouts. If
+     * the WebSocket fails to get a return heartbeat after [KEEP_ALIVE_TIMEOUT] seconds, it is forced to be recreated.
      */
-    private class KeepAliveSender extends Thread {
+    private final class KeepAliveSender extends Thread {
 
         private volatile boolean shouldKeepRunning = true;
 
+        @Override
         public void run() {
-            identified.lastKeepAliveReceived = System.currentTimeMillis();
-            unidentified.lastKeepAliveReceived = System.currentTimeMillis();
+            logger.debug("[KeepAliveSender({})] started", this.threadId());
+            lastKeepAliveReceived = System.currentTimeMillis();
 
-            while (shouldKeepRunning && isKeepAliveNecessary()) {
+            var keepAliveSendTime = System.currentTimeMillis();
+            while (shouldKeepRunning && sendKeepAlives()) {
                 try {
-                    sleepTimer.sleep(KEEP_ALIVE_SEND_CADENCE);
+                    final var nextKeepAliveSendTime = keepAliveSendTime + KEEP_ALIVE_SEND_CADENCE;
+                    sleepUntil(nextKeepAliveSendTime);
 
-                    if (shouldKeepRunning && isKeepAliveNecessary()) {
-                        long keepAliveRequiredSinceTime = System.currentTimeMillis()
-                                - MAX_TIME_SINCE_SUCCESSFUL_KEEP_ALIVE;
+                    if (shouldKeepRunning && sendKeepAlives()) {
+                        keepAliveSendTime = System.currentTimeMillis();
+                        webSocket.sendKeepAlive();
+                    }
 
-                        if (identified.lastKeepAliveReceived < keepAliveRequiredSinceTime
-                                || unidentified.lastKeepAliveReceived < keepAliveRequiredSinceTime) {
-                            logger.warn("Missed keep alives, identified last: "
-                                    + identified.lastKeepAliveReceived
-                                    + " unidentified last: "
-                                    + unidentified.lastKeepAliveReceived
-                                    + " needed by: "
-                                    + keepAliveRequiredSinceTime);
-                            signalWebSocket.forceNewWebSockets();
-                            signalWebSocket.connect();
-                        } else {
-                            signalWebSocket.sendKeepAlive();
+                    final var responseRequiredTime = keepAliveSendTime + KEEP_ALIVE_TIMEOUT;
+                    sleepUntil(responseRequiredTime);
+
+                    if (shouldKeepRunning && sendKeepAlives()) {
+                        if (lastKeepAliveReceived < keepAliveSendTime) {
+                            logger.debug("Missed keep alive, last: {} needed by: {}",
+                                    lastKeepAliveReceived,
+                                    responseRequiredTime);
+                            webSocket.forceNewWebSocket();
                         }
                     }
                 } catch (Throwable e) {
-                    logger.warn("Error occurred in KeepAliveSender, ignoring ...", e);
+                    logger.warn("Keep alive sender failed", e);
+                }
+            }
+            logger.debug("[KeepAliveSender({})] ended", threadId());
+        }
+
+        void sleepUntil(long timeMillis) {
+            while (System.currentTimeMillis() < timeMillis) {
+                final var waitTime = timeMillis - System.currentTimeMillis();
+                if (waitTime > 0) {
+                    try {
+                        sleepTimer.sleep(waitTime);
+                    } catch (InterruptedException e) {
+                        logger.warn("WebSocket health monitor interrupted", e);
+                    }
                 }
             }
         }
 
-        public void shutdown() {
+        void shutdown() {
             shouldKeepRunning = false;
         }
     }
-
-    private static final class HttpErrorTracker {
-
-        private final long[] timestamps;
-        private final long errorTimeRange;
-
-        public HttpErrorTracker(int samples, long errorTimeRange) {
-            this.timestamps = new long[samples];
-            this.errorTimeRange = errorTimeRange;
-        }
-
-        public synchronized boolean addSample(long now) {
-            long errorsMustBeAfter = now - errorTimeRange;
-            int count = 1;
-            int minIndex = 0;
-
-            for (int i = 0; i < timestamps.length; i++) {
-                if (timestamps[i] < errorsMustBeAfter) {
-                    timestamps[i] = 0;
-                } else if (timestamps[i] != 0) {
-                    count++;
-                }
-
-                if (timestamps[i] < timestamps[minIndex]) {
-                    minIndex = i;
-                }
-            }
-
-            timestamps[minIndex] = now;
-
-            if (count >= timestamps.length) {
-                Arrays.fill(timestamps, 0);
-                return true;
-            }
-            return false;
-        }
-    }
 }
+
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
index a0fa3012..7be4a401 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/accounts/AccountsStore.java
@@ -1,6 +1,7 @@
 package org.asamk.signal.manager.storage.accounts;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
 
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.ServiceEnvironment;
@@ -10,7 +11,6 @@ import org.asamk.signal.manager.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.ServiceId.ACI;
-import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -181,7 +181,7 @@ public class AccountsStore {
         return Arrays.stream(files)
                 .filter(File::isFile)
                 .map(File::getName)
-                .filter(file -> PhoneNumberFormatter.isValidNumber(file, null))
+                .filter(file -> PhoneNumberUtil.getInstance().isPossibleNumber(file, null))
                 .collect(Collectors.toSet());
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 2863874b..d4841c7a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -195,7 +195,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .hidden(remote.hidden)
                 .pniSignatureVerified(remote.pniSignatureVerified || local.pniSignatureVerified)
                 .nickname(remote.nickname)
-                .note(remote.note);
+                .note(remote.note)
+                .avatarColor(remote.avatarColor);
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
index af77e857..3c014463 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
@@ -62,7 +62,8 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
                 .mutedUntilTimestamp(remote.mutedUntilTimestamp)
                 .dontNotifyForMentionsIfMuted(remote.dontNotifyForMentionsIfMuted)
                 .hideStory(remote.hideStory)
-                .storySendMode(remote.storySendMode);
+                .storySendMode(remote.storySendMode)
+                .avatarColor(remote.avatarColor);
         final var merged = mergedBuilder.build();
 
         final var matchesRemote = doProtosMatch(merged, remote);
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PhoneNumberFormatter.java b/lib/src/main/java/org/asamk/signal/manager/util/PhoneNumberFormatter.java
new file mode 100644
index 00000000..cc0c6503
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PhoneNumberFormatter.java
@@ -0,0 +1,59 @@
+package org.asamk.signal.manager.util;
+
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
+import org.asamk.signal.manager.api.InvalidNumberException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class PhoneNumberFormatter {
+
+    private static final Logger logger = LoggerFactory.getLogger(PhoneNumberFormatter.class);
+
+    private static String impreciseFormatNumber(String number, String localNumber) {
+        number = number.replaceAll("[^0-9+]", "");
+
+        if (number.charAt(0) == '+') return number;
+
+        if (localNumber.charAt(0) == '+') localNumber = localNumber.substring(1);
+
+        if (localNumber.length() == number.length() || number.length() > localNumber.length()) return "+" + number;
+
+        int difference = localNumber.length() - number.length();
+
+        return "+" + localNumber.substring(0, difference) + number;
+    }
+
+    public static String formatNumber(String number, String localNumber) throws InvalidNumberException {
+        if (number == null) {
+            throw new InvalidNumberException("Null String passed as number.");
+        }
+
+        if (number.contains("@")) {
+            throw new InvalidNumberException("Possible attempt to use email address.");
+        }
+
+        number = number.replaceAll("[^0-9+]", "");
+
+        if (number.isEmpty()) {
+            throw new InvalidNumberException("No valid characters found.");
+        }
+
+        try {
+            PhoneNumberUtil util = PhoneNumberUtil.getInstance();
+            PhoneNumber localNumberObject = util.parse(localNumber, null);
+
+            String localCountryCode = util.getRegionCodeForNumber(localNumberObject);
+            logger.trace("Got local CC: {}", localCountryCode);
+
+            PhoneNumber numberObject = util.parse(number, localCountryCode);
+            return util.format(numberObject, PhoneNumberFormat.E164);
+        } catch (NumberParseException e) {
+            logger.debug("{}: {}", e.getClass().getSimpleName(), e.getMessage());
+            return impreciseFormatNumber(number, localNumber);
+        }
+    }
+}
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index b90a7873..9d97ed7a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -162,7 +162,11 @@ public class Utils {
                 throw new IOException(throwableOptional);
             }
         }
-        return response.successOrThrow();
+        try {
+            return response.successOrThrow();
+        } catch (Throwable e) {
+            throw new AssertionError(e);
+        }
     }
 
     public static ByteString firstNonEmpty(ByteString... strings) {

From 1295ef69ca8a794b40abd0dd6290fd2ca250713a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 16 Mar 2025 22:07:29 +0100
Subject: [PATCH 607/672] Use record patterns

---
 .../manager/helper/RecipientHelper.java       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 58e7ba59..5a3524ec 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 
 import static org.asamk.signal.manager.config.ServiceConfig.MAXIMUM_ONE_OFF_REQUEST_SIZE;
 import static org.asamk.signal.manager.util.Utils.handleResponseException;
@@ -77,12 +78,11 @@ public class RecipientHelper {
     }
 
     public RecipientId resolveRecipient(final RecipientIdentifier.Single recipient) throws UnregisteredRecipientException {
-        if (recipient instanceof RecipientIdentifier.Uuid uuidRecipient) {
-            return account.getRecipientResolver().resolveRecipient(ACI.from(uuidRecipient.uuid()));
-        } else if (recipient instanceof RecipientIdentifier.Pni pniRecipient) {
-            return account.getRecipientResolver().resolveRecipient(PNI.from(pniRecipient.pni()));
-        } else if (recipient instanceof RecipientIdentifier.Number numberRecipient) {
-            final var number = numberRecipient.number();
+        if (recipient instanceof RecipientIdentifier.Uuid(UUID uuid)) {
+            return account.getRecipientResolver().resolveRecipient(ACI.from(uuid));
+        } else if (recipient instanceof RecipientIdentifier.Pni(UUID pni)) {
+            return account.getRecipientResolver().resolveRecipient(PNI.from(pni));
+        } else if (recipient instanceof RecipientIdentifier.Number(String number)) {
             return account.getRecipientStore().resolveRecipientByNumber(number, () -> {
                 try {
                     return getRegisteredUserByNumber(number);
@@ -90,8 +90,7 @@ public class RecipientHelper {
                     return null;
                 }
             });
-        } else if (recipient instanceof RecipientIdentifier.Username usernameRecipient) {
-            var username = usernameRecipient.username();
+        } else if (recipient instanceof RecipientIdentifier.Username(String username)) {
             return resolveRecipientByUsernameOrLink(username, false);
         }
         throw new AssertionError("Unexpected RecipientIdentifier: " + recipient);
@@ -145,8 +144,8 @@ public class RecipientHelper {
         try {
             return Optional.of(resolveRecipient(recipient));
         } catch (UnregisteredRecipientException e) {
-            if (recipient instanceof RecipientIdentifier.Number r) {
-                return account.getRecipientStore().resolveRecipientByNumberOptional(r.number());
+            if (recipient instanceof RecipientIdentifier.Number(String number)) {
+                return account.getRecipientStore().resolveRecipientByNumberOptional(number);
             } else {
                 return Optional.empty();
             }

From f18015ff2ef10d49f8ab0365253e8cece9577dc2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 18 Mar 2025 18:13:38 +0100
Subject: [PATCH 608/672] f

---
 graalvm-config-dir/reflect-config.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 481999d3..50e17987 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2991,6 +2991,9 @@
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$UsernameLink",
   "allDeclaredFields":true
 },
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AvatarColor"
+},
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,

From 67302eb9c31e3bcce4c39ea90d5bdb1f77306a02 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 18 Mar 2025 18:20:44 +0100
Subject: [PATCH 609/672] Replace cached envelopes when moving

Fixes #1730
---
 .../signal/manager/storage/messageCache/MessageCache.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
index 51882a44..e4fd8c01 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/messageCache/MessageCache.java
@@ -10,6 +10,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;
@@ -75,7 +76,7 @@ public class MessageCache {
             return cachedMessage;
         }
         logger.debug("Moving cached message {} to {}", cachedMessage.getFile().toPath(), cacheFile.toPath());
-        Files.move(cachedMessage.getFile().toPath(), cacheFile.toPath());
+        Files.move(cachedMessage.getFile().toPath(), cacheFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
         return new CachedMessage(cacheFile);
     }
 

From 6befda7ef1dabc760db516be5080f1c0bb1c657c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 22 Mar 2025 10:55:16 +0100
Subject: [PATCH 610/672] Update graalvm build tools

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 67a180fb..38c3e265 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "0.10.5"
+    id("org.graalvm.buildtools.native") version "0.10.6"
 }
 
 allprojects {

From 14b07be0dcc9d61eeebc857338367515a3e338b3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Mar 2025 09:11:05 +0200
Subject: [PATCH 611/672] Always renew session when failing to decrypt message

---
 .../signal/manager/actions/RenewSessionAction.java    |  4 +---
 .../actions/SendRetryMessageRequestAction.java        | 11 +----------
 .../signal/manager/helper/IncomingMessageHandler.java |  7 +++----
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
index 40117246..35058940 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/RenewSessionAction.java
@@ -19,9 +19,7 @@ public class RenewSessionAction implements HandleAction {
     @Override
     public void execute(Context context) throws Throwable {
         context.getAccount().getAccountData(accountId).getSessionStore().archiveSessions(serviceId);
-        if (!recipientId.equals(context.getAccount().getSelfRecipientId())) {
-            context.getSendHelper().sendNullMessage(recipientId);
-        }
+        context.getSendHelper().sendNullMessage(recipientId);
     }
 
     @Override
diff --git a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
index 865f062f..96a94128 100644
--- a/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
+++ b/lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java
@@ -7,7 +7,6 @@ import org.signal.libsignal.metadata.ProtocolException;
 import org.signal.libsignal.protocol.message.CiphertextMessage;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.internal.push.Envelope;
 
 import java.util.Optional;
@@ -15,29 +14,21 @@ import java.util.Optional;
 public class SendRetryMessageRequestAction implements HandleAction {
 
     private final RecipientId recipientId;
-    private final ServiceId serviceId;
     private final ProtocolException protocolException;
     private final SignalServiceEnvelope envelope;
-    private final ServiceId accountId;
 
     public SendRetryMessageRequestAction(
             final RecipientId recipientId,
-            final ServiceId serviceId,
             final ProtocolException protocolException,
-            final SignalServiceEnvelope envelope,
-            final ServiceId accountId
+            final SignalServiceEnvelope envelope
     ) {
         this.recipientId = recipientId;
-        this.serviceId = serviceId;
         this.protocolException = protocolException;
         this.envelope = envelope;
-        this.accountId = accountId;
     }
 
     @Override
     public void execute(Context context) throws Throwable {
-        context.getAccount().getAccountData(accountId).getSessionStore().archiveSessions(serviceId);
-
         int senderDevice = protocolException.getSenderDevice();
         Optional<GroupId> groupId = protocolException.getGroupId().isPresent() ? Optional.of(GroupId.unknownVersion(
                 protocolException.getGroupId().get())) : Optional.empty();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 90d67a36..1e808e64 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -165,12 +165,11 @@ public final class IncomingMessageHandler {
                     if (serviceId != null) {
                         final var isSelf = sender.equals(account.getSelfRecipientId())
                                 && e.getSenderDevice() == account.getDeviceId();
+                        logger.debug("Received invalid message, queuing renew session action.");
+                        actions.add(new RenewSessionAction(sender, serviceId, destination));
                         if (!isSelf) {
                             logger.debug("Received invalid message, requesting message resend.");
-                            actions.add(new SendRetryMessageRequestAction(sender, serviceId, e, envelope, destination));
-                        } else {
-                            logger.debug("Received invalid message, queuing renew session action.");
-                            actions.add(new RenewSessionAction(sender, serviceId, destination));
+                            actions.add(new SendRetryMessageRequestAction(sender, e, envelope));
                         }
                     } else {
                         logger.debug("Received invalid message from invalid sender: {}", e.getSender());

From adb6787d5b3d1dae30669e38ca6cdfaf753f6578 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Mar 2025 09:11:28 +0200
Subject: [PATCH 612/672] Refresh prekeys when receiving message with invalid
 key id

---
 .../asamk/signal/manager/helper/IncomingMessageHandler.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 1e808e64..3bb7479a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -157,6 +157,9 @@ public final class IncomingMessageHandler {
             } catch (ProtocolInvalidKeyIdException | ProtocolInvalidKeyException | ProtocolNoSessionException |
                      ProtocolInvalidMessageException e) {
                 logger.debug("Failed to decrypt incoming message", e);
+                if (e instanceof ProtocolInvalidKeyIdException) {
+                    actions.add(RefreshPreKeysAction.create());
+                }
                 final var sender = account.getRecipientResolver().resolveRecipient(e.getSender());
                 if (context.getContactHelper().isContactBlocked(sender)) {
                     logger.debug("Received invalid message from blocked contact, ignoring.");

From 3dc8844cb4e1feb916e5af37cb7817312e033cb8 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Mar 2025 09:19:20 +0200
Subject: [PATCH 613/672] Update libraries

---
 gradle/libs.versions.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b8d57a12..5d633271 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,15 +3,15 @@ slf4j = "2.0.17"
 
 [libraries]
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.80"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.2"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.3"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
-logback = "ch.qos.logback:logback-classic:1.5.17"
+logback = "ch.qos.logback:logback-classic:1.5.18"
 
 signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_119"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
-hikari = "com.zaxxer:HikariCP:6.2.1"
+hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.12.0"

From 69a9b30732aac5ff79012e98f844527074f391a1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Mar 2025 14:45:02 +0200
Subject: [PATCH 614/672] Update libsignal-service

---
 gradle/libs.versions.toml                                    | 2 +-
 .../java/org/asamk/signal/manager/helper/ReceiveHelper.java  | 2 ++
 .../asamk/signal/manager/internal/SignalDependencies.java    | 5 +++--
 .../manager/internal/SignalWebSocketHealthMonitor.java       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5d633271..49f54ff8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_119"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_120"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
index eb935188..71f69081 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java
@@ -100,6 +100,7 @@ public class ReceiveHelper {
                 .distinctUntilChanged()
                 .subscribe(this::onWebSocketStateChange);
         signalWebSocket.connect();
+        signalWebSocket.registerKeepAliveToken("receive");
 
         try {
             receiveMessagesInternal(signalWebSocket, timeout, returnOnTimeout, maxMessages, handler, queuedActions);
@@ -107,6 +108,7 @@ public class ReceiveHelper {
             hasCaughtUpWithOldMessages = false;
             handleQueuedActions(queuedActions.keySet());
             queuedActions.clear();
+            signalWebSocket.removeKeepAliveToken("receive");
             signalWebSocket.disconnect();
             webSocketStateDisposable.dispose();
             shouldStop = false;
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 972b422f..c19e6b66 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -41,6 +41,7 @@ import java.net.Proxy;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 public class SignalDependencies {
@@ -257,7 +258,7 @@ public class SignalDependencies {
                     Optional.of(credentialsProvider),
                     userAgent,
                     healthMonitor,
-                    allowStories));
+                    allowStories), timer, TimeUnit.SECONDS.toMillis(10));
             healthMonitor.monitor(authenticatedSignalWebSocket);
         });
     }
@@ -273,7 +274,7 @@ public class SignalDependencies {
                     Optional.empty(),
                     userAgent,
                     healthMonitor,
-                    allowStories));
+                    allowStories), timer, TimeUnit.SECONDS.toMillis(10));
             healthMonitor.monitor(unauthenticatedSignalWebSocket);
         });
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index b5b855ac..dfae5985 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -90,7 +90,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
     }
 
     private boolean sendKeepAlives() {
-        return needsKeepAlive && webSocket != null && webSocket.getShouldSendKeepAlives();
+        return needsKeepAlive && webSocket != null && webSocket.shouldSendKeepAlives();
     }
 
     /**

From db2182aa7d8b44a49691f7e6d49bac9961f841eb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 6 Apr 2025 19:37:18 +0200
Subject: [PATCH 615/672] Update libsignal-service

---
 graalvm-config-dir/jni-config.json            |  4 ++
 graalvm-config-dir/reflect-config.json        | 29 +++++++++++-
 gradle/libs.versions.toml                     |  2 +-
 .../signal/manager/config/ServiceConfig.java  |  3 +-
 .../signal/manager/helper/PreKeyHelper.java   |  8 ++--
 .../signal/manager/helper/ProfileHelper.java  | 10 +++--
 .../helper/UnidentifiedAccessHelper.java      |  7 ++-
 .../manager/internal/SignalDependencies.java  | 45 +++++++++++++++++--
 .../org/asamk/signal/manager/util/Utils.java  | 15 +------
 run_tests.sh                                  |  1 +
 10 files changed, 94 insertions(+), 30 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 7c68c6d6..0284d58f 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -90,6 +90,10 @@
   "name":"org.signal.libsignal.internal.CompletableFuture",
   "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }]
 },
+{
+  "name":"org.signal.libsignal.internal.NativeHandleGuard$SimpleOwner",
+  "methods":[{"name":"unsafeNativeHandleWithoutGuard","parameterTypes":[] }]
+},
 {
   "name":"org.signal.libsignal.net.CdsiLookupResponse",
   "methods":[{"name":"<init>","parameterTypes":["java.util.Map","int"] }]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 50e17987..cdf38732 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -39,6 +39,9 @@
 {
   "name":"[Ljava.sql.Statement;"
 },
+{
+  "name":"[Lorg.asamk.signal.commands.ListStickerPacksCommand$JsonStickerPack$JsonSticker;"
+},
 {
   "name":"[Lorg.asamk.signal.json.JsonAttachment;"
 },
@@ -2302,7 +2305,7 @@
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
   "allDeclaredConstructors":true,
-  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getDeleteSync","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStorageServiceEncryptionV2","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }, {"name":"getVersionedExpirationTimer","parameterTypes":[] }]
+  "methods":[{"name":"getAnnouncementGroup","parameterTypes":[] }, {"name":"getAttachmentBackfill","parameterTypes":[] }, {"name":"getChangeNumber","parameterTypes":[] }, {"name":"getDeleteSync","parameterTypes":[] }, {"name":"getGiftBadges","parameterTypes":[] }, {"name":"getPaymentActivation","parameterTypes":[] }, {"name":"getPni","parameterTypes":[] }, {"name":"getSenderKey","parameterTypes":[] }, {"name":"getStorage","parameterTypes":[] }, {"name":"getStorageServiceEncryptionV2","parameterTypes":[] }, {"name":"getStories","parameterTypes":[] }, {"name":"getVersionedExpirationTimer","parameterTypes":[] }]
 },
 {
   "name":"org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest",
@@ -2329,6 +2332,13 @@
 {
   "name":"org.whispersystems.signalservice.api.groupsv2.TemporalCredential[]"
 },
+{
+  "name":"org.whispersystems.signalservice.api.keys.OneTimePreKeyCounts",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.whispersystems.signalservice.api.link.LinkedDeviceVerificationCodeResponse",
   "allDeclaredFields":true,
@@ -2396,7 +2406,14 @@
   "name":"org.whispersystems.signalservice.api.profiles.SignalServiceProfileWrite",
   "allDeclaredFields":true,
   "allDeclaredMethods":true,
-  "allDeclaredConstructors":true
+  "allDeclaredConstructors":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","byte[]","byte[]","byte[]","byte[]","byte[]","boolean","boolean","byte[]","java.util.List"] }, {"name":"getAbout","parameterTypes":[] }, {"name":"getAboutEmoji","parameterTypes":[] }, {"name":"getAvatar","parameterTypes":[] }, {"name":"getBadgeIds","parameterTypes":[] }, {"name":"getCommitment","parameterTypes":[] }, {"name":"getName","parameterTypes":[] }, {"name":"getPaymentAddress","parameterTypes":[] }, {"name":"getPhoneNumberSharing","parameterTypes":[] }, {"name":"getSameAvatar","parameterTypes":[] }, {"name":"getVersion","parameterTypes":[] }]
+},
+{
+  "name":"org.whispersystems.signalservice.api.provisioning.ProvisioningMessage",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
 },
 {
   "name":"org.whispersystems.signalservice.api.push.ServiceId",
@@ -2441,6 +2458,12 @@
   "queryAllDeclaredConstructors":true,
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
 },
+{
+  "name":"org.whispersystems.signalservice.api.ratelimit.SubmitRecaptchaChallengePayload",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"org.whispersystems.signalservice.api.storage.StorageAuthResponse",
   "allDeclaredFields":true,
@@ -2965,6 +2988,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
   "allDeclaredFields":true,
+  "fields":[{"name":"avatarColor"}, {"name":"avatarUrlPath"}, {"name":"backupSubscriberData"}, {"name":"backupTier"}, {"name":"displayBadgesOnProfile"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hasBackup"}, {"name":"hasCompletedUsernameOnboarding"}, {"name":"hasSeenGroupStoryEducationSheet"}, {"name":"hasSetMyStoriesPrivacy"}, {"name":"hasViewedOnboardingStory"}, {"name":"keepMutedChatsArchived"}, {"name":"linkPreviews"}, {"name":"noteToSelfArchived"}, {"name":"noteToSelfMarkedUnread"}, {"name":"payments"}, {"name":"phoneNumberSharingMode"}, {"name":"pinnedConversations"}, {"name":"preferContactAvatars"}, {"name":"preferredReactionEmoji"}, {"name":"primarySendsSms"}, {"name":"profileKey"}, {"name":"readReceipts"}, {"name":"sealedSenderIndicators"}, {"name":"storiesDisabled"}, {"name":"storyViewReceiptsEnabled"}, {"name":"subscriberCurrencyCode"}, {"name":"subscriberId"}, {"name":"subscriptionManuallyCancelled"}, {"name":"typingIndicators"}, {"name":"universalExpireTimer"}, {"name":"unlistedPhoneNumber"}, {"name":"username"}, {"name":"usernameLink"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -3027,6 +3051,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
+  "fields":[{"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 49f54ff8..74f97a76 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_120"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_121"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
index fed6f457..587fc89b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java
@@ -30,7 +30,8 @@ public class ServiceConfig {
     public static AccountAttributes.Capabilities getCapabilities(boolean isPrimaryDevice) {
         final var deleteSync = !isPrimaryDevice;
         final var storageEncryptionV2 = !isPrimaryDevice;
-        return new AccountAttributes.Capabilities(true, deleteSync, true, storageEncryptionV2);
+        final var attachmentBackfill = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(true, deleteSync, true, storageEncryptionV2, attachmentBackfill);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
index b17a9206..bf7ad580 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PreKeyHelper.java
@@ -11,17 +11,19 @@ import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.NetworkResultUtil;
 import org.whispersystems.signalservice.api.account.PreKeyUpload;
+import org.whispersystems.signalservice.api.keys.OneTimePreKeyCounts;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.signalservice.internal.push.OneTimePreKeyCounts;
 
 import java.io.IOException;
 import java.util.List;
 
 import static org.asamk.signal.manager.config.ServiceConfig.PREKEY_STALE_AGE;
 import static org.asamk.signal.manager.config.ServiceConfig.SIGNED_PREKEY_ROTATE_AGE;
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
 
 public class PreKeyHelper {
 
@@ -82,7 +84,7 @@ public class PreKeyHelper {
     ) throws IOException {
         OneTimePreKeyCounts preKeyCounts;
         try {
-            preKeyCounts = dependencies.getAccountManager().getPreKeyCounts(serviceIdType);
+            preKeyCounts = handleResponseException(dependencies.getKeysApi().getAvailablePreKeyCounts(serviceIdType));
         } catch (AuthorizationFailedException e) {
             logger.debug("Failed to get pre key count, ignoring: " + e.getClass().getSimpleName());
             preKeyCounts = new OneTimePreKeyCounts(0, 0);
@@ -143,7 +145,7 @@ public class PreKeyHelper {
                 kyberPreKeyRecords);
         var needsReset = false;
         try {
-            dependencies.getAccountManager().setPreKeys(preKeyUpload);
+            NetworkResultUtil.toPreKeysLegacy(dependencies.getKeysApi().setPreKeys(preKeyUpload));
             try {
                 if (preKeyRecords != null) {
                     account.addPreKeys(serviceIdType, preKeyRecords);
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
index 0905bb30..af16ed1d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java
@@ -23,6 +23,7 @@ import org.signal.libsignal.zkgroup.profiles.ExpiringProfileKeyCredential;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.NetworkResultUtil;
 import org.whispersystems.signalservice.api.crypto.SealedSenderAccess;
 import org.whispersystems.signalservice.api.profiles.AvatarUploadParams;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
@@ -196,9 +197,10 @@ public final class ProfileHelper {
                         : avatar == null ? AvatarUploadParams.unchanged(true) : AvatarUploadParams.unchanged(false);
                 final var paymentsAddress = Optional.ofNullable(newProfile.getMobileCoinAddress())
                         .map(address -> PaymentUtils.signPaymentsAddress(address,
-                                account.getAciIdentityKeyPair().getPrivateKey()));
+                                account.getAciIdentityKeyPair().getPrivateKey()))
+                        .orElse(null);
                 logger.debug("Uploading new profile");
-                final var avatarPath = dependencies.getAccountManager()
+                final var avatarPath = NetworkResultUtil.toSetProfileLegacy(dependencies.getProfileApi()
                         .setVersionedProfile(account.getAci(),
                                 account.getProfileKey(),
                                 newProfile.getInternalServiceName(),
@@ -208,9 +210,9 @@ public final class ProfileHelper {
                                 avatarUploadParams,
                                 List.of(/* TODO implement support for badges */),
                                 account.getConfigurationStore().getPhoneNumberSharingMode()
-                                        == PhoneNumberSharingMode.EVERYBODY);
+                                        == PhoneNumberSharingMode.EVERYBODY));
                 if (!avatarUploadParams.keepTheSame) {
-                    builder.withAvatarUrlPath(avatarPath.orElse(null));
+                    builder.withAvatarUrlPath(avatarPath);
                 }
                 newProfile = builder.build();
             }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
index fb39789e..cd2719a1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
@@ -18,6 +18,8 @@ import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import static org.asamk.signal.manager.util.Utils.handleResponseException;
+
 public class UnidentifiedAccessHelper {
 
     private static final Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class);
@@ -109,7 +111,8 @@ public class UnidentifiedAccessHelper {
             return privacySenderCertificate.getSerialized();
         }
         try {
-            final var certificate = dependencies.getAccountManager().getSenderCertificateForPhoneNumberPrivacy();
+            final var certificate = handleResponseException(dependencies.getCertificateApi()
+                    .getSenderCertificateForPhoneNumberPrivacy());
             privacySenderCertificate = new SenderCertificate(certificate);
             return certificate;
         } catch (IOException | InvalidCertificateException e) {
@@ -125,7 +128,7 @@ public class UnidentifiedAccessHelper {
             return senderCertificate.getSerialized();
         }
         try {
-            final var certificate = dependencies.getAccountManager().getSenderCertificate();
+            final var certificate = handleResponseException(dependencies.getCertificateApi().getSenderCertificate());
             this.senderCertificate = new SenderCertificate(certificate);
             return certificate;
         } catch (IOException | InvalidCertificateException e) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index c19e6b66..6470d4e9 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -14,12 +14,17 @@ import org.whispersystems.signalservice.api.SignalServiceMessageReceiver;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.account.AccountApi;
+import org.whispersystems.signalservice.api.attachment.AttachmentApi;
 import org.whispersystems.signalservice.api.cds.CdsApi;
+import org.whispersystems.signalservice.api.certificate.CertificateApi;
 import org.whispersystems.signalservice.api.crypto.SignalServiceCipher;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Api;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
+import org.whispersystems.signalservice.api.keys.KeysApi;
 import org.whispersystems.signalservice.api.link.LinkDeviceApi;
+import org.whispersystems.signalservice.api.message.MessageApi;
+import org.whispersystems.signalservice.api.profiles.ProfileApi;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.ratelimit.RateLimitChallengeApi;
@@ -68,6 +73,10 @@ public class SignalDependencies {
     private RegistrationApi registrationApi;
     private LinkDeviceApi linkDeviceApi;
     private StorageServiceApi storageServiceApi;
+    private CertificateApi certificateApi;
+    private AttachmentApi attachmentApi;
+    private MessageApi messageApi;
+    private KeysApi keysApi;
     private GroupsV2Operations groupsV2Operations;
     private ClientZkOperations clientZkOperations;
 
@@ -80,6 +89,7 @@ public class SignalDependencies {
 
     private List<SecureValueRecovery> secureValueRecovery;
     private ProfileService profileService;
+    private ProfileApi profileApi;
 
     SignalDependencies(
             final ServiceEnvironmentConfig serviceEnvironmentConfig,
@@ -174,7 +184,8 @@ public class SignalDependencies {
 
     public SignalServiceAccountManager getAccountManager() {
         return getOrCreate(() -> accountManager,
-                () -> accountManager = new SignalServiceAccountManager(getAccountApi(),
+                () -> accountManager = new SignalServiceAccountManager(getAuthenticatedSignalWebSocket(),
+                        getAccountApi(),
                         getPushServiceSocket(),
                         getGroupsV2Operations()));
     }
@@ -231,6 +242,27 @@ public class SignalDependencies {
         return new StorageServiceRepository(getStorageServiceApi());
     }
 
+    public CertificateApi getCertificateApi() {
+        return getOrCreate(() -> certificateApi,
+                () -> certificateApi = new CertificateApi(getAuthenticatedSignalWebSocket()));
+    }
+
+    public AttachmentApi getAttachmentApi() {
+        return getOrCreate(() -> attachmentApi,
+                () -> attachmentApi = new AttachmentApi(getAuthenticatedSignalWebSocket(), getPushServiceSocket()));
+    }
+
+    public MessageApi getMessageApi() {
+        return getOrCreate(() -> messageApi,
+                () -> messageApi = new MessageApi(getAuthenticatedSignalWebSocket(),
+                        getUnauthenticatedSignalWebSocket()));
+    }
+
+    public KeysApi getKeysApi() {
+        return getOrCreate(() -> keysApi,
+                () -> keysApi = new KeysApi(getAuthenticatedSignalWebSocket(), getUnauthenticatedSignalWebSocket()));
+    }
+
     public GroupsV2Operations getGroupsV2Operations() {
         return getOrCreate(() -> groupsV2Operations,
                 () -> groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration()),
@@ -289,8 +321,9 @@ public class SignalDependencies {
                 () -> messageSender = new SignalServiceMessageSender(getPushServiceSocket(),
                         dataStore,
                         sessionLock,
-                        getAuthenticatedSignalWebSocket(),
-                        getUnauthenticatedSignalWebSocket(),
+                        getAttachmentApi(),
+                        getMessageApi(),
+                        getKeysApi(),
                         Optional.empty(),
                         executor,
                         ServiceConfig.MAX_ENVELOPE_SIZE));
@@ -304,10 +337,14 @@ public class SignalDependencies {
                         .toList());
     }
 
+    public ProfileApi getProfileApi() {
+        return getOrCreate(() -> profileApi,
+                () -> profileApi = new ProfileApi(getAuthenticatedSignalWebSocket(), getPushServiceSocket()));
+    }
+
     public ProfileService getProfileService() {
         return getOrCreate(() -> profileService,
                 () -> profileService = new ProfileService(getClientZkProfileOperations(),
-                        getMessageReceiver(),
                         getAuthenticatedSignalWebSocket(),
                         getUnauthenticatedSignalWebSocket()));
     }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
index 9d97ed7a..daee1d77 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/Utils.java
@@ -7,6 +7,7 @@ import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.NetworkResult;
+import org.whispersystems.signalservice.api.NetworkResultUtil;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 
@@ -154,19 +155,7 @@ public class Utils {
     }
 
     public static <T> T handleResponseException(final NetworkResult<T> response) throws IOException {
-        final var throwableOptional = response.getCause();
-        if (throwableOptional != null) {
-            if (throwableOptional instanceof IOException ioException) {
-                throw ioException;
-            } else {
-                throw new IOException(throwableOptional);
-            }
-        }
-        try {
-            return response.successOrThrow();
-        } catch (Throwable e) {
-            throw new AssertionError(e);
-        }
+        return NetworkResultUtil.toBasicLegacy(response);
     }
 
     public static ByteString firstNonEmpty(ByteString... strings) {
diff --git a/run_tests.sh b/run_tests.sh
index 253532ec..02ab0286 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -141,6 +141,7 @@ exec 3> "$FIFO_FILE"
   echo '{"jsonrpc":"2.0","id":"id","method":"listGroups"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"listDevices"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"listIdentities"}' >&3
+  echo '{"jsonrpc":"2.0","id":"id","method":"listStickerPacks"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"sendSyncRequest"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"sendContacts"}' >&3
   echo '{"jsonrpc":"2.0","id":"id","method":"version"}' >&3

From b998f322f58fb20c6e545918ee5ec9af80d3aae5 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 6 Apr 2025 20:10:46 +0200
Subject: [PATCH 616/672] Bump version to 0.13.14

---
 CHANGELOG.md                          | 13 ++++++++++++-
 build.gradle.kts                      |  2 +-
 data/org.asamk.SignalCli.metainfo.xml |  3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40ff89f8..3474b123 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.14] - 2025-04-06
+
+Requires libsignal-client version 0.68.1.
+
+### Fixed
+
+- Fix pre key import from old data files
+
+### Changed
+
+- Use websocket connection instead of HTTP for more requests
+- Improve handling of messages with decryption error
 
 ## [0.13.13] - 2025-02-28
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 38c3e265..bfc09725 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.14-SNAPSHOT"
+    version = "0.13.14"
 }
 
 java {
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index a0af7892..b6f81a4d 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.14" date="2025-04-06">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.14</url>
+        </release>
         <release version="0.13.13" date="2025-02-28">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.13</url>
         </release>

From bd7948e24657e1f324e423eb43b13aeedf6f3637 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 617/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3474b123..16899ff1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.14] - 2025-04-06
 
 Requires libsignal-client version 0.68.1.
diff --git a/build.gradle.kts b/build.gradle.kts
index bfc09725..17c632af 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.14"
+    version = "0.13.15-SNAPSHOT"
 }
 
 java {

From ce813e4529811b7e97c46e13bf716f08a4139785 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 8 Apr 2025 16:24:57 +0200
Subject: [PATCH 618/672] Update client dependencies

---
 client/Cargo.lock | 435 +++++++++++++++++++++++-----------------------
 1 file changed, 218 insertions(+), 217 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index b85be350..d0cd01f4 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -69,15 +69,15 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 
 [[package]]
 name = "async-trait"
-version = "0.1.85"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -108,7 +108,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -119,21 +119,21 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "bytes"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.10"
+version = "1.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
+checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
 dependencies = [
  "shlex",
 ]
@@ -152,9 +152,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.26"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
+checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -162,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.26"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
+checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -175,9 +175,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.24"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -209,9 +209,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.4"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -236,15 +236,15 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -343,9 +343,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -374,9 +374,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "http"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
  "bytes",
  "fnv",
@@ -395,12 +395,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "pin-project-lite",
@@ -408,15 +408,15 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.5"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "hyper"
-version = "1.5.2"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -452,9 +452,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -462,6 +462,7 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
+ "libc",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -510,9 +511,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locid_transform_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
 
 [[package]]
 name = "icu_normalizer"
@@ -534,9 +535,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
 
 [[package]]
 name = "icu_properties"
@@ -555,9 +556,9 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
 
 [[package]]
 name = "icu_provider"
@@ -610,9 +611,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -626,22 +627,24 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jni"
-version = "0.19.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
  "cesu8",
+ "cfg-if",
  "combine",
  "jni-sys",
  "log",
  "thiserror 1.0.69",
  "walkdir",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -652,9 +655,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jsonrpsee"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5c71d8c1a731cc4227c2f698d377e7848ca12c8a48866fc5e6951c43a4db843"
+checksum = "37b26c20e2178756451cfeb0661fb74c47dd5988cb7e3939de7e9241fd604d42"
 dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-http-client",
@@ -665,9 +668,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2882f6f8acb9fdaec7cefc4fd607119a9bd709831df7d7672a1d3b644628280"
+checksum = "456196007ca3a14db478346f58c7238028d55ee15c1df15115596e411ff27925"
 dependencies = [
  "async-trait",
  "bytes",
@@ -689,9 +692,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3638bc4617f96675973253b3a45006933bde93c2fd8a6170b33c777cc389e5b"
+checksum = "c872b6c9961a4ccc543e321bb5b89f6b2d2c7fe8b61906918273a3333c95400c"
 dependencies = [
  "async-trait",
  "base64",
@@ -714,9 +717,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06c01ae0007548e73412c08e2285ffe5d723195bf268bce67b1b77c3bb2a14d"
+checksum = "5e65763c942dfc9358146571911b0cd1c361c2d63e2d2305622d40d36376ca80"
 dependencies = [
  "heck",
  "proc-macro-crate",
@@ -727,9 +730,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.24.7"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a178c60086f24cc35bb82f57c651d0d25d99c4742b4d335de04e97fa1f08a8a1"
+checksum = "08a8e70baf945b6b5752fc8eb38c918a48f1234daf11355e07106d963f860089"
 dependencies = [
  "http",
  "serde",
@@ -739,27 +742,27 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.15"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
 
 [[package]]
 name = "litemap"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
 
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memchr"
@@ -769,9 +772,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
+checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
 dependencies = [
  "adler2",
 ]
@@ -787,34 +790,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "num-bigint"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-dependencies = [
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "object"
 version = "0.36.7"
@@ -826,15 +801,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "percent-encoding"
@@ -844,18 +819,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.8"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.8"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -876,42 +851,41 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
  "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
  "getrandom",
  "libc",
- "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
@@ -924,15 +898,15 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "0.38.43"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
 dependencies = [
  "bitflags",
  "errno",
@@ -943,9 +917,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.21"
+version = "0.23.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8"
+checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
 dependencies = [
  "log",
  "once_cell",
@@ -958,37 +932,27 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.3"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
  "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-platform-verifier"
-version = "0.3.4"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
+checksum = "4a5467026f437b4cb2a533865eaa73eb840019a0916f4b9ec563c6e617e086c9"
 dependencies = [
  "core-foundation",
  "core-foundation-sys",
@@ -1001,8 +965,8 @@ dependencies = [
  "rustls-webpki",
  "security-framework",
  "security-framework-sys",
- "webpki-roots",
- "winapi",
+ "webpki-root-certs",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1013,9 +977,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -1024,9 +988,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "same-file"
@@ -1048,15 +1012,14 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
 dependencies = [
  "bitflags",
  "core-foundation",
  "core-foundation-sys",
  "libc",
- "num-bigint",
  "security-framework-sys",
 ]
 
@@ -1072,18 +1035,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1092,9 +1055,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.135"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -1120,7 +1083,7 @@ dependencies = [
  "log",
  "serde",
  "serde_json",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-util",
 ]
@@ -1136,26 +1099,20 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
 [[package]]
 name = "socket2"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -1176,9 +1133,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.96"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1198,9 +1155,9 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
+checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
 dependencies = [
  "rustix",
  "windows-sys 0.59.0",
@@ -1217,11 +1174,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.11",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -1237,9 +1194,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1258,9 +1215,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.44.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1285,9 +1242,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.1"
+version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
  "rustls",
  "tokio",
@@ -1306,9 +1263,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1325,9 +1282,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 
 [[package]]
 name = "toml_edit"
-version = "0.22.22"
+version = "0.22.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1401,9 +1358,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "untrusted"
@@ -1466,30 +1423,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "webpki-roots"
-version = "0.26.7"
+name = "webpki-root-certs"
+version = "0.26.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e"
+checksum = "09aed61f5e8d2c18344b3faa33a4c837855fe56642757754775548fee21386c4"
 dependencies = [
  "rustls-pki-types",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.9"
@@ -1500,10 +1441,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
+name = "windows-sys"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
 
 [[package]]
 name = "windows-sys"
@@ -1511,7 +1455,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1520,7 +1464,22 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
 ]
 
 [[package]]
@@ -1529,28 +1488,46 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -1563,24 +1540,48 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -1589,9 +1590,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.24"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a"
+checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
 dependencies = [
  "memchr",
 ]
@@ -1634,18 +1635,18 @@ dependencies = [
 
 [[package]]
 name = "zerofrom"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",

From 1e685c7cab19b2cd57d79cf5d54999b5549164fd Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 9 Apr 2025 20:44:10 +0200
Subject: [PATCH 619/672] Extend merge/split logging

---
 .../manager/storage/recipients/MergeRecipientHelper.java   | 7 ++++---
 .../signal/manager/storage/recipients/RecipientStore.java  | 7 ++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
index 0a96785b..1454c8a7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/MergeRecipientHelper.java
@@ -83,10 +83,11 @@ public class MergeRecipientHelper {
             recipientsToBeStripped.add(recipient);
         }
 
-        logger.debug("Got separate recipients for high trust identifiers {}, need to merge ({}) and strip ({})",
+        logger.debug("Got separate recipients for high trust identifiers {}, need to merge ({}, {}) and strip ({})",
                 address,
-                recipientsToBeMerged.stream().map(r -> r.id().toString()).collect(Collectors.joining(", ")),
-                recipientsToBeStripped.stream().map(r -> r.id().toString()).collect(Collectors.joining(", ")));
+                resultingRecipient.map(RecipientWithAddress::address),
+                recipientsToBeMerged.stream().map(r -> r.address().toString()).collect(Collectors.joining(", ")),
+                recipientsToBeStripped.stream().map(r -> r.address().toString()).collect(Collectors.joining(", ")));
 
         RecipientAddress finalAddress = resultingRecipient.map(RecipientWithAddress::address).orElse(null);
         for (final var recipient : recipientsToBeMerged) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
index 8d006416..442cbf4e 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java
@@ -994,7 +994,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
     ) throws SQLException {
         markUnregistered(connection, recipientId);
         final var address = resolveRecipientAddress(connection, recipientId);
-        if (address.aci().isPresent() && address.pni().isPresent()) {
+        final var needSplit = address.aci().isPresent() && address.pni().isPresent();
+        logger.trace("Marking unregistered recipient {} as unregistered (and split={}): {}",
+                recipientId,
+                needSplit,
+                address);
+        if (needSplit) {
             final var numberAddress = new RecipientAddress(address.pni().get(), address.number().orElse(null));
             updateRecipientAddress(connection, recipientId, address.removeIdentifiersFrom(numberAddress));
             addNewRecipient(connection, numberAddress);

From 4e455d85d6e311cf229efae7f4d4acc9208d6931 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 26 Apr 2025 09:04:05 +0200
Subject: [PATCH 620/672] Add more logging to register

---
 .../asamk/signal/manager/internal/RegistrationManagerImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index e103fec3..0d20cc0b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -129,12 +129,15 @@ public class RegistrationManagerImpl implements RegistrationManager {
             }
 
             final var registrationApi = unauthenticatedAccountManager.getRegistrationApi();
+            logger.trace("Creating verification session");
             String sessionId = NumberVerificationUtils.handleVerificationSession(registrationApi,
                     account.getSessionId(account.getNumber()),
                     id -> account.setSessionId(account.getNumber(), id),
                     voiceVerification,
                     captcha);
+            logger.trace("Requesting verification code");
             NumberVerificationUtils.requestVerificationCode(registrationApi, sessionId, voiceVerification);
+            logger.debug("Successfully requested verification code");
             account.setRegistered(false);
         } catch (DeprecatedVersionException e) {
             logger.debug("Signal-Server returned deprecated version exception", e);

From 5e11cf1c508810388de9dce18034723a66a8b453 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 19:37:41 +0200
Subject: [PATCH 621/672] Update gradle

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43705 -> 43764 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   4 ++--
 gradlew.bat                              |   4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644
GIT binary patch
delta 642
zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|**
z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$
z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O%
zFic^X{7^$?^Ho04eona9<j-?s7{5&pn3vAfATT*_p3LN00ny11Rtil1HBXAkTNo_F
zzkq$Rzpyk|IAy*RlYkgpSVT+(EPNd(yipP=9LB_`2v^ayz>n#mGMxKhA=~8B%JN`M
zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n
zVkxF2rjrjWR+_xr6e6@_u@s~2<o%12m_J)HOm?uBn*82c8LYT)i4=33JxI(O%zp{w
z$2u}hws-UZ^W&CEF->uv{9vi*<o>1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v
z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^
z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK
I1x7am0No)LiU0rr

delta 584
zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe
z+ES)HSrVnWLtJ&)lO<X$;;LdIOT<1FeJo;R2=Hd-$lYjX>%hRkV9zl5qqWRt0e;bb
zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ
zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT
z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR
z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN
zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N
z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b
zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts
AA^-pY

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37f853b1..ca025c83 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index faf93008..23d15a93 100755
--- a/gradlew
+++ b/gradlew
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 9b42019c..5eed7ee8 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From a2900085c9fa85c86ccabd00e843593a9f480816 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 19:37:57 +0200
Subject: [PATCH 622/672] Use java 24 in CI

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f27b4e1..ad4dbf15 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '21', '23' ]
+        java: [ '21', '24' ]
 
     steps:
       - uses: actions/checkout@v4

From 4fd9e55c3c13f5be80d6abdd21f2c608e65903d0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 20:04:49 +0200
Subject: [PATCH 623/672] Enable native access required by Java 24

Fixes #1765
---
 build.gradle.kts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 17c632af..bd091026 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,6 +24,7 @@ java {
 
 application {
     mainClass.set("org.asamk.signal.Main")
+    applicationDefaultJvmArgs = listOf("--enable-native-access=ALL-UNNAMED")
 }
 
 graalvmNative {
@@ -112,7 +113,8 @@ tasks.withType<Jar> {
         attributes(
             "Implementation-Title" to project.name,
             "Implementation-Version" to project.version,
-            "Main-Class" to application.mainClass.get()
+            "Main-Class" to application.mainClass.get(),
+            "Enable-Native-Access" to "ALL-UNNAMED",
         )
     }
 }

From bcc1eadc7de7320d12246a4958d83e7f167d9195 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 20:36:27 +0200
Subject: [PATCH 624/672] Remove unused e164 field from account record

---
 .../signal/manager/syncStorage/AccountRecordProcessor.java | 7 +------
 .../signal/manager/syncStorage/StorageSyncModels.java      | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 656297bf..21c0d97a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -2,7 +2,6 @@ package org.asamk.signal.manager.syncStorage;
 
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.internal.JobExecutor;
-import org.asamk.signal.manager.jobs.CheckWhoAmIJob;
 import org.asamk.signal.manager.jobs.DownloadProfileAvatarJob;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
@@ -146,7 +145,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
                         : remote.storyViewReceiptsEnabled)
                 .username(remote.username)
                 .usernameLink(remote.usernameLink)
-                .e164(account.isPrimaryDevice() ? local.e164 : remote.e164);
+                .avatarColor(remote.avatarColor);
         safeSetPayments(mergedBuilder,
                 payments != null && payments.enabled,
                 payments == null ? null : payments.entropy.toByteArray());
@@ -179,10 +178,6 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
         final var accountRecord = update.newRecord();
         final var accountProto = accountRecord.getProto();
 
-        if (!accountProto.e164.equals(account.getNumber())) {
-            jobExecutor.enqueueJob(new CheckWhoAmIJob());
-        }
-
         account.getConfigurationStore().setReadReceipts(connection, accountProto.readReceipts);
         account.getConfigurationStore().setTypingIndicators(connection, accountProto.typingIndicators);
         account.getConfigurationStore()
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
index b5d702b4..7ca71bfc 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java
@@ -74,7 +74,6 @@ public final class StorageSyncModels {
                 .phoneNumberSharingMode(Optional.ofNullable(configStore.getPhoneNumberSharingMode(connection))
                         .map(StorageSyncModels::localToRemote)
                         .orElse(AccountRecord.PhoneNumberSharingMode.UNKNOWN))
-                .e164(self.getAddress().number().orElse(""))
                 .username(self.getAddress().username().orElse(""));
         if (usernameLinkComponents != null) {
             final var linkColor = configStore.getUsernameLinkColor(connection);

From bb86830a61975a69552a5785fbbffb6d5911fc8a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 20:42:13 +0200
Subject: [PATCH 625/672] Add compatibility flag for graalvm native build

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index bd091026..6feb1b8b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -33,6 +33,7 @@ graalvmNative {
             buildArgs.add("--install-exit-handlers")
             buildArgs.add("-Dfile.encoding=UTF-8")
             buildArgs.add("-J-Dfile.encoding=UTF-8")
+            buildArgs.add("-march=compatibility")
             resources.autodetect()
             configurationFileDirectories.from(file("graalvm-config-dir"))
             if (System.getenv("GRAALVM_HOME") == null) {

From e594f3b237d2aa3dfe2383301398d8c9fed86ac0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 21:18:25 +0200
Subject: [PATCH 626/672] Update libsignal-service

---
 graalvm-config-dir/reflect-config.json                       | 1 +
 gradle/libs.versions.toml                                    | 2 +-
 .../java/org/asamk/signal/manager/config/LiveConfig.java     | 3 +++
 .../java/org/asamk/signal/manager/config/StagingConfig.java  | 3 +++
 .../java/org/asamk/signal/manager/helper/AccountHelper.java  | 4 ++--
 .../org/asamk/signal/manager/helper/RecipientHelper.java     | 1 -
 .../signal/manager/internal/ProvisioningManagerImpl.java     | 3 ---
 .../asamk/signal/manager/internal/SignalDependencies.java    | 5 ++---
 src/main/java/org/asamk/signal/BaseConfig.java               | 2 +-
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index cdf38732..d9b07c03 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -3021,6 +3021,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,
+  "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 74f97a76..3182d4bf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_121"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_122"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 6a707fa5..7085132d 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -5,6 +5,7 @@ import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
+import org.whispersystems.signalservice.internal.configuration.HttpProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
@@ -41,6 +42,7 @@ class LiveConfig {
 
     private static final Optional<Dns> dns = Optional.empty();
     private static final Optional<SignalProxy> proxy = Optional.empty();
+    private static final Optional<HttpProxy> systemProxy = Optional.empty();
 
     private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
             .decode("AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0LUlT9vALgh/f2DPVOOmR0RW6bgRvc7DSF20V/omg+YBw==");
@@ -68,6 +70,7 @@ class LiveConfig {
                 interceptors,
                 dns,
                 proxy,
+                systemProxy,
                 zkGroupServerPublicParams,
                 genericServerPublicParams,
                 backupServerPublicParams,
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 7eb04b3c..6b6ae9b5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -5,6 +5,7 @@ import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
+import org.whispersystems.signalservice.internal.configuration.HttpProxy;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalProxy;
@@ -41,6 +42,7 @@ class StagingConfig {
 
     private static final Optional<Dns> dns = Optional.empty();
     private static final Optional<SignalProxy> proxy = Optional.empty();
+    private static final Optional<HttpProxy> systemProxy = Optional.empty();
 
     private static final byte[] zkGroupServerPublicParams = Base64.getDecoder()
             .decode("ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCNWI+wwkyFCqNDXz/qxl1gAntuCJtSfq9OC3NkdhQlgYQ==");
@@ -68,6 +70,7 @@ class StagingConfig {
                 interceptors,
                 dns,
                 proxy,
+                systemProxy,
                 zkGroupServerPublicParams,
                 genericServerPublicParams,
                 backupServerPublicParams,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 7d40f99c..f94a3dca 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -535,9 +535,9 @@ public class AccountHelper {
                         account.getAciIdentityKeyPair(),
                         account.getPniIdentityKeyPair(),
                         account.getProfileKey(),
+                        account.getOrCreateAccountEntropyPool(),
                         account.getOrCreatePinMasterKey(),
                         account.getOrCreateMediaRootBackupKey(),
-                        account.getOrCreateAccountEntropyPool(),
                         verificationCode.getVerificationCode(),
                         null));
         account.setMultiDevice(true);
@@ -595,7 +595,7 @@ public class AccountHelper {
         }
         account.setRegistrationLockPin(null);
 
-        dependencies.getAccountManager().deleteAccount();
+        handleResponseException(dependencies.getAccountApi().deleteAccount());
 
         account.setRegistered(false);
         unregisteredListener.call();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index 5a3524ec..ecb85254 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -241,7 +241,6 @@ public class RecipientHelper {
                             token,
                             null,
                             dependencies.getLibSignalNetwork(),
-                            false,
                             newToken -> {
                                 if (isPartialRefresh) {
                                     account.getCdsiStore().updateAfterPartialCdsQuery(newNumbers);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
index e5a381e1..eeca842a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java
@@ -29,7 +29,6 @@ import org.asamk.signal.manager.util.KeyUtils;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
@@ -76,7 +75,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
 
         tempIdentityKey = KeyUtils.generateIdentityKeyPair();
         password = KeyUtils.createPassword();
-        final var clientZkOperations = ClientZkOperations.create(serviceEnvironmentConfig.signalServiceConfiguration());
         final var credentialsProvider = new DynamicCredentialsProvider(null,
                 null,
                 null,
@@ -85,7 +83,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager {
         final var pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
                 credentialsProvider,
                 userAgent,
-                clientZkOperations.getProfileOperations(),
                 ServiceConfig.AUTOMATIC_NETWORK_RETRY);
         final var provisioningSocket = new ProvisioningSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
                 userAgent);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 6470d4e9..abdebd9a 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -147,7 +147,6 @@ public class SignalDependencies {
                 () -> pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
                         credentialsProvider,
                         userAgent,
-                        getClientZkProfileOperations(),
                         ServiceConfig.AUTOMATIC_NETWORK_RETRY));
     }
 
@@ -290,7 +289,7 @@ public class SignalDependencies {
                     Optional.of(credentialsProvider),
                     userAgent,
                     healthMonitor,
-                    allowStories), timer, TimeUnit.SECONDS.toMillis(10));
+                    allowStories), () -> true, timer, TimeUnit.SECONDS.toMillis(10));
             healthMonitor.monitor(authenticatedSignalWebSocket);
         });
     }
@@ -306,7 +305,7 @@ public class SignalDependencies {
                     Optional.empty(),
                     userAgent,
                     healthMonitor,
-                    allowStories), timer, TimeUnit.SECONDS.toMillis(10));
+                    allowStories), () -> true, timer, TimeUnit.SECONDS.toMillis(10));
             healthMonitor.monitor(unauthenticatedSignalWebSocket);
         });
     }
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 9218fe5f..101b0e3a 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.35.0");
+            .orElse("Signal-Android/7.41.3");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 7aafb05995ee09305fa36bcb79a03dc1d057a0eb Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 21:19:47 +0200
Subject: [PATCH 627/672] Update dependencies

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3182d4bf..9986e329 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ slf4j = "2.0.17"
 
 [libraries]
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.80"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.18.3"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.19.0"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }

From d0d0021f57a4f94749597a5324ee6eefbc54d5a3 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 21:49:51 +0200
Subject: [PATCH 628/672] Bump version to 0.13.15

---
 CHANGELOG.md                          | 13 ++++++++++++-
 build.gradle.kts                      |  2 +-
 data/org.asamk.SignalCli.metainfo.xml |  3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16899ff1..86fb8178 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.15] - 2025-05-08
+
+Requires libsignal-client version 0.70.0.
+
+### Fixed
+
+- Fix native access warning with Java 24
+- Fix storage sync loop due to old removed e164 field
+
+### Changed
+
+- Increased compatibility of native build with older/virtual CPUs
 
 ## [0.13.14] - 2025-04-06
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 6feb1b8b..9ec777c1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.15-SNAPSHOT"
+    version = "0.13.15"
 }
 
 java {
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index b6f81a4d..5e80335e 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.15" date="2025-05-08">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.15</url>
+        </release>
         <release version="0.13.14" date="2025-04-06">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.14</url>
         </release>

From 56e11d0857c6131667695b95c9c2805c8a938150 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Thu, 8 May 2025 22:55:26 +0200
Subject: [PATCH 629/672] Update codeql v3

---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ff13469a..f778268a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         # Override language selection by uncommenting this and choosing your languages
         # with:
         #   languages: go, javascript, csharp, python, cpp, java
@@ -43,7 +43,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -57,4 +57,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

From bb124a922defe76565386d767ff318db28d897bd Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 630/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86fb8178..2d306b4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.15] - 2025-05-08
 
 Requires libsignal-client version 0.70.0.
diff --git a/build.gradle.kts b/build.gradle.kts
index 9ec777c1..267673d6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.15"
+    version = "0.13.16-SNAPSHOT"
 }
 
 java {

From 74909408c4d56fd8ee05c4720d1229a040b46c3b Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 10 May 2025 10:18:03 +0200
Subject: [PATCH 631/672] Add missing reflect config

Fixes #1768
---
 graalvm-config-dir/reflect-config.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index d9b07c03..e27f68d9 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1409,6 +1409,12 @@
   "name":"org.asamk.signal.manager.storage.profiles.LegacyProfileStore$ProfileStoreDeserializer",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.asamk.signal.manager.storage.profiles.LegacySignalProfile",
+  "allDeclaredFields":true,
+  "allDeclaredMethods":true,
+  "allDeclaredConstructors":true
+},
 {
   "name":"org.asamk.signal.manager.storage.profiles.LegacySignalProfileEntry",
   "allDeclaredFields":true,

From a9bb8d9aaef94bf1e251b822532da8a91f870dd2 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 1 Jun 2025 16:11:21 +0200
Subject: [PATCH 632/672] Update gradle

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ca025c83..002b867c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From e89803464b0e1fd284045bd4100c05ec856c7011 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 1 Jun 2025 21:51:03 +0200
Subject: [PATCH 633/672] Update libsignal-service

---
 graalvm-config-dir/jni-config.json            | 13 ++++++++++-
 graalvm-config-dir/reflect-config.json        |  3 ---
 gradle/libs.versions.toml                     |  2 +-
 .../signal/manager/config/LiveConfig.java     |  5 ++--
 .../signal/manager/config/StagingConfig.java  |  5 ++--
 .../signal/manager/helper/AccountHelper.java  |  2 +-
 .../manager/internal/SignalDependencies.java  |  3 ++-
 .../signal/manager/storage/SignalAccount.java |  2 +-
 .../storage/identities/IdentityKeyStore.java  | 23 +++++++++++--------
 .../identities/SignalIdentityKeyStore.java    |  2 +-
 .../storage/protocol/SignalProtocolStore.java |  2 +-
 11 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 0284d58f..23a2160c 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -27,6 +27,10 @@
 {
   "name":"java.lang.ClassNotFoundException"
 },
+{
+  "name":"java.lang.Enum",
+  "methods":[{"name":"ordinal","parameterTypes":[] }]
+},
 {
   "name":"java.lang.IllegalArgumentException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
@@ -48,6 +52,10 @@
 {
   "name":"java.lang.String"
 },
+{
+  "name":"java.lang.Thread",
+  "methods":[{"name":"currentThread","parameterTypes":[] }, {"name":"getStackTrace","parameterTypes":[] }]
+},
 {
   "name":"java.lang.Throwable",
   "methods":[{"name":"getMessage","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]
@@ -88,7 +96,7 @@
 },
 {
   "name":"org.signal.libsignal.internal.CompletableFuture",
-  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }]
+  "methods":[{"name":"<init>","parameterTypes":[] }, {"name":"complete","parameterTypes":["java.lang.Object"] }, {"name":"completeExceptionally","parameterTypes":["java.lang.Throwable"] }, {"name":"setCancellationId","parameterTypes":["long"] }]
 },
 {
   "name":"org.signal.libsignal.internal.NativeHandleGuard$SimpleOwner",
@@ -195,6 +203,9 @@
   "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$Direction",
   "fields":[{"name":"RECEIVING"}, {"name":"SENDING"}]
 },
+{
+  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$IdentityChange"
+},
 {
   "name":"org.signal.libsignal.protocol.state.KyberPreKeyRecord",
   "fields":[{"name":"unsafeHandle"}]
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index e27f68d9..cbec1c86 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2994,7 +2994,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord",
   "allDeclaredFields":true,
-  "fields":[{"name":"avatarColor"}, {"name":"avatarUrlPath"}, {"name":"backupSubscriberData"}, {"name":"backupTier"}, {"name":"displayBadgesOnProfile"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hasBackup"}, {"name":"hasCompletedUsernameOnboarding"}, {"name":"hasSeenGroupStoryEducationSheet"}, {"name":"hasSetMyStoriesPrivacy"}, {"name":"hasViewedOnboardingStory"}, {"name":"keepMutedChatsArchived"}, {"name":"linkPreviews"}, {"name":"noteToSelfArchived"}, {"name":"noteToSelfMarkedUnread"}, {"name":"payments"}, {"name":"phoneNumberSharingMode"}, {"name":"pinnedConversations"}, {"name":"preferContactAvatars"}, {"name":"preferredReactionEmoji"}, {"name":"primarySendsSms"}, {"name":"profileKey"}, {"name":"readReceipts"}, {"name":"sealedSenderIndicators"}, {"name":"storiesDisabled"}, {"name":"storyViewReceiptsEnabled"}, {"name":"subscriberCurrencyCode"}, {"name":"subscriberId"}, {"name":"subscriptionManuallyCancelled"}, {"name":"typingIndicators"}, {"name":"universalExpireTimer"}, {"name":"unlistedPhoneNumber"}, {"name":"username"}, {"name":"usernameLink"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -3027,7 +3026,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,
-  "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
@@ -3058,7 +3056,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
-  "fields":[{"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9986e329..a90ecb53 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_122"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_123"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 7085132d..111695f6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -29,7 +29,8 @@ class LiveConfig {
     private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE = "9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570";
+    private static final String SVR2_MRENCLAVE_LEGACY = "9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570";
+    private static final String SVR2_MRENCLAVE = "093be9ea32405e85ae28dbb48eb668aebeb7dbe29517b9b86ad4bec4dfe0e6a6";
 
     private static final String URL = "https://chat.signal.org";
     private static final String CDN_URL = "https://cdn.signal.org";
@@ -91,7 +92,7 @@ class LiveConfig {
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE));
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY));
     }
 
     private LiveConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 6b6ae9b5..e72c66b5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -29,7 +29,8 @@ class StagingConfig {
     private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE = "38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3";
+    private static final String SVR2_MRENCLAVE_LEGACY = "38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3";
+    private static final String SVR2_MRENCLAVE = "2e8cefe6e3f389d8426adb24e9b7fb7adf10902c96f06f7bbcee36277711ed91";
 
     private static final String URL = "https://chat.staging.signal.org";
     private static final String CDN_URL = "https://cdn-staging.signal.org";
@@ -91,7 +92,7 @@ class StagingConfig {
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE));
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY));
     }
 
     private StagingConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index f94a3dca..1d5849c3 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -105,7 +105,7 @@ public class AccountHelper {
             if (!account.isPrimaryDevice() && account.getPniIdentityKeyPair() == null) {
                 throw new IOException("Missing PNI identity key, relinking required");
             }
-            if (account.getPreviousStorageVersion() < 4
+            if (account.getPreviousStorageVersion() < 10
                     && account.isPrimaryDevice()
                     && account.getRegistrationLockPin() != null) {
                 migrateRegistrationPin();
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index abdebd9a..9a8e1fd5 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -325,7 +325,8 @@ public class SignalDependencies {
                         getKeysApi(),
                         Optional.empty(),
                         executor,
-                        ServiceConfig.MAX_ENVELOPE_SIZE));
+                        ServiceConfig.MAX_ENVELOPE_SIZE,
+                        () -> true));
     }
 
     public List<SecureValueRecovery> getSecureValueRecovery() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
index 8d2fbd0f..83040906 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java
@@ -116,7 +116,7 @@ public class SignalAccount implements Closeable {
     private static final Logger logger = LoggerFactory.getLogger(SignalAccount.class);
 
     private static final int MINIMUM_STORAGE_VERSION = 1;
-    private static final int CURRENT_STORAGE_VERSION = 9;
+    private static final int CURRENT_STORAGE_VERSION = 10;
 
     private final Object LOCK = new Object();
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
index 5e32ba12..a2d03a21 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java
@@ -8,6 +8,7 @@ import org.asamk.signal.manager.storage.recipients.RecipientStore;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.state.IdentityKeyStore.Direction;
+import org.signal.libsignal.protocol.state.IdentityKeyStore.IdentityChange;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.ServiceId;
@@ -62,11 +63,11 @@ public class IdentityKeyStore {
         return identityChanges;
     }
 
-    public boolean saveIdentity(final ServiceId serviceId, final IdentityKey identityKey) {
+    public IdentityChange saveIdentity(final ServiceId serviceId, final IdentityKey identityKey) {
         return saveIdentity(serviceId.toString(), identityKey);
     }
 
-    public boolean saveIdentity(
+    public IdentityChange saveIdentity(
             final Connection connection,
             final ServiceId serviceId,
             final IdentityKey identityKey
@@ -74,9 +75,9 @@ public class IdentityKeyStore {
         return saveIdentity(connection, serviceId.toString(), identityKey);
     }
 
-    boolean saveIdentity(final String address, final IdentityKey identityKey) {
+    IdentityChange saveIdentity(final String address, final IdentityKey identityKey) {
         if (isRetryingDecryption) {
-            return false;
+            return IdentityChange.NEW_OR_UNCHANGED;
         }
         try (final var connection = database.getConnection()) {
             return saveIdentity(connection, address, identityKey);
@@ -85,20 +86,24 @@ public class IdentityKeyStore {
         }
     }
 
-    private boolean saveIdentity(
+    private IdentityChange saveIdentity(
             final Connection connection,
             final String address,
             final IdentityKey identityKey
     ) throws SQLException {
         final var identityInfo = loadIdentity(connection, address);
-        if (identityInfo != null && identityInfo.getIdentityKey().equals(identityKey)) {
+        if (identityInfo == null) {
+            saveNewIdentity(connection, address, identityKey, true);
+            return IdentityChange.NEW_OR_UNCHANGED;
+        }
+        if (identityInfo.getIdentityKey().equals(identityKey)) {
             // Identity already exists, not updating the trust level
             logger.trace("Not storing new identity for recipient {}, identity already stored", address);
-            return false;
+            return IdentityChange.NEW_OR_UNCHANGED;
         }
 
-        saveNewIdentity(connection, address, identityKey, identityInfo == null);
-        return true;
+        saveNewIdentity(connection, address, identityKey, false);
+        return IdentityChange.REPLACED_EXISTING;
     }
 
     public void setRetryingDecryption(final boolean retryingDecryption) {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java
index 5a1a676e..1ac7c9a6 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/identities/SignalIdentityKeyStore.java
@@ -33,7 +33,7 @@ public class SignalIdentityKeyStore implements org.signal.libsignal.protocol.sta
     }
 
     @Override
-    public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
+    public IdentityChange saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
         return identityKeyStore.saveIdentity(address.getName(), identityKey);
     }
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
index b631f632..e1cf9a88 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java
@@ -65,7 +65,7 @@ public class SignalProtocolStore implements SignalServiceAccountDataStore {
     }
 
     @Override
-    public boolean saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
+    public IdentityChange saveIdentity(SignalProtocolAddress address, IdentityKey identityKey) {
         return identityKeyStore.saveIdentity(address, identityKey);
     }
 

From 6b46314eabaa769c16415baf62c8e2f4697286ae Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 3 Jun 2025 19:24:21 +0200
Subject: [PATCH 634/672] Update dependencies

---
 graalvm-config-dir/reflect-config.json | 1 +
 gradle/libs.versions.toml              | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index cbec1c86..c1c5a63d 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -3056,6 +3056,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
+  "fields":[{"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a90ecb53..d712041f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,5 +13,5 @@ logback = "ch.qos.logback:logback-classic:1.5.18"
 signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_123"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.12.0"
-junit-launcher = "org.junit.platform:junit-platform-launcher:1.12.0"
+junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.0"
+junit-launcher = "org.junit.platform:junit-platform-launcher:1.13.0"

From bf87fcc652bc37a9843b4dc79f985005452a1c41 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 3 Jun 2025 22:22:51 +0200
Subject: [PATCH 635/672] Ensure messages are created with a unique timestamp

Fixes #1783
---
 .../signal/manager/internal/ManagerImpl.java  | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index c5a7552f..0a67e0a0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -131,6 +131,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -160,6 +161,7 @@ public class ManagerImpl implements Manager {
     private final List<Runnable> closedListeners = new ArrayList<>();
     private final List<Runnable> addressChangedListeners = new ArrayList<>();
     private final CompositeDisposable disposable = new CompositeDisposable();
+    private final AtomicLong lastMessageTimestamp = new AtomicLong();
 
     public ManagerImpl(
             SignalAccount account,
@@ -598,6 +600,24 @@ public class ManagerImpl implements Manager {
         return context.getGroupHelper().joinGroup(inviteLinkUrl);
     }
 
+    private long getNextMessageTimestamp() {
+        while (true) {
+            final var last = lastMessageTimestamp.get();
+            final var timestamp = System.currentTimeMillis();
+            if (last == timestamp) {
+                try {
+                    Thread.sleep(1);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                }
+                continue;
+            }
+            if (lastMessageTimestamp.compareAndSet(last, timestamp)) {
+                return timestamp;
+            }
+        }
+    }
+
     private SendMessageResults sendMessage(
             SignalServiceDataMessage.Builder messageBuilder,
             Set<RecipientIdentifier> recipients,
@@ -613,7 +633,7 @@ public class ManagerImpl implements Manager {
             Optional<Long> editTargetTimestamp
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
-        long timestamp = System.currentTimeMillis();
+        long timestamp = getNextMessageTimestamp();
         messageBuilder.withTimestamp(timestamp);
         for (final var recipient : recipients) {
             if (recipient instanceof RecipientIdentifier.NoteToSelf || (
@@ -653,7 +673,7 @@ public class ManagerImpl implements Manager {
             Set<RecipientIdentifier> recipients
     ) throws IOException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
         var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
-        final var timestamp = System.currentTimeMillis();
+        final var timestamp = getNextMessageTimestamp();
         for (var recipient : recipients) {
             if (recipient instanceof RecipientIdentifier.Single single) {
                 final var message = new SignalServiceTypingMessage(action, timestamp, Optional.empty());
@@ -685,7 +705,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List<Long> messageIds) {
-        final var timestamp = System.currentTimeMillis();
+        final var timestamp = getNextMessageTimestamp();
         var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ,
                 messageIds,
                 timestamp);
@@ -695,7 +715,7 @@ public class ManagerImpl implements Manager {
 
     @Override
     public SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List<Long> messageIds) {
-        final var timestamp = System.currentTimeMillis();
+        final var timestamp = getNextMessageTimestamp();
         var receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED,
                 messageIds,
                 timestamp);

From 7e9727aa382d746b9eb12c772c7251947793b68a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 7 Jun 2025 16:14:20 +0200
Subject: [PATCH 636/672] Update tests

---
 run_tests.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/run_tests.sh b/run_tests.sh
index 02ab0286..339d9d7b 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -176,6 +176,17 @@ run_main -a "$NUMBER_2" receive
 run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
 run_main -a "$NUMBER_1" receive
 run_main -a "$NUMBER_2" receive
+run_main -a "$NUMBER_1" updateAccount --discoverable-by-number=true
+run_main -a "$NUMBER_2" removeContact --forget "$NUMBER_1"
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hii
+run_main -a "$NUMBER_1" updateAccount --discoverable-by-number=false
+run_main -a "$NUMBER_1" receive
+run_main -a "$NUMBER_2" receive
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hi
+run_main -a "$NUMBER_2" send "$NUMBER_1" -m hii
+run_main -a "$NUMBER_1" receive
+run_main -a "$NUMBER_2" receive
 ## Groups
 GROUP_ID=$(run_main -a "$NUMBER_1" --output=json updateGroup -n GRUPPE -a LICENSE -m "$NUMBER_1" | jq -r '.groupId')
 run_main -a "$NUMBER_1" send "$NUMBER_2" -m first
@@ -238,7 +249,9 @@ for OUTPUT in "plain-text" "json"; do
   run_linked -a "$NUMBER_1" --output="$OUTPUT" receive
 done
 
-run_main -a "$NUMBER_1" removeDevice -d 2
+run_main -a "$NUMBER_1" --output="$OUTPUT" receive
+run_main -a "$NUMBER_1" removeDevice -d 2 || true
+run_main -a "$NUMBER_1" removeDevice -d 2 || true
 
 ## Unregister
 if [ "$TEST_REGISTER" -eq 1 ]; then

From 2f8328847c32e1908e6dcc2d188a28509627d302 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 7 Jun 2025 16:13:09 +0200
Subject: [PATCH 637/672] Update dependencies

---
 graalvm-config-dir/reflect-config.json                | 11 +++++++++++
 gradle/libs.versions.toml                             |  8 ++++----
 .../signal/manager/internal/SignalDependencies.java   |  5 ++++-
 src/main/java/org/asamk/signal/BaseConfig.java        |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index c1c5a63d..d1c2075b 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -1626,6 +1626,10 @@
   "name":"org.bouncycastle.jcajce.provider.asymmetric.NTRU$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"org.bouncycastle.jcajce.provider.asymmetric.NoSig$Mappings",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"org.bouncycastle.jcajce.provider.asymmetric.RSA$Mappings",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -2996,6 +3000,9 @@
   "allDeclaredFields":true,
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$BackupTierHistory"
+},
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$Builder"
 },
@@ -3005,6 +3012,9 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$IAPSubscriberData"
 },
+{
+  "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$NotificationProfileManualOverride"
+},
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.AccountRecord$PhoneNumberSharingMode"
 },
@@ -3026,6 +3036,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,
+  "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d712041f..a6b9fda1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 slf4j = "2.0.17"
 
 [libraries]
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.80"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.81"
 jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.19.0"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
@@ -10,8 +10,8 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_123"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_124"
 sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.0"
-junit-launcher = "org.junit.platform:junit-platform-launcher:1.13.0"
+junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.1"
+junit-launcher = "org.junit.platform:junit-platform-launcher:1.13.1"
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index 9a8e1fd5..f954588f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -339,7 +339,10 @@ public class SignalDependencies {
 
     public ProfileApi getProfileApi() {
         return getOrCreate(() -> profileApi,
-                () -> profileApi = new ProfileApi(getAuthenticatedSignalWebSocket(), getPushServiceSocket()));
+                () -> profileApi = new ProfileApi(getAuthenticatedSignalWebSocket(),
+                        getUnauthenticatedSignalWebSocket(),
+                        getPushServiceSocket(),
+                        getClientZkProfileOperations()));
     }
 
     public ProfileService getProfileService() {
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 101b0e3a..8a38c36a 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.41.3");
+            .orElse("Signal-Android/7.44.1");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From 17cd99be5967419c5c518ba444c8c58fdaa65b0f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 7 Jun 2025 16:58:00 +0200
Subject: [PATCH 638/672] Bump version to 0.13.16

---
 CHANGELOG.md                          | 8 +++++++-
 build.gradle.kts                      | 2 +-
 data/org.asamk.SignalCli.metainfo.xml | 3 +++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d306b4b..f29e3d93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.16] - 2025-06-07
+
+Requires libsignal-client version 0.73.2.
+
+### Changed
+
+- Ensure every sent message gets a unique timestamp
 
 ## [0.13.15] - 2025-05-08
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 267673d6..3be525f1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.16-SNAPSHOT"
+    version = "0.13.16"
 }
 
 java {
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 5e80335e..b7483db9 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.16" date="2025-06-07">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.16</url>
+        </release>
         <release version="0.13.15" date="2025-05-08">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.15</url>
         </release>

From 02573449402003871f44f153b06bec7a9e47d521 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 639/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f29e3d93..3ea3c01b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.16] - 2025-06-07
 
 Requires libsignal-client version 0.73.2.
diff --git a/build.gradle.kts b/build.gradle.kts
index 3be525f1..8fadb883 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.16"
+    version = "0.13.17-SNAPSHOT"
 }
 
 java {

From 6b60a6d5a5aacb579cbd64074f25d1014bc93e00 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Jun 2025 14:48:25 +0200
Subject: [PATCH 640/672] Fix NPR when loading an inactive group

Fixes #1786
---
 .../main/java/org/asamk/signal/manager/helper/GroupHelper.java | 3 +++
 .../java/org/asamk/signal/manager/helper/GroupV2Helper.java    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index 0d838204..682bd996 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -551,6 +551,9 @@ public class GroupHelper {
         while (true) {
             final var page = context.getGroupV2Helper()
                     .getDecryptedGroupHistoryPage(groupSecretParams, fromRevision, sendEndorsementsExpirationMs);
+            if (page == null) {
+                break;
+            }
             page.getChangeLogs()
                     .stream()
                     .map(DecryptedGroupChangeLog::getChange)
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 900d7ea9..8eb66843 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -44,6 +44,7 @@ import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.push.exceptions.NotInGroupException;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -119,6 +120,8 @@ class GroupV2Helper {
                             groupsV2AuthorizationString,
                             false,
                             sendEndorsementsExpirationMs);
+        } catch (NotInGroupException e) {
+            throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);
         } catch (NonSuccessfulResponseCodeException e) {
             if (e.code == 403) {
                 throw new NotAGroupMemberException(GroupUtils.getGroupIdV2(groupSecretParams), null);

From a0d5744c4945791eb57436d0f1288b09bd41132a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 8 Jun 2025 16:22:03 +0200
Subject: [PATCH 641/672] Improve behavior when pin data doesn't exist on the
 server

---
 lib/src/main/java/org/asamk/signal/manager/Manager.java     | 3 ++-
 .../java/org/asamk/signal/manager/RegistrationManager.java  | 3 ++-
 .../asamk/signal/manager/api/PinLockMissingException.java   | 3 +++
 .../java/org/asamk/signal/manager/helper/AccountHelper.java | 5 +++--
 .../java/org/asamk/signal/manager/helper/PinHelper.java     | 6 +++++-
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java | 3 ++-
 .../signal/manager/internal/RegistrationManagerImpl.java    | 3 ++-
 .../asamk/signal/manager/util/NumberVerificationUtils.java  | 5 +++--
 .../asamk/signal/commands/FinishChangeNumberCommand.java    | 3 +++
 src/main/java/org/asamk/signal/commands/VerifyCommand.java  | 3 +++
 .../java/org/asamk/signal/dbus/DbusSignalControlImpl.java   | 3 +++
 11 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 lib/src/main/java/org/asamk/signal/manager/api/PinLockMissingException.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index affbaa9d..238084e7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -30,6 +30,7 @@ import org.asamk.signal.manager.api.NotAGroupMemberException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.ReceiveConfig;
@@ -140,7 +141,7 @@ public interface Manager extends Closeable {
             String newNumber,
             String verificationCode,
             String pin
-    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException;
+    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException, PinLockMissingException;
 
     void unregister() throws IOException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
index 7d358df6..5f4f4463 100644
--- a/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/RegistrationManager.java
@@ -3,6 +3,7 @@ package org.asamk.signal.manager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
@@ -21,7 +22,7 @@ public interface RegistrationManager extends Closeable {
     void verifyAccount(
             String verificationCode,
             String pin
-    ) throws IOException, PinLockedException, IncorrectPinException;
+    ) throws IOException, PinLockedException, IncorrectPinException, PinLockMissingException;
 
     void deleteLocalAccountData() throws IOException;
 
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/PinLockMissingException.java b/lib/src/main/java/org/asamk/signal/manager/api/PinLockMissingException.java
new file mode 100644
index 00000000..7887d45f
--- /dev/null
+++ b/lib/src/main/java/org/asamk/signal/manager/api/PinLockMissingException.java
@@ -0,0 +1,3 @@
+package org.asamk.signal.manager.api;
+
+public class PinLockMissingException extends Exception {}
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
index 1d5849c3..de3e2402 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java
@@ -4,6 +4,7 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
@@ -185,7 +186,7 @@ public class AccountHelper {
             String newNumber,
             String verificationCode,
             String pin
-    ) throws IncorrectPinException, PinLockedException, IOException {
+    ) throws IncorrectPinException, PinLockedException, IOException, PinLockMissingException {
         for (var attempts = 0; attempts < 5; attempts++) {
             try {
                 finishChangeNumberInternal(newNumber, verificationCode, pin);
@@ -205,7 +206,7 @@ public class AccountHelper {
             String newNumber,
             String verificationCode,
             String pin
-    ) throws IncorrectPinException, PinLockedException, IOException {
+    ) throws IncorrectPinException, PinLockedException, IOException, PinLockMissingException {
         final var pniIdentity = KeyUtils.generateIdentityKeyPair();
         final var encryptedDeviceMessages = new ArrayList<OutgoingPushMessage>();
         final var devicePniSignedPreKeys = new HashMap<Integer, SignedPreKeyEntity>();
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
index a95635cf..40878647 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/PinHelper.java
@@ -88,7 +88,11 @@ public class PinHelper {
             IOException exception = null;
             for (final var secureValueRecovery : secureValueRecoveries) {
                 try {
-                    return getRegistrationLockData(secureValueRecovery, svr2Credentials, pin);
+                    final var lockData = getRegistrationLockData(secureValueRecovery, svr2Credentials, pin);
+                    if (lockData == null) {
+                        continue;
+                    }
+                    return lockData;
                 } catch (IOException e) {
                     exception = e;
                 }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index 0a67e0a0..ffb74de2 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -48,6 +48,7 @@ import org.asamk.signal.manager.api.NotPrimaryDeviceException;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.PendingAdminApprovalException;
 import org.asamk.signal.manager.api.PhoneNumberSharingMode;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.Profile;
 import org.asamk.signal.manager.api.RateLimitException;
@@ -428,7 +429,7 @@ public class ManagerImpl implements Manager {
             String newNumber,
             String verificationCode,
             String pin
-    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException {
+    ) throws IncorrectPinException, PinLockedException, IOException, NotPrimaryDeviceException, PinLockMissingException {
         if (!account.isPrimaryDevice()) {
             throw new NotPrimaryDeviceException();
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
index 0d20cc0b..72c4b63f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/RegistrationManagerImpl.java
@@ -21,6 +21,7 @@ import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UpdateProfile;
@@ -149,7 +150,7 @@ public class RegistrationManagerImpl implements RegistrationManager {
     public void verifyAccount(
             String verificationCode,
             String pin
-    ) throws IOException, PinLockedException, IncorrectPinException {
+    ) throws IOException, PinLockedException, IncorrectPinException, PinLockMissingException {
         if (account.isRegistered()) {
             throw new IOException("Account is already registered");
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
index 921d7fc1..659a8c67 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/NumberVerificationUtils.java
@@ -4,6 +4,7 @@ import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
 import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.VerificationMethodNotAvailableException;
@@ -114,7 +115,7 @@ public class NumberVerificationUtils {
             String pin,
             PinHelper pinHelper,
             Verifier verifier
-    ) throws IOException, PinLockedException, IncorrectPinException {
+    ) throws IOException, PinLockedException, IncorrectPinException, PinLockMissingException {
         verificationCode = verificationCode.replace("-", "");
         try {
             final var response = verifier.verify(sessionId, verificationCode, null);
@@ -127,7 +128,7 @@ public class NumberVerificationUtils {
 
             final var registrationLockData = pinHelper.getRegistrationLockData(pin, e);
             if (registrationLockData == null) {
-                throw e;
+                throw new PinLockMissingException();
             }
 
             var registrationLock = registrationLockData.getMasterKey().deriveRegistrationLock();
diff --git a/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
index 8fce4dbf..1242c194 100644
--- a/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
+++ b/src/main/java/org/asamk/signal/commands/FinishChangeNumberCommand.java
@@ -9,6 +9,7 @@ import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.output.OutputWriter;
 
@@ -50,6 +51,8 @@ public class FinishChangeNumberCommand implements JsonRpcLocalCommand {
                             + "\nUse '--pin PIN_CODE' to specify the registration lock PIN");
         } catch (IncorrectPinException e) {
             throw new UserErrorException("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());
+        } catch (PinLockMissingException e) {
+            throw new UserErrorException("Account is pin locked, but pin data has been deleted on the server.");
         } catch (NotPrimaryDeviceException e) {
             throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (IOException e) {
diff --git a/src/main/java/org/asamk/signal/commands/VerifyCommand.java b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
index a8543c5a..6a5046bc 100644
--- a/src/main/java/org/asamk/signal/commands/VerifyCommand.java
+++ b/src/main/java/org/asamk/signal/commands/VerifyCommand.java
@@ -11,6 +11,7 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.IncorrectPinException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.output.JsonWriter;
 import org.slf4j.Logger;
@@ -76,6 +77,8 @@ public class VerifyCommand implements RegistrationCommand, JsonRpcRegistrationCo
                             + "\nUse '--pin PIN_CODE' to specify the registration lock PIN");
         } catch (IncorrectPinException e) {
             throw new UserErrorException("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());
+        } catch (PinLockMissingException e) {
+            throw new UserErrorException("Account is pin locked, but pin data has been deleted on the server.");
         } catch (IOException e) {
             throw new IOErrorException("Verify error: " + e.getMessage(), e);
         }
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
index cf6999a9..50150a98 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalControlImpl.java
@@ -10,6 +10,7 @@ import org.asamk.signal.manager.RegistrationManager;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.NonNormalizedPhoneNumberException;
+import org.asamk.signal.manager.api.PinLockMissingException;
 import org.asamk.signal.manager.api.PinLockedException;
 import org.asamk.signal.manager.api.RateLimitException;
 import org.asamk.signal.manager.api.UserAlreadyExistsException;
@@ -105,6 +106,8 @@ public class DbusSignalControlImpl implements org.asamk.SignalControl {
                             + (e.getTimeRemaining() / 1000 / 60 / 60));
         } catch (IncorrectPinException e) {
             throw new Error.Failure("Verification failed! Invalid pin, tries remaining: " + e.getTriesRemaining());
+        } catch (PinLockMissingException e) {
+            throw new Error.Failure("Account is pin locked, but pin data has been deleted on the server.");
         }
     }
 

From 5dc66f839d3792fbd32f830f9a82d5fbc4223711 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 10 Jun 2025 19:36:43 +0200
Subject: [PATCH 642/672] Close attachment input streams after upload

Fixes #1790
---
 .../manager/helper/AttachmentHelper.java       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index 0ffa62ed..b55153f0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -44,14 +44,20 @@ public class AttachmentHelper {
     }
 
     public List<SignalServiceAttachment> uploadAttachments(final List<String> attachments) throws AttachmentInvalidException, IOException {
-        var attachmentStreams = createAttachmentStreams(attachments);
+        final var attachmentStreams = createAttachmentStreams(attachments);
 
-        // Upload attachments here, so we only upload once even for multiple recipients
-        var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
-        for (var attachmentStream : attachmentStreams) {
-            attachmentPointers.add(uploadAttachment(attachmentStream));
+        try {
+            // Upload attachments here, so we only upload once even for multiple recipients
+            final var attachmentPointers = new ArrayList<SignalServiceAttachment>(attachmentStreams.size());
+            for (final var attachmentStream : attachmentStreams) {
+                attachmentPointers.add(uploadAttachment(attachmentStream));
+            }
+            return attachmentPointers;
+        } finally {
+            for (final var attachmentStream : attachmentStreams) {
+                attachmentStream.close();
+            }
         }
-        return attachmentPointers;
     }
 
     private List<SignalServiceAttachmentStream> createAttachmentStreams(List<String> attachments) throws AttachmentInvalidException, IOException {

From 70c79eac01304cd2bae5da2973a33e3253d400dc Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 24 Jun 2025 23:13:00 +0200
Subject: [PATCH 643/672] Keep all unhandled fields of remote storage record

Fixes #1792
---
 .../signal/manager/syncStorage/AccountRecordProcessor.java      | 2 +-
 .../signal/manager/syncStorage/ContactRecordProcessor.java      | 2 +-
 .../signal/manager/syncStorage/GroupV1RecordProcessor.java      | 2 +-
 .../signal/manager/syncStorage/GroupV2RecordProcessor.java      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
index 21c0d97a..30816060 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/AccountRecordProcessor.java
@@ -111,7 +111,7 @@ public class AccountRecordProcessor extends DefaultStorageRecordProcessor<Signal
             backupsPurchaseToken = IAPSubscriptionId.Companion.from(local.backupSubscriberData);
         }
 
-        final var mergedBuilder = SignalAccountRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
+        final var mergedBuilder = remote.newBuilder()
                 .givenName(givenName)
                 .familyName(familyName)
                 .avatarUrlPath(firstNonEmpty(remote.avatarUrlPath, local.avatarUrlPath))
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index d4841c7a..3858bd06 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -172,7 +172,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
             e164 = firstNonEmpty(remote.e164, local.e164);
         }
 
-        final var mergedBuilder = SignalContactRecord.Companion.newBuilder(remote.unknownFields().toByteArray())
+        final var mergedBuilder = remote.newBuilder()
                 .aci(local.aci.isEmpty() ? remote.aci : local.aci)
                 .e164(e164)
                 .pni(pni)
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
index 22d18c8b..a5c3e3e0 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java
@@ -74,7 +74,7 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
         final var remote = remoteRecord.getProto();
         final var local = localRecord.getProto();
 
-        final var mergedBuilder = SignalGroupV1Record.Companion.newBuilder(remote.unknownFields().toByteArray())
+        final var mergedBuilder = remote.newBuilder()
                 .id(remote.id)
                 .blocked(remote.blocked)
                 .whitelisted(remote.whitelisted)
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
index 3c014463..dfbe7c4b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java
@@ -53,7 +53,7 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
         final var remote = remoteRecord.getProto();
         final var local = localRecord.getProto();
 
-        final var mergedBuilder = SignalGroupV2Record.Companion.newBuilder(remote.unknownFields().toByteArray())
+        final var mergedBuilder = remote.newBuilder()
                 .masterKey(remote.masterKey)
                 .blocked(remote.blocked)
                 .whitelisted(remote.whitelisted)

From 6cc3a6f5614632c854430186ebaa4938342551e1 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 25 Jun 2025 00:20:42 +0200
Subject: [PATCH 644/672] Update dependencies

---
 CHANGELOG.md                                   |  2 ++
 graalvm-config-dir/reflect-config.json         |  5 ++++-
 gradle/libs.versions.toml                      | 10 +++++-----
 src/main/java/org/asamk/signal/BaseConfig.java |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ea3c01b..ecb19833 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+Requires libsignal-client version 0.74.0.
+
 ## [0.13.16] - 2025-06-07
 
 Requires libsignal-client version 0.73.2.
diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index d1c2075b..0bfd1cdf 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -671,6 +671,10 @@
 {
   "name":"long[]"
 },
+{
+  "name":"okhttp3.internal.connection.RealConnectionPool",
+  "fields":[{"name":"addressStates"}]
+},
 {
   "name":"okio.BufferedSink"
 },
@@ -3036,7 +3040,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.ContactRecord",
   "allDeclaredFields":true,
-  "fields":[{"name":"aci"}, {"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"e164"}, {"name":"familyName"}, {"name":"givenName"}, {"name":"hidden"}, {"name":"hideStory"}, {"name":"identityKey"}, {"name":"identityState"}, {"name":"markedUnread"}, {"name":"mutedUntilTimestamp"}, {"name":"nickname"}, {"name":"note"}, {"name":"pni"}, {"name":"pniSignatureVerified"}, {"name":"profileKey"}, {"name":"systemFamilyName"}, {"name":"systemGivenName"}, {"name":"systemNickname"}, {"name":"unregisteredAtTimestamp"}, {"name":"username"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a6b9fda1..4ff08539 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,15 +3,15 @@ slf4j = "2.0.17"
 
 [libraries]
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.81"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.19.0"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.19.1"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_124"
-sqlite = "org.xerial:sqlite-jdbc:3.49.1.0"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_125"
+sqlite = "org.xerial:sqlite-jdbc:3.50.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.1"
-junit-launcher = "org.junit.platform:junit-platform-launcher:1.13.1"
+junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.2"
+junit-launcher = "org.junit.platform:junit-platform-launcher:1.13.2"
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 8a38c36a..1f0922fe 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.44.1");
+            .orElse("Signal-Android/7.46.1");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From e6113d4d96f7677422d348b16408d2a4990fb934 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 28 Jun 2025 14:35:56 +0200
Subject: [PATCH 645/672] Update libsignal-service-java

---
 graalvm-config-dir/reflect-config.json         |  1 -
 gradle/libs.versions.toml                      |  2 +-
 .../signal/manager/api/DeviceLinkUrl.java      |  3 +--
 .../signal/manager/config/LiveConfig.java      |  3 +--
 .../signal/manager/config/StagingConfig.java   |  3 +--
 .../manager/helper/AttachmentHelper.java       |  9 ++++++++-
 .../internal/SignalWebSocketHealthMonitor.java |  8 +++++---
 .../manager/storage/prekeys/PreKeyStore.java   |  7 ++++---
 .../storage/prekeys/SignedPreKeyStore.java     |  7 ++++---
 .../asamk/signal/manager/util/KeyUtils.java    | 18 +++++++-----------
 src/main/java/org/asamk/signal/BaseConfig.java |  2 +-
 11 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 0bfd1cdf..c5459804 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -3070,7 +3070,6 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
-  "fields":[{"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4ff08539..680ca54a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_125"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_126"
 sqlite = "org.xerial:sqlite-jdbc:3.50.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.2"
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
index 54271dac..2bb63507 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/DeviceLinkUrl.java
@@ -2,7 +2,6 @@ package org.asamk.signal.manager.api;
 
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 
 import java.net.URI;
@@ -37,7 +36,7 @@ public record DeviceLinkUrl(String deviceIdentifier, ECPublicKey deviceKey) {
         }
         ECPublicKey deviceKey;
         try {
-            deviceKey = Curve.decodePoint(publicKeyBytes, 0);
+            deviceKey = new ECPublicKey(publicKeyBytes);
         } catch (InvalidKeyException e) {
             throw new InvalidDeviceLinkException("Invalid device link", e);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 111695f6..890d7081 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -2,7 +2,6 @@ package org.asamk.signal.manager.config;
 
 import org.signal.libsignal.net.Network.Environment;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.HttpProxy;
@@ -80,7 +79,7 @@ class LiveConfig {
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
         try {
-            return Curve.decodePoint(UNIDENTIFIED_SENDER_TRUST_ROOT, 0);
+            return new ECPublicKey(UNIDENTIFIED_SENDER_TRUST_ROOT);
         } catch (InvalidKeyException e) {
             throw new AssertionError(e);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index e72c66b5..6d8f08c7 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -2,7 +2,6 @@ package org.asamk.signal.manager.config;
 
 import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.HttpProxy;
@@ -80,7 +79,7 @@ class StagingConfig {
 
     static ECPublicKey getUnidentifiedSenderTrustRoot() {
         try {
-            return Curve.decodePoint(UNIDENTIFIED_SENDER_TRUST_ROOT, 0);
+            return new ECPublicKey(UNIDENTIFIED_SENDER_TRUST_ROOT);
         } catch (InvalidKeyException e) {
             throw new AssertionError(e);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
index b55153f0..08526c72 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/AttachmentHelper.java
@@ -9,6 +9,7 @@ import org.asamk.signal.manager.util.IOUtils;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.whispersystems.signalservice.api.crypto.AttachmentCipherInputStream;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
@@ -138,9 +139,15 @@ public class AttachmentHelper {
             SignalServiceAttachmentPointer pointer,
             File tmpFile
     ) throws IOException {
+        if (pointer.getDigest().isEmpty()) {
+            throw new IOException("Attachment pointer has no digest.");
+        }
         try {
             return dependencies.getMessageReceiver()
-                    .retrieveAttachment(pointer, tmpFile, ServiceConfig.MAX_ATTACHMENT_SIZE);
+                    .retrieveAttachment(pointer,
+                            tmpFile,
+                            ServiceConfig.MAX_ATTACHMENT_SIZE,
+                            AttachmentCipherInputStream.IntegrityCheck.forEncryptedDigest(pointer.getDigest().get()));
         } catch (MissingConfigurationException | InvalidMessageException e) {
             throw new IOException(e);
         }
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
index dfae5985..7d927ddd 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java
@@ -56,7 +56,10 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
                     .distinctUntilChanged()
                     .subscribe(this::onStateChanged);
 
-            webSocket.setKeepAliveChangedListener(this::updateKeepAliveSenderStatus);
+            webSocket.addKeepAliveChangeListener(() -> {
+                executor.execute(this::updateKeepAliveSenderStatus);
+                return Unit.INSTANCE;
+            });
         });
     }
 
@@ -78,7 +81,7 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
     public void onMessageError(int status, boolean isIdentifiedWebSocket) {
     }
 
-    private Unit updateKeepAliveSenderStatus() {
+    private void updateKeepAliveSenderStatus() {
         if (keepAliveSender == null && sendKeepAlives()) {
             keepAliveSender = new KeepAliveSender();
             keepAliveSender.start();
@@ -86,7 +89,6 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
             keepAliveSender.shutdown();
             keepAliveSender = null;
         }
-        return Unit.INSTANCE;
     }
 
     private boolean sendKeepAlives() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
index d2d55710..8e8bd2ab 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java
@@ -4,8 +4,9 @@ import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.InvalidKeyIdException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECKeyPair;
+import org.signal.libsignal.protocol.ecc.ECPrivateKey;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -176,8 +177,8 @@ public class PreKeyStore implements SignalServicePreKeyStore {
     private PreKeyRecord getPreKeyRecordFromResultSet(ResultSet resultSet) throws SQLException {
         try {
             final var keyId = resultSet.getInt("key_id");
-            final var publicKey = Curve.decodePoint(resultSet.getBytes("public_key"), 0);
-            final var privateKey = Curve.decodePrivatePoint(resultSet.getBytes("private_key"));
+            final var publicKey = new ECPublicKey(resultSet.getBytes("public_key"));
+            final var privateKey = new ECPrivateKey(resultSet.getBytes("private_key"));
             return new PreKeyRecord(keyId, new ECKeyPair(publicKey, privateKey));
         } catch (InvalidKeyException e) {
             return null;
diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
index d62e939d..4644c3ba 100644
--- a/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java
@@ -4,8 +4,9 @@ import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.InvalidKeyIdException;
-import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECKeyPair;
+import org.signal.libsignal.protocol.ecc.ECPrivateKey;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -238,8 +239,8 @@ public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.Si
     private SignedPreKeyRecord getSignedPreKeyRecordFromResultSet(ResultSet resultSet) throws SQLException {
         try {
             final var keyId = resultSet.getInt("key_id");
-            final var publicKey = Curve.decodePoint(resultSet.getBytes("public_key"), 0);
-            final var privateKey = Curve.decodePrivatePoint(resultSet.getBytes("private_key"));
+            final var publicKey = new ECPublicKey(resultSet.getBytes("public_key"));
+            final var privateKey = new ECPrivateKey(resultSet.getBytes("private_key"));
             final var signature = resultSet.getBytes("signature");
             final var timestamp = resultSet.getLong("timestamp");
             return new SignedPreKeyRecord(keyId, timestamp, new ECKeyPair(publicKey, privateKey), signature);
diff --git a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
index 37a0bf82..31c3cd39 100644
--- a/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/KeyUtils.java
@@ -4,7 +4,7 @@ import org.asamk.signal.manager.storage.SignalAccount;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.libsignal.protocol.ecc.Curve;
+import org.signal.libsignal.protocol.ecc.ECKeyPair;
 import org.signal.libsignal.protocol.ecc.ECPrivateKey;
 import org.signal.libsignal.protocol.kem.KEMKeyPair;
 import org.signal.libsignal.protocol.kem.KEMKeyType;
@@ -33,8 +33,8 @@ public class KeyUtils {
 
     public static IdentityKeyPair getIdentityKeyPair(byte[] publicKeyBytes, byte[] privateKeyBytes) {
         try {
-            IdentityKey publicKey = new IdentityKey(publicKeyBytes);
-            ECPrivateKey privateKey = Curve.decodePrivatePoint(privateKeyBytes);
+            final var publicKey = new IdentityKey(publicKeyBytes);
+            final var privateKey = new ECPrivateKey(privateKeyBytes);
 
             return new IdentityKeyPair(publicKey, privateKey);
         } catch (InvalidKeyException e) {
@@ -43,7 +43,7 @@ public class KeyUtils {
     }
 
     public static IdentityKeyPair generateIdentityKeyPair() {
-        var djbKeyPair = Curve.generateKeyPair();
+        var djbKeyPair = ECKeyPair.generate();
         var djbIdentityKey = new IdentityKey(djbKeyPair.getPublicKey());
         var djbPrivateKey = djbKeyPair.getPrivateKey();
 
@@ -54,7 +54,7 @@ public class KeyUtils {
         var records = new ArrayList<PreKeyRecord>(PREKEY_BATCH_SIZE);
         for (var i = 0; i < PREKEY_BATCH_SIZE; i++) {
             var preKeyId = (offset + i) % PREKEY_MAXIMUM_ID;
-            var keyPair = Curve.generateKeyPair();
+            var keyPair = ECKeyPair.generate();
             var record = new PreKeyRecord(preKeyId, keyPair);
 
             records.add(record);
@@ -66,13 +66,9 @@ public class KeyUtils {
             final int signedPreKeyId,
             final ECPrivateKey privateKey
     ) {
-        var keyPair = Curve.generateKeyPair();
+        var keyPair = ECKeyPair.generate();
         byte[] signature;
-        try {
-            signature = Curve.calculateSignature(privateKey, keyPair.getPublicKey().serialize());
-        } catch (InvalidKeyException e) {
-            throw new AssertionError(e);
-        }
+        signature = privateKey.calculateSignature(keyPair.getPublicKey().serialize());
         return new SignedPreKeyRecord(signedPreKeyId, System.currentTimeMillis(), keyPair, signature);
     }
 
diff --git a/src/main/java/org/asamk/signal/BaseConfig.java b/src/main/java/org/asamk/signal/BaseConfig.java
index 1f0922fe..730485bc 100644
--- a/src/main/java/org/asamk/signal/BaseConfig.java
+++ b/src/main/java/org/asamk/signal/BaseConfig.java
@@ -8,7 +8,7 @@ public class BaseConfig {
     public static final String PROJECT_VERSION = BaseConfig.class.getPackage().getImplementationVersion();
 
     static final String USER_AGENT_SIGNAL_ANDROID = Optional.ofNullable(System.getenv("SIGNAL_CLI_USER_AGENT"))
-            .orElse("Signal-Android/7.46.1");
+            .orElse("Signal-Android/7.47.1");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

From fa9bb3c21030fb0ef89a440859b796a1e5ebd64a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 28 Jun 2025 14:57:20 +0200
Subject: [PATCH 646/672] Bump version to 0.13.17

---
 CHANGELOG.md                          | 14 ++++++++++++--
 build.gradle.kts                      |  2 +-
 data/org.asamk.SignalCli.metainfo.xml |  3 +++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecb19833..62abfe70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,18 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.17] - 2025-06-28
 
-Requires libsignal-client version 0.74.0.
+Requires libsignal-client version 0.76.0.
+
+### Fixed
+
+- Fix issue when loading an older inactive group
+- Close attachment input streams after upload
+- Fix storage sync behavior with unhandled fields
+
+### Changed
+
+- Improve behavior when pin data doesn't exist on the server
 
 ## [0.13.16] - 2025-06-07
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 8fadb883..11715e36 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.17-SNAPSHOT"
+    version = "0.13.17"
 }
 
 java {
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index b7483db9..95646534 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.17" date="2025-06-28">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.17</url>
+        </release>
         <release version="0.13.16" date="2025-06-07">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.16</url>
         </release>

From e7ca02f1fb1a06caf712a3316648947e99fed5da Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 647/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62abfe70..5437bd63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.17] - 2025-06-28
 
 Requires libsignal-client version 0.76.0.
diff --git a/build.gradle.kts b/build.gradle.kts
index 11715e36..c3568444 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.17"
+    version = "0.13.18-SNAPSHOT"
 }
 
 java {

From 069325af4715b63725ac4a41874dd453dea563cf Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 29 Jun 2025 11:16:32 +0200
Subject: [PATCH 648/672] Extend shutdown request with optional error

---
 src/main/java/org/asamk/signal/Shutdown.java      | 15 ++++++++++++---
 .../org/asamk/signal/commands/DaemonCommand.java  |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/asamk/signal/Shutdown.java b/src/main/java/org/asamk/signal/Shutdown.java
index a59497c9..c51c12e4 100644
--- a/src/main/java/org/asamk/signal/Shutdown.java
+++ b/src/main/java/org/asamk/signal/Shutdown.java
@@ -1,5 +1,6 @@
 package org.asamk.signal;
 
+import org.asamk.signal.commands.exceptions.CommandException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -11,7 +12,7 @@ import sun.misc.Signal;
 public class Shutdown {
 
     private static final Logger logger = LoggerFactory.getLogger(Shutdown.class);
-    private static final CompletableFuture<Void> shutdown = new CompletableFuture<>();
+    private static final CompletableFuture<Object> shutdown = new CompletableFuture<>();
     private static final CompletableFuture<Void> shutdownComplete = new CompletableFuture<>();
     private static boolean initialized = false;
 
@@ -43,9 +44,17 @@ public class Shutdown {
         shutdown.complete(null);
     }
 
-    public static void waitForShutdown() throws InterruptedException {
+    public static void triggerShutdown(CommandException exception) {
+        logger.debug("Triggering shutdown with exception.", exception);
+        shutdown.complete(exception);
+    }
+
+    public static void waitForShutdown() throws InterruptedException, CommandException {
         try {
-            shutdown.get();
+            final var result = shutdown.get();
+            if (result instanceof CommandException e) {
+                throw e;
+            }
         } catch (ExecutionException e) {
             throw new RuntimeException(e);
         }
diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
index 197e1286..6790c65d 100644
--- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java
+++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java
@@ -97,7 +97,7 @@ public class DaemonCommand implements MultiLocalCommand, LocalCommand {
             final OutputWriter outputWriter
     ) throws CommandException {
         Shutdown.installHandler();
-        logger.info("Starting daemon in single-account mode for " + m.getSelfNumber());
+        logger.info("Starting daemon in single-account mode for {}", m.getSelfNumber());
         final var noReceiveStdOut = Boolean.TRUE.equals(ns.getBoolean("no-receive-stdout"));
         final var receiveMode = ns.<ReceiveMode>get("receive-mode");
         final var receiveConfig = getReceiveConfig(ns);

From cb06cbdcca718e7a2f5e9360f3eb6b319a9ea933 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 29 Jun 2025 11:21:31 +0200
Subject: [PATCH 649/672] Shut down when dbus daemon connection goes away
 unexpectedly

Fixes #1800
---
 .../java/org/asamk/signal/dbus/DbusHandler.java | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/dbus/DbusHandler.java b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
index b6799de7..2ed6d11f 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusHandler.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusHandler.java
@@ -1,17 +1,21 @@
 package org.asamk.signal.dbus;
 
 import org.asamk.signal.DbusConfig;
+import org.asamk.signal.Shutdown;
 import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
+import org.freedesktop.dbus.connections.IDisconnectCallback;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -94,7 +98,9 @@ public class DbusHandler implements AutoCloseable {
         final var busType = isDbusSystem ? DBusConnection.DBusBusType.SYSTEM : DBusConnection.DBusBusType.SESSION;
         logger.debug("Starting DBus server on {} bus: {}", busType, busname);
         try {
-            dBusConnection = DBusConnectionBuilder.forType(busType).build();
+            dBusConnection = DBusConnectionBuilder.forType(busType)
+                    .withDisconnectCallback(new DisconnectCallback())
+                    .build();
             dbusRunner.run(dBusConnection);
         } catch (DBusException e) {
             throw new UnexpectedErrorException("Dbus command failed: " + e.getMessage(), e);
@@ -141,4 +147,13 @@ public class DbusHandler implements AutoCloseable {
 
         void run(DBusConnection connection) throws DBusException;
     }
+
+    private static final class DisconnectCallback implements IDisconnectCallback {
+
+        @Override
+        public void disconnectOnError(IOException ex) {
+            logger.debug("DBus daemon disconnected unexpectedly, shutting down");
+            Shutdown.triggerShutdown(new IOErrorException("Unexpected dbus daemon disconnect", ex));
+        }
+    }
 }

From 3180eba83694cf24d23cf9f3e4d73fa5e8791533 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 8 Jul 2025 17:34:04 +0200
Subject: [PATCH 650/672] Exit if account check fails at startup

Fixes #1804
---
 .../signal/manager/SignalAccountFiles.java    | 22 ++++++++++++++-----
 src/main/java/org/asamk/signal/App.java       |  2 ++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
index 4072a9df..cd0b5a21 100644
--- a/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
+++ b/lib/src/main/java/org/asamk/signal/manager/SignalAccountFiles.java
@@ -2,6 +2,7 @@ package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.api.AccountCheckException;
 import org.asamk.signal.manager.api.NotRegisteredException;
+import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.ServiceEnvironment;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
@@ -63,19 +64,28 @@ public class SignalAccountFiles {
         return accountsStore.getAllNumbers();
     }
 
-    public MultiAccountManager initMultiAccountManager() throws IOException {
-        final var managers = accountsStore.getAllAccounts().parallelStream().map(a -> {
+    public MultiAccountManager initMultiAccountManager() throws IOException, AccountCheckException {
+        final var managerPairs = accountsStore.getAllAccounts().parallelStream().map(a -> {
             try {
-                return initManager(a.number(), a.path());
-            } catch (NotRegisteredException | IOException | AccountCheckException e) {
+                return new Pair<Manager, Throwable>(initManager(a.number(), a.path()), null);
+            } catch (NotRegisteredException e) {
                 logger.warn("Ignoring {}: {} ({})", a.number(), e.getMessage(), e.getClass().getSimpleName());
                 return null;
-            } catch (Throwable e) {
+            } catch (AccountCheckException | IOException e) {
                 logger.error("Failed to load {}: {} ({})", a.number(), e.getMessage(), e.getClass().getSimpleName());
-                throw e;
+                return new Pair<Manager, Throwable>(null, e);
             }
         }).filter(Objects::nonNull).toList();
 
+        for (final var pair : managerPairs) {
+            if (pair.second() instanceof IOException e) {
+                throw e;
+            } else if (pair.second() instanceof AccountCheckException e) {
+                throw e;
+            }
+        }
+
+        final var managers = managerPairs.stream().map(Pair::first).toList();
         return new MultiAccountManagerImpl(managers, this);
     }
 
diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index e494d201..cf731ea9 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -291,6 +291,8 @@ public class App {
             commandHandler.handleMultiLocalCommand(command, multiAccountManager);
         } catch (IOException e) {
             throw new IOErrorException("Failed to load local accounts file", e);
+        } catch (AccountCheckException e) {
+            throw new UnexpectedErrorException("Failed to load local accounts file", e);
         }
     }
 

From 887ed3bb448624095f950674931cf60924c5f219 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Tue, 8 Jul 2025 17:35:17 +0200
Subject: [PATCH 651/672] Show better error message when sending fails due to
 missing pre keys

---
 .../java/org/asamk/signal/commands/SendCommand.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index 39be74ee..cce1d21e 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -250,8 +250,14 @@ public class SendCommand implements JsonRpcLocalCommand {
                     : m.sendMessage(message, recipientIdentifiers, notifySelf);
             outputResult(outputWriter, results);
         } catch (AttachmentInvalidException | IOException e) {
-            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
-                    .getSimpleName() + ")", e);
+            if (e instanceof IOException io && io.getMessage().contains("No prekeys available")) {
+                throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                        .getSimpleName() + "), maybe one of the devices of the recipient wasn't online for a while.",
+                        e);
+            } else {
+                throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                        .getSimpleName() + ")", e);
+            }
         } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
             throw new UserErrorException(e.getMessage());
         } catch (UnregisteredRecipientException e) {

From 1b7f75559008ea2dc557bc3e5228bd0db7a30b3f Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 10:05:14 +0200
Subject: [PATCH 652/672] Update dependencies

---
 client/Cargo.lock            | 512 ++++++++++++++++++++---------------
 client/Cargo.toml            |   2 +-
 client/src/transports/mod.rs |   7 +-
 3 files changed, 295 insertions(+), 226 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index d0cd01f4..ed225c51 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -13,15 +13,15 @@ dependencies = [
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -34,44 +34,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
  "anstyle",
- "once_cell",
+ "once_cell_polyfill",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "async-trait"
@@ -90,17 +90,11 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -119,9 +113,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "bytes"
@@ -131,9 +125,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
 
 [[package]]
 name = "cc"
-version = "1.2.18"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
 dependencies = [
  "shlex",
 ]
@@ -146,15 +140,15 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -162,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -175,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -187,15 +181,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "combine"
@@ -209,9 +203,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -242,12 +236,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.11"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -326,9 +320,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
  "cfg-if",
  "libc",
@@ -343,9 +337,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "h2"
-version = "0.4.8"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
+checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -362,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 
 [[package]]
 name = "heck"
@@ -434,11 +428,10 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.27.5"
+version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "futures-util",
  "http",
  "hyper",
  "hyper-util",
@@ -452,12 +445,13 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.11"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2"
+checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df"
 dependencies = [
  "bytes",
  "futures-channel",
+ "futures-core",
  "futures-util",
  "http",
  "http-body",
@@ -472,21 +466,22 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
 dependencies = [
  "displaydoc",
+ "potential_utf",
  "yoke",
  "zerofrom",
  "zerovec",
 ]
 
 [[package]]
-name = "icu_locid"
-version = "1.5.0"
+name = "icu_locale_core"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -495,31 +490,11 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
-
 [[package]]
 name = "icu_normalizer"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -527,67 +502,54 @@ dependencies = [
  "icu_properties",
  "icu_provider",
  "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
 
 [[package]]
 name = "icu_properties"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
 dependencies = [
  "displaydoc",
  "icu_collections",
- "icu_locid_transform",
+ "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "tinystr",
+ "potential_utf",
+ "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.1"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
 
 [[package]]
 name = "icu_provider"
-version = "1.5.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
 dependencies = [
  "displaydoc",
- "icu_locid",
- "icu_provider_macros",
+ "icu_locale_core",
  "stable_deref_trait",
  "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
+ "zerotrie",
  "zerovec",
 ]
 
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "idna"
 version = "1.0.3"
@@ -601,9 +563,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -611,14 +573,25 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -655,9 +628,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jsonrpsee"
-version = "0.24.9"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37b26c20e2178756451cfeb0661fb74c47dd5988cb7e3939de7e9241fd604d42"
+checksum = "1fba77a59c4c644fd48732367624d1bcf6f409f9c9a286fbc71d2f1fc0b2ea16"
 dependencies = [
  "jsonrpsee-core",
  "jsonrpsee-http-client",
@@ -668,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.24.9"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456196007ca3a14db478346f58c7238028d55ee15c1df15115596e411ff27925"
+checksum = "693c93cbb7db25f4108ed121304b671a36002c2db67dff2ee4391a688c738547"
 dependencies = [
  "async-trait",
  "bytes",
@@ -684,19 +657,19 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
+ "tower",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.24.9"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c872b6c9961a4ccc543e321bb5b89f6b2d2c7fe8b61906918273a3333c95400c"
+checksum = "6962d2bd295f75e97dd328891e58fce166894b974c1f7ce2e7597f02eeceb791"
 dependencies = [
- "async-trait",
  "base64",
  "http-body",
  "hyper",
@@ -708,18 +681,17 @@ dependencies = [
  "rustls-platform-verifier",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
  "tokio",
  "tower",
- "tracing",
  "url",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.24.9"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e65763c942dfc9358146571911b0cd1c361c2d63e2d2305622d40d36376ca80"
+checksum = "2fa4f5daed39f982a1bb9d15449a28347490ad42b212f8eaa2a2a344a0dce9e9"
 dependencies = [
  "heck",
  "proc-macro-crate",
@@ -730,33 +702,33 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.24.9"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a8e70baf945b6b5752fc8eb38c918a48f1234daf11355e07106d963f860089"
+checksum = "66df7256371c45621b3b7d2fb23aea923d577616b9c0e9c0b950a6ea5c2be0ca"
 dependencies = [
  "http",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "litemap"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "log"
@@ -766,28 +738,28 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.7"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -805,6 +777,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.6"
@@ -849,6 +827,15 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "3.3.0"
@@ -860,9 +847,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -892,9 +879,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
 [[package]]
 name = "rustc-hash"
@@ -904,9 +891,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
  "bitflags",
  "errno",
@@ -917,9 +904,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.25"
+version = "0.23.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
+checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
 dependencies = [
  "log",
  "once_cell",
@@ -944,15 +931,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
 
 [[package]]
 name = "rustls-platform-verifier"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5467026f437b4cb2a533865eaa73eb840019a0916f4b9ec563c6e617e086c9"
+checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1"
 dependencies = [
  "core-foundation",
  "core-foundation-sys",
@@ -965,7 +955,7 @@ dependencies = [
  "rustls-webpki",
  "security-framework",
  "security-framework-sys",
- "webpki-root-certs",
+ "webpki-root-certs 0.26.11",
  "windows-sys 0.59.0",
 ]
 
@@ -977,9 +967,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.1"
+version = "0.103.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
+checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -1090,24 +1080,21 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "smallvec"
-version = "1.15.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -1133,9 +1120,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1143,10 +1130,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "synstructure"
-version = "0.13.1"
+name = "sync_wrapper"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1205,9 +1198,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.7.6"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -1215,15 +1208,17 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.44.2"
+version = "1.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48"
+checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
+ "slab",
  "socket2",
  "tokio-macros",
  "windows-sys 0.52.0",
@@ -1263,9 +1258,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.14"
+version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
 dependencies = [
  "bytes",
  "futures-core",
@@ -1276,15 +1271,15 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.8"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
 
 [[package]]
 name = "toml_edit"
-version = "0.22.24"
+version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
  "indexmap",
  "toml_datetime",
@@ -1293,17 +1288,16 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.4.13"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
  "pin-project-lite",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
- "tracing",
 ]
 
 [[package]]
@@ -1324,7 +1318,6 @@ version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
- "log",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -1332,9 +1325,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1343,9 +1336,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
 ]
@@ -1379,12 +1372,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -1418,15 +1405,24 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "webpki-root-certs"
-version = "0.26.8"
+version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09aed61f5e8d2c18344b3faa33a4c837855fe56642757754775548fee21386c4"
+checksum = "75c7f0ef91146ebfb530314f5f1d24528d7f0767efbfd31dce919275413e393e"
+dependencies = [
+ "webpki-root-certs 1.0.1",
+]
+
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86138b15b2b7d561bc4469e77027b8dd005a43dc502e9031d1f5afc8ce1f280e"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -1467,6 +1463,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -1491,13 +1496,29 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -1510,6 +1531,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -1522,6 +1549,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -1534,12 +1567,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -1552,6 +1597,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -1564,6 +1615,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -1576,6 +1633,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -1589,31 +1652,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "winnow"
-version = "0.7.6"
+name = "windows_x86_64_msvc"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
 [[package]]
 name = "writeable"
-version = "0.5.5"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
 
 [[package]]
 name = "yoke"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
 dependencies = [
  "serde",
  "stable_deref_trait",
@@ -1623,9 +1686,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.7.5"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1661,10 +1724,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
 [[package]]
-name = "zerovec"
-version = "0.10.4"
+name = "zerotrie"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -1673,9 +1747,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.10.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/client/Cargo.toml b/client/Cargo.toml
index c435149f..694ee652 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -12,7 +12,7 @@ log = "0.4"
 serde = "1"
 serde_json = "1"
 tokio = { version = "1", features = ["rt", "macros", "net", "rt-multi-thread"] }
-jsonrpsee = { version = "0.24", features = [
+jsonrpsee = { version = "0.25", features = [
     "macros",
     "async-client",
     "http-client",
diff --git a/client/src/transports/mod.rs b/client/src/transports/mod.rs
index 04f4390f..3d0c4195 100644
--- a/client/src/transports/mod.rs
+++ b/client/src/transports/mod.rs
@@ -1,8 +1,5 @@
 use futures_util::{stream::StreamExt, Sink, SinkExt, Stream};
-use jsonrpsee::core::{
-    async_trait,
-    client::{ReceivedMessage, TransportReceiverT, TransportSenderT},
-};
+use jsonrpsee::core::client::{ReceivedMessage, TransportReceiverT, TransportSenderT};
 use thiserror::Error;
 
 pub mod ipc;
@@ -21,7 +18,6 @@ struct Sender<T: Send + Sink<String>> {
     inner: T,
 }
 
-#[async_trait]
 impl<T: Send + Sink<String, Error = impl std::error::Error> + Unpin + 'static> TransportSenderT
     for Sender<T>
 {
@@ -48,7 +44,6 @@ struct Receiver<T: Send + Stream> {
     inner: T,
 }
 
-#[async_trait]
 impl<T: Send + Stream<Item = Result<String, std::io::Error>> + Unpin + 'static> TransportReceiverT
     for Receiver<T>
 {

From ff846bc6784f1245bc2b1c83651fea3b673c563a Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 10:05:57 +0200
Subject: [PATCH 653/672] Fix clippy warnings

---
 client/src/main.rs                    | 2 +-
 client/src/transports/mod.rs          | 6 +++---
 client/src/transports/stream_codec.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/main.rs b/client/src/main.rs
index 35c1ab22..68de03d4 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -70,7 +70,7 @@ async fn handle_command(
                 .await
                 .map_err(|e| RpcError::Custom(format!("JSON-RPC command startLink failed: {e:?}")))?
                 .device_link_uri;
-            println!("{}", url);
+            println!("{url}");
             client.finish_link(url, name).await
         }
         CliCommands::ListAccounts => client.list_accounts().await,
diff --git a/client/src/transports/mod.rs b/client/src/transports/mod.rs
index 3d0c4195..ad552cbf 100644
--- a/client/src/transports/mod.rs
+++ b/client/src/transports/mod.rs
@@ -27,7 +27,7 @@ impl<T: Send + Sink<String, Error = impl std::error::Error> + Unpin + 'static> T
         self.inner
             .send(body)
             .await
-            .map_err(|e| Errors::Other(format!("{:?}", e)))?;
+            .map_err(|e| Errors::Other(format!("{e:?}")))?;
         Ok(())
     }
 
@@ -35,7 +35,7 @@ impl<T: Send + Sink<String, Error = impl std::error::Error> + Unpin + 'static> T
         self.inner
             .close()
             .await
-            .map_err(|e| Errors::Other(format!("{:?}", e)))?;
+            .map_err(|e| Errors::Other(format!("{e:?}")))?;
         Ok(())
     }
 }
@@ -53,7 +53,7 @@ impl<T: Send + Stream<Item = Result<String, std::io::Error>> + Unpin + 'static>
         match self.inner.next().await {
             None => Err(Errors::Closed),
             Some(Ok(msg)) => Ok(ReceivedMessage::Text(msg)),
-            Some(Err(e)) => Err(Errors::Other(format!("{:?}", e))),
+            Some(Err(e)) => Err(Errors::Other(format!("{e:?}"))),
         }
     }
 }
diff --git a/client/src/transports/stream_codec.rs b/client/src/transports/stream_codec.rs
index 6f77306f..e46233cb 100644
--- a/client/src/transports/stream_codec.rs
+++ b/client/src/transports/stream_codec.rs
@@ -41,7 +41,7 @@ impl Decoder for StreamCodec {
 
             match str::from_utf8(line.as_ref()) {
                 Ok(s) => Ok(Some(s.to_string())),
-                Err(_) => Err(io::Error::new(io::ErrorKind::Other, "invalid UTF-8")),
+                Err(_) => Err(io::Error::other("invalid UTF-8")),
             }
         } else {
             Ok(None)

From d54be747da7fec55686eae27a26dbd266e4fbb6d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 10:15:27 +0200
Subject: [PATCH 654/672] Remove unused dependency

---
 client/Cargo.lock | 1 -
 client/Cargo.toml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/client/Cargo.lock b/client/Cargo.lock
index ed225c51..01f28e0c 100644
--- a/client/Cargo.lock
+++ b/client/Cargo.lock
@@ -1070,7 +1070,6 @@ dependencies = [
  "clap",
  "futures-util",
  "jsonrpsee",
- "log",
  "serde",
  "serde_json",
  "thiserror 2.0.12",
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 694ee652..85daf1e2 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2021"
 [dependencies]
 anyhow = "1"
 clap = { version = "4", features = ["cargo", "derive", "wrap_help"] }
-log = "0.4"
 serde = "1"
 serde_json = "1"
 tokio = { version = "1", features = ["rt", "macros", "net", "rt-multi-thread"] }

From a96626c4685cfaf589deea45ff2d46e5d6883f3c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 10:16:57 +0200
Subject: [PATCH 655/672] Update to rust 2024 edition

---
 client/Cargo.toml     | 2 +-
 client/src/jsonrpc.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/Cargo.toml b/client/Cargo.toml
index 85daf1e2..aff9ede4 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "signal-cli-client"
 version = "0.0.1"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index b085cde5..6598d525 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -417,6 +417,6 @@ pub async fn connect_unix(
     Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
 }
 
-pub async fn connect_http(uri: &str) -> Result<impl SubscriptionClientT, Error> {
+pub async fn connect_http(uri: &str) -> Result<impl SubscriptionClientT + use<>, Error> {
     HttpClientBuilder::default().build(uri)
 }

From ca33249170118be0d2fe3e9deed4ad23b34ac875 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 11:03:28 +0200
Subject: [PATCH 656/672] Handle rate limit exception correctly when querying
 usernames

Fixes #1797
---
 graalvm-config-dir/jni-config.json            |  6 ++++-
 .../org/asamk/signal/manager/Manager.java     |  2 +-
 .../manager/helper/RecipientHelper.java       | 25 +++++++++++++------
 .../signal/manager/internal/ManagerImpl.java  |  2 +-
 .../signal/commands/GetUserStatusCommand.java | 13 +++++++---
 5 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/graalvm-config-dir/jni-config.json b/graalvm-config-dir/jni-config.json
index 23a2160c..523a6c03 100644
--- a/graalvm-config-dir/jni-config.json
+++ b/graalvm-config-dir/jni-config.json
@@ -58,7 +58,7 @@
 },
 {
   "name":"java.lang.Throwable",
-  "methods":[{"name":"getMessage","parameterTypes":[] }, {"name":"toString","parameterTypes":[] }]
+  "methods":[{"name":"getMessage","parameterTypes":[] }, {"name":"setStackTrace","parameterTypes":["java.lang.StackTraceElement[]"] }, {"name":"toString","parameterTypes":[] }]
 },
 {
   "name":"java.lang.UnsatisfiedLinkError",
@@ -126,6 +126,10 @@
   "name":"org.signal.libsignal.net.NetworkException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
 },
+{
+  "name":"org.signal.libsignal.net.RetryLaterException",
+  "methods":[{"name":"<init>","parameterTypes":["long"] }]
+},
 {
   "name":"org.signal.libsignal.protocol.DuplicateMessageException",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
diff --git a/lib/src/main/java/org/asamk/signal/manager/Manager.java b/lib/src/main/java/org/asamk/signal/manager/Manager.java
index 238084e7..ccb661e1 100644
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@@ -96,7 +96,7 @@ public interface Manager extends Closeable {
      */
     Map<String, UserStatus> getUserStatus(Set<String> numbers) throws IOException, RateLimitException;
 
-    Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames);
+    Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames) throws IOException;
 
     void updateAccountAttributes(
             String deviceName,
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
index ecb85254..a73bb741 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/RecipientHelper.java
@@ -17,6 +17,7 @@ import org.whispersystems.signalservice.api.push.ServiceId.PNI;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidArgumentException;
 import org.whispersystems.signalservice.api.push.exceptions.CdsiInvalidTokenException;
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -68,7 +69,7 @@ public class RecipientHelper {
                 .toSignalServiceAddress();
     }
 
-    public Set<RecipientId> resolveRecipients(Collection<RecipientIdentifier.Single> recipients) throws UnregisteredRecipientException {
+    public Set<RecipientId> resolveRecipients(Collection<RecipientIdentifier.Single> recipients) throws UnregisteredRecipientException, IOException {
         final var recipientIds = new HashSet<RecipientId>(recipients.size());
         for (var number : recipients) {
             final var recipientId = resolveRecipient(number);
@@ -91,7 +92,11 @@ public class RecipientHelper {
                 }
             });
         } else if (recipient instanceof RecipientIdentifier.Username(String username)) {
-            return resolveRecipientByUsernameOrLink(username, false);
+            try {
+                return resolveRecipientByUsernameOrLink(username, false);
+            } catch (Exception e) {
+                return null;
+            }
         }
         throw new AssertionError("Unexpected RecipientIdentifier: " + recipient);
     }
@@ -99,7 +104,7 @@ public class RecipientHelper {
     public RecipientId resolveRecipientByUsernameOrLink(
             String username,
             boolean forceRefresh
-    ) throws UnregisteredRecipientException {
+    ) throws UnregisteredRecipientException, IOException {
         final Username finalUsername;
         try {
             finalUsername = getUsernameFromUsernameOrLink(username);
@@ -110,11 +115,15 @@ public class RecipientHelper {
             try {
                 final var aci = handleResponseException(dependencies.getUsernameApi().getAciByUsername(finalUsername));
                 return account.getRecipientStore().resolveRecipientTrusted(aci, finalUsername.getUsername());
-            } catch (IOException e) {
-                throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
-                        null,
-                        null,
-                        username));
+            } catch (NonSuccessfulResponseCodeException e) {
+                if (e.code == 404) {
+                    throw new UnregisteredRecipientException(new org.asamk.signal.manager.api.RecipientAddress(null,
+                            null,
+                            null,
+                            username));
+                }
+                logger.debug("Failed to get uuid for username: {}", username, e);
+                throw e;
             }
         }
         return account.getRecipientStore().resolveRecipientByUsername(finalUsername.getUsername(), () -> {
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index ffb74de2..eb672d24 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -285,7 +285,7 @@ public class ManagerImpl implements Manager {
     }
 
     @Override
-    public Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames) {
+    public Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames) throws IOException {
         final var registeredUsers = new HashMap<String, RecipientAddress>();
         for (final var username : usernames) {
             try {
diff --git a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
index e3d36d85..eab4155c 100644
--- a/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
+++ b/src/main/java/org/asamk/signal/commands/GetUserStatusCommand.java
@@ -64,9 +64,16 @@ public class GetUserStatusCommand implements JsonRpcLocalCommand {
         }
 
         final var usernames = ns.<String>getList("username");
-        final var registeredUsernames = usernames == null
-                ? Map.<String, UsernameStatus>of()
-                : m.getUsernameStatus(new HashSet<>(usernames));
+        final Map<String, UsernameStatus> registeredUsernames;
+        try {
+            registeredUsernames = usernames == null ? Map.of() : m.getUsernameStatus(new HashSet<>(usernames));
+        } catch (IOException e) {
+            throw new IOErrorException("Unable to check if users are registered: "
+                    + e.getMessage()
+                    + " ("
+                    + e.getClass().getSimpleName()
+                    + ")", e);
+        }
 
         // Output
         switch (outputWriter) {

From 4ce194afe28e8918d066b267dec8ea9cf6b4b2a0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 11:03:54 +0200
Subject: [PATCH 657/672] Add missing username parameter to getUserStatus
 command in json-rpc client

---
 client/src/cli.rs     | 2 ++
 client/src/jsonrpc.rs | 1 +
 client/src/main.rs    | 9 +++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 4ff9d458..e0abb717 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -84,6 +84,8 @@ pub enum CliCommands {
     },
     GetUserStatus {
         recipient: Vec<String>,
+        #[arg(long)]
+        username: Vec<String>,
     },
     JoinGroup {
         #[arg(long)]
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 6598d525..3b6d583b 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -70,6 +70,7 @@ pub trait Rpc {
         &self,
         account: Option<String>,
         recipients: Vec<String>,
+        usernames: Vec<String>,
     ) -> Result<Value, ErrorObjectOwned>;
 
     #[method(name = "joinGroup", param_kind = map)]
diff --git a/client/src/main.rs b/client/src/main.rs
index 68de03d4..6466b2e6 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -60,8 +60,13 @@ async fn handle_command(
                 .delete_local_account_data(cli.account, ignore_registered)
                 .await
         }
-        CliCommands::GetUserStatus { recipient } => {
-            client.get_user_status(cli.account, recipient).await
+        CliCommands::GetUserStatus {
+            recipient,
+            username,
+        } => {
+            client
+                .get_user_status(cli.account, recipient, username)
+                .await
         }
         CliCommands::JoinGroup { uri } => client.join_group(cli.account, uri).await,
         CliCommands::Link { name } => {

From dbdff831323a3242527eb4e3e4a823322e1c9262 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 11:09:24 +0200
Subject: [PATCH 658/672] Update README

Fixes #1803
---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index e6d6e5ff..c7228c09 100644
--- a/README.md
+++ b/README.md
@@ -83,6 +83,12 @@ of all country codes.)
      signal-cli -a ACCOUNT send -m "This is a message" RECIPIENT
      ```
 
+* Send a message to a username, usernames need to be prefixed with `u:`
+
+     ```sh
+     signal-cli -a ACCOUNT send -m "This is a message" u:USERNAME.000
+     ```
+
 * Pipe the message content from another process.
 
       uname -a | signal-cli -a ACCOUNT send --message-from-stdin RECIPIENT

From 3d4070a13907152b312c863a2ea885ac57935365 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 11:41:52 +0200
Subject: [PATCH 659/672] Compile UnixStream support only on unix systems

---
 client/src/cli.rs            |  1 +
 client/src/jsonrpc.rs        |  1 +
 client/src/main.rs           | 37 +++++++++++++++++++++---------------
 client/src/transports/mod.rs |  1 +
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index e0abb717..90809e1b 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -15,6 +15,7 @@ pub struct Cli {
     pub json_rpc_tcp: Option<Option<SocketAddr>>,
 
     /// UNIX socket address and port of signal-cli daemon
+    #[cfg(unix)]
     #[arg(long, conflicts_with = "json_rpc_tcp")]
     pub json_rpc_socket: Option<Option<OsString>>,
 
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 3b6d583b..6874652d 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -410,6 +410,7 @@ pub async fn connect_tcp(
     Ok(ClientBuilder::default().build_with_tokio(sender, receiver))
 }
 
+#[cfg(unix)]
 pub async fn connect_unix(
     socket_path: impl AsRef<Path>,
 ) -> Result<impl SubscriptionClientT, std::io::Error> {
diff --git a/client/src/main.rs b/client/src/main.rs
index 6466b2e6..f82ee237 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -482,23 +482,30 @@ async fn connect(cli: Cli) -> Result<Value, RpcError> {
 
         handle_command(cli, client).await
     } else {
-        let socket_path = cli
-            .json_rpc_socket
-            .clone()
-            .unwrap_or(None)
-            .or_else(|| {
-                std::env::var_os("XDG_RUNTIME_DIR").map(|runtime_dir| {
-                    PathBuf::from(runtime_dir)
-                        .join(DEFAULT_SOCKET_SUFFIX)
-                        .into()
+        #[cfg(windows)]
+        {
+            Err(RpcError::Custom("Invalid socket".into()))
+        }
+        #[cfg(unix)]
+        {
+            let socket_path = cli
+                .json_rpc_socket
+                .clone()
+                .unwrap_or(None)
+                .or_else(|| {
+                    std::env::var_os("XDG_RUNTIME_DIR").map(|runtime_dir| {
+                        PathBuf::from(runtime_dir)
+                            .join(DEFAULT_SOCKET_SUFFIX)
+                            .into()
+                    })
                 })
-            })
-            .unwrap_or_else(|| ("/run".to_owned() + DEFAULT_SOCKET_SUFFIX).into());
-        let client = jsonrpc::connect_unix(socket_path)
-            .await
-            .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
+                .unwrap_or_else(|| ("/run".to_owned() + DEFAULT_SOCKET_SUFFIX).into());
+            let client = jsonrpc::connect_unix(socket_path)
+                .await
+                .map_err(|e| RpcError::Custom(format!("Failed to connect to socket: {e}")))?;
 
-        handle_command(cli, client).await
+            handle_command(cli, client).await
+        }
     }
 }
 
diff --git a/client/src/transports/mod.rs b/client/src/transports/mod.rs
index ad552cbf..ed1963a0 100644
--- a/client/src/transports/mod.rs
+++ b/client/src/transports/mod.rs
@@ -2,6 +2,7 @@ use futures_util::{stream::StreamExt, Sink, SinkExt, Stream};
 use jsonrpsee::core::client::{ReceivedMessage, TransportReceiverT, TransportSenderT};
 use thiserror::Error;
 
+#[cfg(unix)]
 pub mod ipc;
 mod stream_codec;
 pub mod tcp;

From dc787be17ba3ec2396c992b77fff3aa7d98d259c Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 12 Jul 2025 11:31:38 +0200
Subject: [PATCH 660/672] Build rust json-rpc client in CI

---
 .github/workflows/ci.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad4dbf15..23e19225 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,3 +69,28 @@ jobs:
         with:
           name: signal-cli-native
           path: build/native/nativeCompile/signal-cli
+
+  build-client:
+    strategy:
+      matrix:
+        os:
+          - ubuntu
+          - macos
+          - windows
+    runs-on: ${{ matrix.os }}-latest
+    defaults:
+      run:
+        working-directory: ./client
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install rust
+        run: rustup default stable
+      - name: Build client
+        run: cargo build --release --verbose
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: signal-cli-client-${{ matrix.os }}
+          path: |
+            client/target/release/signal-cli-client
+            client/target/release/signal-cli-client.exe

From c924d5c03a318d8c7d4dd7be287eaf0d523ecd91 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 14 Jul 2025 15:59:26 +0200
Subject: [PATCH 661/672] Update libsignal-service-java

---
 graalvm-config-dir/reflect-config.json                       | 1 +
 gradle/libs.versions.toml                                    | 2 +-
 .../asamk/signal/manager/helper/IncomingMessageHandler.java  | 5 +++--
 .../asamk/signal/manager/internal/SignalDependencies.java    | 4 +++-
 .../signal/manager/syncStorage/ContactRecordProcessor.java   | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index c5459804..0bfd1cdf 100644
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -3070,6 +3070,7 @@
 {
   "name":"org.whispersystems.signalservice.internal.storage.protos.GroupV2Record",
   "allDeclaredFields":true,
+  "fields":[{"name":"archived"}, {"name":"avatarColor"}, {"name":"blocked"}, {"name":"dontNotifyForMentionsIfMuted"}, {"name":"hideStory"}, {"name":"markedUnread"}, {"name":"masterKey"}, {"name":"mutedUntilTimestamp"}, {"name":"storySendMode"}, {"name":"whitelisted"}],
   "methods":[{"name":"adapter","parameterTypes":[] }, {"name":"unknownFields","parameterTypes":[] }]
 },
 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 680ca54a..4edfe40a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
-signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_126"
+signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_127"
 sqlite = "org.xerial:sqlite-jdbc:3.50.1.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.2"
diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
index 3bb7479a..dd9cb38f 100644
--- a/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java
@@ -41,6 +41,7 @@ import org.signal.libsignal.metadata.ProtocolNoSessionException;
 import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
 import org.signal.libsignal.metadata.SelfSendException;
 import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.UsePqRatchet;
 import org.signal.libsignal.protocol.groups.GroupSessionBuilder;
 import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.signal.libsignal.zkgroup.InvalidInputException;
@@ -105,7 +106,7 @@ public final class IncomingMessageHandler {
             try {
                 final var cipherResult = dependencies.getCipher(destination == null
                                 || destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
-                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
+                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp(), UsePqRatchet.NO);
                 content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
                 if (content == null) {
                     return new Pair<>(List.of(), null);
@@ -143,7 +144,7 @@ public final class IncomingMessageHandler {
             try {
                 final var cipherResult = dependencies.getCipher(destination == null
                                 || destination.equals(account.getAci()) ? ServiceIdType.ACI : ServiceIdType.PNI)
-                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp());
+                        .decrypt(envelope.getProto(), envelope.getServerDeliveredTimestamp(), UsePqRatchet.NO);
                 content = validate(envelope.getProto(), cipherResult, envelope.getServerDeliveredTimestamp());
                 if (content == null) {
                     return new Pair<>(List.of(), null);
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
index f954588f..0bc895cb 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java
@@ -5,6 +5,7 @@ import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.util.Utils;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.signal.libsignal.net.Network;
+import org.signal.libsignal.protocol.UsePqRatchet;
 import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -326,7 +327,8 @@ public class SignalDependencies {
                         Optional.empty(),
                         executor,
                         ServiceConfig.MAX_ENVELOPE_SIZE,
-                        () -> true));
+                        () -> true,
+                        UsePqRatchet.NO));
     }
 
     public List<SecureValueRecovery> getSecureValueRecovery() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
index 3858bd06..e1fee99b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
+++ b/lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java
@@ -37,7 +37,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
 
     private static final Logger logger = LoggerFactory.getLogger(ContactRecordProcessor.class);
 
-    private static final Pattern E164_PATTERN = Pattern.compile("^\\+[1-9]\\d{0,18}$");
+    private static final Pattern E164_PATTERN = Pattern.compile("^\\+[1-9]\\d{6,18}$");
 
     private final ACI selfAci;
     private final PNI selfPni;

From 7c7fc76a649678e9f77f1fcaeaaf4efdf9cc3cd9 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 14 Jul 2025 16:42:06 +0200
Subject: [PATCH 662/672] Add support for sending view once messages

Closes #1812
---
 client/src/cli.rs                                            | 3 +++
 client/src/jsonrpc.rs                                        | 1 +
 client/src/main.rs                                           | 2 ++
 lib/src/main/java/org/asamk/signal/manager/api/Message.java  | 1 +
 .../java/org/asamk/signal/manager/internal/ManagerImpl.java  | 1 +
 man/signal-cli.1.adoc                                        | 5 +++++
 src/main/java/org/asamk/signal/commands/SendCommand.java     | 5 +++++
 src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java      | 3 +++
 8 files changed, 21 insertions(+)

diff --git a/client/src/cli.rs b/client/src/cli.rs
index 90809e1b..7fa5d1c5 100644
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -179,6 +179,9 @@ pub enum CliCommands {
         #[arg(short = 'a', long)]
         attachment: Vec<String>,
 
+        #[arg(long)]
+        view_once: bool,
+
         #[arg(long)]
         mention: Vec<String>,
 
diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index 6874652d..fe0dc668 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -183,6 +183,7 @@ pub trait Rpc {
         endSession: bool,
         message: String,
         attachments: Vec<String>,
+        view_once: bool,
         mentions: Vec<String>,
         textStyle: Vec<String>,
         quoteTimestamp: Option<u64>,
diff --git a/client/src/main.rs b/client/src/main.rs
index f82ee237..ac12331d 100644
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -144,6 +144,7 @@ async fn handle_command(
             end_session,
             message,
             attachment,
+            view_once,
             mention,
             text_style,
             quote_timestamp,
@@ -170,6 +171,7 @@ async fn handle_command(
                     end_session,
                     message.unwrap_or_default(),
                     attachment,
+                    view_once,
                     mention,
                     text_style,
                     quote_timestamp,
diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Message.java b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
index 48277e6d..9b372451 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/Message.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Message.java
@@ -6,6 +6,7 @@ import java.util.Optional;
 public record Message(
         String messageText,
         List<String> attachments,
+        boolean viewOnce,
         List<Mention> mentions,
         Optional<Quote> quote,
         Optional<Sticker> sticker,
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
index eb672d24..726d0aaf 100644
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -810,6 +810,7 @@ public class ManagerImpl implements Manager {
         } else if (!additionalAttachments.isEmpty()) {
             messageBuilder.withAttachments(additionalAttachments);
         }
+        messageBuilder.withViewOnce(message.viewOnce());
         if (!message.mentions().isEmpty()) {
             messageBuilder.withMentions(resolveMentions(message.mentions()));
         }
diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 32321095..73286aac 100644
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -316,6 +316,11 @@ Data URI encoded attachments must follow the RFC 2397.
 Additionally a file name can be added:
 e.g.: `data:<MIME-TYPE>;filename=<FILENAME>;base64,<BASE64 ENCODED DATA>`
 
+*--view-once*::
+Send the message as a view once message.
+A conformant client will only allow the receiver to view the message once.
+View Once is only supported for messages that include an image attachment.
+
 *--sticker* STICKER::
 Send a sticker of a locally known sticker pack (syntax: stickerPackId:stickerId).
 Shouldn't be used together with `-m` as the official clients don't support this.
diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index cce1d21e..e022723e 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -66,6 +66,9 @@ public class SendCommand implements JsonRpcLocalCommand {
                 .help("Add an attachment. "
                         + "Can be either a file path or a data URI. Data URI encoded attachments must follow the RFC 2397. Additionally a file name can be added, e.g. "
                         + "data:<MIME-TYPE>;filename=<FILENAME>;base64,<BASE64 ENCODED DATA>.");
+        subparser.addArgument("--view-once")
+                .action(Arguments.storeTrue())
+                .help("Send the message as a view once message");
         subparser.addArgument("-e", "--end-session", "--endsession")
                 .help("Clear session state and send end session message.")
                 .action(Arguments.storeTrue());
@@ -164,6 +167,7 @@ public class SendCommand implements JsonRpcLocalCommand {
         if (attachments == null) {
             attachments = List.of();
         }
+        final var viewOnce = ns.getBoolean("view-once");
 
         final var selfNumber = m.getSelfNumber();
 
@@ -239,6 +243,7 @@ public class SendCommand implements JsonRpcLocalCommand {
         try {
             final var message = new Message(messageText,
                     attachments,
+                    viewOnce,
                     mentions,
                     Optional.ofNullable(quote),
                     Optional.ofNullable(sticker),
diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index ac77df99..725df8b1 100644
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -236,6 +236,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
         try {
             final var message = new Message(messageText,
                     attachments,
+                    false,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
@@ -399,6 +400,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
         try {
             final var message = new Message(messageText,
                     attachments,
+                    false,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),
@@ -444,6 +446,7 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
         try {
             final var message = new Message(messageText,
                     attachments,
+                    false,
                     List.of(),
                     Optional.empty(),
                     Optional.empty(),

From 3e981d66e9534db61953078b3ca8faf16ed9dd2d Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 14 Jul 2025 18:52:41 +0200
Subject: [PATCH 663/672] Fix null pointer regression

---
 src/main/java/org/asamk/signal/commands/SendCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index e022723e..98051b23 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -167,7 +167,7 @@ public class SendCommand implements JsonRpcLocalCommand {
         if (attachments == null) {
             attachments = List.of();
         }
-        final var viewOnce = ns.getBoolean("view-once");
+        final var viewOnce = Boolean.TRUE.equals(ns.getBoolean("view-once"));
 
         final var selfNumber = m.getSelfNumber();
 

From 783201d12e7ef621554fe16640ddfd7f0534ff37 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 16 Jul 2025 19:17:21 +0200
Subject: [PATCH 664/672] Fix incorrect error message

---
 src/main/java/org/asamk/signal/App.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java
index cf731ea9..6352aa13 100644
--- a/src/main/java/org/asamk/signal/App.java
+++ b/src/main/java/org/asamk/signal/App.java
@@ -292,7 +292,7 @@ public class App {
         } catch (IOException e) {
             throw new IOErrorException("Failed to load local accounts file", e);
         } catch (AccountCheckException e) {
-            throw new UnexpectedErrorException("Failed to load local accounts file", e);
+            throw new UnexpectedErrorException("Failed to load account file", e);
         }
     }
 

From 2225e69277a72926fd201269c554553f95af9163 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 16 Jul 2025 19:37:03 +0200
Subject: [PATCH 665/672] Update sqlite-jdbc

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4edfe40a..fec44a43 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.18"
 
 signalservice = "com.github.turasa:signal-service-java:2.15.3_unofficial_127"
-sqlite = "org.xerial:sqlite-jdbc:3.50.1.0"
+sqlite = "org.xerial:sqlite-jdbc:3.50.2.0"
 hikari = "com.zaxxer:HikariCP:6.3.0"
 junit-jupiter = "org.junit.jupiter:junit-jupiter:5.13.2"
 junit-launcher = "org.junit.platform:junit-platform-launcher:1.13.2"

From dbc454ba9e71b6ed98e8b3a9682fefe849773263 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 16 Jul 2025 19:40:10 +0200
Subject: [PATCH 666/672] Bump version to 0.13.18

---
 CHANGELOG.md                          | 18 +++++++++++++++++-
 build.gradle.kts                      |  2 +-
 data/org.asamk.SignalCli.metainfo.xml |  3 +++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5437bd63..bb795535 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 # Changelog
 
-## [Unreleased]
+## [0.13.18] - 2025-07-16
+
+Requires libsignal-client version 0.76.3.
+
+### Added
+
+- Added `--view-once` parameter to send command to send view once images
+
+### Fixed
+
+- Handle rate limit exception correctly when querying usernames
+
+### Improved
+
+- Shut down when dbus daemon connection goes away unexpectedly
+- In daemon mode, exit immediately if account check fails at startup
+- Improve behavior when sending to devices that have no available prekeys
 
 ## [0.13.17] - 2025-06-28
 
diff --git a/build.gradle.kts b/build.gradle.kts
index c3568444..97853d19 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.18-SNAPSHOT"
+    version = "0.13.18"
 }
 
 java {
diff --git a/data/org.asamk.SignalCli.metainfo.xml b/data/org.asamk.SignalCli.metainfo.xml
index 95646534..c6c07411 100644
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/data/org.asamk.SignalCli.metainfo.xml
@@ -45,6 +45,9 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
+        <release version="0.13.18" date="2025-07-16">
+            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.18</url>
+        </release>
         <release version="0.13.17" date="2025-06-28">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.13.17</url>
         </release>

From a0960fcabd4b4a81e84feb83773e01160acec7e4 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Fri, 19 Apr 2024 19:25:27 +0200
Subject: [PATCH 667/672] Prepare next release

---
 CHANGELOG.md     | 2 ++
 build.gradle.kts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb795535..74d0bdc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [Unreleased]
+
 ## [0.13.18] - 2025-07-16
 
 Requires libsignal-client version 0.76.3.
diff --git a/build.gradle.kts b/build.gradle.kts
index 97853d19..ea69d97e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 allprojects {
     group = "org.asamk"
-    version = "0.13.18"
+    version = "0.13.19-SNAPSHOT"
 }
 
 java {

From be48afb2b5b4b138f09dcb112541fa56106a16d6 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 16 Jul 2025 20:56:02 +0200
Subject: [PATCH 668/672] Fix container build

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b1f4027d..b7ce03f1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -182,7 +182,7 @@ jobs:
           tar xf ./"${ARCHIVE_DIR}"/*.tar.gz
           rm -r signal-cli-archive-* signal-cli-native
           mkdir -p build/install/
-          mv ./signal-cli-*/ build/install/signal-cli
+          mv ./signal-cli-"${GITHUB_REF_NAME#v}"/ build/install/signal-cli
 
       - name: Build Image
         id: build_image

From f9a36c6e0404d06bd396b24b5ea699e49ed29b89 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Wed, 16 Jul 2025 20:59:26 +0200
Subject: [PATCH 669/672] Fix send parameters to be all camel case

Fixes #1814
---
 client/src/jsonrpc.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index fe0dc668..66ef9d9d 100644
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -183,7 +183,7 @@ pub trait Rpc {
         endSession: bool,
         message: String,
         attachments: Vec<String>,
-        view_once: bool,
+        viewOnce: bool,
         mentions: Vec<String>,
         textStyle: Vec<String>,
         quoteTimestamp: Option<u64>,
@@ -192,10 +192,10 @@ pub trait Rpc {
         quoteMention: Vec<String>,
         quoteTextStyle: Vec<String>,
         quoteAttachment: Vec<String>,
-        preview_url: Option<String>,
-        preview_title: Option<String>,
-        preview_description: Option<String>,
-        preview_image: Option<String>,
+        previewUrl: Option<String>,
+        previewTitle: Option<String>,
+        previewDescription: Option<String>,
+        previewImage: Option<String>,
         sticker: Option<String>,
         storyTimestamp: Option<u64>,
         storyAuthor: Option<String>,

From b453d7a0b9c6617d44d802c8ed310c17c1fe9257 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sat, 2 Aug 2025 12:05:01 +0200
Subject: [PATCH 670/672] Add new svr2 mrenclave

---
 .../java/org/asamk/signal/manager/config/LiveConfig.java   | 7 ++++---
 .../org/asamk/signal/manager/config/StagingConfig.java     | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
index 890d7081..c76da017 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@@ -28,8 +28,9 @@ class LiveConfig {
     private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE_LEGACY = "9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570";
-    private static final String SVR2_MRENCLAVE = "093be9ea32405e85ae28dbb48eb668aebeb7dbe29517b9b86ad4bec4dfe0e6a6";
+    private static final String SVR2_MRENCLAVE_LEGACY_LEGACY = "9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570";
+    private static final String SVR2_MRENCLAVE_LEGACY = "093be9ea32405e85ae28dbb48eb668aebeb7dbe29517b9b86ad4bec4dfe0e6a6";
+    private static final String SVR2_MRENCLAVE = "29cd63c87bea751e3bfd0fbd401279192e2e5c99948b4ee9437eafc4968355fb";
 
     private static final String URL = "https://chat.signal.org";
     private static final String CDN_URL = "https://cdn.signal.org";
@@ -91,7 +92,7 @@ class LiveConfig {
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY));
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY, SVR2_MRENCLAVE_LEGACY_LEGACY));
     }
 
     private LiveConfig() {
diff --git a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
index 6d8f08c7..e25fe21b 100644
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@@ -28,8 +28,9 @@ class StagingConfig {
     private static final byte[] UNIDENTIFIED_SENDER_TRUST_ROOT = Base64.getDecoder()
             .decode("BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx");
     private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
-    private static final String SVR2_MRENCLAVE_LEGACY = "38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3";
-    private static final String SVR2_MRENCLAVE = "2e8cefe6e3f389d8426adb24e9b7fb7adf10902c96f06f7bbcee36277711ed91";
+    private static final String SVR2_MRENCLAVE_LEGACY_LEGACY = "38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3";
+    private static final String SVR2_MRENCLAVE_LEGACY = "2e8cefe6e3f389d8426adb24e9b7fb7adf10902c96f06f7bbcee36277711ed91";
+    private static final String SVR2_MRENCLAVE = "a75542d82da9f6914a1e31f8a7407053b99cc99a0e7291d8fbd394253e19b036";
 
     private static final String URL = "https://chat.staging.signal.org";
     private static final String CDN_URL = "https://cdn-staging.signal.org";
@@ -91,7 +92,7 @@ class StagingConfig {
                 createDefaultServiceConfiguration(interceptors),
                 getUnidentifiedSenderTrustRoot(),
                 CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY));
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY, SVR2_MRENCLAVE_LEGACY_LEGACY));
     }
 
     private StagingConfig() {

From 42f10670b654b2314e05fee142ec6b18a8196362 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 17 Aug 2025 17:35:14 +0200
Subject: [PATCH 671/672] Replace deprecated groovy utils

---
 buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt b/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
index eb74acb2..ae8ae4de 100644
--- a/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
+++ b/buildSrc/src/main/kotlin/CheckLibVersionsPlugin.kt
@@ -1,12 +1,10 @@
 @file:Suppress("DEPRECATION")
 
-import groovy.util.XmlSlurper
-import groovy.util.slurpersupport.GPathResult
-import org.codehaus.groovy.runtime.ResourceGroovyMethods
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.artifacts.Dependency
+import javax.xml.parsers.DocumentBuilderFactory
 
 class CheckLibVersionsPlugin : Plugin<Project> {
     override fun apply(project: Project) {
@@ -28,10 +26,10 @@ class CheckLibVersionsPlugin : Plugin<Project> {
         val name = dependency.name
         val metaDataUrl = "https://repo1.maven.org/maven2/$path/$name/maven-metadata.xml"
         try {
-            val url = ResourceGroovyMethods.toURL(metaDataUrl)
-            val metaDataText = ResourceGroovyMethods.getText(url)
-            val metadata = XmlSlurper().parseText(metaDataText)
-            val newest = (metadata.getProperty("versioning") as GPathResult).getProperty("latest")
+            val dbf = DocumentBuilderFactory.newInstance()
+            val db = dbf.newDocumentBuilder()
+            val doc = db.parse(metaDataUrl);
+            val newest = doc.getElementsByTagName("latest").item(0).textContent
             if (version != newest.toString()) {
                 println("UPGRADE {\"group\": \"$group\", \"name\": \"$name\", \"current\": \"$version\", \"latest\": \"$newest\"}")
             }

From f6d81e3c056cb42dd8e21b6ebd46d7cc119be221 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Sun, 17 Aug 2025 17:35:59 +0200
Subject: [PATCH 672/672] Update gradle

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 43764 -> 45457 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1b33c55baabb587c669f562ae36f953de2481846..8bdaf60c75ab801e22807dde59e12a8735a34077 100644
GIT binary patch
delta 37256
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

delta 35551
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 002b867c..2a84e188 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 23d15a93..ef07e016 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.