.github/workflows/dependency-graph.yml

@@ -1,27 +0,0 @@
-name: dependency-graph
-
-on:
-  push:
-    branches:
-      - "**"
-
-permissions: {}
-
-jobs:
-  submit-dependency-graph:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v6
-      - name: Set up JDK
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'zulu'
-          java-version: '25'
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
-        with:
-          dependency-graph: generate-and-submit
-      - name: Generate dependency graph
-        run: ./gradlew --no-daemon dependencies

.github/workflows/release.yml

@@ -35,19 +35,55 @@ jobs:
           mv ./signal-cli-archive-${{ env.ARCHIVE_JAVA_VERSION }}/* .
           echo "version=$(cat VERSION)" >> $GITHUB_OUTPUT
 
-      - name: Create draft release and upload assets
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
+        with:
-          gh release create "v${{ steps.version.outputs.version }}" \
+          tag_name: v${{ steps.version.outputs.version }} # note: added `v`
-            --repo "${{ github.repository }}" \
+          release_name: v${{ steps.version.outputs.version }} # note: added `v`
-            --title "v${{ steps.version.outputs.version }}" \
+          draft: true
-            --draft \
+
-            --verify-tag \
+      - name: Upload archive
-            "signal-cli-${{ steps.version.outputs.version }}.tar.gz" \
+        uses: actions/upload-release-asset@v1
-            "signal-cli-${{ steps.version.outputs.version }}-Linux-native.tar.gz" \
+        env:
-            "signal-cli-${{ steps.version.outputs.version }}-Linux-client.tar.gz" \
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            "signal-cli-${{ steps.version.outputs.version }}-json-schemas.tar.gz"
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: signal-cli-${{ steps.version.outputs.version }}.tar.gz
+          asset_name: signal-cli-${{ steps.version.outputs.version }}.tar.gz
+          asset_content_type: application/x-compressed-tar # .tar.gz
+
+      - name: Upload Linux native 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.version.outputs.version }}-Linux-native.tar.gz
+          asset_name: signal-cli-${{ steps.version.outputs.version }}-Linux-native.tar.gz
+          asset_content_type: application/x-compressed-tar # .tar.gz
+
+      - name: Upload Linux client 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.version.outputs.version }}-Linux-client.tar.gz
+          asset_name: signal-cli-${{ steps.version.outputs.version }}-Linux-client.tar.gz
+          asset_content_type: application/x-compressed-tar # .tar.gz
+
+      - name: Upload JSON schemas 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.version.outputs.version }}-json-schemas.tar.gz
+          asset_name: signal-cli-${{ steps.version.outputs.version }}-json-schemas.tar.gz
+          asset_content_type: application/x-compressed-tar # .tar.gz
 
   build-container:
     needs: release
@@ -68,7 +104,7 @@ jobs:
 
       - name: Build Image
         id: build_image
-        uses: redhat-actions/buildah-build@v3
+        uses: redhat-actions/buildah-build@v2
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: latest ${{ github.sha }} ${{ needs.release.outputs.version }}
@@ -76,7 +112,7 @@ jobs:
           oci: true
 
       - name: Push To GHCR
-        uses: redhat-actions/push-to-registry@v3
+        uses: redhat-actions/push-to-registry@v2
         id: push
         with:
           image: ${{ steps.build_image.outputs.image }}
@@ -109,7 +145,7 @@ jobs:
 
       - name: Build Image
         id: build_image
-        uses: redhat-actions/buildah-build@v3
+        uses: redhat-actions/buildah-build@v2
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: latest-native ${{ github.sha }}-native ${{ needs.release.outputs.version }}-native
@@ -117,7 +153,7 @@ jobs:
           oci: true
 
       - name: Push To GHCR
-        uses: redhat-actions/push-to-registry@v3
+        uses: redhat-actions/push-to-registry@v2
         id: push
         with:
           image: ${{ steps.build_image.outputs.image }}
@@ -150,7 +186,7 @@ jobs:
 
       - name: Build Image
         id: build_image
-        uses: redhat-actions/buildah-build@v3
+        uses: redhat-actions/buildah-build@v2
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: latest-client ${{ github.sha }}-client ${{ needs.release.outputs.version }}-client
@@ -158,7 +194,7 @@ jobs:
           oci: true
 
       - name: Push To GHCR
-        uses: redhat-actions/push-to-registry@v3
+        uses: redhat-actions/push-to-registry@v2
         id: push
         with:
           image: ${{ steps.build_image.outputs.image }}

CHANGELOG.md

@@ -1,24 +1,5 @@
 # Changelog
 
-## [Unreleased]
-
-## [0.14.7] - 2026-08-01
-
-### Added
-
-- Sync installed sticker packs via storage sync
-
-### Improved
-
-- Set width/height for outgoing image attachments (Thanks @mikesimone)
-- Update to new registration/provisioning API
-
-### Fixed
-
-- Removing self from pending group invite now works if invited via PNI
-- Correctly set needs PNI signature for recipients
-- Fix linking after previous unsuccessful link attempt
-
 ## [0.14.6] - 2026-07-12
 
 ### Added

README.md

@@ -64,20 +64,8 @@ Important: The ACCOUNT is your phone number in international format and must inc
 should start with a "+" sign. (See [Wikipedia](https://en.wikipedia.org/wiki/List_of_country_calling_codes) for a list
 of all country codes.)
 
-* Link to an existing account
-
-  If you have an existing Signal account associated
-  with a number, you can link signal-cli to it with:
-
-      signal-cli link
-
 * Register a number (with SMS verification)
 
-  Alternatively, if you don't have an existing Signal
-  account, you can register one from signal-cli. Note
-  that this will unregister any existing client
-  associated with the same number.
-
       signal-cli -a ACCOUNT register
 
   You can register Signal using a landline number. In this case, you need to follow the procedure below:

build.gradle.kts

@@ -5,12 +5,12 @@ plugins {
     application
     eclipse
     `check-lib-versions`
-    id("org.graalvm.buildtools.native") version "1.1.9"
+    id("org.graalvm.buildtools.native") version "1.1.4"
 }
 
 allprojects {
     group = "org.asamk"
-    version = "0.14.8"
+    version = "0.14.6"
 }
 
 java {

data/org.asamk.SignalCli.metainfo.xml

@@ -45,9 +45,6 @@
         <content_attribute id="social-chat">intense</content_attribute>
     </content_rating>
     <releases>
-        <release version="0.14.7" date="2026-08-01">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.7</url>
-        </release>
         <release version="0.14.6" date="2026-07-12">
             <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.6</url>
         </release>

gradle/libs.versions.toml

@@ -1,14 +1,13 @@
 [versions]
 slf4j = "2.0.18"
-coroutines = "1.10.2"
+junit = "6.1.0"
-junit = "6.1.2"
+micronaut-json-schema = "2.0.1"
-micronaut-json-schema = "2.1.0"
+micronaut-core = "5.0.0"
-micronaut-core = "5.1.10"
+signal-service = "2.15.3_unofficial_149"
-signal-service = "2.15.3_unofficial_152"
 
 [libraries]
-bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.85"
+bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.84"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.22.1"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.21.5"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 zxing = "com.google.zxing:core:3.5.4"
@@ -18,12 +17,11 @@ micronaut-json-schema-generator = { module = "io.micronaut.jsonschema:micronaut-
 micronaut-inject-java = { module = "io.micronaut:micronaut-inject-java", version.ref = "micronaut-core" }
 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.6.1"
+logback = "ch.qos.logback:logback-classic:1.5.32"
 
-kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 signalnetwork = { module = "com.github.turasa:signal-network", version.ref = "signal-service" }
-sqlite = "org.xerial:sqlite-jdbc:3.53.2.1"
+sqlite = "org.xerial:sqlite-jdbc:3.53.1.0"
-hikari = "com.zaxxer:HikariCP:7.1.0"
+hikari = "com.zaxxer:HikariCP:7.0.2"
 junit-jupiter-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
 junit-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit" }

lib/build.gradle.kts

@@ -30,7 +30,6 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.sqlite)
     implementation(libs.hikari)
-    compileOnly(libs.kotlinx.coroutines.core)
 
     testImplementation(libs.junit.jupiter)
     testImplementation(platform(libs.junit.jupiter.bom))

lib/src/main/java/org/asamk/signal/manager/Manager.java

@@ -184,10 +184,6 @@ public interface Manager extends Closeable {
 
     void deleteGroup(GroupId groupId) throws IOException;
 
-    SendGroupMessageResults terminateGroup(
-            GroupId groupId
-    ) throws IOException, GroupNotFoundException, NotAGroupMemberException;
-
     Pair<GroupId, SendGroupMessageResults> createGroup(
             String name,
             Set<RecipientIdentifier.Single> members,

lib/src/main/java/org/asamk/signal/manager/api/Contact.java

@@ -15,7 +15,6 @@ public record Contact(
         long muteUntil,
         boolean hideStory,
         boolean isBlocked,
-        long blockedAt,
         boolean isArchived,
         boolean isProfileSharingEnabled,
         boolean isHidden,
@@ -35,7 +34,6 @@ public record Contact(
                 builder.muteUntil,
                 builder.hideStory,
                 builder.isBlocked,
-                builder.blockedAt,
                 builder.isArchived,
                 builder.isProfileSharingEnabled,
                 builder.isHidden,
@@ -60,7 +58,6 @@ public record Contact(
         builder.muteUntil = copy.muteUntil();
         builder.hideStory = copy.hideStory();
         builder.isBlocked = copy.isBlocked();
-        builder.blockedAt = copy.blockedAt();
         builder.isArchived = copy.isArchived();
         builder.isProfileSharingEnabled = copy.isProfileSharingEnabled();
         builder.isHidden = copy.isHidden();
@@ -83,21 +80,6 @@ public record Contact(
         return givenName + " " + familyName;
     }
 
-    public String getDisplayNickname() {
-        final var noNickGivenName = Util.isEmpty(nickNameGivenName);
-        final var noNickFamilyName = Util.isEmpty(nickNameFamilyName);
-
-        if (noNickGivenName && noNickFamilyName) {
-            return null;
-        } else if (noNickGivenName) {
-            return nickNameFamilyName;
-        } else if (noNickFamilyName) {
-            return nickNameGivenName;
-        }
-
-        return nickNameGivenName + " " + nickNameFamilyName;
-    }
-
     public static final class Builder {
 
         private String givenName;
@@ -112,7 +94,6 @@ public record Contact(
         private long muteUntil;
         private boolean hideStory;
         private boolean isBlocked;
-        private long blockedAt;
         private boolean isArchived;
         private boolean isProfileSharingEnabled;
         private boolean isHidden;
@@ -181,20 +162,10 @@ public record Contact(
         }
 
         public Builder withIsBlocked(final boolean val) {
-            if (val && !isBlocked) {
-                blockedAt = System.currentTimeMillis();
-            } else if (!val) {
-                blockedAt = 0;
-            }
             isBlocked = val;
             return this;
         }
 
-        public Builder withBlockedAt(final long val) {
-            blockedAt = val;
-            return this;
-        }
-
         public Builder withIsArchived(final boolean val) {
             isArchived = val;
             return this;

lib/src/main/java/org/asamk/signal/manager/api/Group.java

@@ -22,8 +22,7 @@ public record Group(
         GroupPermission permissionEditDetails,
         GroupPermission permissionSendMessage,
         boolean isMember,
-        boolean isAdmin,
+        boolean isAdmin
-        boolean isTerminated
 ) {
 
     public static Group from(
@@ -60,7 +59,6 @@ public record Group(
                 groupInfo.getPermissionEditDetails(),
                 groupInfo.getPermissionSendMessage(),
                 groupInfo.isMember(selfRecipientId),
-                groupInfo.isAdmin(selfRecipientId),
+                groupInfo.isAdmin(selfRecipientId));
-                groupInfo.isTerminated());
     }
 }

lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java

@@ -739,10 +739,7 @@ public record MessageEnvelope(
                                 null,
                                 d.getE164(),
                                 null))
-                        .toList(),
+                        .toList(), blockedListMessage.groupIds.stream().map(GroupId::unknownVersion).toList());
-                        blockedListMessage.groups.stream()
-                                .map(group -> GroupId.unknownVersion(group.getGroupId()))
-                                .toList());
             }
         }
 

lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java

@@ -3,15 +3,15 @@ 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.ECPublicKey;
-import org.signal.network.config.HttpProxy;
+import org.whispersystems.signalservice.api.push.TrustStore;
-import org.signal.network.config.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.HttpProxy;
-import org.signal.network.config.SignalCdsiUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
-import org.signal.network.config.SignalProxy;
+import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
-import org.signal.network.config.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalProxy;
-import org.signal.network.config.SignalServiceUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
-import org.signal.network.config.SignalStorageUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
-import org.signal.network.config.SignalSvr2Url;
+import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
-import org.signal.network.config.TrustStore;
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;
 
 import java.util.Base64;
 import java.util.List;

lib/src/main/java/org/asamk/signal/manager/config/ServiceConfig.java

@@ -32,13 +32,7 @@ public class ServiceConfig {
         final var attachmentBackfill = !isPrimaryDevice;
         final var spqr = true;
         final var usernameSyncChangeMessage = !isPrimaryDevice;
-        final var optionalPhoneNumber = !isPrimaryDevice;
+        return new AccountAttributes.Capabilities(true, true, attachmentBackfill, spqr, usernameSyncChangeMessage);
-        return new AccountAttributes.Capabilities(true,
-                true,
-                attachmentBackfill,
-                spqr,
-                usernameSyncChangeMessage,
-                optionalPhoneNumber);
     }
 
     public static ServiceEnvironmentConfig getServiceEnvironmentConfig(

lib/src/main/java/org/asamk/signal/manager/config/ServiceEnvironmentConfig.java

@@ -3,7 +3,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.signal.network.config.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
 import java.util.List;
 

lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java

@@ -3,15 +3,15 @@ package org.asamk.signal.manager.config;
 import org.signal.libsignal.net.Network;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
-import org.signal.network.config.HttpProxy;
+import org.whispersystems.signalservice.api.push.TrustStore;
-import org.signal.network.config.SignalCdnUrl;
+import org.whispersystems.signalservice.internal.configuration.HttpProxy;
-import org.signal.network.config.SignalCdsiUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
-import org.signal.network.config.SignalProxy;
+import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl;
-import org.signal.network.config.SignalServiceConfiguration;
+import org.whispersystems.signalservice.internal.configuration.SignalProxy;
-import org.signal.network.config.SignalServiceUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
-import org.signal.network.config.SignalStorageUrl;
+import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl;
-import org.signal.network.config.SignalSvr2Url;
+import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl;
-import org.signal.network.config.TrustStore;
+import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url;
 
 import java.util.Base64;
 import java.util.List;

lib/src/main/java/org/asamk/signal/manager/config/WhisperTrustStore.java

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.config;
 
-import org.signal.network.config.TrustStore;
+import org.whispersystems.signalservice.api.push.TrustStore;
 
 import java.io.InputStream;
 

lib/src/main/java/org/asamk/signal/manager/helper/AccountHelper.java

@@ -17,7 +17,6 @@ import org.asamk.signal.manager.util.Utils;
 import org.signal.core.models.ServiceId.ACI;
 import org.signal.core.models.ServiceId.PNI;
 import org.signal.core.util.Base64;
-import org.signal.core.util.crypto.DeviceNameCipher;
 import org.signal.libsignal.protocol.IdentityKeyPair;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.NoSessionException;
@@ -33,7 +32,6 @@ 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.messages.multidevice.DeviceInfo;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity;
@@ -41,6 +39,7 @@ 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;
+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;
@@ -48,9 +47,7 @@ import org.whispersystems.signalservice.internal.push.SyncMessage;
 import org.whispersystems.signalservice.internal.push.exceptions.MismatchedDevicesException;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@@ -61,7 +58,6 @@ 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.asamk.signal.manager.util.Utils.handleResponseExceptionSuspend;
 import static org.whispersystems.signalservice.internal.util.Util.isEmpty;
 
 public class AccountHelper {
@@ -325,14 +321,10 @@ public class AccountHelper {
             return;
         }
 
-        handlePniChangeNumberMessage(selfChangeNumber, updatePni, false);
+        handlePniChangeNumberMessage(selfChangeNumber, updatePni);
     }
 
-    public boolean handlePniChangeNumberMessage(
+    public void handlePniChangeNumberMessage(final SyncMessage.PniChangeNumber pniChangeNumber, final PNI updatedPni) {
-            final SyncMessage.PniChangeNumber pniChangeNumber,
-            final PNI updatedPni,
-            final boolean forcePniPreKeyRotation
-    ) {
         if (pniChangeNumber.identityKeyPair != null
                 && pniChangeNumber.registrationId != null
                 && pniChangeNumber.signedPreKey != null) {
@@ -346,19 +338,10 @@ public class AccountHelper {
                         pniChangeNumber.lastResortKyberPreKey != null
                                 ? new KyberPreKeyRecord(pniChangeNumber.lastResortKyberPreKey.toByteArray())
                                 : null);
-                if (forcePniPreKeyRotation) {
-                    try {
-                        context.getPreKeyHelper().forceRefreshPreKeys(ServiceIdType.PNI);
-                    } catch (IOException e) {
-                        logger.warn("Failed to force refresh PNI pre keys after PNI change sync", e);
-                    }
-                }
-                return true;
             } catch (Exception e) {
                 logger.warn("Failed to handle change number message", e);
             }
         }
-        return false;
     }
 
     public static final int USERNAME_MIN_LENGTH = 3;
@@ -400,17 +383,13 @@ public class AccountHelper {
     }
 
     private void reserveUsername(final List<Username> candidates) throws IOException {
-        final var candidateHashes = new ArrayList<byte[]>();
+        final var candidateHashes = new ArrayList<String>();
         for (final var candidate : candidates) {
-            candidateHashes.add(candidate.getHash());
+            candidateHashes.add(Base64.encodeUrlSafeWithoutPadding(candidate.getHash()));
         }
 
-        final var usernameHash = handleResponseException(dependencies.getAccountApi().reserveUsername(candidateHashes));
+        final var response = handleResponseException(dependencies.getAccountApi().reserveUsername(candidateHashes));
-        final var hashIndex = candidateHashes.stream()
+        final var hashIndex = candidateHashes.indexOf(response.getUsernameHash());
-                .filter(candidateHash -> Arrays.equals(candidateHash, usernameHash))
-                .findFirst()
-                .map(candidateHashes::indexOf)
-                .orElse(-1);
         if (hashIndex == -1) {
             logger.warn("[reserveUsername] The response hash could not be found in our set of candidateHashes.");
             throw new IOException("Unexpected username response");
@@ -503,7 +482,8 @@ public class AccountHelper {
         final var usernameLink = account.getUsernameLink();
 
         if (usernameLink == null) {
-            handleResponseException(dependencies.getAccountApi().reserveUsername(List.of(username.getHash())));
+            handleResponseException(dependencies.getAccountApi()
+                    .reserveUsername(List.of(Base64.encodeUrlSafeWithoutPadding(username.getHash()))));
             logger.debug("[reserveUsername] Successfully reserved existing username.");
             final var linkComponents = confirmUsernameAndCreateNewLink(username);
             account.setUsernameLink(linkComponents);
@@ -528,34 +508,28 @@ public class AccountHelper {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public void deleteUsername() throws IOException {
-        handleResponseException(dependencies.getAccountApi().deleteUsernameHash());
+        handleResponseException(dependencies.getAccountApi().deleteUsername());
         account.setUsernameLink(null);
         account.setUsername(null);
         logger.debug("[deleteUsername] Successfully deleted the username.");
     }
 
     public void setDeviceName(String deviceName) {
-        final var encryptedDeviceName = getEncryptedDeviceName(deviceName);
+        final var privateKey = account.getAciIdentityKeyPair().getPrivateKey();
-        account.setEncryptedDeviceName(Base64.encodeWithoutPadding(encryptedDeviceName));
+        final var encryptedDeviceName = DeviceNameUtil.encryptDeviceName(deviceName, privateKey);
+        account.setEncryptedDeviceName(encryptedDeviceName);
     }
 
     public void setDeviceName(int deviceId, String deviceName) throws IOException {
-        final var encryptedDeviceName = getEncryptedDeviceName(deviceName);
+        final var privateKey = account.getAciIdentityKeyPair().getPrivateKey();
-        handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi()
+        final var encryptedDeviceName = DeviceNameUtil.encryptDeviceName(deviceName, privateKey);
-                .setDeviceName(encryptedDeviceName, deviceId, cont));
+        handleResponseException(dependencies.getLinkDeviceApi().setDeviceName(encryptedDeviceName, deviceId));
         context.getSyncHelper().sendDeviceNameChange(deviceId);
     }
 
-    private byte[] getEncryptedDeviceName(final String deviceName) {
-        final var identityKey = account.getAciIdentityKeyPair();
-        return DeviceNameCipher.encryptDeviceName(deviceName.getBytes(StandardCharsets.UTF_8), identityKey);
-    }
-
     public void refreshDeviceName() throws IOException {
-        final List<DeviceInfo> devices = handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi()
+        final var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
-                .getDevices(cont));
         final var deviceId = account.getDeviceId();
         final var device = devices.stream().filter(d -> d.id == deviceId).findFirst();
         if (device.isPresent()) {
@@ -589,16 +563,14 @@ public class AccountHelper {
                         account.getOrCreatePinMasterKey(),
                         account.getOrCreateMediaRootBackupKey(),
                         verificationCode.getVerificationCode(),
-                        null,
+                        null));
-                        account.getAuthCredentialSalt()));
         account.setMultiDevice(true);
         context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }
 
     public void removeLinkedDevices(int deviceId) throws IOException {
-        handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi().removeDevice(deviceId, cont));
+        handleResponseException(dependencies.getLinkDeviceApi().removeDevice(deviceId));
-        final List<DeviceInfo> devices = handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi()
+        var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
-                .getDevices(cont));
         account.setMultiDevice(devices.size() > 1);
     }
 
@@ -606,14 +578,16 @@ public class AccountHelper {
         var masterKey = account.getOrCreatePinMasterKey();
 
         context.getPinHelper().migrateRegistrationLockPin(account.getRegistrationLockPin(), masterKey);
-        handleResponseException(dependencies.getAccountApi().enableRegistrationLock(masterKey));
+        handleResponseException(dependencies.getAccountApi()
+                .enableRegistrationLock(masterKey.deriveRegistrationLock()));
     }
 
     public void setRegistrationPin(String pin) throws IOException {
         var masterKey = account.getOrCreatePinMasterKey();
 
         context.getPinHelper().setRegistrationLockPin(pin, masterKey);
-        handleResponseException(dependencies.getAccountApi().enableRegistrationLock(masterKey));
+        handleResponseException(dependencies.getAccountApi()
+                .enableRegistrationLock(masterKey.deriveRegistrationLock()));
 
         account.setRegistrationLockPin(pin);
         updateAccountAttributes();
@@ -631,7 +605,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.
-        handleResponseExceptionSuspend(cont -> dependencies.getAccountApi().clearFcmToken(cont));
+        handleResponseException(dependencies.getAccountApi().clearFcmToken());
 
         account.setRegistered(false);
         unregisteredListener.call();

lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java

@@ -85,18 +85,12 @@ public class ContactHelper {
     }
 
     public void setContactBlocked(RecipientId recipientId, boolean blocked) {
-        setContactBlocked(recipientId, blocked, blocked ? System.currentTimeMillis() : 0);
-    }
-
-    public void setContactBlocked(RecipientId recipientId, boolean blocked, long blockedAt) {
         var contact = account.getContactStore().getContact(recipientId);
         final var builder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
         if (blocked) {
             builder.withIsProfileSharingEnabled(false);
         }
-        account.getContactStore()
+        account.getContactStore().storeContact(recipientId, builder.withIsBlocked(blocked).build());
-                .storeContact(recipientId,
-                        builder.withIsBlocked(blocked).withBlockedAt(blocked ? blockedAt : 0).build());
     }
 
     public void setContactProfileSharing(RecipientId recipientId, boolean profileSharing) {

lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java

@@ -363,28 +363,6 @@ public class GroupHelper {
         return results;
     }
 
-    public SendGroupMessageResults terminateGroup(final GroupId groupId) throws IOException, GroupNotFoundException, NotAGroupMemberException {
-        final var group = getGroupForUpdating(groupId);
-        if (!(group instanceof GroupInfoV2)) {
-            throw new IOException("Terminating a group is only supported for Signal group v2 groups.");
-        }
-
-        SendGroupMessageResults results;
-        try {
-            results = terminateGroupV2((GroupInfoV2) group);
-        } catch (ConflictException e) {
-            // Detected conflicting update, refreshing group and trying again
-            results = terminateGroupV2((GroupInfoV2) getGroup(groupId, true));
-        }
-        context.getJobExecutor().enqueueJob(new SyncStorageJob());
-        return results;
-    }
-
-    private SendGroupMessageResults terminateGroupV2(final GroupInfoV2 group) throws IOException {
-        final var groupGroupChangePair = context.getGroupV2Helper().terminateGroup(group);
-        return sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
-    }
-
     public void updateGroupProfileKey(GroupIdV2 groupId) throws GroupNotFoundException, NotAGroupMemberException, IOException {
         var group = getGroupForUpdating(groupId);
 
@@ -459,21 +437,12 @@ public class GroupHelper {
     }
 
     public void setGroupBlocked(final GroupId groupId, final boolean blocked) throws GroupNotFoundException {
-        setGroupBlocked(groupId, blocked, blocked ? System.currentTimeMillis() : 0);
-    }
-
-    public void setGroupBlocked(
-            final GroupId groupId,
-            final boolean blocked,
-            final long blockedAt
-    ) throws GroupNotFoundException {
         var group = getGroup(groupId);
         if (group == null) {
             throw new GroupNotFoundException(groupId);
         }
 
         group.setBlocked(blocked);
-        group.setBlockedAt(blocked ? blockedAt : 0);
         account.getGroupStore().updateGroup(group);
         context.getJobExecutor().enqueueJob(new SyncStorageJob());
     }

lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java

@@ -264,9 +264,6 @@ class GroupV2Helper {
         var pendingMembersList = groupInfoV2.getGroup().pendingMembers;
         final var selfAci = getSelfAci();
         var selfPendingMember = DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, selfAci);
-        if (selfPendingMember.isEmpty()) {
-            selfPendingMember = DecryptedGroupUtil.findPendingByServiceId(pendingMembersList, getSelfPni());
-        }
 
         if (selfPendingMember.isPresent()) {
             return revokeInvites(groupInfoV2, Set.of(selfPendingMember.get()));
@@ -543,14 +540,6 @@ class GroupV2Helper {
         return commitChange(groupInfoV2, change);
     }
 
-    Pair<DecryptedGroup, GroupChangeResponse> terminateGroup(
-            GroupInfoV2 groupInfoV2
-    ) throws IOException {
-        final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        final var change = groupOperations.createTerminateGroup();
-        return commitChange(groupInfoV2, change);
-    }
-
     Pair<DecryptedGroup, GroupChangeResponse> setMemberLabels(
             GroupInfoV2 groupInfoV2,
             String labelEmoji,

lib/src/main/java/org/asamk/signal/manager/helper/IncomingMessageHandler.java

@@ -340,9 +340,9 @@ public final class IncomingMessageHandler {
         }
 
         if (account.getPni().equals(destination.serviceId)) {
-            account.getRecipientStore().markNeedsPniSignature(sender, true);
+            account.getRecipientStore().markNeedsPniSignature(destination.recipientId, true);
         } else if (account.getAci().equals(destination.serviceId)) {
-            account.getRecipientStore().markNeedsPniSignature(sender, false);
+            account.getRecipientStore().markNeedsPniSignature(destination.recipientId, false);
         }
 
         if (content.getReceiptMessage().isPresent()) {
@@ -498,11 +498,10 @@ public final class IncomingMessageHandler {
         }
 
         logger.debug("Verified association of ACI {} with PNI {}", aci, pni);
-        final var recipientId = account.getRecipientTrustedResolver()
+        account.getRecipientTrustedResolver()
                 .resolveRecipientTrusted(Optional.of(ACI.from(aci.getRawUuid())),
                         Optional.of(pni),
                         senderAddress.getNumber());
-        account.getRecipientStore().markPniSignatureVerified(recipientId);
         return true;
     }
 
@@ -626,12 +625,13 @@ public final class IncomingMessageHandler {
             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, individual.getBlockedAt());
+                context.getContactHelper().setContactBlocked(recipientId, true);
             }
-            for (var group : blockedListMessage.groups) {
+            for (var groupId : blockedListMessage.groupIds.stream()
-                final var groupId = GroupId.unknownVersion(group.getGroupId());
+                    .map(GroupId::unknownVersion)
+                    .collect(Collectors.toSet())) {
                 try {
-                    context.getGroupHelper().setGroupBlocked(groupId, true, group.getBlockedAt());
+                    context.getGroupHelper().setGroupBlocked(groupId, true);
                 } catch (GroupNotFoundException e) {
                     logger.warn("BlockedListMessage contained groupID that was not found in GroupStore: {}",
                             groupId.toBase64());
@@ -717,30 +717,11 @@ public final class IncomingMessageHandler {
         }
         if (syncMessage.getPniChangeNumber().isPresent()) {
             final var pniChangeNumber = syncMessage.getPniChangeNumber().get();
-            if (account.isPrimaryDevice()) {
+            logger.debug("Received PNI change number sync message, applying.");
-                logger.warn("Received PNI change number sync message on primary device, ignoring.");
+            final var updatedPniString = envelope.getUpdatedPni();
-            } else if (sender.deviceId() != SignalServiceAddress.DEFAULT_DEVICE_ID) {
+            if (updatedPniString != null && !updatedPniString.isEmpty()) {
-                logger.warn("Received PNI change number sync message from non-primary device {}, ignoring.",
+                final var updatedPni = ServiceId.PNI.parseOrThrow(updatedPniString);
-                        sender.deviceId());
+                context.getAccountHelper().handlePniChangeNumberMessage(pniChangeNumber, updatedPni);
-            } else {
-                final var envelopeServerTimestamp = envelope.getServerDeliveredTimestamp();
-                final var lastAppliedServerTimestamp = account.getLastAppliedPniChangeServerTimestamp();
-                if (envelopeServerTimestamp <= lastAppliedServerTimestamp) {
-                    logger.warn(
-                            "PNI change number sync server timestamp ({}) is not newer than last applied ({}), treating as replay.",
-                            envelopeServerTimestamp,
-                            lastAppliedServerTimestamp);
-                } else {
-                    final var updatedPniString = envelope.getUpdatedPni();
-                    if (updatedPniString != null && !updatedPniString.isEmpty()) {
-                        final var updatedPni = ServiceId.PNI.parseOrThrow(updatedPniString);
-                        final var applied = context.getAccountHelper()
-                                .handlePniChangeNumberMessage(pniChangeNumber, updatedPni, true);
-                        if (applied) {
-                            account.setLastAppliedPniChangeServerTimestamp(envelopeServerTimestamp);
-                        }
-                    }
-                }
             }
         }
         if (syncMessage.getDeviceNameChange().isPresent()) {
@@ -836,15 +817,6 @@ public final class IncomingMessageHandler {
             return true;
         }
 
-        if (group.isTerminated()) {
-            return message == null
-                    || message.getBody().isPresent()
-                    || message.getAttachments().isPresent()
-                    || message.getQuote().isPresent()
-                    || message.getPreviews().isPresent()
-                    || message.getMentions().isPresent()
-                    || message.getSticker().isPresent();
-        }
         if (group.isAnnouncementGroup() && !group.isAdmin(recipientId)) {
             return message == null
                     || message.getBody().isPresent()

lib/src/main/java/org/asamk/signal/manager/helper/ReceiveHelper.java

@@ -12,7 +12,6 @@ import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.signal.core.models.ServiceId.ACI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.messages.EnvelopeResponse;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
@@ -148,19 +147,15 @@ public class ReceiveHelper {
                     logger.debug("Retrieved {} envelopes!", batch.size());
                     isWaitingForMessage = false;
                     for (final var it : batch) {
-                        if (it instanceof EnvelopeResponse.Unparseable) {
+                        SignalServiceEnvelope envelope1 = new SignalServiceEnvelope(it.getEnvelope(),
-                            logger.warn("Received unparseable envelope from server, ignoring.");
+                                it.getServerDeliveredTimestamp());
-                        } else if (it instanceof EnvelopeResponse.Parsed parsed) {
+                        final var sourceServiceId = envelope1.getSourceServiceId();
-                            SignalServiceEnvelope envelope1 = new SignalServiceEnvelope(parsed.getEnvelope(),
+                        final var recipientId = sourceServiceId == null
-                                    parsed.getServerDeliveredTimestamp());
+                                ? null
-                            final var sourceServiceId = envelope1.getSourceServiceId();
+                                : account.getRecipientResolver().resolveRecipient(sourceServiceId);
-                            final var recipientId = sourceServiceId == null
+                        logger.trace("Storing new message from {}", recipientId);
-                                    ? null
+                        // store message on disk, before acknowledging receipt to the server
-                                    : account.getRecipientResolver().resolveRecipient(sourceServiceId);
+                        cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
-                            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) {
@@ -172,9 +167,6 @@ public class ReceiveHelper {
                 backOffCounter = 0;
 
                 if (queueNotEmpty) {
-                    if (cachedMessage[0] == null) {
-                        continue;
-                    }
                     if (remainingMessages > 0) {
                         remainingMessages -= 1;
                     }

lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java

@@ -567,7 +567,7 @@ public class SendHelper {
         return results;
     }
 
-    private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException, GroupSendingNotAllowedException {
+    private GroupInfo getGroupForSending(GroupId groupId) throws GroupNotFoundException, NotAGroupMemberException {
         var g = context.getGroupHelper().getGroup(groupId);
         if (g == null) {
             throw new GroupNotFoundException(groupId);
@@ -575,10 +575,6 @@ public class SendHelper {
         if (!g.isMember(account.getSelfRecipientId())) {
             throw new NotAGroupMemberException(groupId, g.getTitle());
         }
-        if (g.isTerminated()) {
-            // Other clients drop messages sent to a terminated group.
-            throw new GroupSendingNotAllowedException(groupId, g.getTitle());
-        }
         if (!g.isProfileSharingEnabled()) {
             g.setProfileSharingEnabled(true);
             account.getGroupStore().updateGroup(g);

lib/src/main/java/org/asamk/signal/manager/helper/StorageHelper.java

@@ -4,17 +4,13 @@ import org.asamk.signal.manager.api.GroupIdV1;
 import org.asamk.signal.manager.api.GroupIdV2;
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.api.Profile;
-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.recipients.RecipientId;
-import org.asamk.signal.manager.storage.stickers.StickerPack;
 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.StickerPackRecordProcessor;
-import org.asamk.signal.manager.syncStorage.StorageSyncLoopDetector;
 import org.asamk.signal.manager.syncStorage.StorageSyncModels;
 import org.asamk.signal.manager.syncStorage.StorageSyncValidations;
 import org.asamk.signal.manager.syncStorage.WriteOperationResult;
@@ -56,19 +52,16 @@ public class StorageHelper {
     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(),
+            ManifestRecord.Identifier.Type.ACCOUNT.getValue());
-            ManifestRecord.Identifier.Type.STICKER_PACK.getValue());
 
     private final SignalAccount account;
     private final SignalDependencies dependencies;
     private final Context context;
-    private final StorageSyncLoopDetector storageSyncLoopDetector;
 
     public StorageHelper(final Context context) {
         this.account = context.getAccount();
         this.dependencies = context.getDependencies();
         this.context = context;
-        this.storageSyncLoopDetector = new StorageSyncLoopDetector(account::isMultiDevice);
     }
 
     public void syncDataWithStorage() throws IOException {
@@ -87,7 +80,6 @@ public class StorageHelper {
         final var storageServiceRepository = dependencies.getStorageServiceRepository();
         final var result = storageServiceRepository.getStorageManifestIfDifferentVersion(storageKey,
                 localManifestVersion);
-        final var fetchedRemoteManifest = result instanceof ManifestIfDifferentVersionResult.DifferentVersion;
 
         var needsForcePush = false;
         final var remoteManifest = switch (result) {
@@ -128,7 +120,6 @@ public class StorageHelper {
         logger.trace("Adding missing storageIds to local data");
         account.getRecipientStore().setMissingStorageIds();
         account.getGroupStore().setMissingStorageIds();
-        account.getStickerStore().setMissingStorageIds();
 
         var needsMultiDeviceSync = false;
 
@@ -150,10 +141,7 @@ public class StorageHelper {
             needsForcePush = true;
         } else {
             try {
-                needsMultiDeviceSync = writeToStorage(storageKey,
+                needsMultiDeviceSync = writeToStorage(storageKey, remoteManifest, needsForcePush);
-                        remoteManifest,
-                        needsForcePush,
-                        fetchedRemoteManifest);
             } catch (RetryLaterException e) {
                 // TODO retry later
                 return;
@@ -234,14 +222,11 @@ public class StorageHelper {
                     final var updated = account.getRecipientStore()
                             .removeStorageIdsFromLocalOnlyUnregisteredRecipients(connection,
                                     oldUnregisteredLocalOnlyIds);
-                    final var updatedStickers = account.getStickerStore()
-                            .removeStorageIdsFromLocalOnlyDeletedStickerPacks(connection, oldUnregisteredLocalOnlyIds);
 
-                    if (updated > 0 || updatedStickers > 0) {
+                    if (updated > 0) {
                         logger.warn(
-                                "Found {} recipients and {} sticker packs that were deleted remotely but only marked deleted locally. Removed those from local store.",
+                                "Found {} records that were deleted remotely but only marked unregistered locally. Removed those from local store.",
-                                updated,
+                                updated);
-                                updatedStickers);
                     }
                 }
 
@@ -295,8 +280,7 @@ public class StorageHelper {
     private boolean writeToStorage(
             final StorageKey storageKey,
             final SignalStorageManifest remoteManifest,
-            final boolean needsForcePush,
+            final boolean needsForcePush
-            final boolean fetchedRemoteManifest
     ) throws IOException, RetryLaterException {
         final WriteOperationResult remoteWriteOperation;
         try (final var connection = account.getAccountDatabase().getConnection()) {
@@ -334,19 +318,6 @@ public class StorageHelper {
 
         if (remoteWriteOperation.isEmpty()) {
             logger.debug("No remote writes needed. Still at version: {}", remoteManifest.version);
-            storageSyncLoopDetector.onConverged();
-            return false;
-        }
-
-        final var loopCheck = storageSyncLoopDetector.onWriteAttempt(remoteWriteOperation,
-                fetchedRemoteManifest,
-                false);
-        if (loopCheck instanceof StorageSyncLoopDetector.Decision.Denied denied) {
-            logger.warn(
-                    "Skipping remote write, another device is likely undoing it. Cause: {}, level: {}. WriteOperationResult :: {}",
-                    denied.cause(),
-                    denied.level(),
-                    remoteWriteOperation);
             return false;
         }
 
@@ -365,18 +336,11 @@ public class StorageHelper {
                         remoteWriteOperation.deletes());
         switch (result) {
             case WriteStorageRecordsResult.ConflictError ignored -> {
-                storageSyncLoopDetector.onWriteFailed();
                 logger.debug("Hit a conflict when trying to resolve the conflict! Retrying.");
                 throw new RetryLaterException();
             }
-            case WriteStorageRecordsResult.NetworkError networkError -> {
+            case WriteStorageRecordsResult.NetworkError networkError -> throw networkError.getException();
-                storageSyncLoopDetector.onWriteFailed();
+            case WriteStorageRecordsResult.StatusCodeError statusCodeError -> throw statusCodeError.getException();
-                throw networkError.getException();
-            }
-            case WriteStorageRecordsResult.StatusCodeError statusCodeError -> {
-                storageSyncLoopDetector.onWriteFailed();
-                throw statusCodeError.getException();
-            }
             case WriteStorageRecordsResult.Success ignored -> {
                 logger.debug("Saved new manifest. Now at version: {}", remoteWriteOperation.manifest().version);
                 storeManifestLocally(remoteWriteOperation.manifest());
@@ -402,7 +366,6 @@ public class StorageHelper {
         final Map<RecipientId, StorageId> newContactStorageIds;
         final Map<GroupIdV1, StorageId> newGroupV1StorageIds;
         final Map<GroupIdV2, StorageId> newGroupV2StorageIds;
-        final Map<StickerPackId, StorageId> newStickerPackStorageIds;
 
         try (final var connection = account.getAccountDatabase().getConnection()) {
             connection.setAutoCommit(false);
@@ -449,19 +412,6 @@ public class StorageHelper {
                         new StorageRecord.Builder().groupV2(record).build()));
             }
 
-            final var stickerPacks = account.getStickerStore()
-                    .getStickerPacks(connection)
-                    .stream()
-                    .filter(pack -> pack.storageId() != null)
-                    .toList();
-            newStickerPackStorageIds = generateStickerPackStorageIds(stickerPacks);
-            for (final var stickerPack : stickerPacks) {
-                final var storageId = newStickerPackStorageIds.get(stickerPack.packId());
-                final var record = StorageSyncModels.localToRemoteRecord(stickerPack);
-                newStorageRecords.add(new SignalStorageRecord(storageId,
-                        new StorageRecord.Builder().stickerPack(record).build()));
-            }
-
             connection.commit();
         } catch (SQLException e) {
             throw new RuntimeException("Failed to sync remote storage", e);
@@ -512,7 +462,6 @@ public class StorageHelper {
             connection.setAutoCommit(false);
             account.getRecipientStore().updateStorageIds(connection, newContactStorageIds);
             account.getGroupStore().updateStorageIds(connection, newGroupV1StorageIds, newGroupV2StorageIds);
-            account.getStickerStore().updateStorageIds(connection, newStickerPackStorageIds);
 
             // delete all unknown storage ids
             account.getUnknownStorageIdStore().deleteAllUnknownStorageIds(connection);
@@ -545,14 +494,6 @@ public class StorageHelper {
                         _ -> StorageId.forGroupV2(KeyUtils.createRawStorageId())));
     }
 
-    private Map<StickerPackId, StorageId> generateStickerPackStorageIds(
-            final List<StickerPack> stickerPacks
-    ) {
-        return stickerPacks.stream()
-                .collect(Collectors.toMap(stickerPack -> stickerPack.packId(),
-                        _ -> StorageId.forStickerPack(KeyUtils.createRawStorageId())));
-    }
-
     private void storeManifestLocally(
             final SignalStorageManifest remoteManifest
     ) {
@@ -592,7 +533,6 @@ public class StorageHelper {
         storageIds.addAll(account.getUnknownStorageIdStore().getUnknownStorageIds(connection));
         storageIds.addAll(account.getGroupStore().getStorageIds(connection));
         storageIds.addAll(account.getRecipientStore().getStorageIds(connection));
-        storageIds.addAll(account.getStickerStore().getStorageIds(connection));
         storageIds.add(account.getRecipientStore().getSelfStorageId(connection));
         return storageIds;
     }
@@ -641,14 +581,6 @@ public class StorageHelper {
                         account.getUsernameLink());
                 yield new SignalStorageRecord(storageId, new StorageRecord.Builder().account(record).build());
             }
-            case ManifestRecord.Identifier.Type.STICKER_PACK -> {
-                final var stickerPack = account.getStickerStore().getStickerPack(connection, storageId);
-                if (stickerPack == null) {
-                    throw new AssertionError("Missing local sticker pack model for storage id: " + storageId);
-                }
-                final var record = StorageSyncModels.localToRemoteRecord(stickerPack);
-                yield new SignalStorageRecord(storageId, new StorageRecord.Builder().stickerPack(record).build());
-            }
             case null, default -> {
                 throw new AssertionError("Got unknown local storage record type: " + storageId);
             }
@@ -714,14 +646,6 @@ public class StorageHelper {
         final var groupV1RecordProcessor = new GroupV1RecordProcessor(account, connection);
         final var groupV2RecordProcessor = new GroupV2RecordProcessor(account, connection);
         final var contactRecordProcessor = new ContactRecordProcessor(account, connection, context.getJobExecutor());
-        final var stickerPackRecordProcessor = new StickerPackRecordProcessor(account, connection);
-
-        final var contactRecords = records.stream()
-                .filter(record -> record.getProto().contact != null)
-                .map(record -> StorageRecordConvertersKt.toSignalContactRecord(record.getProto().contact,
-                        record.getId()))
-                .toList();
-        contactRecordProcessor.prepare(contactRecords);
 
         for (final var record : records) {
             if (record.getProto().account != null) {
@@ -740,10 +664,6 @@ public class StorageHelper {
                 logger.debug("Reading record {} of type contact", record.getId());
                 contactRecordProcessor.process(StorageRecordConvertersKt.toSignalContactRecord(record.getProto().contact,
                         record.getId()));
-            } else if (record.getProto().stickerPack != null) {
-                logger.debug("Reading record {} of type stickerPack", record.getId());
-                stickerPackRecordProcessor.process(StorageRecordConvertersKt.toSignalStickerPackRecord(record.getProto().stickerPack,
-                        record.getId()));
             } else {
                 unknownRecords.add(record.getId());
             }
@@ -752,7 +672,6 @@ public class StorageHelper {
         processedRecords.addAll(groupV1RecordProcessor.getUpdatedStorageIds());
         processedRecords.addAll(groupV2RecordProcessor.getUpdatedStorageIds());
         processedRecords.addAll(contactRecordProcessor.getUpdatedStorageIds());
-        processedRecords.addAll(stickerPackRecordProcessor.getUpdatedStorageIds());
 
         return new Pair<>(unknownRecords, processedRecords);
     }

lib/src/main/java/org/asamk/signal/manager/helper/SyncHelper.java

@@ -237,19 +237,18 @@ public class SyncHelper {
                 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),
+                            address.number().orElse(null)));
-                            record.second().blockedAt()));
                 }
             }
         }
-        var groups = new ArrayList<BlockedListMessage.Group>();
+        var groupIds = new ArrayList<byte[]>();
         for (var record : account.getGroupStore().getGroups()) {
             if (record.isBlocked()) {
-                groups.add(new BlockedListMessage.Group(record.getGroupId().serialize(), record.getBlockedAt()));
+                groupIds.add(record.getGroupId().serialize());
             }
         }
         return context.getSendHelper()
-                .sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groups)));
+                .sendSyncMessage(SignalServiceSyncMessage.forBlocked(new BlockedListMessage(addresses, groupIds)));
     }
 
     public SendMessageResult sendVerifiedMessage(

lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java

@@ -98,10 +98,8 @@ import org.asamk.signal.manager.util.StickerUtils;
 import org.signal.core.models.ServiceId;
 import org.signal.core.models.ServiceId.ACI;
 import org.signal.core.models.ServiceId.PNI;
+import org.signal.core.util.Base64;
 import org.signal.core.util.Hex;
-import org.signal.core.util.crypto.DeviceName;
-import org.signal.core.util.crypto.DeviceNameCipher;
-import org.signal.libsignal.net.LinkedDevice;
 import org.signal.libsignal.protocol.InvalidMessageException;
 import org.signal.libsignal.protocol.NoSessionException;
 import org.signal.libsignal.usernames.BaseUsernameException;
@@ -122,8 +120,10 @@ import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 import org.whispersystems.signalservice.api.messages.calls.IceUpdateMessage;
 import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
 import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMessage;
+import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
 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.StreamDetails;
 import org.whispersystems.signalservice.internal.util.Util;
 
@@ -160,7 +160,6 @@ 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.asamk.signal.manager.util.Utils.handleResponseExceptionSuspend;
 import static org.signal.core.util.StringExtensionsKt.splitByByteLength;
 
 public class ManagerImpl implements Manager {
@@ -484,26 +483,23 @@ public class ManagerImpl implements Manager {
 
     @Override
     public List<Device> getLinkedDevices() throws IOException {
-        final List<LinkedDevice> devices = handleResponseExceptionSuspend(cont -> dependencies.getLinkDeviceApi()
+        var devices = handleResponseException(dependencies.getLinkDeviceApi().getDevices());
-                .getDevices(cont));
         account.setMultiDevice(devices.size() > 1);
-        var identityKey = account.getAciIdentityKeyPair();
+        var identityKey = account.getAciIdentityKeyPair().getPrivateKey();
         return devices.stream().map(d -> {
-            String deviceName = null;
+            String deviceName = d.getName();
-            if (d.getEncryptedName() != null && d.getEncryptedName().length > 0) {
+            if (deviceName != null) {
                 try {
-                    deviceName = new String(DeviceNameCipher.decryptDeviceName(DeviceName.ADAPTER.decode(d.getEncryptedName()),
+                    deviceName = DeviceNameUtil.decryptDeviceName(deviceName, identityKey);
-                            identityKey), StandardCharsets.UTF_8);
+                } catch (IOException e) {
-                } catch (Exception e) {
                     logger.debug("Failed to decrypt device name, maybe plain text?", e);
-                    deviceName = new String(d.getEncryptedName(), StandardCharsets.UTF_8);
                 }
             }
             final var createdAt = getPlaintextCreatedAt(d);
             return new Device(d.getId(),
                     deviceName,
                     createdAt == null ? 0 : createdAt,
-                    d.getLastSeen().toEpochMilli(),
+                    d.getLastSeen(),
                     d.getId() == account.getDeviceId());
         }).toList();
     }
@@ -523,7 +519,7 @@ public class ManagerImpl implements Manager {
         }
     }
 
-    private Long getPlaintextCreatedAt(LinkedDevice d) {
+    private Long getPlaintextCreatedAt(DeviceInfo d) {
         final var DECRYPTION_INFO = "deviceCreatedAt";
         var identityKey = account.getAciIdentityKeyPair().getPrivateKey();
         try {
@@ -531,9 +527,8 @@ public class ManagerImpl implements Manager {
             var associatedData = new ByteArrayOutputStream();
             associatedData.write(d.getId());
             associatedData.write(ByteBuffer.allocate(4).putInt(d.getRegistrationId()).array());
-            var createdAtPlaintext = identityKey.open(d.getCreatedAtCiphertext(),
+            var createdAtPlaintext = identityKey.open(Base64.decode(d.getCreatedAtCiphertext()
-                    DECRYPTION_INFO,
+                    .getBytes(StandardCharsets.UTF_8)), DECRYPTION_INFO, associatedData.toByteArray());
-                    associatedData.toByteArray());
             return ByteBuffer.wrap(createdAtPlaintext).getLong();
         } catch (Exception e) {
             logger.warn("Failed while reading the protobuf.", e);
@@ -610,11 +605,6 @@ public class ManagerImpl implements Manager {
         context.getGroupHelper().deleteGroup(groupId);
     }
 
-    @Override
-    public SendGroupMessageResults terminateGroup(GroupId groupId) throws IOException, GroupNotFoundException, NotAGroupMemberException {
-        return context.getGroupHelper().terminateGroup(groupId);
-    }
-
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
             String name,
@@ -917,10 +907,6 @@ public class ManagerImpl implements Manager {
         if (!(groupInfo instanceof GroupInfoV2 groupInfoV2)) {
             throw new IOException("Stories are only supported for V2 groups");
         }
-        if (groupInfoV2.isTerminated()) {
-            // Other clients drop messages sent to a terminated group.
-            throw new IOException("Cannot send a story to a group that has been terminated");
-        }
 
         final var uploadedAttachment = context.getAttachmentHelper().uploadAttachment(attachment);
         final var groupContext = SignalServiceGroupV2.newBuilder(groupInfoV2.getMasterKey())
@@ -1715,15 +1701,8 @@ public class ManagerImpl implements Manager {
         }
 
         final var contact = account.getContactStore().getContact(recipientId);
-        if (contact != null) {
+        if (contact != null && !Util.isEmpty(contact.getName())) {
-            final var nickname = contact.getDisplayNickname();
+            return contact.getName();
-            if (!Util.isEmpty(nickname)) {
-                return nickname;
-            }
-
-            if (!Util.isEmpty(contact.getName())) {
-                return contact.getName();
-            }
         }
 
         final var profile = context.getProfileHelper().getRecipientProfile(recipientId);

lib/src/main/java/org/asamk/signal/manager/internal/ProvisioningManagerImpl.java

@@ -19,57 +19,34 @@ 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;
 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.core.models.AccountEntropyPool;
-import org.signal.core.models.ServiceId.ACI;
-import org.signal.core.models.ServiceId.PNI;
-import org.signal.core.models.backup.MediaRootBackupKey;
-import org.signal.core.util.crypto.DeviceNameCipher;
-import org.signal.libsignal.protocol.IdentityKey;
 import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.signal.libsignal.protocol.ecc.ECPrivateKey;
-import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.account.DeviceAttributes;
-import org.whispersystems.signalservice.api.provisioning.ProvisioningSocket;
 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.internal.crypto.SecondaryProvisioningCipher;
+import org.whispersystems.signalservice.api.registration.ProvisioningApi;
-import org.whispersystems.signalservice.internal.push.ProvisionMessage;
+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.Closeable;
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.channels.OverlappingFileLockException;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
-import kotlin.ResultKt;
-import kotlin.Unit;
-import kotlin.coroutines.Continuation;
-import kotlin.coroutines.EmptyCoroutineContext;
-import kotlin.coroutines.intrinsics.IntrinsicsKt;
-import kotlin.jvm.functions.Function3;
-import kotlinx.coroutines.BuildersKt;
-import kotlinx.coroutines.CoroutineScope;
-
 import static org.asamk.signal.manager.util.KeyUtils.generatePreKeysForType;
-import static org.asamk.signal.manager.util.Utils.handleResponseException;
 
-public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
+public class ProvisioningManagerImpl implements ProvisioningManager {
 
     private static final Logger logger = LoggerFactory.getLogger(ProvisioningManagerImpl.class);
 
@@ -79,10 +56,9 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
     private final Consumer<Manager> newManagerListener;
     private final AccountsStore accountsStore;
 
+    private final ProvisioningApi provisioningApi;
+    private final IdentityKeyPair tempIdentityKey;
     private final String password;
-    private final CompletableFuture<String> urlFuture = new CompletableFuture<>();
-    private final CompletableFuture<SecondaryProvisioningCipher.ProvisioningDecryptResult<ProvisionMessage>> messageFuture = new CompletableFuture<>();
-    private final Closeable socketHandle;
 
     public ProvisioningManagerImpl(
             PathConfig pathConfig,
@@ -97,58 +73,35 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
         this.newManagerListener = newManagerListener;
         this.accountsStore = accountsStore;
 
-        final IdentityKeyPair tempIdentityKey = KeyUtils.generateIdentityKeyPair();
+        tempIdentityKey = KeyUtils.generateIdentityKeyPair();
         password = KeyUtils.createPassword();
-
+        final var credentialsProvider = new DynamicCredentialsProvider(null,
-        socketHandle = ProvisioningSocket.Companion.start(new ProvisioningSocket.Mode.Link(false),
+                null,
-                tempIdentityKey,
+                null,
-                serviceEnvironmentConfig.signalServiceConfiguration(),
+                password,
-                (id, t) -> {
+                SignalServiceAddress.DEFAULT_DEVICE_ID);
-                    urlFuture.completeExceptionally(t);
+        final var pushServiceSocket = new PushServiceSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
-                    messageFuture.completeExceptionally(t);
+                credentialsProvider,
-                },
+                userAgent,
-                new ProvisioningBlock());
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+        final var provisioningSocket = new ProvisioningSocket(serviceEnvironmentConfig.signalServiceConfiguration(),
+                userAgent);
+        this.provisioningApi = new ProvisioningApi(pushServiceSocket, provisioningSocket, credentialsProvider);
     }
 
     @Override
     public URI getDeviceLinkUri() throws TimeoutException, IOException {
-        try {
+        var deviceUuid = provisioningApi.getNewDeviceUuid();
-            var url = urlFuture.get(30, TimeUnit.SECONDS);
+
-            return new URI(url);
+        return new DeviceLinkUrl(deviceUuid, tempIdentityKey.getPublicKey().getPublicKey()).createDeviceLinkUri();
-        } catch (java.util.concurrent.TimeoutException e) {
-            throw new TimeoutException("Timed out waiting for provisioning URL");
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException("Interrupted while waiting for provisioning URL", e);
-        } catch (ExecutionException e) {
-            throw new IOException("Failed to get provisioning URL", e.getCause());
-        } catch (URISyntaxException e) {
-            throw new IOException("Invalid provisioning URL", e);
-        }
     }
 
     @Override
     public String finishDeviceLink(String deviceName) throws IOException, TimeoutException, UserAlreadyExistsException {
-        SecondaryProvisioningCipher.ProvisioningDecryptResult<ProvisionMessage> decryptResult;
+        var ret = provisioningApi.getNewDeviceRegistration(tempIdentityKey);
-        try {
+        var number = ret.getNumber();
-            decryptResult = messageFuture.get(120, TimeUnit.SECONDS);
+        var aci = ret.getAci();
-        } catch (java.util.concurrent.TimeoutException e) {
+        var pni = ret.getPni();
-            throw new TimeoutException("Timed out waiting for provisioning message");
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException("Interrupted while waiting for provisioning message", e);
-        } catch (ExecutionException e) {
-            throw new IOException("Failed to receive provisioning message", e.getCause());
-        }
-
-        if (!(decryptResult instanceof SecondaryProvisioningCipher.ProvisioningDecryptResult.Success<ProvisionMessage> success)) {
-            throw new IOException("Failed to decrypt provisioning message");
-        }
-        var msg = success.getMessage();
-
-        var number = msg.number;
-        var aci = ACI.parseOrThrow(msg.aci, msg.aciBinary);
-        var pni = PNI.parseOrThrow(msg.pni, msg.pniBinary);
 
         logger.info("Received link information from {}, linking in progress ...", number);
 
@@ -167,42 +120,21 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
             accountsStore.updateAccount(accountPath, number, aci);
         }
 
-        final IdentityKeyPair aciIdentity;
-        final IdentityKeyPair pniIdentity;
-        final ProfileKey profileKey;
-        try {
-            aciIdentity = new IdentityKeyPair(new IdentityKey(msg.aciIdentityKeyPublic.toByteArray()),
-                    new ECPrivateKey(msg.aciIdentityKeyPrivate.toByteArray()));
-            pniIdentity = new IdentityKeyPair(new IdentityKey(msg.pniIdentityKeyPublic.toByteArray()),
-                    new ECPrivateKey(msg.pniIdentityKeyPrivate.toByteArray()));
-            profileKey = msg.profileKey == null
-                    ? KeyUtils.createProfileKey()
-                    : new ProfileKey(msg.profileKey.toByteArray());
-        } catch (Exception e) {
-            throw new IOException("Invalid key material in provisioning message", e);
-        }
-
         var encryptedDeviceName = deviceName == null
                 ? null
-                : DeviceNameCipher.encryptDeviceName(deviceName.getBytes(StandardCharsets.UTF_8), aciIdentity);
+                : DeviceNameUtil.encryptDeviceName(deviceName, ret.getAciIdentity().getPrivateKey());
-        var accountEntropyPool = msg.accountEntropyPool == null ? null : new AccountEntropyPool(msg.accountEntropyPool);
+        // Create new account with the synced identity
-        var mediaRootBackupKey = msg.mediaRootBackupKey == null
+        var profileKey = ret.getProfileKey() == null ? KeyUtils.createProfileKey() : ret.getProfileKey();
-                ? null
-                : new MediaRootBackupKey(msg.mediaRootBackupKey.toByteArray());
 
         SignalAccount account = null;
-        var cleanUpPartialAccountOnFailure = false;
-        var linkingFinished = false;
         try {
             if (!accountExists) {
                 account = SignalAccount.createLinkedAccount(pathConfig.dataPath(),
                         accountPath,
                         serviceEnvironmentConfig.type(),
                         Settings.DEFAULT);
-                cleanUpPartialAccountOnFailure = true;
             } else {
                 account = SignalAccount.load(pathConfig.dataPath(), accountPath, true, Settings.DEFAULT);
-                cleanUpPartialAccountOnFailure = false;
             }
 
             account.setProvisioningData(number,
@@ -210,43 +142,24 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
                     pni,
                     password,
                     encryptedDeviceName,
-                    aciIdentity,
+                    ret.getAciIdentity(),
-                    pniIdentity,
+                    ret.getPniIdentity(),
                     profileKey,
-                    accountEntropyPool,
+                    ret.getAccountEntropyPool(),
-                    msg.authCredentialSalt == null ? null : msg.authCredentialSalt.toByteArray(),
+                    ret.getMediaRootBackupKey());
-                    mediaRootBackupKey);
 
-            if (msg.readReceipts != null) {
+            account.getConfigurationStore().setReadReceipts(ret.isReadReceipts());
-                account.getConfigurationStore().setReadReceipts(msg.readReceipts);
-            }
 
             final var aciPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.ACI));
             final var pniPreKeys = generatePreKeysForType(account.getAccountData(ServiceIdType.PNI));
 
             logger.debug("Finishing new device registration");
-            final var attrs = account.getAccountAttributes(null);
+            var deviceId = provisioningApi.finishNewDeviceRegistration(ret.getProvisioningCode(),
-            final var deviceAttributes = new DeviceAttributes(attrs.getFetchesMessages(),
+                    account.getAccountAttributes(null),
-                    attrs.getRegistrationId(),
+                    aciPreKeys,
-                    attrs.getPniRegistrationId(),
+                    pniPreKeys);
-                    attrs.getName(),
-                    attrs.getCapabilities());
-            final var unauthAccountManager = SignalServiceAccountManager.createWithStaticCredentials(
-                    serviceEnvironmentConfig.signalServiceConfiguration(),
-                    null,
-                    null,
-                    number,
-                    SignalServiceAddress.DEFAULT_DEVICE_ID,
-                    password,
-                    userAgent,
-                    ServiceConfig.AUTOMATIC_NETWORK_RETRY,
-                    ServiceConfig.GROUP_MAX_SIZE);
-            final var registerResponse = handleResponseException(unauthAccountManager.getRegistrationApi()
-                    .registerAsSecondaryDevice(msg.provisioningCode, deviceAttributes, aciPreKeys, pniPreKeys, null));
-            final var deviceId = Integer.parseInt(registerResponse.getDeviceId());
 
             account.finishLinking(deviceId, aciPreKeys, pniPreKeys);
-            linkingFinished = true;
 
             ManagerImpl m = null;
             try {
@@ -283,12 +196,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
                     m.close();
                 }
             }
-        } catch (Exception e) {
-            if (!linkingFinished && cleanUpPartialAccountOnFailure && account != null) {
-                cleanupPartialAccount(account, accountPath, e);
-                account = null;
-            }
-            throw e;
         } finally {
             if (account != null) {
                 account.close();
@@ -296,33 +203,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
         }
     }
 
-    @Override
-    public void close() throws IOException {
-        socketHandle.close();
-    }
-
-    private void cleanupPartialAccount(final SignalAccount account, final String accountPath, final Exception cause) {
-        logger.warn("Link attempt failed before registration completed, removing partial account state for {}.",
-                accountPath,
-                cause);
-        try {
-            account.deleteAccountData();
-        } catch (IOException cleanupError) {
-            logger.warn("Failed to delete partial account data for {}: {}",
-                    accountPath,
-                    cleanupError.getMessage(),
-                    cleanupError);
-        }
-        try {
-            accountsStore.removeAccount(accountPath);
-        } catch (RuntimeException cleanupError) {
-            logger.warn("Failed to remove partial account entry for {}: {}",
-                    accountPath,
-                    cleanupError.getMessage(),
-                    cleanupError);
-        }
-    }
-
     private boolean canRelinkExistingAccount(final String accountPath) throws IOException {
         final SignalAccount signalAccount;
         try {
@@ -336,10 +216,6 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
         }
 
         try (signalAccount) {
-            if (signalAccount.getDeviceId() <= 0) {
-                logger.debug("Account has invalid deviceId {}, allowing relink.", signalAccount.getDeviceId());
-                return true;
-            }
             if (signalAccount.isPrimaryDevice()) {
                 logger.debug("Account is a primary device.");
                 return false;
@@ -367,36 +243,4 @@ public class ProvisioningManagerImpl implements ProvisioningManager, Closeable {
             return false;
         }
     }
-
-    private class ProvisioningBlock implements Function3<CoroutineScope, ProvisioningSocket<ProvisionMessage>, Continuation<? super Unit>, Object> {
-
-        @Override
-        public Object invoke(
-                CoroutineScope scope,
-                ProvisioningSocket<ProvisionMessage> socket,
-                Continuation<? super Unit> cont
-        ) {
-            Thread.ofVirtual().start(() -> {
-                try {
-                    urlFuture.complete(BuildersKt.runBlocking(EmptyCoroutineContext.INSTANCE,
-                            (s, c) -> socket.getProvisioningUrl(c)));
-                    messageFuture.complete(BuildersKt.runBlocking(EmptyCoroutineContext.INSTANCE,
-                            (s, c) -> socket.getProvisioningMessageDecryptResult(c)));
-                    cont.resumeWith(Unit.INSTANCE);
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                    failBoth(new RuntimeException(e), cont);
-                } catch (Throwable t) {
-                    failBoth(t, cont);
-                }
-            });
-            return IntrinsicsKt.getCOROUTINE_SUSPENDED();
-        }
-
-        private void failBoth(Throwable t, Continuation<? super Unit> cont) {
-            urlFuture.completeExceptionally(t);
-            messageFuture.completeExceptionally(t);
-            cont.resumeWith(ResultKt.createFailure(t));
-        }
-    }
 }

lib/src/main/java/org/asamk/signal/manager/internal/SignalDependencies.java

@@ -355,7 +355,6 @@ public class SignalDependencies {
                 () -> preKeyRepository = new PreKeyRepository(getKeysApi(),
                         dataStore.aci(),
                         localProtocolAddress,
-                        getSessionLock(),
                         Runnable::run));
     }
 

lib/src/main/java/org/asamk/signal/manager/internal/SignalWebSocketHealthMonitor.java

@@ -9,7 +9,6 @@ import org.whispersystems.signalservice.api.websocket.HealthMonitor;
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState;
 
-import java.time.Duration;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -104,18 +103,6 @@ final class SignalWebSocketHealthMonitor implements HealthMonitor {
         logger.info("Received alerts: {}", String.join(", ", strings));
     }
 
-    @Override
-    public void onServerTimestamp(final long serverTimestamp, final boolean isIdentifiedWebsocket) {
-        final var skew = skewFrom(serverTimestamp);
-        if (skew.compareTo(Duration.ofDays(1)) > 0) {
-            logger.warn("Local clock is off from the server by {}, which exceeds the allowed limit..", skew);
-        }
-    }
-
-    private Duration skewFrom(long serverTime) {
-        return Duration.ofMillis(Math.abs(System.currentTimeMillis() - serverTime));
-    }
-
     /**
      * 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.

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 = 31;
+    private static final long DATABASE_VERSION = 28;
 
     private AccountDatabase(final HikariDataSource dataSource) {
         super(logger, DATABASE_VERSION, dataSource);
@@ -623,36 +623,6 @@ public class AccountDatabase extends Database {
                                         """);
             }
         }
-        if (oldVersion < 29) {
-            logger.debug("Updating database: Adding sticker storage sync columns");
-            try (final var statement = connection.createStatement()) {
-                statement.executeUpdate("""
-                                        ALTER TABLE sticker ADD COLUMN position INTEGER NOT NULL DEFAULT 0;
-                                        ALTER TABLE sticker ADD COLUMN deleted_timestamp INTEGER NOT NULL DEFAULT 0;
-                                        ALTER TABLE sticker ADD COLUMN storage_id BLOB;
-                                        ALTER TABLE sticker ADD COLUMN storage_record BLOB;
-                                        CREATE UNIQUE INDEX sticker_storage_id_index ON sticker (storage_id);
-                                        """);
-            }
-        }
-        if (oldVersion < 30) {
-            logger.debug("Updating database: Create pni_signature_verified column");
-            try (final var statement = connection.createStatement()) {
-                statement.executeUpdate("""
-                                        ALTER TABLE recipient ADD pni_signature_verified INTEGER NOT NULL DEFAULT FALSE;
-                                        """);
-            }
-        }
-        if (oldVersion < 31) {
-            logger.debug("Updating database: Add blocked-at timestamps");
-            try (final var statement = connection.createStatement()) {
-                statement.executeUpdate("""
-                                        ALTER TABLE recipient ADD blocked_at INTEGER NOT NULL DEFAULT 0;
-                                        ALTER TABLE group_v1 ADD blocked_at INTEGER NOT NULL DEFAULT 0;
-                                        ALTER TABLE group_v2 ADD blocked_at INTEGER NOT NULL DEFAULT 0;
-                                        """);
-            }
-        }
     }
 
     private static void createUuidMappingTable(

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 = 11;
+    private static final int CURRENT_STORAGE_VERSION = 10;
 
     private final Object LOCK = new Object();
 
@@ -141,7 +141,6 @@ public class SignalAccount implements Closeable {
     private MasterKey pinMasterKey;
     private StorageKey storageKey;
     private AccountEntropyPool accountEntropyPool;
-    private byte[] authCredentialSalt;
     private MediaRootBackupKey mediaRootBackupKey;
     private ProfileKey profileKey;
 
@@ -154,10 +153,6 @@ public class SignalAccount implements Closeable {
     private final KeyValueEntry<Long> lastReceiveTimestamp = new KeyValueEntry<>("last-receive-timestamp",
             long.class,
             0L);
-    private final KeyValueEntry<Long> lastAppliedPniChangeServerTimestamp = new KeyValueEntry<>(
-            "last-applied-pni-change-server-timestamp",
-            long.class,
-            0L);
     private final KeyValueEntry<Boolean> needsToRetryFailedMessages = new KeyValueEntry<>("retry-failed-messages",
             Boolean.class,
             true);
@@ -297,12 +292,11 @@ public class SignalAccount implements Closeable {
             final ACI aci,
             final PNI pni,
             final String password,
-            final byte[] encryptedDeviceName,
+            final String encryptedDeviceName,
             final IdentityKeyPair aciIdentity,
             final IdentityKeyPair pniIdentity,
             final ProfileKey profileKey,
             final AccountEntropyPool accountEntropyPool,
-            final byte[] authCredentialSalt,
             final MediaRootBackupKey mediaRootBackupKey
     ) {
         this.deviceId = 0;
@@ -313,13 +307,12 @@ public class SignalAccount implements Closeable {
         getRecipientTrustedResolver().resolveSelfRecipientTrusted(getSelfRecipientAddress());
         this.password = password;
         this.profileKey = profileKey;
-        this.encryptedDeviceName = org.signal.core.util.Base64.encodeWithoutPadding(encryptedDeviceName);
+        this.encryptedDeviceName = encryptedDeviceName;
         this.aciAccountData.setIdentityKeyPair(aciIdentity);
         this.pniAccountData.setIdentityKeyPair(pniIdentity);
         this.registered = false;
         this.isMultiDevice = true;
         setLastReceiveTimestamp(0L);
-        setLastAppliedPniChangeServerTimestamp(0L);
         if (accountEntropyPool != null) {
             this.pinMasterKey = null;
             this.accountEntropyPool = accountEntropyPool;
@@ -327,7 +320,6 @@ public class SignalAccount implements Closeable {
             this.pinMasterKey = null;
             this.accountEntropyPool = null;
         }
-        this.authCredentialSalt = authCredentialSalt;
         this.mediaRootBackupKey = mediaRootBackupKey;
         getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
@@ -364,7 +356,6 @@ public class SignalAccount implements Closeable {
     ) {
         this.pinMasterKey = masterKey;
         this.accountEntropyPool = null;
-        this.authCredentialSalt = null;
         getKeyValueStore().storeEntry(storageManifestVersion, -1L);
         this.setStorageManifest(null);
         this.storageKey = null;
@@ -377,7 +368,6 @@ public class SignalAccount implements Closeable {
         init();
         this.registrationLockPin = pin;
         setLastReceiveTimestamp(0L);
-        setLastAppliedPniChangeServerTimestamp(0L);
         save();
 
         setPreKeys(ServiceIdType.ACI, aciPreKeys);
@@ -530,9 +520,6 @@ public class SignalAccount implements Closeable {
             if (storage.accountEntropyPool != null) {
                 accountEntropyPool = new AccountEntropyPool(storage.accountEntropyPool);
             }
-            if (storage.authCredentialSalt != null) {
-                authCredentialSalt = base64.decode(storage.authCredentialSalt);
-            }
             if (storage.mediaRootBackupKey != null) {
                 mediaRootBackupKey = new MediaRootBackupKey(base64.decode(storage.mediaRootBackupKey));
             }
@@ -913,7 +900,6 @@ public class SignalAccount implements Closeable {
                                 0,
                                 false,
                                 contact.blocked,
-                                0,
                                 contact.archived,
                                 false,
                                 false,
@@ -1022,7 +1008,6 @@ public class SignalAccount implements Closeable {
                     pinMasterKey == null ? null : base64.encodeToString(pinMasterKey.serialize()),
                     storageKey == null ? null : base64.encodeToString(storageKey.serialize()),
                     accountEntropyPool == null ? null : accountEntropyPool.getValue(),
-                    authCredentialSalt == null ? null : base64.encodeToString(authCredentialSalt),
                     mediaRootBackupKey == null ? null : base64.encodeToString(mediaRootBackupKey.getValue()),
                     profileKey == null ? null : base64.encodeToString(profileKey.serialize()),
                     usernameLink == null ? null : base64.encodeToString(usernameLink.getEntropy()),
@@ -1237,11 +1222,6 @@ public class SignalAccount implements Closeable {
                 return pniAccountData.getSignalServiceAccountDataStore();
             }
 
-            @Override
-            public SignalServiceAccountDataStore pniOrNull() {
-                return getPni() != null ? pniAccountData.getSignalServiceAccountDataStore() : null;
-            }
-
             @Override
             public boolean isMultiDevice() {
                 return SignalAccount.this.isMultiDevice();
@@ -1662,10 +1642,6 @@ public class SignalAccount implements Closeable {
         save();
     }
 
-    public byte[] getAuthCredentialSalt() {
-        return authCredentialSalt;
-    }
-
     public String getRecoveryPassword() {
         final var masterKey = getPinBackedMasterKey();
         if (masterKey == null) {
@@ -1749,7 +1725,7 @@ public class SignalAccount implements Closeable {
     }
 
     public boolean isRegistered() {
-        return registered && deviceId > 0;
+        return registered;
     }
 
     public void setRegistered(final boolean registered) {
@@ -1777,14 +1753,6 @@ public class SignalAccount implements Closeable {
         getKeyValueStore().storeEntry(lastReceiveTimestamp, value);
     }
 
-    public long getLastAppliedPniChangeServerTimestamp() {
-        return getKeyValueStore().getEntry(lastAppliedPniChangeServerTimestamp);
-    }
-
-    public void setLastAppliedPniChangeServerTimestamp(final long value) {
-        getKeyValueStore().storeEntry(lastAppliedPniChangeServerTimestamp, value);
-    }
-
     public void setNeedsToRetryFailedMessages(final boolean value) {
         getKeyValueStore().storeEntry(needsToRetryFailedMessages, value);
     }
@@ -2005,7 +1973,6 @@ public class SignalAccount implements Closeable {
             String pinMasterKey,
             String storageKey,
             String accountEntropyPool,
-            String authCredentialSalt,
             String mediaRootBackupKey,
             String profileKey,
             String usernameLinkEntropy,

lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java

@@ -58,10 +58,6 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {
 
     public abstract void setBlocked(boolean blocked);
 
-    public abstract long getBlockedAt();
-
-    public abstract void setBlockedAt(long blockedAt);
-
     public abstract boolean isProfileSharingEnabled();
 
     public abstract void setProfileSharingEnabled(boolean profileSharingEnabled);
@@ -70,8 +66,6 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {
 
     public abstract boolean isAnnouncementGroup();
 
-    public abstract boolean isTerminated();
-
     public abstract GroupPermission getPermissionAddMember();
 
     public abstract GroupPermission getPermissionEditDetails();

lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV1.java

@@ -24,7 +24,6 @@ public final class GroupInfoV1 extends GroupInfo {
     public String color;
     public int messageExpirationTime;
     public boolean blocked;
-    private long blockedAt;
     public boolean archived;
     private byte[] storageRecord;
 
@@ -40,7 +39,6 @@ public final class GroupInfoV1 extends GroupInfo {
             final String color,
             final int messageExpirationTime,
             final boolean blocked,
-            final long blockedAt,
             final boolean archived,
             final byte[] storageRecord
     ) {
@@ -51,7 +49,6 @@ public final class GroupInfoV1 extends GroupInfo {
         this.color = color;
         this.messageExpirationTime = messageExpirationTime;
         this.blocked = blocked;
-        this.blockedAt = blockedAt;
         this.archived = archived;
         this.storageRecord = storageRecord;
     }
@@ -94,24 +91,9 @@ public final class GroupInfoV1 extends GroupInfo {
 
     @Override
     public void setBlocked(final boolean blocked) {
-        if (blocked && !this.blocked) {
-            blockedAt = System.currentTimeMillis();
-        } else if (!blocked) {
-            blockedAt = 0;
-        }
         this.blocked = blocked;
     }
 
-    @Override
-    public long getBlockedAt() {
-        return blockedAt;
-    }
-
-    @Override
-    public void setBlockedAt(final long blockedAt) {
-        this.blockedAt = blockedAt;
-    }
-
     @Override
     public boolean isProfileSharingEnabled() {
         return true;
@@ -131,11 +113,6 @@ public final class GroupInfoV1 extends GroupInfo {
         return false;
     }
 
-    @Override
-    public boolean isTerminated() {
-        return false;
-    }
-
     @Override
     public GroupPermission getPermissionAddMember() {
         return GroupPermission.EVERY_MEMBER;

lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java

@@ -23,7 +23,6 @@ public final class GroupInfoV2 extends GroupInfo {
     private final GroupMasterKey masterKey;
     private final DistributionId distributionId;
     private boolean blocked;
-    private long blockedAt;
     private boolean profileSharingEnabled;
     private DecryptedGroup group;
     private byte[] storageRecord;
@@ -48,7 +47,6 @@ public final class GroupInfoV2 extends GroupInfo {
             final DecryptedGroup group,
             final DistributionId distributionId,
             final boolean blocked,
-            final long blockedAt,
             final boolean profileSharingEnabled,
             final boolean permissionDenied,
             final byte[] storageRecord,
@@ -59,7 +57,6 @@ public final class GroupInfoV2 extends GroupInfo {
         this.group = group;
         this.distributionId = distributionId;
         this.blocked = blocked;
-        this.blockedAt = blockedAt;
         this.profileSharingEnabled = profileSharingEnabled;
         this.permissionDenied = permissionDenied;
         this.storageRecord = storageRecord;
@@ -189,24 +186,9 @@ public final class GroupInfoV2 extends GroupInfo {
 
     @Override
     public void setBlocked(final boolean blocked) {
-        if (blocked && !this.blocked) {
-            blockedAt = System.currentTimeMillis();
-        } else if (!blocked) {
-            blockedAt = 0;
-        }
         this.blocked = blocked;
     }
 
-    @Override
-    public long getBlockedAt() {
-        return blockedAt;
-    }
-
-    @Override
-    public void setBlockedAt(final long blockedAt) {
-        this.blockedAt = blockedAt;
-    }
-
     @Override
     public boolean isProfileSharingEnabled() {
         return profileSharingEnabled;
@@ -229,11 +211,6 @@ public final class GroupInfoV2 extends GroupInfo {
         return this.group != null && this.group.isAnnouncementGroup == EnabledState.ENABLED;
     }
 
-    @Override
-    public boolean isTerminated() {
-        return this.group != null && Boolean.TRUE.equals(this.group.terminated);
-    }
-
     @Override
     public GroupPermission getPermissionAddMember() {
         final var accessControl = getAccessControl();

lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java

@@ -63,7 +63,6 @@ public class GroupStore {
                                       distribution_id BLOB UNIQUE NOT NULL,
                                       endorsement_expiration_time INTEGER NOT NULL DEFAULT 0,
                                       blocked INTEGER NOT NULL DEFAULT FALSE,
-                                      blocked_at INTEGER NOT NULL DEFAULT 0,
                                       profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                       permission_denied INTEGER NOT NULL DEFAULT FALSE
                                     ) STRICT;
@@ -84,7 +83,6 @@ public class GroupStore {
                                       color TEXT,
                                       expiration_time INTEGER NOT NULL DEFAULT 0,
                                       blocked INTEGER NOT NULL DEFAULT FALSE,
-                                      blocked_at INTEGER NOT NULL DEFAULT 0,
                                       archived INTEGER NOT NULL DEFAULT FALSE
                                     ) STRICT;
                                     CREATE TABLE group_v1_member (
@@ -403,7 +401,6 @@ public class GroupStore {
                 deleteGroup(connection, groupInfoV1.getGroupId());
                 final var groupInfoV2 = new GroupInfoV2(groupId, groupMasterKey, recipientResolver);
                 groupInfoV2.setBlocked(groupInfoV1.isBlocked());
-                groupInfoV2.setBlockedAt(groupInfoV1.getBlockedAt());
                 updateGroup(connection, groupInfoV2);
                 logger.debug("Locally migrated group {} to group v2, id: {}",
                         groupInfoV1.getGroupId().toBase64(),
@@ -617,9 +614,9 @@ public class GroupStore {
                 }
             }
             final var sql = """
-                            INSERT INTO %s (_id, group_id, group_id_v2, name, color, expiration_time, blocked, blocked_at, archived, storage_id)
+                            INSERT INTO %s (_id, group_id, group_id_v2, name, color, expiration_time, blocked, archived, storage_id)
-                            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-                            ON CONFLICT (_id) DO UPDATE SET group_id=excluded.group_id, group_id_v2=excluded.group_id_v2, name=excluded.name, color=excluded.color, expiration_time=excluded.expiration_time, blocked=excluded.blocked, blocked_at=excluded.blocked_at, archived=excluded.archived, storage_id=excluded.storage_id
+                            ON CONFLICT (_id) DO UPDATE SET group_id=excluded.group_id, group_id_v2=excluded.group_id_v2, name=excluded.name, color=excluded.color, expiration_time=excluded.expiration_time, blocked=excluded.blocked, archived=excluded.archived, storage_id=excluded.storage_id
                             RETURNING _id
                             """.formatted(TABLE_GROUP_V1);
             try (final var statement = connection.prepareStatement(sql)) {
@@ -634,9 +631,8 @@ public class GroupStore {
                 statement.setString(5, groupV1.color);
                 statement.setLong(6, groupV1.getMessageExpirationTimer());
                 statement.setBoolean(7, groupV1.isBlocked());
-                statement.setLong(8, groupV1.getBlockedAt());
+                statement.setBoolean(8, groupV1.archived);
-                statement.setBoolean(9, groupV1.archived);
+                statement.setBytes(9, KeyUtils.createRawStorageId());
-                statement.setBytes(10, KeyUtils.createRawStorageId());
                 final var generatedKey = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
 
                 if (internalId == null) {
@@ -662,9 +658,9 @@ public class GroupStore {
         } else if (group instanceof GroupInfoV2 groupV2) {
             final var sql = (
                     """
-                    INSERT INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, blocked_at, permission_denied, storage_id, profile_sharing)
+                    INSERT INTO %s (_id, group_id, master_key, group_data, distribution_id, blocked, permission_denied, storage_id, profile_sharing)
-                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-                    ON CONFLICT (_id) DO UPDATE SET group_id=excluded.group_id, master_key=excluded.master_key, group_data=excluded.group_data, distribution_id=excluded.distribution_id, blocked=excluded.blocked, blocked_at=excluded.blocked_at, permission_denied=excluded.permission_denied, storage_id=excluded.storage_id, profile_sharing=excluded.profile_sharing
+                    ON CONFLICT (_id) DO UPDATE SET group_id=excluded.group_id, master_key=excluded.master_key, group_data=excluded.group_data, distribution_id=excluded.distribution_id, blocked=excluded.blocked, permission_denied=excluded.permission_denied, storage_id=excluded.storage_id, profile_sharing=excluded.profile_sharing
                     """
             ).formatted(TABLE_GROUP_V2);
             try (final var statement = connection.prepareStatement(sql)) {
@@ -682,10 +678,9 @@ public class GroupStore {
                 }
                 statement.setBytes(5, UuidUtil.toByteArray(groupV2.getDistributionId().asUuid()));
                 statement.setBoolean(6, groupV2.isBlocked());
-                statement.setLong(7, groupV2.getBlockedAt());
+                statement.setBoolean(7, groupV2.isPermissionDenied());
-                statement.setBoolean(8, groupV2.isPermissionDenied());
+                statement.setBytes(8, KeyUtils.createRawStorageId());
-                statement.setBytes(9, KeyUtils.createRawStorageId());
+                statement.setBoolean(9, groupV2.isProfileSharingEnabled());
-                statement.setBoolean(10, groupV2.isProfileSharingEnabled());
                 statement.executeUpdate();
             }
         } else {
@@ -696,7 +691,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.blocked_at, g.profile_sharing, 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);
@@ -714,7 +709,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.blocked_at, g.profile_sharing, 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 = ?
                 """
@@ -748,7 +743,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.blocked_at, g.profile_sharing, 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 = ?
                 """
@@ -771,7 +766,6 @@ 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 blockedAt = resultSet.getLong("blocked_at");
             final var profileSharingEnabled = resultSet.getBoolean("profile_sharing");
             final var permissionDenied = resultSet.getBoolean("permission_denied");
             final var storageRecord = resultSet.getBytes("storage_record");
@@ -780,7 +774,6 @@ public class GroupStore {
                     groupData == null ? null : DecryptedGroup.ADAPTER.decode(groupData),
                     DistributionId.from(UuidUtil.parseOrThrow(distributionId)),
                     blocked,
-                    blockedAt,
                     profileSharingEnabled,
                     permissionDenied,
                     storageRecord,
@@ -807,7 +800,7 @@ public class GroupStore {
     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.blocked_at, g.archived, g.storage_record
+                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);
@@ -825,7 +818,7 @@ public class GroupStore {
     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.blocked_at, g.archived, g.storage_record
+                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 = ?
                 """
@@ -859,7 +852,7 @@ public class GroupStore {
     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.blocked_at, g.archived, g.storage_record
+                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 = ?
                 """
@@ -889,7 +882,6 @@ public class GroupStore {
                   .collect(Collectors.toSet());
         final var expirationTime = resultSet.getInt("expiration_time");
         final var blocked = resultSet.getBoolean("blocked");
-        final var blockedAt = resultSet.getLong("blocked_at");
         final var archived = resultSet.getBoolean("archived");
         final var storageRecord = resultSet.getBytes("storage_record");
         return new GroupInfoV1(GroupId.v1(groupId),
@@ -899,7 +891,6 @@ public class GroupStore {
                 color,
                 expirationTime,
                 blocked,
-                blockedAt,
                 archived,
                 storageRecord);
     }
@@ -911,7 +902,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.blocked_at, g.archived, g.storage_record
+                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 = ?
                 """

lib/src/main/java/org/asamk/signal/manager/storage/groups/LegacyGroupStore.java

@@ -59,7 +59,6 @@ public class LegacyGroupStore {
                         g1.color,
                         g1.messageExpirationTime,
                         g1.blocked,
-                        0,
                         g1.archived,
                         null);
             }
@@ -78,7 +77,6 @@ public class LegacyGroupStore {
                     loadDecryptedGroupLocked(groupId, groupCachePath),
                     g2.distributionId == null ? DistributionId.create() : DistributionId.from(g2.distributionId),
                     g2.blocked,
-                    0,
                     true,
                     g2.permissionDenied,
                     null,

lib/src/main/java/org/asamk/signal/manager/storage/recipients/LegacyRecipientStore2.java

@@ -50,7 +50,6 @@ public class LegacyRecipientStore2 {
                             0,
                             false,
                             r.contact.blocked,
-                            0,
                             r.contact.archived,
                             r.contact.profileSharingEnabled,
                             false,
@@ -101,7 +100,6 @@ public class LegacyRecipientStore2 {
                         profile,
                         null,
                         null,
-                        false,
                         null);
             }).collect(Collectors.toMap(Recipient::getRecipientId, r -> r));
 

lib/src/main/java/org/asamk/signal/manager/storage/recipients/Recipient.java

@@ -25,8 +25,6 @@ public class Recipient {
 
     private final Long unregisteredTimestamp;
 
-    private final boolean pniSignatureVerified;
-
     private final byte[] storageRecord;
 
     public Recipient(
@@ -38,7 +36,6 @@ public class Recipient {
             final Profile profile,
             final Boolean discoverable,
             final Long unregisteredTimestamp,
-            final boolean pniSignatureVerified,
             final byte[] storageRecord
     ) {
         this.recipientId = recipientId;
@@ -49,7 +46,6 @@ public class Recipient {
         this.profile = profile;
         this.discoverable = discoverable;
         this.unregisteredTimestamp = unregisteredTimestamp;
-        this.pniSignatureVerified = pniSignatureVerified;
         this.storageRecord = storageRecord;
     }
 
@@ -62,7 +58,6 @@ public class Recipient {
         profile = builder.profile;
         discoverable = builder.discoverable;
         unregisteredTimestamp = builder.unregisteredTimestamp;
-        pniSignatureVerified = builder.pniSignatureVerified;
         storageRecord = builder.storageRecord;
     }
 
@@ -78,9 +73,6 @@ public class Recipient {
         builder.profileKey = copy.getProfileKey();
         builder.expiringProfileKeyCredential = copy.getExpiringProfileKeyCredential();
         builder.profile = copy.getProfile();
-        builder.discoverable = copy.getDiscoverable();
-        builder.unregisteredTimestamp = copy.getUnregisteredTimestamp();
-        builder.pniSignatureVerified = copy.isPniSignatureVerified();
         builder.storageRecord = copy.getStorageRecord();
         return builder;
     }
@@ -121,10 +113,6 @@ public class Recipient {
         return unregisteredTimestamp == null;
     }
 
-    public boolean isPniSignatureVerified() {
-        return pniSignatureVerified;
-    }
-
     public byte[] getStorageRecord() {
         return storageRecord;
     }
@@ -139,19 +127,12 @@ public class Recipient {
                 && Objects.equals(contact, recipient.contact)
                 && Objects.equals(profileKey, recipient.profileKey)
                 && Objects.equals(expiringProfileKeyCredential, recipient.expiringProfileKeyCredential)
-                && Objects.equals(profile, recipient.profile)
+                && Objects.equals(profile, recipient.profile);
-                && pniSignatureVerified == recipient.pniSignatureVerified;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(recipientId,
+        return Objects.hash(recipientId, address, contact, profileKey, expiringProfileKeyCredential, profile);
-                address,
-                contact,
-                profileKey,
-                expiringProfileKeyCredential,
-                profile,
-                pniSignatureVerified);
     }
 
     public static final class Builder {
@@ -164,7 +145,6 @@ public class Recipient {
         private Profile profile;
         private Boolean discoverable;
         private Long unregisteredTimestamp;
-        private boolean pniSignatureVerified;
         private byte[] storageRecord;
 
         private Builder() {
@@ -210,11 +190,6 @@ public class Recipient {
             return this;
         }
 
-        public Builder withPniSignatureVerified(final boolean val) {
-            pniSignatureVerified = val;
-            return this;
-        }
-
         public Builder withStorageRecord(final byte[] val) {
             storageRecord = val;
             return this;

lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java

@@ -54,16 +54,14 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private static final int MAX_RECIPIENT_CACHE_SIZE = 2000;
 
-    private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = Collections.synchronizedMap(new LinkedHashMap<>(
+    private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = Collections.synchronizedMap(
-            16,
+            new LinkedHashMap<>(16, 0.75f, true) {
-            0.75f,
-            true) {
 
-        @Override
+                @Override
-        protected boolean removeEldestEntry(Map.Entry<ServiceId, RecipientWithAddress> eldest) {
+                protected boolean removeEldestEntry(Map.Entry<ServiceId, RecipientWithAddress> eldest) {
-            return size() > MAX_RECIPIENT_CACHE_SIZE;
+                    return size() > MAX_RECIPIENT_CACHE_SIZE;
-        }
+                }
-    });
+            });
 
     public static void createSql(Connection connection) throws SQLException {
         // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
@@ -82,7 +80,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       profile_key BLOB,
                                       profile_key_credential BLOB,
                                       needs_pni_signature INTEGER NOT NULL DEFAULT FALSE,
-                                      pni_signature_verified INTEGER NOT NULL DEFAULT FALSE,
                                     
                                       given_name TEXT,
                                       family_name TEXT,
@@ -96,7 +93,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                                       expiration_time_version INTEGER DEFAULT 1 NOT NULL,
                                       mute_until INTEGER NOT NULL DEFAULT 0,
                                       blocked INTEGER NOT NULL DEFAULT FALSE,
-                                      blocked_at INTEGER NOT NULL DEFAULT 0,
                                       archived INTEGER NOT NULL DEFAULT FALSE,
                                       profile_sharing INTEGER NOT NULL DEFAULT FALSE,
                                       hide_story INTEGER NOT NULL DEFAULT FALSE,
@@ -352,7 +348,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.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.blocked_at, 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.pni IS NOT NULL OR r.aci IS NOT NULL) AND %s AND r.hidden = FALSE
                 """
@@ -376,8 +372,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.pni_signature_verified,
+                       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.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.blocked_at, 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
@@ -397,8 +392,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.pni_signature_verified,
+                       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.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.blocked_at, 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
@@ -447,8 +441,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.pni_signature_verified,
+                       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.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.blocked_at, 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
@@ -893,7 +886,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET given_name = ?, family_name = ?, nick_name = ?, expiration_time = ?, expiration_time_version = ?, mute_until = ?, hide_story = ?, profile_sharing = ?, color = ?, blocked = ?, blocked_at = ?, archived = ?, unregistered_timestamp = ?, nick_name_given_name = ?, nick_name_family_name = ?, note = ?, hidden = ?
+                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 = ?, hidden = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -908,49 +901,25 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             statement.setBoolean(8, contact != null && contact.isProfileSharingEnabled());
             statement.setString(9, contact == null ? null : contact.color());
             statement.setBoolean(10, contact != null && contact.isBlocked());
-            statement.setLong(11, contact == null ? 0 : contact.blockedAt());
+            statement.setBoolean(11, contact != null && contact.isArchived());
-            statement.setBoolean(12, contact != null && contact.isArchived());
             if (contact == null || contact.unregisteredTimestamp() == null) {
-                statement.setNull(13, Types.INTEGER);
+                statement.setNull(12, Types.INTEGER);
             } else {
-                statement.setLong(13, contact.unregisteredTimestamp());
+                statement.setLong(12, contact.unregisteredTimestamp());
             }
-            statement.setString(14, contact == null ? null : contact.nickNameGivenName());
+            statement.setString(13, contact == null ? null : contact.nickNameGivenName());
-            statement.setString(15, contact == null ? null : contact.nickNameFamilyName());
+            statement.setString(14, contact == null ? null : contact.nickNameFamilyName());
-            statement.setString(16, contact == null ? null : contact.note());
+            statement.setString(15, contact == null ? null : contact.note());
-            statement.setBoolean(17, contact != null && contact.isHidden());
+            statement.setBoolean(16, contact != null && contact.isHidden());
-            statement.setLong(18, recipientId.id());
+            statement.setLong(17, recipientId.id());
             statement.executeUpdate();
         }
         if (contact != null && contact.unregisteredTimestamp() != null) {
-            markUnregisteredAndSplitIfNecessary(connection, recipientId, contact.unregisteredTimestamp());
+            markUnregisteredAndSplitIfNecessary(connection, recipientId);
         }
         rotateStorageId(connection, recipientId);
     }
 
-    public void splitForStorageSyncIfNecessary(final Connection connection, final ACI aci) throws SQLException {
-        final var recipient = findByServiceId(connection, aci);
-        if (recipient.isEmpty()) {
-            return;
-        }
-
-        final var recipientId = recipient.get().id();
-        final var address = recipient.get().address();
-        if (address.pni().isEmpty() && address.number().isEmpty()) {
-            return;
-        }
-
-        logger.debug("Splitting {} for storage sync", recipientId);
-        final var splitAddress = new RecipientAddress(Optional.empty(),
-                address.pni(),
-                address.number(),
-                Optional.empty());
-        updateRecipientAddress(connection,
-                recipientId,
-                new RecipientAddress(address.aci(), Optional.empty(), Optional.empty(), address.username()));
-        resolveRecipientTrusted(connection, splitAddress);
-    }
-
     public int removeStorageIdsFromLocalOnlyUnregisteredRecipients(
             final Connection connection,
             final Collection<StorageId> storageIds
@@ -992,69 +961,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    public void markPniSignatureVerified(final RecipientId recipientId) {
-        logger.debug("Marking {} as pni signature verified", recipientId);
-        try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            if (storePniSignatureVerified(connection, recipientId, true)) {
-                rotateStorageId(connection, recipientId);
-            }
-            connection.commit();
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed update recipient store", e);
-        }
-    }
-
-    public boolean storePniSignatureVerified(
-            final Connection connection,
-            final RecipientId recipientId,
-            final boolean value
-    ) throws SQLException {
-        return storePniSignatureVerified(connection, recipientId, value, false);
-    }
-
-    private boolean storePniSignatureVerified(
-            final Connection connection,
-            final RecipientId recipientId,
-            final boolean value,
-            final boolean force
-    ) throws SQLException {
-        if (!force && isPniSignatureVerified(connection, recipientId) == value) {
-            return false;
-        }
-
-        final var sql = (
-                """
-                UPDATE %s
-                SET pni_signature_verified = ?
-                WHERE _id = ?
-                """
-        ).formatted(TABLE_RECIPIENT);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBoolean(1, value);
-            statement.setLong(2, recipientId.id());
-            statement.executeUpdate();
-        }
-        return true;
-    }
-
-    private boolean isPniSignatureVerified(
-            final Connection connection,
-            final RecipientId recipientId
-    ) throws SQLException {
-        final var sql = (
-                """
-                SELECT pni_signature_verified
-                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("pni_signature_verified"));
-        }
-    }
-
     public boolean needsPniSignature(final RecipientId recipientId) {
         try (final var connection = database.getConnection()) {
             final var sql = (
@@ -1086,7 +992,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                     if (recipientAddress.get().address().aci().isEmpty() || (
                             contact != null && contact.unregisteredTimestamp() != null
                     )) {
-                        markUnregisteredAndSplitIfNecessary(connection, recipientId, System.currentTimeMillis());
+                        markUnregisteredAndSplitIfNecessary(connection, recipientId);
                     }
                 }
             }
@@ -1120,7 +1026,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             if (registered) {
                 markRegistered(connection, recipientId);
             } else {
-                markUnregisteredAndSplitIfNecessary(connection, recipientId, System.currentTimeMillis());
+                markUnregisteredAndSplitIfNecessary(connection, recipientId);
             }
             connection.commit();
         } catch (SQLException e) {
@@ -1130,10 +1036,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private void markUnregisteredAndSplitIfNecessary(
             final Connection connection,
-            final RecipientId recipientId,
+            final RecipientId recipientId
-            final long unregisteredTimestamp
     ) throws SQLException {
-        markUnregistered(connection, recipientId, unregisteredTimestamp);
+        markUnregistered(connection, recipientId);
         final var address = resolveRecipientAddress(connection, recipientId);
         final var needSplit = address.aci().isPresent() && address.pni().isPresent();
         logger.trace("Marking unregistered recipient {} as unregistered (and split={}): {}",
@@ -1180,11 +1085,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         }
     }
 
-    private void markUnregistered(
+    private void markUnregistered(final Connection connection, final RecipientId recipientId) throws SQLException {
-            final Connection connection,
-            final RecipientId recipientId,
-            final long unregisteredTimestamp
-    ) throws SQLException {
         final var sql = (
                 """
                 UPDATE %s
@@ -1193,7 +1094,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 """
         ).formatted(TABLE_RECIPIENT);
         try (final var statement = connection.prepareStatement(sql)) {
-            statement.setLong(1, unregisteredTimestamp);
+            statement.setLong(1, System.currentTimeMillis());
             statement.setLong(2, recipientId.id());
             statement.executeUpdate();
         }
@@ -1354,9 +1255,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final List<RecipientId> toBeMergedRecipientIds
     ) throws SQLException {
         for (final var toBeMergedRecipientId : toBeMergedRecipientIds) {
-            if (isPniSignatureVerified(connection, toBeMergedRecipientId)) {
-                storePniSignatureVerified(connection, recipientId, true, true);
-            }
             recipientMergeHandler.mergeRecipients(connection, recipientId, toBeMergedRecipientId);
             deleteRecipient(connection, toBeMergedRecipientId);
             recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(toBeMergedRecipientId));
@@ -1451,12 +1349,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         final var sql = (
                 """
                 UPDATE %s
-                SET number = NULL,
+                SET number = NULL, aci = NULL, pni = NULL, username = NULL, storage_id = NULL
-                    aci = NULL,
-                    pni = NULL,
-                    username = NULL,
-                    storage_id = NULL,
-                    pni_signature_verified = FALSE
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -1472,18 +1365,10 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             final RecipientAddress address
     ) throws SQLException {
         recipientAddressCache.entrySet().removeIf(e -> e.getValue().id().equals(recipientId));
-        final var existingAddress = resolveRecipientAddress(connection, recipientId);
-        final var keepPniSignatureVerified = Objects.equals(existingAddress.aci(), address.aci()) && Objects.equals(
-                existingAddress.pni(),
-                address.pni());
         final var sql = (
                 """
                 UPDATE %s
-                SET number = ?,
+                SET number = ?, aci = ?, pni = ?, username = ?
-                    aci = ?,
-                    pni = ?,
-                    username = ?,
-                    pni_signature_verified = ?
                 WHERE _id = ?
                 """
         ).formatted(TABLE_RECIPIENT);
@@ -1492,8 +1377,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             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.setBoolean(5, keepPniSignatureVerified && isPniSignatureVerified(connection, recipientId));
+            statement.setLong(5, recipientId.id());
-            statement.setLong(6, recipientId.id());
             statement.executeUpdate();
         }
         rotateStorageId(connection, recipientId);
@@ -1518,14 +1402,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
             RecipientId toBeMergedRecipientId
     ) throws SQLException {
         final var contact = getContact(connection, recipientId);
-        final var toBeMergedContact = getContact(connection, toBeMergedRecipientId);
         if (contact == null) {
+            final var toBeMergedContact = getContact(connection, toBeMergedRecipientId);
             storeContact(connection, recipientId, toBeMergedContact);
-        } else if (toBeMergedContact != null) {
-            final var mergedContact = mergeContacts(contact, toBeMergedContact);
-            if (!contact.equals(mergedContact)) {
-                storeContact(connection, recipientId, mergedContact);
-            }
         }
 
         final var profileKey = getProfileKey(connection, recipientId);
@@ -1550,24 +1429,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
         recipientsMerged.put(toBeMergedRecipientId.id(), recipientId.id());
     }
 
-    static Contact mergeContacts(final Contact primary, final Contact secondary) {
-        final var profileSharingEnabled = primary.isProfileSharingEnabled() || secondary.isProfileSharingEnabled();
-        return Contact.newBuilder(primary)
-                .withGivenName(secondary.givenName())
-                .withFamilyName(secondary.familyName())
-                .withMessageExpirationTime(primary.messageExpirationTime() > 0
-                        ? primary.messageExpirationTime()
-                        : secondary.messageExpirationTime())
-                .withMessageExpirationTimeVersion(Math.max(primary.messageExpirationTimeVersion(),
-                        secondary.messageExpirationTimeVersion()))
-                .withMuteUntil(primary.muteUntil() > 0 ? primary.muteUntil() : secondary.muteUntil())
-                .withIsBlocked(primary.isBlocked() || secondary.isBlocked())
-                .withBlockedAt(Math.max(primary.blockedAt(), secondary.blockedAt()))
-                .withIsProfileSharingEnabled(profileSharingEnabled)
-                .withIsHidden(profileSharingEnabled ? false : primary.isHidden())
-                .build();
-    }
-
     private Optional<RecipientWithAddress> findByNumber(
             final Connection connection,
             final String number
@@ -1647,7 +1508,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.expiration_time_version, r.mute_until, r.hide_story, r.profile_sharing, r.color, r.blocked, r.blocked_at, 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)
                 """
@@ -1734,7 +1595,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 getProfileFromResultSet(resultSet),
                 getDiscoverableFromResultSet(resultSet),
                 getUnregisteredTimestampFromResultSet(resultSet),
-                resultSet.getBoolean("pni_signature_verified"),
                 getStorageRecordFromResultSet(resultSet));
     }
 
@@ -1752,7 +1612,6 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 resultSet.getLong("mute_until"),
                 resultSet.getBoolean("hide_story"),
                 resultSet.getBoolean("blocked"),
-                resultSet.getLong("blocked_at"),
                 resultSet.getBoolean("archived"),
                 resultSet.getBoolean("profile_sharing"),
                 resultSet.getBoolean("hidden"),

lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java

@@ -410,7 +410,7 @@ public class SessionStore implements SignalServiceSessionStore {
     }
 
     private static boolean isActive(SessionRecord record) {
-        return record != null && record.hasSenderChain();
+        return record != null && record.hasSenderChain(0.0);
     }
 
     record Key(String address, int deviceId) {}

lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerPack.java

@@ -1,29 +1,10 @@
 package org.asamk.signal.manager.storage.stickers;
 
 import org.asamk.signal.manager.api.StickerPackId;
-import org.whispersystems.signalservice.api.storage.StorageId;
 
-public record StickerPack(
+public record StickerPack(long internalId, StickerPackId packId, byte[] packKey, boolean isInstalled) {
-        long internalId,
-        StickerPackId packId,
-        byte[] packKey,
-        boolean isInstalled,
-        int position,
-        long deletedTimestamp,
-        StorageId storageId,
-        byte[] storageRecord
-) {
-
-    public StickerPack(
-            final long internalId,
-            final StickerPackId packId,
-            final byte[] packKey,
-            final boolean isInstalled
-    ) {
-        this(internalId, packId, packKey, isInstalled, 0, 0, null, null);
-    }
 
     public StickerPack(final StickerPackId packId, final byte[] packKey) {
-        this(-1, packId, packKey, false, 0, 0, null, null);
+        this(-1, packId, packKey, false);
     }
 }

lib/src/main/java/org/asamk/signal/manager/storage/stickers/StickerStore.java

@@ -3,19 +3,14 @@ package org.asamk.signal.manager.storage.stickers;
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.Utils;
-import org.asamk.signal.manager.util.KeyUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.storage.SignalStickerPackRecord;
-import org.whispersystems.signalservice.api.storage.StorageId;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Types;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 public class StickerStore {
 
@@ -32,11 +27,7 @@ public class StickerStore {
                                       _id INTEGER PRIMARY KEY,
                                       pack_id BLOB UNIQUE NOT NULL,
                                       pack_key BLOB NOT NULL,
-                                      installed INTEGER NOT NULL DEFAULT FALSE,
+                                      installed INTEGER NOT NULL DEFAULT FALSE
-                                      position INTEGER NOT NULL DEFAULT 0,
-                                      deleted_timestamp INTEGER NOT NULL DEFAULT 0,
-                                      storage_id BLOB UNIQUE,
-                                      storage_record BLOB
                                     ) STRICT;
                                     """);
         }
@@ -47,103 +38,55 @@ public class StickerStore {
     }
 
     public List<StickerPack> getStickerPacks() {
-        try (final var connection = database.getConnection()) {
-            return getStickerPacks(connection);
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed read from sticker store", e);
-        }
-    }
-
-    public List<StickerPack> getStickerPacks(final Connection connection) throws SQLException {
         final var sql = (
                 """
-                SELECT s._id, s.pack_id, s.pack_key, s.installed, s.position, s.deleted_timestamp, s.storage_id, s.storage_record
+                SELECT s._id, s.pack_id, s.pack_key, s.installed
                 FROM %s s
                 """
         ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
+        try (final var connection = database.getConnection()) {
-            try (var result = Utils.executeQueryForStream(statement, this::getStickerPackFromResultSet)) {
+            try (final var statement = connection.prepareStatement(sql)) {
-                return result.toList();
+                try (var result = Utils.executeQueryForStream(statement, this::getStickerPackFromResultSet)) {
+                    return result.toList();
+                }
             }
+        } catch (SQLException e) {
+            throw new RuntimeException("Failed read from sticker store", e);
         }
     }
 
     public StickerPack getStickerPack(StickerPackId packId) {
-        try (final var connection = database.getConnection()) {
-            return getStickerPack(connection, packId);
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed read from sticker store", e);
-        }
-    }
-
-    public StickerPack getStickerPack(Connection connection, StickerPackId packId) throws SQLException {
         final var sql = (
                 """
-                SELECT s._id, s.pack_id, s.pack_key, s.installed, s.position, s.deleted_timestamp, s.storage_id, s.storage_record
+                SELECT s._id, s.pack_id, s.pack_key, s.installed
                 FROM %s s
                 WHERE s.pack_id = ?
                 """
         ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
+        try (final var connection = database.getConnection()) {
-            statement.setBytes(1, packId.serialize());
+            try (final var statement = connection.prepareStatement(sql)) {
-            return Utils.executeQueryForOptional(statement, this::getStickerPackFromResultSet).orElse(null);
+                statement.setBytes(1, packId.serialize());
-        }
+                return Utils.executeQueryForOptional(statement, this::getStickerPackFromResultSet).orElse(null);
-    }
+            }
-
+        } catch (SQLException e) {
-    public StickerPack getStickerPack(Connection connection, StorageId storageId) throws SQLException {
+            throw new RuntimeException("Failed read from sticker store", e);
-        final var sql = (
-                """
-                SELECT s._id, s.pack_id, s.pack_key, s.installed, s.position, s.deleted_timestamp, s.storage_id, s.storage_record
-                FROM %s s
-                WHERE s.storage_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, storageId.getRaw());
-            return Utils.executeQueryForOptional(statement, this::getStickerPackFromResultSet).orElse(null);
         }
     }
 
     public void addStickerPack(StickerPack stickerPack) {
         final var sql = (
                 """
-                INSERT INTO %s (pack_id, pack_key, installed, position, deleted_timestamp, storage_id, storage_record)
+                INSERT INTO %s (pack_id, pack_key, installed)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                VALUES (?, ?, ?)
                 """
         ).formatted(TABLE_STICKER);
         try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            var storageId = stickerPack.storageId();
-            if (storageId == null && (stickerPack.isInstalled() || stickerPack.deletedTimestamp() > 0)) {
-                storageId = StorageId.forStickerPack(KeyUtils.createRawStorageId());
-            }
-
-            final var position = stickerPack.isInstalled() ? Math.max(stickerPack.position(),
-                    getNextPosition(connection)) : 0;
-            var deletedTimestamp = stickerPack.deletedTimestamp();
-            if (!stickerPack.isInstalled() && deletedTimestamp == 0 && storageId != null) {
-                deletedTimestamp = System.currentTimeMillis();
-            }
-
             try (final var statement = connection.prepareStatement(sql)) {
                 statement.setBytes(1, stickerPack.packId().serialize());
                 statement.setBytes(2, stickerPack.packKey());
                 statement.setBoolean(3, stickerPack.isInstalled());
-                statement.setInt(4, position);
-                statement.setLong(5, deletedTimestamp);
-                if (storageId == null) {
-                    statement.setNull(6, Types.BLOB);
-                } else {
-                    statement.setBytes(6, storageId.getRaw());
-                }
-                if (stickerPack.storageRecord() == null) {
-                    statement.setNull(7, Types.BLOB);
-                } else {
-                    statement.setBytes(7, stickerPack.storageRecord());
-                }
                 statement.executeUpdate();
             }
-            connection.commit();
         } catch (SQLException e) {
             throw new RuntimeException("Failed update sticker store", e);
         }
@@ -153,279 +96,28 @@ public class StickerStore {
         final var sql = (
                 """
                 UPDATE %s
-                SET installed = ?, position = ?, deleted_timestamp = ?, storage_id = ?
+                SET installed = ?
                 WHERE pack_id = ?
                 """
         ).formatted(TABLE_STICKER);
         try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            final var existing = getStickerPack(connection, stickerPackId);
-            if (existing == null || existing.isInstalled() == installed) {
-                connection.commit();
-                return;
-            }
-
-            final var newStorageId = StorageId.forStickerPack(KeyUtils.createRawStorageId());
-            final var position = installed ? getNextPosition(connection) : 0;
-            final var deletedTimestamp = installed ? 0 : System.currentTimeMillis();
-
             try (final var statement = connection.prepareStatement(sql)) {
-                statement.setBoolean(1, installed);
+                statement.setBytes(1, stickerPackId.serialize());
-                statement.setInt(2, position);
+                statement.setBoolean(2, installed);
-                statement.setLong(3, deletedTimestamp);
-                statement.setBytes(4, newStorageId.getRaw());
-                statement.setBytes(5, stickerPackId.serialize());
                 statement.executeUpdate();
             }
-            connection.commit();
         } catch (SQLException e) {
             throw new RuntimeException("Failed update sticker store", e);
         }
     }
 
-    public List<StorageId> getStorageIds(final Connection connection) throws SQLException {
-        final var sql = (
-                """
-                SELECT s.storage_id
-                FROM %s s
-                WHERE s.storage_id IS NOT NULL
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            return Utils.executeQueryForStream(statement, this::getStorageIdFromResultSet).toList();
-        }
-    }
-
-    public void updateStorageId(
-            final Connection connection,
-            final StickerPackId packId,
-            final StorageId storageId
-    ) throws SQLException {
-        final var sql = (
-                """
-                UPDATE %s
-                SET storage_id = ?
-                WHERE pack_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, storageId.getRaw());
-            statement.setBytes(2, packId.serialize());
-            statement.executeUpdate();
-        }
-    }
-
-    public void updateStorageIds(
-            final Connection connection,
-            final Map<StickerPackId, StorageId> storageIdMap
-    ) throws SQLException {
-        final var sql = (
-                """
-                UPDATE %s
-                SET storage_id = ?
-                WHERE pack_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            for (final var entry : storageIdMap.entrySet()) {
-                statement.setBytes(1, entry.getValue().getRaw());
-                statement.setBytes(2, entry.getKey().serialize());
-                statement.executeUpdate();
-            }
-        }
-    }
-
-    public StorageId getStorageId(final Connection connection, final StickerPackId packId) throws SQLException {
-        final var sql = (
-                """
-                SELECT s.storage_id
-                FROM %s s
-                WHERE s.pack_id = ? AND s.storage_id IS NOT NULL
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            statement.setBytes(1, packId.serialize());
-            final var storageId = Utils.executeQueryForOptional(statement, this::getStorageIdFromResultSet);
-            if (storageId.isPresent()) {
-                return storageId.get();
-            }
-        }
-
-        final var newStorageId = StorageId.forStickerPack(KeyUtils.createRawStorageId());
-        updateStorageId(connection, packId, newStorageId);
-        return newStorageId;
-    }
-
-    public void storeStorageRecord(
-            final Connection connection,
-            final StickerPackId packId,
-            final StorageId storageId,
-            final byte[] storageRecord
-    ) throws SQLException {
-        final var clearSql = (
-                """
-                UPDATE %s
-                SET storage_id = NULL
-                WHERE storage_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(clearSql)) {
-            statement.setBytes(1, storageId.getRaw());
-            statement.executeUpdate();
-        }
-
-        final var updateSql = (
-                """
-                UPDATE %s
-                SET storage_id = ?, storage_record = ?
-                WHERE pack_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(updateSql)) {
-            statement.setBytes(1, storageId.getRaw());
-            if (storageRecord == null) {
-                statement.setNull(2, Types.BLOB);
-            } else {
-                statement.setBytes(2, storageRecord);
-            }
-            statement.setBytes(3, packId.serialize());
-            statement.executeUpdate();
-        }
-    }
-
-    public void setMissingStorageIds() {
-        final var selectSql = (
-                """
-                SELECT s.pack_id
-                FROM %s s
-                WHERE s.storage_id IS NULL AND s.installed = TRUE
-                """
-        ).formatted(TABLE_STICKER);
-        final var updateSql = (
-                """
-                UPDATE %s
-                SET storage_id = ?
-                WHERE pack_id = ?
-                """
-        ).formatted(TABLE_STICKER);
-
-        try (final var connection = database.getConnection()) {
-            connection.setAutoCommit(false);
-            try (final var selectStatement = connection.prepareStatement(selectSql)) {
-                final var packIds = Utils.executeQueryForStream(selectStatement,
-                        resultSet -> StickerPackId.deserialize(resultSet.getBytes("pack_id"))).toList();
-                try (final var updateStatement = connection.prepareStatement(updateSql)) {
-                    for (final var packId : packIds) {
-                        updateStatement.setBytes(1, KeyUtils.createRawStorageId());
-                        updateStatement.setBytes(2, packId.serialize());
-                        updateStatement.executeUpdate();
-                    }
-                }
-            }
-            connection.commit();
-        } catch (SQLException e) {
-            throw new RuntimeException("Failed update sticker store", e);
-        }
-    }
-
-    public int removeStorageIdsFromLocalOnlyDeletedStickerPacks(
-            final Connection connection,
-            final Collection<StorageId> storageIds
-    ) throws SQLException {
-        final var sql = (
-                """
-                UPDATE %s
-                SET storage_id = NULL
-                WHERE storage_id = ? AND installed = FALSE AND deleted_timestamp > 0
-                """
-        ).formatted(TABLE_STICKER);
-        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 upsertFromStorageSync(
-            final Connection connection,
-            final SignalStickerPackRecord record
-    ) throws SQLException {
-        final var remote = record.getProto();
-        final var packId = StickerPackId.deserialize(remote.packId.toByteArray());
-        final var deleted = remote.deletedAtTimestamp > 0;
-        final var packKey = remote.packKey.toByteArray();
-        final var storageRecord = remote.encode();
-
-        final var current = getStickerPack(connection, packId);
-
-        if (current == null) {
-            final var insertSql = (
-                    """
-                    INSERT INTO %s (pack_id, pack_key, installed, position, deleted_timestamp, storage_id, storage_record)
-                    VALUES (?, ?, ?, ?, ?, ?, ?)
-                    """
-            ).formatted(TABLE_STICKER);
-            try (final var statement = connection.prepareStatement(insertSql)) {
-                statement.setBytes(1, packId.serialize());
-                statement.setBytes(2, packKey);
-                statement.setBoolean(3, !deleted);
-                statement.setInt(4, deleted ? 0 : remote.position);
-                statement.setLong(5, remote.deletedAtTimestamp);
-                statement.setBytes(6, record.getId().getRaw());
-                statement.setBytes(7, storageRecord);
-                statement.executeUpdate();
-            }
-            return;
-        }
-
-        if (packKey.length > 0) {
-            final var updateSql = (
-                    """
-                    UPDATE %s
-                    SET pack_key = ?, installed = ?, position = ?, deleted_timestamp = ?, storage_id = ?, storage_record = ?
-                    WHERE pack_id = ?
-                    """
-            ).formatted(TABLE_STICKER);
-            try (final var statement = connection.prepareStatement(updateSql)) {
-                statement.setBytes(1, packKey);
-                statement.setBoolean(2, !deleted);
-                statement.setInt(3, deleted ? 0 : remote.position);
-                statement.setLong(4, remote.deletedAtTimestamp);
-                statement.setBytes(5, record.getId().getRaw());
-                statement.setBytes(6, storageRecord);
-                statement.setBytes(7, packId.serialize());
-                statement.executeUpdate();
-            }
-        } else {
-            final var updateSql = (
-                    """
-                    UPDATE %s
-                    SET installed = ?, position = ?, deleted_timestamp = ?, storage_id = ?, storage_record = ?
-                    WHERE pack_id = ?
-                    """
-            ).formatted(TABLE_STICKER);
-            try (final var statement = connection.prepareStatement(updateSql)) {
-                statement.setBoolean(1, !deleted);
-                statement.setInt(2, deleted ? 0 : remote.position);
-                statement.setLong(3, remote.deletedAtTimestamp);
-                statement.setBytes(4, record.getId().getRaw());
-                statement.setBytes(5, storageRecord);
-                statement.setBytes(6, packId.serialize());
-                statement.executeUpdate();
-            }
-        }
-    }
-
     void addLegacyStickers(Collection<StickerPack> stickerPacks) {
         logger.debug("Migrating legacy stickers to database");
         long start = System.nanoTime();
         final var sql = (
                 """
-                INSERT INTO %s (pack_id, pack_key, installed, position, deleted_timestamp, storage_id, storage_record)
+                INSERT INTO %s (pack_id, pack_key, installed)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                VALUES (?, ?, ?)
                 """
         ).formatted(TABLE_STICKER);
         try (final var connection = database.getConnection()) {
@@ -433,23 +125,11 @@ public class StickerStore {
             try (final var statement = connection.prepareStatement("DELETE FROM %s".formatted(TABLE_STICKER))) {
                 statement.executeUpdate();
             }
-            var installedPosition = 0;
             try (final var statement = connection.prepareStatement(sql)) {
                 for (final var sticker : stickerPacks) {
-                    final var storageId = sticker.isInstalled()
-                            ? StorageId.forStickerPack(KeyUtils.createRawStorageId())
-                            : null;
                     statement.setBytes(1, sticker.packId().serialize());
                     statement.setBytes(2, sticker.packKey());
                     statement.setBoolean(3, sticker.isInstalled());
-                    statement.setInt(4, sticker.isInstalled() ? installedPosition++ : 0);
-                    statement.setLong(5, 0);
-                    if (storageId == null) {
-                        statement.setNull(6, Types.BLOB);
-                    } else {
-                        statement.setBytes(6, storageId.getRaw());
-                    }
-                    statement.setNull(7, Types.BLOB);
                     statement.executeUpdate();
                 }
             }
@@ -465,36 +145,6 @@ public class StickerStore {
         final var packId = resultSet.getBytes("pack_id");
         final var packKey = resultSet.getBytes("pack_key");
         final var installed = resultSet.getBoolean("installed");
-        final var position = resultSet.getInt("position");
+        return new StickerPack(internalId, StickerPackId.deserialize(packId), packKey, installed);
-        final var deletedTimestamp = resultSet.getLong("deleted_timestamp");
-        final var storageIdBytes = resultSet.getBytes("storage_id");
-        final var storageId = storageIdBytes == null ? null : StorageId.forStickerPack(storageIdBytes);
-        final var storageRecord = resultSet.getBytes("storage_record");
-        return new StickerPack(internalId,
-                StickerPackId.deserialize(packId),
-                packKey,
-                installed,
-                position,
-                deletedTimestamp,
-                storageId,
-                storageRecord);
-    }
-
-    private StorageId getStorageIdFromResultSet(final ResultSet resultSet) throws SQLException {
-        final var storageId = resultSet.getBytes("storage_id");
-        return StorageId.forStickerPack(storageId);
-    }
-
-    private int getNextPosition(final Connection connection) throws SQLException {
-        final var sql = (
-                """
-                SELECT IFNULL(MAX(position) + 1, 0) AS next_position
-                FROM %s
-                WHERE installed = TRUE
-                """
-        ).formatted(TABLE_STICKER);
-        try (final var statement = connection.prepareStatement(sql)) {
-            return Utils.executeQuerySingleRow(statement, resultSet -> resultSet.getInt("next_position"));
-        }
     }
 }

lib/src/main/java/org/asamk/signal/manager/syncStorage/ContactRecordProcessor.java

@@ -24,7 +24,6 @@ import org.whispersystems.signalservice.internal.storage.protos.ContactRecord.Id
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
@@ -57,29 +56,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
         this.selfNumber = account.getNumber();
     }
 
-    public void prepare(final Collection<SignalContactRecord> remoteRecords) throws SQLException {
-        for (final var remoteRecord : remoteRecords) {
-            if (isInvalid(remoteRecord)) {
-                continue;
-            }
-            final var remote = remoteRecord.getProto();
-            final var aci = ACI.parseOrNull(remote.aci, remote.aciBinary);
-            final var pni = PNI.parseOrNull(remote.pni, remote.pniBinary);
-            if (shouldSplitForStorageSync(remote.unregisteredAtTimestamp, aci, pni, remote.e164)) {
-                account.getRecipientStore().splitForStorageSyncIfNecessary(connection, aci);
-            }
-        }
-    }
-
-    static boolean shouldSplitForStorageSync(
-            final long unregisteredAtTimestamp,
-            final ACI aci,
-            final PNI pni,
-            final String e164
-    ) {
-        return unregisteredAtTimestamp > 0 && aci != null && pni == null && e164.isEmpty();
-    }
-
     /**
      * Error cases:
      * - You can't have a contact record without an ACI or PNI.
@@ -229,7 +205,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 .identityState(identityState)
                 .identityKey(identityKey)
                 .blocked(remote.blocked)
-                .blockedAtTimestamp(remote.blockedAtTimestamp)
                 .whitelisted(remote.whitelisted)
                 .archived(remote.archived)
                 .markedUnread(remote.markedUnread)
@@ -308,9 +283,7 @@ 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();
-        final var blockedAt = contact == null ? 0 : contact.blockedAt();
         if (blocked != contactProto.blocked
-                || blockedAt != contactProto.blockedAtTimestamp
                 || profileShared != contactProto.whitelisted
                 || archived != contactProto.archived
                 || hidden != contactProto.hidden
@@ -328,7 +301,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
             logger.debug("Storing new or updated contact {}", recipientId);
             final var contactBuilder = contact == null ? Contact.newBuilder() : Contact.newBuilder(contact);
             final var newContact = contactBuilder.withIsBlocked(contactProto.blocked)
-                    .withBlockedAt(contactProto.blocked ? contactProto.blockedAtTimestamp : 0)
                     .withIsProfileSharingEnabled(contactProto.whitelisted)
                     .withIsArchived(contactProto.archived)
                     .withIsHidden(contactProto.hidden)
@@ -385,8 +357,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
                 logger.warn("Received invalid contact identity key from storage");
             }
         }
-        account.getRecipientStore()
-                .storePniSignatureVerified(connection, recipientId, contactProto.pniSignatureVerified);
         account.getRecipientStore()
                 .storeStorageRecord(connection, recipientId, contactRecord.getId(), contactProto.encode());
     }

lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV1RecordProcessor.java

@@ -114,7 +114,6 @@ public final class GroupV1RecordProcessor extends DefaultStorageRecordProcessor<
         final var group = account.getGroupStore().getOrCreateGroupV1(connection, groupIdV1);
         if (group != null) {
             group.setBlocked(groupV1Proto.blocked);
-            group.setBlockedAt(0);
             account.getGroupStore().updateGroup(connection, group);
             account.getGroupStore()
                     .storeStorageRecord(connection, group.getGroupId(), groupV1Record.getId(), groupV1Proto.encode());

lib/src/main/java/org/asamk/signal/manager/syncStorage/GroupV2RecordProcessor.java

@@ -56,7 +56,6 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
         final var mergedBuilder = remote.newBuilder()
                 .masterKey(remote.masterKey)
                 .blocked(remote.blocked)
-                .blockedAtTimestamp(remote.blockedAtTimestamp)
                 .whitelisted(remote.whitelisted)
                 .archived(remote.archived)
                 .markedUnread(remote.markedUnread)
@@ -94,7 +93,6 @@ public final class GroupV2RecordProcessor extends DefaultStorageRecordProcessor<
 
         final var group = account.getGroupStore().getGroupOrPartialMigrate(connection, groupMasterKey);
         group.setBlocked(groupV2Proto.blocked);
-        group.setBlockedAt(groupV2Proto.blocked ? groupV2Proto.blockedAtTimestamp : 0);
         group.setProfileSharingEnabled(groupV2Proto.whitelisted);
         account.getGroupStore().updateGroup(connection, group);
         account.getGroupStore()

lib/src/main/java/org/asamk/signal/manager/syncStorage/StickerPackRecordProcessor.java

@@ -1,86 +0,0 @@
-package org.asamk.signal.manager.syncStorage;
-
-import org.asamk.signal.manager.api.StickerPackId;
-import org.asamk.signal.manager.storage.SignalAccount;
-import org.asamk.signal.manager.util.KeyUtils;
-import org.whispersystems.signalservice.api.storage.SignalStickerPackRecord;
-import org.whispersystems.signalservice.api.storage.StorageId;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Optional;
-
-public class StickerPackRecordProcessor extends DefaultStorageRecordProcessor<SignalStickerPackRecord> {
-
-    private static final int PACK_ID_LENGTH = 16;
-    private static final int PACK_KEY_LENGTH = 32;
-
-    private final SignalAccount account;
-    private final Connection connection;
-
-    public StickerPackRecordProcessor(final SignalAccount account, final Connection connection) {
-        this.account = account;
-        this.connection = connection;
-    }
-
-    @Override
-    public int compare(final SignalStickerPackRecord lhs, final SignalStickerPackRecord rhs) {
-        return lhs.getProto().packId.equals(rhs.getProto().packId) ? 0 : 1;
-    }
-
-    @Override
-    protected boolean isInvalid(final SignalStickerPackRecord remote) {
-        return remote.getProto().packId.size() != PACK_ID_LENGTH || (
-                remote.getProto().deletedAtTimestamp == 0 && remote.getProto().packKey.size() != PACK_KEY_LENGTH
-        );
-    }
-
-    @Override
-    protected Optional<SignalStickerPackRecord> getMatching(final SignalStickerPackRecord remote) throws SQLException {
-        final var packId = StickerPackId.deserialize(remote.getProto().packId.toByteArray());
-        final var local = account.getStickerStore().getStickerPack(connection, packId);
-
-        if (local == null || (!local.isInstalled() && local.deletedTimestamp() == 0)) {
-            return Optional.empty();
-        }
-
-        final StorageId storageId;
-        if (local.storageId() != null) {
-            storageId = local.storageId();
-        } else {
-            storageId = StorageId.forStickerPack(KeyUtils.createRawStorageId());
-            account.getStickerStore().updateStorageId(connection, packId, storageId);
-        }
-
-        return Optional.of(new SignalStickerPackRecord(storageId, StorageSyncModels.localToRemoteRecord(local)));
-    }
-
-    @Override
-    protected SignalStickerPackRecord merge(
-            final SignalStickerPackRecord remoteRecord,
-            final SignalStickerPackRecord localRecord
-    ) {
-        final var remote = remoteRecord.getProto();
-        final var local = localRecord.getProto();
-
-        if (shouldKeepLocalDeletion(remote.deletedAtTimestamp, local.deletedAtTimestamp)) {
-            return localRecord;
-        }
-
-        return remoteRecord;
-    }
-
-    static boolean shouldKeepLocalDeletion(final long remoteDeletedAt, final long localDeletedAt) {
-        return remoteDeletedAt > 0 && localDeletedAt > 0 && localDeletedAt < remoteDeletedAt;
-    }
-
-    @Override
-    protected void insertLocal(final SignalStickerPackRecord record) throws SQLException {
-        account.getStickerStore().upsertFromStorageSync(connection, record);
-    }
-
-    @Override
-    protected void updateLocal(final StorageRecordUpdate<SignalStickerPackRecord> update) throws SQLException {
-        account.getStickerStore().upsertFromStorageSync(connection, update.newRecord());
-    }
-}

lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncLoopDetector.java

@@ -1,139 +0,0 @@
-package org.asamk.signal.manager.syncStorage;
-
-import org.asamk.signal.manager.util.LeakyBucket;
-
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.function.BooleanSupplier;
-
-public final class StorageSyncLoopDetector {
-
-    private static final int FINGERPRINT_HISTORY = 3;
-
-    private final BooleanSupplier isMultiDevice;
-    private final List<Integer> recentFingerprints = new ArrayList<>();
-    private final LeakyBucket contentBucket = new LeakyBucket(3,
-            Duration.ofHours(1).toMillis(),
-            new InMemoryBucketState());
-    private final LeakyBucket rateBucket = new LeakyBucket(100,
-            Duration.ofMinutes(10).toMillis(),
-            new InMemoryBucketState());
-
-    public StorageSyncLoopDetector(final BooleanSupplier isMultiDevice) {
-        this.isMultiDevice = isMultiDevice;
-    }
-
-    public synchronized Decision onWriteAttempt(
-            final WriteOperationResult write,
-            final boolean fetchedRemoteManifest,
-            final boolean isRetry
-    ) {
-        return onWriteAttempt(write, fetchedRemoteManifest, isRetry, System.currentTimeMillis());
-    }
-
-    synchronized Decision onWriteAttempt(
-            final WriteOperationResult write,
-            final boolean fetchedRemoteManifest,
-            final boolean isRetry,
-            final long now
-    ) {
-        if (!isMultiDevice.getAsBoolean() || isRetry) {
-            return Decision.Allowed.INSTANCE;
-        }
-
-        final var fingerprint = fingerprint(write);
-        final var chargeContent = fetchedRemoteManifest && fingerprint != null && recentFingerprints.contains(
-                fingerprint);
-
-        if (chargeContent && !contentBucket.hasRoom(now)) {
-            return new Decision.Denied(Cause.REPEATED_PAYLOAD, contentBucket.level(now));
-        }
-        if (fetchedRemoteManifest && !rateBucket.hasRoom(now)) {
-            return new Decision.Denied(Cause.WRITE_RATE, rateBucket.level(now));
-        }
-
-        if (chargeContent) {
-            contentBucket.use(now);
-        }
-        if (fetchedRemoteManifest) {
-            rateBucket.use(now);
-        }
-        if (fingerprint != null) {
-            remember(fingerprint);
-        }
-
-        return Decision.Allowed.INSTANCE;
-    }
-
-    public synchronized void onWriteFailed() {
-        onWriteFailed(System.currentTimeMillis());
-    }
-
-    synchronized void onWriteFailed(final long now) {
-        contentBucket.refund(now);
-        rateBucket.refund(now);
-    }
-
-    public synchronized void onConverged() {
-        contentBucket.clear();
-    }
-
-    private void remember(final int fingerprint) {
-        recentFingerprints.remove(Integer.valueOf(fingerprint));
-        recentFingerprints.addFirst(fingerprint);
-        if (recentFingerprints.size() > FINGERPRINT_HISTORY) {
-            recentFingerprints.removeLast();
-        }
-    }
-
-    private static Integer fingerprint(final WriteOperationResult write) {
-        if (write.inserts().isEmpty()) {
-            return null;
-        }
-
-        return write.inserts()
-                .stream()
-                .map(record -> Arrays.hashCode(record.getProto().encode()))
-                .sorted()
-                .toList()
-                .hashCode();
-    }
-
-    private static final class InMemoryBucketState implements LeakyBucket.State {
-
-        private int level;
-        private long levelUpdatedAt;
-
-        @Override
-        public int level() {
-            return level;
-        }
-
-        @Override
-        public long levelUpdatedAt() {
-            return levelUpdatedAt;
-        }
-
-        @Override
-        public void update(final int level, final long levelUpdatedAt) {
-            this.level = level;
-            this.levelUpdatedAt = levelUpdatedAt;
-        }
-    }
-
-    public enum Cause {
-        REPEATED_PAYLOAD,
-        WRITE_RATE
-    }
-
-    public sealed interface Decision {
-
-        enum Allowed implements Decision {
-            INSTANCE
-        }
-
-        record Denied(Cause cause, int level) implements Decision {}
-    }
-}

lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncModels.java

@@ -8,7 +8,6 @@ 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.asamk.signal.manager.storage.stickers.StickerPack;
 import org.signal.core.models.ServiceId.ACI;
 import org.signal.core.models.ServiceId.PNI;
 import org.signal.core.util.UuidUtil;
@@ -17,14 +16,12 @@ 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.SignalStickerPackRecord;
 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 org.whispersystems.signalservice.internal.storage.protos.StickerPackRecord;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -96,11 +93,11 @@ public final class StorageSyncModels {
     public static ContactRecord localToRemoteRecord(Recipient recipient, IdentityInfo identity) {
         final var address = recipient.getAddress();
         final var aciPresent = address.aci().isPresent();
+        final var pniPresent = address.pni().isPresent();
 
         final var builder = SignalContactRecord.Companion.newBuilder(recipient.getStorageRecord())
-                .e164(address.number().orElse(""))
+                .e164(pniPresent ? address.number().orElse("") : "")
                 .username(address.username().orElse(""))
-                .pniSignatureVerified(recipient.isPniSignatureVerified())
                 .profileKey(recipient.getProfileKey() == null
                         ? ByteString.EMPTY
                         : ByteString.of(recipient.getProfileKey().serialize()));
@@ -123,7 +120,6 @@ public final class StorageSyncModels {
                     .nickname(getNicknameRemoteRecord(recipient.getContact()))
                     .note(emptyIfNull(recipient.getContact().note()))
                     .blocked(recipient.getContact().isBlocked())
-                    .blockedAtTimestamp(recipient.getContact().blockedAt())
                     .whitelisted(recipient.getContact().isProfileSharingEnabled())
                     .mutedUntilTimestamp(recipient.getContact().muteUntil())
                     .hideStory(recipient.getContact().hideStory())
@@ -162,28 +158,10 @@ public final class StorageSyncModels {
         final var builder = SignalGroupV2Record.Companion.newBuilder(group.getStorageRecord());
         builder.masterKey(ByteString.of(group.getMasterKey().serialize()));
         builder.blocked(group.isBlocked());
-        builder.blockedAtTimestamp(group.getBlockedAt());
         builder.whitelisted(group.isProfileSharingEnabled());
         return builder.build();
     }
 
-    public static StickerPackRecord localToRemoteRecord(StickerPack stickerPack) {
-        final var builder = SignalStickerPackRecord.Companion.newBuilder(stickerPack.storageRecord());
-        builder.packId(ByteString.of(stickerPack.packId().serialize()));
-
-        if (stickerPack.deletedTimestamp() > 0) {
-            builder.packKey(ByteString.EMPTY);
-            builder.position(0);
-            builder.deletedAtTimestamp(stickerPack.deletedTimestamp());
-        } else {
-            builder.packKey(ByteString.of(stickerPack.packKey()));
-            builder.position(stickerPack.position());
-            builder.deletedAtTimestamp(0);
-        }
-
-        return builder.build();
-    }
-
     public static TrustLevel remoteToLocal(IdentityState identityState) {
         return switch (identityState) {
             case DEFAULT -> TrustLevel.TRUSTED_UNVERIFIED;

lib/src/main/java/org/asamk/signal/manager/syncStorage/StorageSyncValidations.java

@@ -168,11 +168,6 @@ public final class StorageSyncValidations {
                 throw new DuplicateCallLinkError();
             }
 
-            ids = manifest.getStorageIdsByType().get(ManifestRecord.Identifier.Type.STICKER_PACK.getValue());
-            if (ids.size() != new HashSet<>(ids).size()) {
-                throw new DuplicateStickerPackError();
-            }
-
             throw new DuplicateRawIdAcrossTypesError();
         }
 
@@ -222,8 +217,6 @@ public final class StorageSyncValidations {
 
     private static final class DuplicateInsertInWriteError extends Error {}
 
-    private static final class DuplicateStickerPackError extends Error {}
-
     private static final class InsertNotPresentInFullIdSetError extends Error {}
 
     private static final class DeletePresentInFullIdSetError extends Error {}

lib/src/main/java/org/asamk/signal/manager/util/AttachmentUtils.java

@@ -1,44 +1,28 @@
 package org.asamk.signal.manager.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 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.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Optional;
 import java.util.UUID;
 
-import javax.imageio.ImageIO;
-
 public class AttachmentUtils {
 
-    private static final Logger logger = LoggerFactory.getLogger(AttachmentUtils.class);
-
-    // Images are fully buffered in memory to probe their dimensions, so cap how large a file we'll do this for.
-    private static final long MAX_DIMENSION_PROBE_SIZE = 20 * 1024 * 1024;
-
     public static SignalServiceAttachmentStream createAttachmentStream(
             StreamDetails streamDetails,
             Optional<String> name,
             boolean voiceNote,
             ResumableUploadSpec resumableUploadSpec
-    ) throws ResumeLocationInvalidException, IOException {
+    ) throws ResumeLocationInvalidException {
         final var uploadTimestamp = System.currentTimeMillis();
-        final var probedStream = probeImageDimensions(streamDetails);
         return SignalServiceAttachmentStream.newStreamBuilder()
-                .withStream(probedStream.inputStream())
+                .withStream(streamDetails.getStream())
                 .withContentType(streamDetails.getContentType())
                 .withLength(streamDetails.getLength())
                 .withFileName(name.orElse(null))
                 .withVoiceNote(voiceNote)
-                .withWidth(probedStream.width())
-                .withHeight(probedStream.height())
                 .withUploadTimestamp(uploadTimestamp)
                 .withResumableUploadSpec(resumableUploadSpec)
                 .withUuid(UUID.randomUUID())
@@ -49,55 +33,7 @@ public class AttachmentUtils {
             StreamDetails streamDetails,
             Optional<String> name,
             ResumableUploadSpec resumableUploadSpec
-    ) throws ResumeLocationInvalidException, IOException {
+    ) throws ResumeLocationInvalidException {
         return createAttachmentStream(streamDetails, name, false, resumableUploadSpec);
     }
-
-    /**
-     * Reads the attachment's dimensions if it's an image, so recipients don't get a square-cropped thumbnail.
-     * Falls back to width/height 0 (today's behavior) if the content isn't an image, is too large to probe
-     * cheaply, or fails to parse.
-     */
-    private static ProbedStream probeImageDimensions(StreamDetails streamDetails) throws IOException {
-        final var contentType = streamDetails.getContentType();
-        final var length = streamDetails.getLength();
-        if (contentType == null
-                || !contentType.startsWith("image/")
-                || length <= 0
-                || length > MAX_DIMENSION_PROBE_SIZE) {
-            return new ProbedStream(streamDetails.getStream(), 0, 0);
-        }
-
-        final var stream = streamDetails.getStream();
-        var width = 0;
-        var height = 0;
-        if (stream instanceof FileInputStream fis) {
-            try {
-                final var image = ImageIO.read(fis);
-                if (image != null) {
-                    width = image.getWidth();
-                    height = image.getHeight();
-                }
-                fis.getChannel().position(0);
-            } catch (IOException | LinkageError e) {
-                logger.debug("Failed to probe image dimensions, sending without width/height: {}", e.getMessage());
-                fis.getChannel().position(0);
-            }
-            return new ProbedStream(fis, width, height);
-        }
-
-        final var bytes = stream.readAllBytes();
-        try {
-            final var image = ImageIO.read(new ByteArrayInputStream(bytes));
-            if (image != null) {
-                width = image.getWidth();
-                height = image.getHeight();
-            }
-        } catch (IOException | LinkageError e) {
-            logger.debug("Failed to probe image dimensions, sending without width/height: {}", e.getMessage());
-        }
-        return new ProbedStream(new ByteArrayInputStream(bytes), width, height);
-    }
-
-    private record ProbedStream(InputStream inputStream, int width, int height) {}
 }

lib/src/main/java/org/asamk/signal/manager/util/LeakyBucket.java

@@ -1,60 +0,0 @@
-package org.asamk.signal.manager.util;
-
-public final class LeakyBucket {
-
-    private final int capacity;
-    private final long dripIntervalMillis;
-    private final State state;
-
-    public LeakyBucket(final int capacity, final long dripIntervalMillis, final State state) {
-        this.capacity = capacity;
-        this.dripIntervalMillis = dripIntervalMillis;
-        this.state = state;
-    }
-
-    public int level(final long now) {
-        return calculateStateForCurrentTime(now).level();
-    }
-
-    public boolean hasRoom(final long now) {
-        return level(now) < capacity;
-    }
-
-    public void use(final long now) {
-        final var currentState = calculateStateForCurrentTime(now);
-        state.update(currentState.level() + 1, currentState.levelUpdatedAt());
-    }
-
-    public void refund(final long now) {
-        final var currentState = calculateStateForCurrentTime(now);
-        state.update(Math.max(currentState.level() - 1, 0), currentState.levelUpdatedAt());
-    }
-
-    public void clear() {
-        state.update(0, 0);
-    }
-
-    private Snapshot calculateStateForCurrentTime(final long now) {
-        final var level = state.level();
-        final var levelUpdatedAt = state.levelUpdatedAt();
-        final var elapsed = now - levelUpdatedAt;
-
-        if (level <= 0 || elapsed < 0) {
-            return new Snapshot(0, now);
-        }
-
-        final var drips = elapsed / dripIntervalMillis;
-        return new Snapshot((int) Math.max(level - drips, 0), levelUpdatedAt + dripIntervalMillis * drips);
-    }
-
-    private record Snapshot(int level, long levelUpdatedAt) {}
-
-    public interface State {
-
-        int level();
-
-        long levelUpdatedAt();
-
-        void update(int level, long levelUpdatedAt);
-    }
-}

lib/src/main/java/org/asamk/signal/manager/util/Utils.java

@@ -17,6 +17,7 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
 import java.net.Proxy;
 import java.net.ProxySelector;
@@ -38,9 +39,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import kotlin.coroutines.Continuation;
-import kotlin.coroutines.EmptyCoroutineContext;
-import kotlinx.coroutines.BuildersKt;
 import okio.ByteString;
 
 public class Utils {
@@ -55,7 +53,7 @@ public class Utils {
     }
 
     public static StreamDetails createStreamDetailsFromFile(final File file) throws IOException {
-        final var stream = new FileInputStream(file);
+        final InputStream stream = new FileInputStream(file);
         final var size = file.length();
         final var mime = MimeUtils.getFileMimeType(file).orElse(MimeUtils.OCTET_STREAM);
         return new StreamDetails(stream, mime, size);
@@ -163,24 +161,6 @@ public class Utils {
         return NetworkResultUtil.toBasicLegacy(response);
     }
 
-    @SuppressWarnings("unchecked")
-    public static <T> T runSuspendBlocking(final Function<Continuation<? super T>, Object> call) {
-        try {
-            return (T) BuildersKt.runBlocking(EmptyCoroutineContext.INSTANCE,
-                    (scope, cont) -> call.apply((Continuation<? super T>) cont));
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException("Interrupted while waiting for suspend function", e);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T, E extends BadRequestError> T handleResponseExceptionSuspend(
-            final Function<Continuation<? super RequestResult>, Object> call
-    ) throws IOException {
-        return handleResponseException((RequestResult<T, E>) runSuspendBlocking((Function) call));
-    }
-
     @SuppressWarnings("unchecked")
     public static <T, E extends BadRequestError> T handleResponseException(final RequestResult<T, E> result) throws IOException {
         if (result instanceof RequestResult.Success<?> success) {

lib/src/test/java/org/asamk/signal/manager/storage/groups/GroupInfoTerminatedTest.java

@@ -1,104 +0,0 @@
-package org.asamk.signal.manager.storage.groups;
-
-import org.asamk.signal.manager.api.Group;
-import org.asamk.signal.manager.api.GroupId;
-import org.asamk.signal.manager.groups.GroupUtils;
-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.asamk.signal.manager.storage.recipients.TestRecipientId;
-import org.junit.jupiter.api.Test;
-import org.signal.core.models.ServiceId;
-import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
-import org.signal.storageservice.storage.protos.groups.local.DecryptedGroup;
-import org.whispersystems.signalservice.api.push.DistributionId;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class GroupInfoTerminatedTest {
-
-    private static final RecipientResolver UNUSED_RESOLVER = new RecipientResolver() {
-        @Override
-        public RecipientId resolveRecipient(final RecipientAddress address) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public RecipientId resolveRecipient(final long recipientId) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public RecipientId resolveRecipient(final String identifier) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public RecipientId resolveRecipient(final ServiceId serviceId) {
-            throw new UnsupportedOperationException();
-        }
-    };
-
-    private static GroupMasterKey masterKey() {
-        final var bytes = new byte[32];
-        for (int i = 0; i < bytes.length; i++) {
-            bytes[i] = (byte) (i + 1);
-        }
-        try {
-            return new GroupMasterKey(bytes);
-        } catch (InvalidInputException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    private static GroupInfoV2 groupV2(final DecryptedGroup group) {
-        final var masterKey = masterKey();
-        return new GroupInfoV2(GroupUtils.getGroupIdV2(masterKey),
-                masterKey,
-                group,
-                DistributionId.create(),
-                false,
-                0,
-                false,
-                false,
-                null,
-                UNUSED_RESOLVER);
-    }
-
-    @Test
-    void v1GroupsAreNeverTerminated() {
-        final var group = new GroupInfoV1(GroupId.v1(new byte[16]));
-        assertFalse(group.isTerminated());
-    }
-
-    @Test
-    void v2ReadsTerminatedFlagFromDecryptedGroup() {
-        assertTrue(groupV2(new DecryptedGroup.Builder().terminated(true).build()).isTerminated());
-        assertFalse(groupV2(new DecryptedGroup.Builder().terminated(false).build()).isTerminated());
-        assertFalse(groupV2(new DecryptedGroup.Builder().build()).isTerminated());
-    }
-
-    @Test
-    void v2IsNotTerminatedWhenGroupStateMissing() {
-        final var masterKey = masterKey();
-        final var group = new GroupInfoV2(GroupUtils.getGroupIdV2(masterKey), masterKey, UNUSED_RESOLVER);
-        assertFalse(group.isTerminated());
-    }
-
-    @Test
-    void groupApiRecordCarriesTerminatedFromModel() {
-        final RecipientId self = TestRecipientId.createTestId(1);
-
-        final var terminated = Group.from(groupV2(new DecryptedGroup.Builder().terminated(true).build()),
-                recipientId -> null,
-                self);
-        assertTrue(terminated.isTerminated());
-
-        final var live = Group.from(groupV2(new DecryptedGroup.Builder().terminated(false).build()),
-                recipientId -> null,
-                self);
-        assertFalse(live.isTerminated());
-    }
-}

lib/src/test/java/org/asamk/signal/manager/storage/recipients/RecipientStoreTest.java

@@ -1,93 +0,0 @@
-package org.asamk.signal.manager.storage.recipients;
-
-import org.asamk.signal.manager.api.Contact;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class RecipientStoreTest {
-
-    @Test
-    void mergeContactsUsesAndroidMergePolicy() {
-        final var primary = Contact.newBuilder()
-                .withGivenName("Primary given")
-                .withFamilyName("Primary family")
-                .withNickName("Primary system nickname")
-                .withNickNameGivenName("Primary nickname given")
-                .withNickNameFamilyName("Primary nickname family")
-                .withNote("Primary note")
-                .withColor("Primary color")
-                .withMessageExpirationTimeVersion(2)
-                .withHideStory(true)
-                .withIsBlocked(false)
-                .withBlockedAt(100)
-                .withIsArchived(true)
-                .withIsHidden(true)
-                .withUnregisteredTimestamp(300L)
-                .build();
-        final var secondary = Contact.newBuilder()
-                .withGivenName("Secondary given")
-                .withFamilyName("Secondary family")
-                .withNickName("Secondary system nickname")
-                .withNickNameGivenName("Secondary nickname given")
-                .withNickNameFamilyName("Secondary nickname family")
-                .withNote("Secondary note")
-                .withColor("Secondary color")
-                .withMessageExpirationTime(60)
-                .withMessageExpirationTimeVersion(3)
-                .withMuteUntil(400)
-                .withIsBlocked(true)
-                .withBlockedAt(200)
-                .withIsProfileSharingEnabled(true)
-                .withIsHidden(true)
-                .withUnregisteredTimestamp(500L)
-                .build();
-
-        final var merged = RecipientStore.mergeContacts(primary, secondary);
-
-        assertEquals("Secondary given", merged.givenName());
-        assertEquals("Secondary family", merged.familyName());
-        assertEquals("Primary system nickname", merged.nickName());
-        assertEquals("Primary nickname given", merged.nickNameGivenName());
-        assertEquals("Primary nickname family", merged.nickNameFamilyName());
-        assertEquals("Primary note", merged.note());
-        assertEquals("Primary color", merged.color());
-        assertEquals(60, merged.messageExpirationTime());
-        assertEquals(3, merged.messageExpirationTimeVersion());
-        assertEquals(400, merged.muteUntil());
-        assertTrue(merged.hideStory());
-        assertTrue(merged.isBlocked());
-        assertEquals(200, merged.blockedAt());
-        assertTrue(merged.isArchived());
-        assertTrue(merged.isProfileSharingEnabled());
-        assertFalse(merged.isHidden());
-        assertEquals(300L, merged.unregisteredTimestamp());
-    }
-
-    @Test
-    void mergeContactsPrefersConfiguredPrimaryValues() {
-        final var primary = Contact.newBuilder()
-                .withColor("Primary color")
-                .withMessageExpirationTime(30)
-                .withMessageExpirationTimeVersion(4)
-                .withMuteUntil(100)
-                .withIsHidden(true)
-                .build();
-        final var secondary = Contact.newBuilder()
-                .withColor("Secondary color")
-                .withMessageExpirationTime(60)
-                .withMessageExpirationTimeVersion(3)
-                .withMuteUntil(200)
-                .build();
-
-        final var merged = RecipientStore.mergeContacts(primary, secondary);
-
-        assertEquals("Primary color", merged.color());
-        assertEquals(30, merged.messageExpirationTime());
-        assertEquals(4, merged.messageExpirationTimeVersion());
-        assertEquals(100, merged.muteUntil());
-        assertTrue(merged.isHidden());
-    }
-}

lib/src/test/java/org/asamk/signal/manager/syncStorage/StorageRecordProcessorTest.java

@@ -1,33 +0,0 @@
-package org.asamk.signal.manager.syncStorage;
-
-import org.junit.jupiter.api.Test;
-import org.signal.core.models.ServiceId.ACI;
-import org.signal.core.models.ServiceId.PNI;
-
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class StorageRecordProcessorTest {
-
-    @Test
-    void splitsOnlyUnregisteredAciOnlyRecords() {
-        final var aci = ACI.from(UUID.randomUUID());
-        final var pni = PNI.from(UUID.randomUUID());
-
-        assertTrue(ContactRecordProcessor.shouldSplitForStorageSync(1, aci, null, ""));
-        assertFalse(ContactRecordProcessor.shouldSplitForStorageSync(0, aci, null, ""));
-        assertFalse(ContactRecordProcessor.shouldSplitForStorageSync(1, null, null, ""));
-        assertFalse(ContactRecordProcessor.shouldSplitForStorageSync(1, aci, pni, ""));
-        assertFalse(ContactRecordProcessor.shouldSplitForStorageSync(1, aci, null, "+12025550123"));
-    }
-
-    @Test
-    void keepsOlderLocalStickerDeletion() {
-        assertTrue(StickerPackRecordProcessor.shouldKeepLocalDeletion(200, 100));
-        assertFalse(StickerPackRecordProcessor.shouldKeepLocalDeletion(100, 200));
-        assertFalse(StickerPackRecordProcessor.shouldKeepLocalDeletion(200, 0));
-        assertFalse(StickerPackRecordProcessor.shouldKeepLocalDeletion(0, 100));
-    }
-}

lib/src/test/java/org/asamk/signal/manager/syncStorage/StorageSyncLoopDetectorTest.java

@@ -1,102 +0,0 @@
-package org.asamk.signal.manager.syncStorage;
-
-import org.junit.jupiter.api.Test;
-import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
-import org.whispersystems.signalservice.api.storage.StorageId;
-import org.whispersystems.signalservice.internal.storage.protos.StorageRecord;
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-
-class StorageSyncLoopDetectorTest {
-
-    private static final long NOW = 1_700_000_000_000L;
-
-    @Test
-    void repeatedPayloadIsDeniedAfterThreeCharges() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-        final var write = writeWithInsert(1);
-
-        assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-        for (var index = 0; index < 3; index++) {
-            assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-        }
-
-        assertEquals(new StorageSyncLoopDetector.Decision.Denied(StorageSyncLoopDetector.Cause.REPEATED_PAYLOAD, 3),
-                detector.onWriteAttempt(write, true, false, NOW));
-    }
-
-    @Test
-    void storageIdsAreExcludedFromPayloadFingerprint() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-
-        assertAllowed(detector.onWriteAttempt(writeWithInsert(1), true, false, NOW));
-        assertAllowed(detector.onWriteAttempt(writeWithInsert(2), true, false, NOW));
-        assertAllowed(detector.onWriteAttempt(writeWithInsert(3), true, false, NOW));
-        assertAllowed(detector.onWriteAttempt(writeWithInsert(4), true, false, NOW));
-
-        assertInstanceOf(StorageSyncLoopDetector.Decision.Denied.class,
-                detector.onWriteAttempt(writeWithInsert(5), true, false, NOW));
-    }
-
-    @Test
-    void convergenceClearsTheContentBucket() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-        final var write = writeWithInsert(1);
-        for (var index = 0; index < 4; index++) {
-            assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-        }
-
-        detector.onConverged();
-
-        assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-    }
-
-    @Test
-    void failedWritesAreRefunded() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-        final var write = writeWithInsert(1);
-
-        for (var index = 0; index < 20; index++) {
-            assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-            detector.onWriteFailed(NOW);
-        }
-    }
-
-    @Test
-    void rateBucketLimitsDeleteOnlyWrites() {
-        final var detector = new StorageSyncLoopDetector(() -> true);
-        final var write = new WriteOperationResult(null, List.of(), List.of(new byte[]{1}));
-
-        for (var index = 0; index < 100; index++) {
-            assertAllowed(detector.onWriteAttempt(write, true, false, NOW));
-        }
-
-        assertEquals(new StorageSyncLoopDetector.Decision.Denied(StorageSyncLoopDetector.Cause.WRITE_RATE, 100),
-                detector.onWriteAttempt(write, true, false, NOW));
-    }
-
-    @Test
-    void retriesAndSingleDeviceWritesAreExempt() {
-        final var retryDetector = new StorageSyncLoopDetector(() -> true);
-        final var singleDeviceDetector = new StorageSyncLoopDetector(() -> false);
-        final var write = writeWithInsert(1);
-
-        for (var index = 0; index < 20; index++) {
-            assertAllowed(retryDetector.onWriteAttempt(write, true, true, NOW));
-            assertAllowed(singleDeviceDetector.onWriteAttempt(write, true, false, NOW));
-        }
-    }
-
-    private static WriteOperationResult writeWithInsert(final int storageIdByte) {
-        final var storageId = StorageId.forType(new byte[]{(byte) storageIdByte}, 99);
-        final var record = new SignalStorageRecord(storageId, new StorageRecord.Builder().build());
-        return new WriteOperationResult(null, List.of(record), List.of());
-    }
-
-    private static void assertAllowed(final StorageSyncLoopDetector.Decision decision) {
-        assertEquals(StorageSyncLoopDetector.Decision.Allowed.INSTANCE, decision);
-    }
-}

lib/src/test/java/org/asamk/signal/manager/util/AttachmentUtilsTest.java

@@ -1,52 +0,0 @@
-package org.asamk.signal.manager.util;
-
-import org.junit.jupiter.api.Test;
-import org.whispersystems.signalservice.api.util.StreamDetails;
-
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Optional;
-
-import javax.imageio.ImageIO;
-
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class AttachmentUtilsTest {
-
-    @Test
-    public void createAttachmentStream_setsWidthAndHeightForImage() throws Exception {
-        final var imageBytes = pngBytes(37, 21);
-        final var streamDetails = new StreamDetails(new ByteArrayInputStream(imageBytes),
-                "image/png",
-                imageBytes.length);
-
-        final var attachment = AttachmentUtils.createAttachmentStream(streamDetails, Optional.of("meme.png"), null);
-
-        assertEquals(37, attachment.getWidth());
-        assertEquals(21, attachment.getHeight());
-        assertArrayEquals(imageBytes, attachment.getInputStream().readAllBytes());
-    }
-
-    @Test
-    public void createAttachmentStream_leavesWidthAndHeightZeroForNonImage() throws Exception {
-        final var bytes = "not an image".getBytes();
-        final var streamDetails = new StreamDetails(new ByteArrayInputStream(bytes),
-                "application/octet-stream",
-                bytes.length);
-
-        final var attachment = AttachmentUtils.createAttachmentStream(streamDetails, Optional.of("file.bin"), null);
-
-        assertEquals(0, attachment.getWidth());
-        assertEquals(0, attachment.getHeight());
-        assertArrayEquals(bytes, attachment.getInputStream().readAllBytes());
-    }
-
-    private static byte[] pngBytes(final int width, final int height) throws Exception {
-        final var image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        final var out = new ByteArrayOutputStream();
-        ImageIO.write(image, "png", out);
-        return out.toByteArray();
-    }
-}

lib/src/test/java/org/asamk/signal/manager/util/LeakyBucketTest.java

@@ -1,66 +0,0 @@
-package org.asamk.signal.manager.util;
-
-import org.junit.jupiter.api.Test;
-
-import java.time.Duration;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class LeakyBucketTest {
-
-    private static final long NOW = 1_700_000_000_000L;
-
-    @Test
-    void dripsLevelsAndCarriesPartialIntervals() {
-        final var state = new TestState();
-        final var bucket = new LeakyBucket(3, Duration.ofHours(1).toMillis(), state);
-
-        bucket.use(NOW);
-        bucket.use(NOW);
-        bucket.use(NOW);
-
-        assertEquals(2, bucket.level(NOW + Duration.ofMinutes(90).toMillis()));
-        assertEquals(1, bucket.level(NOW + Duration.ofMinutes(121).toMillis()));
-    }
-
-    @Test
-    void refundNeverDropsBelowZero() {
-        final var bucket = new LeakyBucket(1, 1_000, new TestState());
-
-        bucket.refund(NOW);
-
-        assertEquals(0, bucket.level(NOW));
-        assertTrue(bucket.hasRoom(NOW));
-    }
-
-    @Test
-    void clockMovingBackwardsRefillsTheBucket() {
-        final var bucket = new LeakyBucket(1, 1_000, new TestState());
-        bucket.use(NOW);
-
-        assertTrue(bucket.hasRoom(NOW - 1));
-    }
-
-    private static final class TestState implements LeakyBucket.State {
-
-        private int level;
-        private long levelUpdatedAt;
-
-        @Override
-        public int level() {
-            return level;
-        }
-
-        @Override
-        public long levelUpdatedAt() {
-            return levelUpdatedAt;
-        }
-
-        @Override
-        public void update(final int level, final long levelUpdatedAt) {
-            this.level = level;
-            this.levelUpdatedAt = levelUpdatedAt;
-        }
-    }
-}

libsignal-version

@@ -1 +1 @@
-0.99.1
+0.96.3

man/signal-cli-dbus.5.adoc

@@ -452,7 +452,6 @@ Groups have the following (case-sensitive) properties:
 * IsBlocked<b> : true=member will not receive group messages; false=not blocked
 * IsMember<b> (read-only) : always true (object path exists only for group members)
 * IsAdmin<b> (read-only) : true=member has admin privileges; false=not admin
-* IsTerminated<b> (read-only) : true=group was permanently ended by an admin; nobody (not even an admin) can send messages or start calls, sending is rejected locally
 * MessageExpirationTimer<i> : int32 representing message expiration time for group
 * Members<as> (read-only) : String array of group members' phone numbers
 * PendingMembers<as> (read-only) : String array of pending members' phone numbers
@@ -503,11 +502,6 @@ Exceptions: Failure
 quitGroup() -> <>::
 Exceptions: Failure, LastGroupAdmin
 
-terminateGroup() -> <>::
-Permanently terminate the group for all members (requires admin privileges). Afterwards nobody can send messages or start calls; members keep access to the existing history.
-
-Exceptions: Failure
-
 removeAdmins(recipients<as>) -> <>::
 * recipients : String array of phone numbers
 

man/signal-cli.1.adoc

@@ -786,16 +786,6 @@ Specify the recipient group ID in base64 encoding.
 *--delete*::
 Delete local group data completely after quitting group.
 
-=== terminateGroup
-
-Permanently terminate a group for all members.
-This requires admin privileges.
-Afterwards no member (not even an admin) can send messages or start calls in the group; members keep access to the existing message history.
-Only supported for Signal group v2 groups.
-
-*-g* GROUP, *--group-id* GROUP::
-Specify the group ID in base64 encoding.
-
 === listGroups
 
 Show a list of known groups and related information.

run_tests.sh

@@ -213,7 +213,6 @@ 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_1" send "$NUMBER_2" -m hi
 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

src/main/java/org/asamk/Signal.java

@@ -595,7 +595,6 @@ public interface Signal extends DBusInterface {
     @DBusProperty(name = "IsBlocked", type = Boolean.class)
     @DBusProperty(name = "IsMember", type = Boolean.class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "IsAdmin", type = Boolean.class, access = DBusProperty.Access.READ)
-    @DBusProperty(name = "IsTerminated", type = Boolean.class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "MessageExpirationTimer", type = Integer.class)
     @DBusProperty(name = "Members", type = String[].class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "PendingMembers", type = String[].class, access = DBusProperty.Access.READ)
@@ -612,8 +611,6 @@ public interface Signal extends DBusInterface {
 
         void deleteGroup() throws Error.Failure;
 
-        void terminateGroup() throws Error.Failure;
-
         void addMembers(List<String> recipients) throws Error.Failure;
 
         void removeMembers(List<String> recipients) throws Error.Failure;

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/8.21.1");
+            .orElse("Signal-Android/8.15.0");
     static final String USER_AGENT_SIGNAL_CLI = PROJECT_NAME == null
             ? "signal-cli"
             : PROJECT_NAME + "/" + PROJECT_VERSION;

src/main/java/org/asamk/signal/commands/Commands.java

@@ -61,7 +61,6 @@ public class Commands {
         addCommand(new SubmitRateLimitChallengeCommand());
         addCommand(new StartChangeNumberCommand());
         addCommand(new StartLinkCommand());
-        addCommand(new TerminateGroupCommand());
         addCommand(new TrustCommand());
         addCommand(new UnblockCommand());
         addCommand(new UnregisterCommand());

src/main/java/org/asamk/signal/commands/ListGroupsCommand.java

@@ -79,13 +79,12 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
             final var groupInviteLink = group.groupInviteLinkUrl();
 
             writer.println(
-                    "Id: {} Name: {} Description: {} Active: {} Blocked: {} Terminated: {} Members: {} Pending members: {} Requesting members: {} Banned: {} Message expiration: {} Link: {}",
+                    "Id: {} Name: {} Description: {} Active: {} Blocked: {} Members: {} Pending members: {} Requesting members: {} Banned: {} Message expiration: {} Link: {}",
                     group.groupId().toBase64(),
                     group.title(),
                     group.description(),
                     group.isMember(),
                     group.isBlocked(),
-                    group.isTerminated(),
                     resolveMembers(group.members()),
                     resolveMemberAddress(group.pendingMembers()),
                     resolveMemberAddress(group.requestingMembers()),
@@ -93,12 +92,11 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                     group.messageExpirationTimer() == 0 ? "disabled" : group.messageExpirationTimer() + "s",
                     groupInviteLink == null ? '-' : groupInviteLink.getUrl());
         } else {
-            writer.println("Id: {} Name: {}  Active: {} Blocked: {} Terminated: {}",
+            writer.println("Id: {} Name: {}  Active: {} Blocked: {}",
                     group.groupId().toBase64(),
                     group.title(),
                     group.isMember(),
-                    group.isBlocked(),
+                    group.isBlocked());
-                    group.isTerminated());
         }
     }
 
@@ -135,8 +133,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                             group.permissionAddMember().name(),
                             group.permissionEditDetails().name(),
                             group.permissionSendMessage().name(),
-                            groupInviteLink == null ? null : groupInviteLink.getUrl(),
+                            groupInviteLink == null ? null : groupInviteLink.getUrl());
-                            group.isTerminated());
                 }).toList();
                 jsonWriter.write(jsonGroups);
             }
@@ -164,8 +161,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
             String permissionAddMember,
             String permissionEditDetails,
             String permissionSendMessage,
-            String groupInviteLink,
+            String groupInviteLink
-            boolean isTerminated
     ) {}
 
     private record JsonGroupMemberAddress(String number, String uuid) {}

src/main/java/org/asamk/signal/commands/SendStoryCommand.java

@@ -33,7 +33,9 @@ public class SendStoryCommand implements JsonRpcLocalCommand {
         subparser.addArgument("-a", "--attachment")
                 .required(true)
                 .help("Specify the file path to the image or video to post as a story.");
-        subparser.addArgument("--no-replies").action(Arguments.storeTrue()).help("Disable replies on this story.");
+        subparser.addArgument("--no-replies")
+                .action(Arguments.storeTrue())
+                .help("Disable replies on this story.");
         subparser.addArgument("-g", "--group-id")
                 .help("Specify a group to post the story to. Without this, posts to My Story.");
     }

src/main/java/org/asamk/signal/commands/SubmitRateLimitChallengeCommand.java

@@ -42,8 +42,7 @@ public class SubmitRateLimitChallengeCommand implements JsonRpcLocalCommand {
             throw new IOErrorException("Submit challenge error: " + e.getMessage(), e);
         } catch (CaptchaRejectedException e) {
             throw new CaptchaRejectedErrorException(
-                    "Captcha rejected, it may be outdated, already used or solved from a different IP address.",
+                    "Captcha rejected, it may be outdated, already used or solved from a different IP address.", e);
-                    e);
         }
     }
 }

src/main/java/org/asamk/signal/commands/TerminateGroupCommand.java

@@ -1,54 +0,0 @@
-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.GroupNotFoundException;
-import org.asamk.signal.manager.api.NotAGroupMemberException;
-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 TerminateGroupCommand implements JsonRpcLocalCommand {
-
-    @Override
-    public String getName() {
-        return "terminateGroup";
-    }
-
-    @Override
-    public void attachToSubparser(final Subparser subparser) {
-        subparser.help(
-                "Permanently terminate a group for all members. Requires admin privileges; afterwards nobody can send messages or start calls.");
-        subparser.addArgument("-g", "--group-id", "--group").required(true).help("Specify the group ID.");
-    }
-
-    @Override
-    public void handleCommand(
-            final Namespace ns,
-            final Manager m,
-            final OutputWriter outputWriter
-    ) throws CommandException {
-        final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
-
-        try {
-            final var results = m.terminateGroup(groupId);
-            outputResult(outputWriter, results);
-        } catch (IOException e) {
-            throw new IOErrorException("Failed to send message: "
-                    + e.getMessage()
-                    + " ("
-                    + e.getClass().getSimpleName()
-                    + ")", e);
-        } catch (GroupNotFoundException | NotAGroupMemberException e) {
-            throw new UserErrorException("Failed to terminate group: " + e.getMessage());
-        }
-    }
-}

src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java

@@ -327,21 +327,6 @@ public class DbusManagerImpl implements Manager {
         group.deleteGroup();
     }
 
-    @Override
-    public SendGroupMessageResults terminateGroup(
-            final GroupId groupId
-    ) throws IOException, GroupNotFoundException, NotAGroupMemberException {
-        final var group = getRemoteObject(signal.getGroup(groupId.serialize()), Signal.Group.class);
-        try {
-            group.terminateGroup();
-        } 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"));
-        }
-        return new SendGroupMessageResults(0, List.of());
-    }
-
     @Override
     public Pair<GroupId, SendGroupMessageResults> createGroup(
             final String name,
@@ -563,7 +548,11 @@ public class DbusManagerImpl implements Manager {
     }
 
     @Override
-    public SendMessageResults sendStory(String attachment, boolean allowsReplies, Optional<GroupId> groupId) {
+    public SendMessageResults sendStory(
+            String attachment,
+            boolean allowsReplies,
+            Optional<GroupId> groupId
+    ) {
         throw new UnsupportedOperationException();
     }
 
@@ -839,7 +828,6 @@ public class DbusManagerImpl implements Manager {
                             0,
                             false,
                             contactBlocked,
-                            0,
                             false,
                             false,
                             false,
@@ -887,8 +875,7 @@ public class DbusManagerImpl implements Manager {
                     GroupPermission.valueOf((String) group.get("PermissionEditDetails").getValue()),
                     GroupPermission.valueOf((String) group.get("PermissionSendMessage").getValue()),
                     (boolean) group.get("IsMember").getValue(),
-                    (boolean) group.get("IsAdmin").getValue(),
+                    (boolean) group.get("IsAdmin").getValue());
-                    group.get("IsTerminated") != null && (boolean) group.get("IsTerminated").getValue());
         } catch (GroupInviteLinkUrl.InvalidGroupLinkException | GroupInviteLinkUrl.UnknownGroupLinkVersionException e) {
             throw new AssertionError(e);
         }

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

@@ -1308,7 +1308,6 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
                             new DbusProperty<>("IsBlocked", () -> getGroup().isBlocked(), this::setIsBlocked),
                             new DbusProperty<>("IsMember", () -> getGroup().isMember()),
                             new DbusProperty<>("IsAdmin", () -> getGroup().isAdmin()),
-                            new DbusProperty<>("IsTerminated", () -> getGroup().isTerminated()),
                             new DbusProperty<>("MessageExpirationTimer",
                                     () -> getGroup().messageExpirationTimer(),
                                     this::setMessageExpirationTime),
@@ -1376,19 +1375,6 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
             updateGroups();
         }
 
-        @Override
-        public void terminateGroup() throws Error.Failure {
-            try {
-                m.terminateGroup(groupId);
-            } 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());
-            }
-        }
-
         @Override
         public void addMembers(final List<String> recipients) throws Error.Failure {
             final var memberIdentifiers = getSingleRecipientIdentifiers(recipients, m.getSelfNumber());

src/main/java/org/asamk/signal/http/HttpServerHandler.java

@@ -76,8 +76,7 @@ public class HttpServerHandler implements AutoCloseable {
         // If we're listening on any local address (0.0.0.0 or ::), skip Host header validation
         final var addr = address == null ? null : address.getAddress();
         if (addr != null && addr.isAnyLocalAddress()) {
-            logger.warn("HTTP server has no authentication; Host header validation DISABLED because listening on {}",
+            logger.warn("HTTP server has no authentication; Host header validation DISABLED because listening on {}", address);
-                    address);
         } else {
             logger.warn("HTTP server has no authentication; Host header is pinned to {}", allowedHosts);
         }
@@ -115,8 +114,7 @@ public class HttpServerHandler implements AutoCloseable {
     private void handleRpcEndpoint(HttpExchange httpExchange) throws IOException {
         if (!isHostAllowed(httpExchange)) {
             logger.warn("Rejected RPC request with invalid Host header: {} from {}",
-                    httpExchange.getRequestHeaders().getFirst("Host"),
+                    httpExchange.getRequestHeaders().getFirst("Host"), httpExchange.getRemoteAddress());
-                    httpExchange.getRemoteAddress());
             sendResponse(421, null, httpExchange);
             return;
         }
@@ -169,8 +167,7 @@ public class HttpServerHandler implements AutoCloseable {
     private void handleEventsEndpoint(HttpExchange httpExchange) throws IOException {
         if (!isHostAllowed(httpExchange)) {
             logger.warn("Rejected Events request with invalid Host header: {} from {}",
-                    httpExchange.getRequestHeaders().getFirst("Host"),
+                    httpExchange.getRequestHeaders().getFirst("Host"), httpExchange.getRemoteAddress());
-                    httpExchange.getRemoteAddress());
             sendResponse(421, null, httpExchange);
             return;
         }

src/main/java/org/asamk/signal/json/JsonAdminDelete.java

@@ -1,11 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "AdminDelete")
 public record JsonAdminDelete(
         @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp

src/main/java/org/asamk/signal/json/JsonAttachment.java

@@ -1,9 +1,9 @@
 package org.asamk.signal.json;
 
-import org.asamk.signal.manager.api.MessageEnvelope;
-
 import io.micronaut.jsonschema.JsonSchema;
 
+import org.asamk.signal.manager.api.MessageEnvelope;
+
 @JsonSchema(title = "Attachment")
 record JsonAttachment(
         String contentType,
@@ -13,8 +13,7 @@ record JsonAttachment(
         Integer width,
         Integer height,
         String caption,
-        Long uploadTimestamp,
+        Long uploadTimestamp
-        boolean isVoiceNote
 ) {
 
     static JsonAttachment from(MessageEnvelope.Data.Attachment attachment) {
@@ -33,7 +32,6 @@ record JsonAttachment(
                 width,
                 height,
                 caption,
-                uploadTimestamp,
+                uploadTimestamp);
-                attachment.isVoiceNote());
     }
 }

src/main/java/org/asamk/signal/json/JsonCallMessage.java

@@ -1,6 +1,7 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
@@ -8,8 +9,6 @@ import java.math.BigInteger;
 import java.util.Base64;
 import java.util.List;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 import static org.asamk.signal.manager.util.Utils.callIdUnsigned;
 
 @JsonSchema(title = "CallMessage")

src/main/java/org/asamk/signal/json/JsonContact.java

@@ -1,11 +1,10 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import java.util.List;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "Contact")
 public record JsonContact(
         String number,

src/main/java/org/asamk/signal/json/JsonContactAddress.java

@@ -1,10 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "ContactAddress")
 public record JsonContactAddress(
         String type,

src/main/java/org/asamk/signal/json/JsonContactAvatar.java

@@ -1,9 +1,9 @@
 package org.asamk.signal.json;
 
-import org.asamk.signal.manager.api.MessageEnvelope;
-
 import io.micronaut.jsonschema.JsonSchema;
 
+import org.asamk.signal.manager.api.MessageEnvelope;
+
 @JsonSchema(title = "ContactAvatar")
 public record JsonContactAvatar(JsonAttachment attachment, boolean isProfile) {
 

src/main/java/org/asamk/signal/json/JsonContactEmail.java

@@ -1,10 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "ContactEmail")
 public record JsonContactEmail(String value, String type, String label) {
 

src/main/java/org/asamk/signal/json/JsonContactName.java

@@ -1,10 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "ContactName")
 public record JsonContactName(
         String nickname, String given, String family, String prefix, String suffix, String middle

src/main/java/org/asamk/signal/json/JsonContactPhone.java

@@ -1,10 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "ContactPhone")
 public record JsonContactPhone(String value, String type, String label) {
 

src/main/java/org/asamk/signal/json/JsonDataMessage.java

@@ -1,14 +1,13 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "DataMessage")
 record JsonDataMessage(
         long timestamp,
@@ -16,10 +15,6 @@ record JsonDataMessage(
         Integer expiresInSeconds,
         @JsonInclude(JsonInclude.Include.NON_NULL) Boolean isExpirationUpdate,
         @JsonInclude(JsonInclude.Include.NON_NULL) Boolean viewOnce,
-        @JsonInclude(JsonInclude.Include.NON_NULL) JsonGroupCallUpdate groupCallUpdate,
-        @JsonInclude(JsonInclude.Include.NON_NULL) Boolean isEndSession,
-        @JsonInclude(JsonInclude.Include.NON_NULL) Boolean isProfileKeyUpdate,
-        @JsonInclude(JsonInclude.Include.NON_NULL) Boolean hasProfileKey,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonReaction reaction,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonQuote quote,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonPayment payment,
@@ -51,10 +46,6 @@ record JsonDataMessage(
         final var expiresInSeconds = dataMessage.expiresInSeconds();
         final var isExpirationUpdate = dataMessage.isExpirationUpdate();
         final var viewOnce = dataMessage.isViewOnce();
-        final var groupCallUpdate = dataMessage.groupCallUpdate().map(JsonGroupCallUpdate::from).orElse(null);
-        final var isEndSession = dataMessage.isEndSession();
-        final var isProfileKeyUpdate = dataMessage.isProfileKeyUpdate();
-        final var hasProfileKey = dataMessage.hasProfileKey();
         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;
@@ -94,10 +85,6 @@ record JsonDataMessage(
                 expiresInSeconds,
                 isExpirationUpdate,
                 viewOnce,
-                groupCallUpdate,
-                isEndSession,
-                isProfileKeyUpdate,
-                hasProfileKey,
                 reaction,
                 quote,
                 payment,

src/main/java/org/asamk/signal/json/JsonEditMessage.java

@@ -1,10 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "EditMessage")
 record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
 

src/main/java/org/asamk/signal/json/JsonGroupCallUpdate.java

@@ -1,13 +0,0 @@
-package org.asamk.signal.json;
-
-import org.asamk.signal.manager.api.MessageEnvelope;
-
-import io.micronaut.jsonschema.JsonSchema;
-
-@JsonSchema(title = "GroupCallUpdate")
-record JsonGroupCallUpdate(String eraId) {
-
-    static JsonGroupCallUpdate from(MessageEnvelope.Data.GroupCallUpdate groupCallUpdate) {
-        return new JsonGroupCallUpdate(groupCallUpdate.eraId());
-    }
-}

src/main/java/org/asamk/signal/json/JsonGroupInfo.java

@@ -1,10 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "GroupInfo")
 record JsonGroupInfo(String groupId, String groupName, int revision, String type) {
 

src/main/java/org/asamk/signal/json/JsonMention.java

@@ -1,11 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "Mention")
 public record JsonMention(@Deprecated String name, String number, String uuid, int start, int length) {
 

src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java

@@ -1,6 +1,7 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
@@ -10,8 +11,6 @@ import org.asamk.signal.manager.api.UntrustedIdentityException;
 
 import java.util.UUID;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "MessageEnvelope")
 public record JsonMessageEnvelope(
         @Deprecated String source,

src/main/java/org/asamk/signal/json/JsonPayment.java

@@ -1,9 +1,9 @@
 package org.asamk.signal.json;
 
-import org.asamk.signal.manager.api.MessageEnvelope;
-
 import io.micronaut.jsonschema.JsonSchema;
 
+import org.asamk.signal.manager.api.MessageEnvelope;
+
 @JsonSchema(title = "Payment")
 public record JsonPayment(String note, byte[] receipt) {
 

src/main/java/org/asamk/signal/json/JsonPinMessage.java

@@ -1,11 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "PinMessage")
 public record JsonPinMessage(
         @Deprecated String targetAuthor,

src/main/java/org/asamk/signal/json/JsonPollCreate.java

@@ -1,11 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "PollCreate")
 public record JsonPollCreate(
         String question, boolean allowMultiple, List<String> options

src/main/java/org/asamk/signal/json/JsonPollTerminate.java

@@ -1,9 +1,9 @@
 package org.asamk.signal.json;
 
-import org.asamk.signal.manager.api.MessageEnvelope;
-
 import io.micronaut.jsonschema.JsonSchema;
 
+import org.asamk.signal.manager.api.MessageEnvelope;
+
 @JsonSchema(title = "PollTerminate")
 public record JsonPollTerminate(long targetSentTimestamp) {
 

src/main/java/org/asamk/signal/json/JsonPollVote.java

@@ -1,12 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import java.util.UUID;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "PollVote")
 public record JsonPollVote(
         @Deprecated String author,

src/main/java/org/asamk/signal/json/JsonPreview.java

@@ -1,9 +1,9 @@
 package org.asamk.signal.json;
 
-import org.asamk.signal.manager.api.MessageEnvelope;
-
 import io.micronaut.jsonschema.JsonSchema;
 
+import org.asamk.signal.manager.api.MessageEnvelope;
+
 @JsonSchema(title = "Preview")
 public record JsonPreview(String url, String title, String description, JsonAttachment image) {
 

src/main/java/org/asamk/signal/json/JsonQuote.java

@@ -1,14 +1,13 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import java.util.UUID;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "Quote")
 public record JsonQuote(
         long id,

src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java

@@ -1,11 +1,10 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "QuotedAttachment")
 public record JsonQuotedAttachment(
         String contentType, String filename, @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail

src/main/java/org/asamk/signal/json/JsonReaction.java

@@ -1,11 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "Reaction")
 public record JsonReaction(
         String emoji,

src/main/java/org/asamk/signal/json/JsonReceiptMessage.java

@@ -1,11 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "ReceiptMessage")
 record JsonReceiptMessage(long when, boolean isDelivery, boolean isRead, boolean isViewed, List<Long> timestamps) {
 

src/main/java/org/asamk/signal/json/JsonRecipientAddress.java

@@ -1,11 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.UUID;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "RecipientAddress")
 public record JsonRecipientAddress(String uuid, String number, String username) {
 

src/main/java/org/asamk/signal/json/JsonSendMessageResult.java

@@ -1,12 +1,11 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.SendMessageResult;
 
-import io.micronaut.jsonschema.JsonSchema;
-
 @JsonSchema(title = "SendMessageResult")
 public record JsonSendMessageResult(
         JsonRecipientAddress recipientAddress,