Merge a041826cd595e1c9f21ebbb4205076f49a6afcfb into 78dba20a597bbeda06b7a2b768e5d7401929df32

2026-09-01 06:28:11 +00:00 · 2026-07-12 08:42:04 +02:00
19 changed files with 1063 additions and 323 deletions
--- a/.gitignore
+++ b/.gitignore
@ -20,4 +20,3 @@ man/*.1
 man/*.5
 man/man1
 man/man5
-.superpowers/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,16 +2,9 @@

 ## [Unreleased]

-## [0.14.6] - 2026-07-12
-
 ### Added

- New `sendStory` command to post file attachment stories to "My Story" or to a group via `--group-id`
-
-### Improved
-
- The account parameter `-a` now supports ACI in addition to phone number
- Disabling read receipts in configuration now prevents sending read receipts (only sync message to linked devices is still sent)
+- New `sendStory` command to post file attachment stories to "My Story"

 ### Fixed

--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@
 signal-cli is a commandline interface for the [Signal messenger](https://signal.org/).
 It supports registering, verifying, sending and receiving messages.
 signal-cli uses a [patched libsignal-service-java](https://github.com/Turasa/libsignal-service-java),
-extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/lib/libsignal-service).
+extracted from the [Signal-Android source code](https://github.com/signalapp/Signal-Android/tree/main/libsignal-service).
 For registering you need a phone number where you can receive SMS or incoming calls.

 signal-cli is primarily intended to be used on servers to notify admins of important events.
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -10,7 +10,7 @@ plugins {

 allprojects {
    group = "org.asamk"
-    version = "0.14.7-SNAPSHOT"
+    version = "0.14.6-SNAPSHOT"
 }

 java {
--- a/data/org.asamk.SignalCli.metainfo.xml
+++ b/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.6" date="2026-07-12">
-            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.6</url>
-        </release>
        <release version="0.14.5" date="2026-06-11">
            <url type="details">https://github.com/AsamK/signal-cli/releases/tag/v0.14.5</url>
        </release>
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@ -7,7 +7,7 @@ signal-service = "2.15.3_unofficial_149"

 [libraries]
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.84"
-jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.21.5"
+jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.20.2"
 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"
--- a/lib/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/lib/src/main/java/org/asamk/signal/manager/Manager.java
@ -221,17 +221,12 @@ public interface Manager extends Closeable {
    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;

    /**
-     * Post a file attachment story to "My Story" or to a group.
+     * Post a file attachment story to "My Story".
     *
     * @param attachment    path to the file to upload and post as a story
     * @param allowsReplies whether other users are allowed to reply to this story
-     * @param groupId       if present, post the story to this group instead of "My Story"
     */
-    SendMessageResults sendStory(
-            String attachment,
-            boolean allowsReplies,
-            Optional<GroupId> groupId
-    ) throws IOException, AttachmentInvalidException, GroupNotFoundException, NotAGroupMemberException;
+    SendMessageResults sendStory(String attachment, boolean allowsReplies) throws IOException, AttachmentInvalidException;

    SendMessageResults sendRemoteDeleteMessage(
            long targetSentTimestamp,
--- a/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/LiveConfig.java
@ -32,6 +32,7 @@ class LiveConfig {
    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
    private static final String SVR2_MRENCLAVE = "ced8217b26228e4b210c985786999d095c4958a94faf37b14acaf25c4cbb02a4";
    private static final String SVR2_MRENCLAVE_LEGACY = "1240acbd4aa26974184844c8a46b1022d3957ac8a76c1fd8f5b1a15141ee0708";
+    private static final String SVR2_MRENCLAVE_OLD_LEGACY = "29cd63c87bea751e3bfd0fbd401279192e2e5c99948b4ee9437eafc4968355fb";

    private static final String URL = "https://chat.signal.org";
    private static final String CDN_URL = "https://cdn.signal.org";
@ -94,7 +95,7 @@ class LiveConfig {
                createDefaultServiceConfiguration(interceptors),
                getUnidentifiedSenderTrustRoots(),
                CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY));
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY, SVR2_MRENCLAVE_OLD_LEGACY));
    }

    private LiveConfig() {
--- a/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
+++ b/lib/src/main/java/org/asamk/signal/manager/config/StagingConfig.java
@ -32,6 +32,7 @@ class StagingConfig {
    private static final String CDSI_MRENCLAVE = "0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57";
    private static final String SVR2_MRENCLAVE = "3c699f4975aaa3d172c0aad042f94f031b2b03e10b9c19a45116a01693d83302";
    private static final String SVR2_MRENCLAVE_LEGACY = "97f151f6ed078edbbfd72fa9cae694dcc08353f1f5e8d9ccd79a971b10ffc535";
+    private static final String SVR2_MRENCLAVE_OLD_LEGACY = "a75542d82da9f6914a1e31f8a7407053b99cc99a0e7291d8fbd394253e19b036";

    private static final String URL = "https://chat.staging.signal.org";
    private static final String CDN_URL = "https://cdn-staging.signal.org";
@ -94,7 +95,7 @@ class StagingConfig {
                createDefaultServiceConfiguration(interceptors),
                getUnidentifiedSenderTrustRoots(),
                CDSI_MRENCLAVE,
-                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY));
+                List.of(SVR2_MRENCLAVE, SVR2_MRENCLAVE_LEGACY, SVR2_MRENCLAVE_OLD_LEGACY));
    }

    private StagingConfig() {
--- a/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java
@ -368,8 +368,7 @@ public class SendHelper {
                    timestamp,
                    storyMessageRecipients,
                    null);
-        } catch (UntrustedIdentityException | InvalidKeyException | NoSessionException |
-                 InvalidRegistrationIdException e) {
+        } catch (UntrustedIdentityException | InvalidKeyException | NoSessionException | InvalidRegistrationIdException e) {
            throw new IOException(e);
        }

@ -380,43 +379,6 @@ public class SendHelper {
        return results;
    }

-    /**
-     * Send a story message (file attachment) to a group.
-     */
-    public List<SendMessageResult> sendGroupStoryMessage(
-            SignalServiceStoryMessage storyMessage,
-            long timestamp,
-            GroupInfoV2 groupInfo,
-            boolean allowsReplies
-    ) throws IOException {
-        final var messageSender = dependencies.getMessageSender();
-
-        final var allRecipientIds = groupInfo.getMembersWithout(account.getSelfRecipientId());
-
-        final SenderKeySenderHandler senderKeySender = (distId, recipients, unidentifiedAccess, groupSendEndorsements, isRecipientUpdate) -> messageSender.sendGroupStory(
-                distId,
-                Optional.of(groupInfo.getMasterKey().serialize()),
-                recipients,
-                unidentifiedAccess,
-                groupSendEndorsements,
-                isRecipientUpdate,
-                storyMessage,
-                timestamp,
-                recipients.stream()
-                        .map(address -> new SignalServiceStoryMessageRecipient(address,
-                                List.of(groupInfo.getDistributionId().asUuid().toString()),
-                                allowsReplies))
-                        .collect(Collectors.toSet()),
-                null);
-        final var results = sendGroupMessageInternal(null, senderKeySender, allRecipientIds, groupInfo, false);
-
-        for (var r : results) {
-            handleSendMessageResult(r);
-        }
-
-        return results;
-    }
-
    private List<SendMessageResult> sendAsGroupMessage(
            final SignalServiceDataMessage.Builder messageBuilder,
            final GroupInfo g,
@ -684,7 +646,7 @@ public class SendHelper {
        legacyTargets.removeAll(senderKeyTargets);
        final boolean onlyTargetIsSelfWithLinkedDevice = targetRecipientIds.isEmpty() && account.isMultiDevice();

-        if (legacySender != null && (!legacyTargets.isEmpty() || onlyTargetIsSelfWithLinkedDevice)) {
+        if (!legacyTargets.isEmpty() || onlyTargetIsSelfWithLinkedDevice) {
            if (!legacyTargets.isEmpty()) {
                logger.debug("Need to do {} legacy sends.", legacyTargets.size());
            } else {
--- a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@ -83,7 +83,6 @@ import org.asamk.signal.manager.storage.AttachmentStore;
 import org.asamk.signal.manager.storage.AvatarStore;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
-import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.identities.IdentityInfo;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
@ -109,7 +108,6 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
 import org.whispersystems.signalservice.api.messages.SignalServicePreview;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceStoryMessage;
@ -796,20 +794,13 @@ public class ManagerImpl implements Manager {
    ) {
        try {
            final var recipientId = context.getRecipientHelper().resolveRecipient(sender);
-            List<SendMessageResult> results;
-            if (receiptMessage.isDeliveryReceipt() || !Boolean.FALSE.equals(account.getConfigurationStore()
-                    .getReadReceipts())) {
-                final var result = context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId);
-                results = List.of(toSendMessageResult(result));
-            } else {
-                results = List.of();
-            }
+            final var result = context.getSendHelper().sendReceiptMessage(receiptMessage, recipientId);

            final var aci = account.getRecipientAddressResolver().resolveRecipientAddress(recipientId).aci();
            if (aci.isPresent()) {
                context.getSyncHelper().sendSyncReceiptMessage(aci.get(), receiptMessage);
            }
-            return new SendMessageResults(timestamp, Map.of(sender, results));
+            return new SendMessageResults(timestamp, Map.of(sender, List.of(toSendMessageResult(result))));
        } catch (UnregisteredRecipientException e) {
            return new SendMessageResults(timestamp,
                    Map.of(sender, List.of(SendMessageResult.unregisteredFailure(sender.toPartialRecipientAddress()))));
@ -846,9 +837,8 @@ public class ManagerImpl implements Manager {
    @Override
    public SendMessageResults sendStory(
            String attachment,
-            boolean allowsReplies,
-            Optional<GroupId> groupId
-    ) throws IOException, AttachmentInvalidException, GroupNotFoundException, NotAGroupMemberException {
+            boolean allowsReplies
+    ) throws IOException, AttachmentInvalidException {
        final var file = new File(attachment);
        final var mimeType = MimeUtils.getFileMimeType(file);
        if (mimeType.isEmpty() || (!mimeType.get().startsWith("image/") && !mimeType.get().startsWith("video/"))) {
@ -856,10 +846,6 @@ public class ManagerImpl implements Manager {
                    new IOException("Stories only support image and video attachments"));
        }

-        if (groupId.isPresent()) {
-            return sendGroupStory(attachment, allowsReplies, groupId.get());
-        }
-
        final var recipients = account.getRecipientStore()
                .getRecipients(true, Optional.of(false), Set.of(), Optional.empty());
        final var recipientIds = recipients.stream()
@ -892,45 +878,6 @@ public class ManagerImpl implements Manager {
        return new SendMessageResults(timestamp, results);
    }

-    private SendMessageResults sendGroupStory(
-            String attachment,
-            boolean allowsReplies,
-            GroupId groupId
-    ) throws IOException, AttachmentInvalidException, GroupNotFoundException, NotAGroupMemberException {
-        final var groupInfo = context.getGroupHelper().getGroup(groupId);
-        if (groupInfo == null) {
-            throw new GroupNotFoundException(groupId);
-        }
-        if (!groupInfo.isMember(account.getSelfRecipientId())) {
-            throw new NotAGroupMemberException(groupId, groupInfo.getTitle());
-        }
-        if (!(groupInfo instanceof GroupInfoV2 groupInfoV2)) {
-            throw new IOException("Stories are only supported for V2 groups");
-        }
-
-        final var uploadedAttachment = context.getAttachmentHelper().uploadAttachment(attachment);
-        final var groupContext = SignalServiceGroupV2.newBuilder(groupInfoV2.getMasterKey())
-                .withRevision(groupInfoV2.getGroup() == null ? 0 : groupInfoV2.getGroup().revision)
-                .build();
-        final var storyMessage = SignalServiceStoryMessage.forFileAttachment(account.getProfileKey().serialize(),
-                groupContext,
-                uploadedAttachment,
-                allowsReplies,
-                List.of());
-        final var timestamp = getNextMessageTimestamp();
-
-        final var sendResults = context.getSendHelper()
-                .sendGroupStoryMessage(storyMessage, timestamp, groupInfoV2, allowsReplies);
-
-        final var results = new HashMap<RecipientIdentifier, List<SendMessageResult>>();
-        for (final var sendResult : sendResults) {
-            final var result = toSendMessageResult(sendResult);
-            results.put(RecipientIdentifier.Single.fromAddress(result.address()), List.of(result));
-        }
-
-        return new SendMessageResults(timestamp, results);
-    }
-
    private void applyMessage(
            final SignalServiceDataMessage.Builder messageBuilder,
            final Message message
@ -1923,7 +1870,7 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forOffer(offerMessage, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
        } catch (NoSessionException e) {
            throw new IOException("No session for call recipient", e);
@ -1942,7 +1889,7 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forAnswer(answerMessage, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
        } catch (NoSessionException e) {
            throw new IOException("No session for call recipient", e);
@ -1961,7 +1908,7 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forIceUpdates(iceUpdates, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
        } catch (NoSessionException e) {
            throw new IOException("No session for call recipient", e);
@ -1987,7 +1934,7 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forHangup(hangupMessage, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
        } catch (NoSessionException e) {
            throw new IOException("No session for call recipient", e);
@ -2005,7 +1952,7 @@ public class ManagerImpl implements Manager {
        var callMessage = SignalServiceCallMessage.forBusy(busyMessage, null);
        try {
            dependencies.getMessageSender().sendCallMessage(address, null, callMessage);
-        } catch (UntrustedIdentityException e) {
+        } catch (org.whispersystems.signalservice.api.crypto.UntrustedIdentityException e) {
            throw new IOException("Untrusted identity for call recipient", e);
        } catch (NoSessionException e) {
            throw new IOException("No session for call recipient", e);
--- a/2
+++ b/2
@ -1 +1 @@
-0.96.3
+0.94.4
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@ -639,10 +639,6 @@ Post a file attachment story to your Story, visible to all contacts.
 *-a* ATTACHMENT, *--attachment* ATTACHMENT::
 Specify the file path to the image or video to post as a story.

-*-g* GROUP, *--group-id* GROUP::
-Specify a group to post the story to.
-Without this flag, the story is posted to "My Story".
-
 *--no-replies*::
 Disable replies on this story. By default, replies are allowed.

--- a/run_tests.sh
+++ b/run_tests.sh
@ -62,15 +62,15 @@ run() {
    fi
  elif [ "$DBUS" -eq 1 ]; then
    if [ -n "$STD_BUF" ]; then
-      $STD_BUF "$SIGNAL_CLI" --dbus --verbose --verbose $@ > >(grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org' || true)
+      $STD_BUF "$SIGNAL_CLI" --dbus --verbose --verbose $@ | grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org'
    else
-      "$SIGNAL_CLI" --dbus --verbose --verbose $@ > >(grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org' || true)
+      "$SIGNAL_CLI" --dbus --verbose --verbose $@ | grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org'
    fi
  else
    if [ -n "$STD_BUF" ]; then
-      $STD_BUF "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ > >(grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org' || true)
+      $STD_BUF "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ | grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org'
    else
-      "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ > >(grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org' || true)
+      "$SIGNAL_CLI" --service-environment="staging" --verbose --verbose $@ | grep --line-buffered -v 'Warning:' | grep --line-buffered -v 'at org'
    fi
  fi
  set +x
@ -294,7 +294,6 @@ fi
 run_main -a "$NUMBER_2" deleteLocalAccountData || true

 if [ ! -z "$GRAALVM_HOME" ]; then
-  NATIVE_IMAGE_UTILS="$GRAALVM_HOME/lib/svm/bin/native-image-utils"
-  "$NATIVE_IMAGE_UTILS" generate --input-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/
+  "$GRAALVM_HOME"/lib/svm/bin/native-image-configure generate --input-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/ --input-dir=graalvm-config-dir-linked/ --input-dir=graalvm-config-dir-main/ --output-dir=src/main/resources/META-INF/native-image/org.asamk/signal-cli/
  rm -r graalvm-config-dir-main graalvm-config-dir-linked
 fi
--- a/src/main/java/org/asamk/signal/commands/SendStoryCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendStoryCommand.java
@ -9,14 +9,9 @@ import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.AttachmentInvalidException;
-import org.asamk.signal.manager.api.GroupId;
-import org.asamk.signal.manager.api.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 java.util.Optional;

 import static org.asamk.signal.util.SendMessageResultUtils.outputResult;

@ -36,8 +31,6 @@ public class SendStoryCommand implements JsonRpcLocalCommand {
        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.");
    }

    @Override
@ -53,19 +46,12 @@ public class SendStoryCommand implements JsonRpcLocalCommand {

        final var noReplies = Boolean.TRUE.equals(ns.getBoolean("no-replies"));

-        final var groupIdStr = ns.getString("group-id");
-        final var groupId = groupIdStr != null
-                ? Optional.of(CommandUtil.getGroupId(groupIdStr))
-                : Optional.<GroupId>empty();
-
        try {
-            final var results = m.sendStory(attachment, !noReplies, groupId);
+            final var results = m.sendStory(attachment, !noReplies);
            outputResult(outputWriter, results);
        } catch (AttachmentInvalidException | IOException e) {
            throw new UnexpectedErrorException("Failed to send story: " + e.getMessage() + " (" + e.getClass()
                    .getSimpleName() + ")", e);
-        } catch (GroupNotFoundException | NotAGroupMemberException e) {
-            throw new UserErrorException(e.getMessage());
        }
    }
 }
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@ -548,11 +548,7 @@ public class DbusManagerImpl implements Manager {
    }

    @Override
-    public SendMessageResults sendStory(
-            String attachment,
-            boolean allowsReplies,
-            Optional<GroupId> groupId
-    ) {
+    public SendMessageResults sendStory(String attachment, boolean allowsReplies) {
        throw new UnsupportedOperationException();
    }

--- a/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java
+++ b/src/test/java/org/asamk/signal/http/SseInitialFlushTest.java
@ -1,15 +1,51 @@
 package org.asamk.signal.http;

 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.testutil.ManagerMock;
+import org.asamk.signal.manager.api.CallInfo;
+import org.asamk.signal.manager.api.CallOffer;
+import org.asamk.signal.manager.api.Configuration;
+import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
+import org.asamk.signal.manager.api.Group;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
+import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.manager.api.Recipient;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.SendGroupMessageResults;
+import org.asamk.signal.manager.api.SendMessageResult;
+import org.asamk.signal.manager.api.SendMessageResults;
+import org.asamk.signal.manager.api.StickerPack;
+import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.manager.api.StickerPackUrl;
+import org.asamk.signal.manager.api.TurnServer;
+import org.asamk.signal.manager.api.TypingAction;
+import org.asamk.signal.manager.api.UpdateGroup;
+import org.asamk.signal.manager.api.UpdateProfile;
+import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

+import java.io.File;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.URI;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;

 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@ -41,8 +77,7 @@ class SseInitialFlushTest {
    @BeforeEach
    void setUp() throws Exception {
        port = freePort();
-        final Manager manager = ManagerMock.create("+10000000000");
-        handler = new HttpServerHandler(new InetSocketAddress("127.0.0.1", port), manager);
+        handler = new HttpServerHandler(new InetSocketAddress("127.0.0.1", port), new MinimalStubManager());
        handler.init();
    }

@ -76,4 +111,436 @@ class SseInitialFlushTest {
        }, "SSE endpoint did not return the initial response within 2 seconds");
    }

+    // -------------------------------------------------------------------------
+    // Minimal Manager stub — only receive-handler methods need real behaviour;
+    // everything else is a no-op stub.
+    // -------------------------------------------------------------------------
+
+    private static final class MinimalStubManager implements Manager {
+
+        @Override
+        public String getSelfNumber() {
+            return "+10000000000";
+        }
+
+        @Override
+        public String getSelfACI() {
+            return "00000000-0000-0000-0000-000000000000";
+        }
+
+        @Override
+        public void addReceiveHandler(ReceiveMessageHandler handler, boolean isWeakListener) {
+            // no-op
+        }
+
+        @Override
+        public void removeReceiveHandler(ReceiveMessageHandler handler) {
+            // no-op
+        }
+
+        @Override
+        public boolean isReceiving() {
+            return false;
+        }
+
+        @Override
+        public void receiveMessages(Optional<Duration> timeout, Optional<Integer> maxMessages, ReceiveMessageHandler handler) {
+        }
+
+        @Override
+        public void stopReceiveMessages() {
+        }
+
+        @Override
+        public void setReceiveConfig(ReceiveConfig receiveConfig) {
+        }
+
+        @Override
+        public Map<String, UserStatus> getUserStatus(Set<String> numbers) {
+            return Map.of();
+        }
+
+        @Override
+        public Map<String, UsernameStatus> getUsernameStatus(Set<String> usernames) {
+            return Map.of();
+        }
+
+        @Override
+        public void updateAccountAttributes(String deviceName, Boolean unidentifiedDeliveryIndicators, Boolean discoverableByNumber, Boolean numberSharing) {
+        }
+
+        @Override
+        public Configuration getConfiguration() {
+            return null;
+        }
+
+        @Override
+        public void updateConfiguration(Configuration configuration) {
+        }
+
+        @Override
+        public void updateProfile(UpdateProfile updateProfile) {
+        }
+
+        @Override
+        public String getUsername() {
+            return null;
+        }
+
+        @Override
+        public UsernameLinkUrl getUsernameLink() {
+            return null;
+        }
+
+        @Override
+        public void setUsername(String username) {
+        }
+
+        @Override
+        public void deleteUsername() {
+        }
+
+        @Override
+        public void startChangeNumber(String newNumber, boolean voiceVerification, String captcha) {
+        }
+
+        @Override
+        public void finishChangeNumber(String newNumber, String verificationCode, String pin) {
+        }
+
+        @Override
+        public void unregister() {
+        }
+
+        @Override
+        public void deleteAccount() {
+        }
+
+        @Override
+        public void submitRateLimitRecaptchaChallenge(String challenge, String captcha) {
+        }
+
+        @Override
+        public List<Device> getLinkedDevices() {
+            return List.of();
+        }
+
+        @Override
+        public void updateLinkedDevice(int deviceId, String name) {
+        }
+
+        @Override
+        public void removeLinkedDevices(int deviceId) {
+        }
+
+        @Override
+        public void addDeviceLink(DeviceLinkUrl deviceLinkUrl) {
+        }
+
+        @Override
+        public void setRegistrationLockPin(Optional<String> pin) {
+        }
+
+        @Override
+        public List<Group> getGroups() {
+            return List.of();
+        }
+
+        @Override
+        public List<Group> getGroups(Collection<GroupId> groupIds) {
+            return List.of();
+        }
+
+        @Override
+        public SendGroupMessageResults quitGroup(GroupId groupId, Set<RecipientIdentifier.Single> administrators) {
+            return null;
+        }
+
+        @Override
+        public void deleteGroup(GroupId groupId) {
+        }
+
+        @Override
+        public Pair<GroupId, SendGroupMessageResults> createGroup(String name, Set<RecipientIdentifier.Single> members, String avatarFile) {
+            return null;
+        }
+
+        @Override
+        public SendGroupMessageResults updateGroup(GroupId groupId, UpdateGroup updateGroup) {
+            return null;
+        }
+
+        @Override
+        public Pair<GroupId, SendGroupMessageResults> joinGroup(GroupInviteLinkUrl inviteLinkUrl) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendTypingMessage(TypingAction action, Set<RecipientIdentifier> recipients) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendReadReceipt(RecipientIdentifier.Single sender, List<Long> messageIds) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendViewedReceipt(RecipientIdentifier.Single sender, List<Long> messageIds) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendMessage(Message message, Set<RecipientIdentifier> recipients, boolean notifySelf) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendEditMessage(Message message, Set<RecipientIdentifier> recipients, long targetSentTimestamp) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendRemoteDeleteMessage(long targetSentTimestamp, Set<RecipientIdentifier> recipients) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendMessageReaction(String emoji, boolean remove, RecipientIdentifier.Single targetAuthor, long targetSentTimestamp, Set<RecipientIdentifier> recipients, boolean notifySelf, boolean story) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendAdminDelete(RecipientIdentifier.Single targetAuthor, long targetSentTimestamp, Set<RecipientIdentifier.Group> recipients, boolean notifySelf, boolean story) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPinMessage(int duration, RecipientIdentifier.Single targetAuthor, long targetSentTimestamp, Set<RecipientIdentifier> recipients, boolean notifySelf, boolean story) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendUnpinMessage(RecipientIdentifier.Single targetAuthor, long targetSentTimestamp, Set<RecipientIdentifier> recipients, boolean notifySelf, boolean story) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPaymentNotificationMessage(byte[] receipt, String note, RecipientIdentifier.Single recipient) {
+            return null;
+        }
+
+        @Override
+        public void sendEndSessionMessage(Set<RecipientIdentifier.Single> recipients) {
+        }
+
+        @Override
+        public SendMessageResults sendMessageRequestResponse(MessageEnvelope.Sync.MessageRequestResponse.Type type, Set<RecipientIdentifier> recipients) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPollCreateMessage(String question, boolean multipleChoice, List<String> options, Set<RecipientIdentifier> recipients, boolean notifySelf) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPollVoteMessage(RecipientIdentifier.Single author, long timestamp, List<Integer> optionIds, int version, Set<RecipientIdentifier> recipients, boolean notifySelf) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPollTerminateMessage(long timestamp, Set<RecipientIdentifier> recipients, boolean notifySelf) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendStory(String attachment, boolean allowsReplies) {
+            return new SendMessageResults(0, Map.of());
+        }
+
+        @Override
+        public void hideRecipient(RecipientIdentifier.Single recipient) {
+        }
+
+        @Override
+        public void deleteRecipient(RecipientIdentifier.Single recipient) {
+        }
+
+        @Override
+        public void deleteContact(RecipientIdentifier.Single recipient) {
+        }
+
+        @Override
+        public void setContactName(RecipientIdentifier.Single recipient, String givenName, String familyName, String newGivenName, String newFamilyName, String nick) {
+        }
+
+        @Override
+        public void setContactsBlocked(Collection<RecipientIdentifier.Single> recipients, boolean blocked) {
+        }
+
+        @Override
+        public void setGroupsBlocked(Collection<GroupId> groupIds, boolean blocked) {
+        }
+
+        @Override
+        public void setExpirationTimer(RecipientIdentifier.Single recipient, int messageExpirationTimer) {
+        }
+
+        @Override
+        public StickerPackUrl uploadStickerPack(File path) {
+            return null;
+        }
+
+        @Override
+        public void installStickerPack(StickerPackUrl url) {
+        }
+
+        @Override
+        public List<StickerPack> getStickerPacks() {
+            return List.of();
+        }
+
+        @Override
+        public void requestAllSyncData() {
+        }
+
+        @Override
+        public boolean isContactBlocked(RecipientIdentifier.Single recipient) {
+            return false;
+        }
+
+        @Override
+        public void sendContacts() {
+        }
+
+        @Override
+        public List<Recipient> getRecipients(boolean onlyWithProfile, Optional<Boolean> blocked, Collection<RecipientIdentifier.Single> addresses, Optional<String> name) {
+            return List.of();
+        }
+
+        @Override
+        public String getContactOrProfileName(RecipientIdentifier.Single recipient) {
+            return null;
+        }
+
+        @Override
+        public Group getGroup(GroupId groupId) {
+            return null;
+        }
+
+        @Override
+        public List<Identity> getIdentities() {
+            return List.of();
+        }
+
+        @Override
+        public List<Identity> getIdentities(RecipientIdentifier.Single recipient) {
+            return List.of();
+        }
+
+        @Override
+        public boolean trustIdentityVerified(RecipientIdentifier.Single recipient, IdentityVerificationCode verificationCode) {
+            return false;
+        }
+
+        @Override
+        public boolean trustIdentityAllKeys(RecipientIdentifier.Single recipient) {
+            return false;
+        }
+
+        @Override
+        public void addAddressChangedListener(Runnable listener) {
+        }
+
+        @Override
+        public void addClosedListener(Runnable listener) {
+        }
+
+        @Override
+        public InputStream retrieveAttachment(String id) {
+            return null;
+        }
+
+        @Override
+        public InputStream retrieveContactAvatar(RecipientIdentifier.Single recipient) {
+            return null;
+        }
+
+        @Override
+        public InputStream retrieveProfileAvatar(RecipientIdentifier.Single recipient) {
+            return null;
+        }
+
+        @Override
+        public InputStream retrieveGroupAvatar(GroupId groupId) {
+            return null;
+        }
+
+        @Override
+        public InputStream retrieveSticker(StickerPackId stickerPackId, int stickerId) {
+            return null;
+        }
+
+        @Override
+        public CallInfo startCall(RecipientIdentifier.Single recipient) {
+            return null;
+        }
+
+        @Override
+        public CallInfo acceptCall(long callId) {
+            return null;
+        }
+
+        @Override
+        public void hangupCall(long callId) {
+        }
+
+        @Override
+        public SendMessageResult rejectCall(long callId) {
+            return null;
+        }
+
+        @Override
+        public List<CallInfo> listActiveCalls() {
+            return List.of();
+        }
+
+        @Override
+        public void sendCallOffer(RecipientIdentifier.Single recipient, CallOffer callOffer) {
+        }
+
+        @Override
+        public void sendCallAnswer(RecipientIdentifier.Single recipient, long callId, byte[] answer) {
+        }
+
+        @Override
+        public void sendIceUpdate(RecipientIdentifier.Single recipient, long callId, List<byte[]> iceCandidates) {
+        }
+
+        @Override
+        public void sendHangup(RecipientIdentifier.Single recipient, long callId, MessageEnvelope.Call.Hangup.Type type) {
+        }
+
+        @Override
+        public void sendBusy(RecipientIdentifier.Single recipient, long callId) {
+        }
+
+        @Override
+        public List<TurnServer> getTurnServerInfo() {
+            return List.of();
+        }
+
+        @Override
+        public void close() {
+        }
+
+        @Override
+        public void addCallEventListener(CallEventListener listener) {
+        }
+
+        @Override
+        public void removeCallEventListener(CallEventListener listener) {
+        }
+    }
 }
--- a/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java
+++ b/src/test/java/org/asamk/signal/jsonrpc/SubscribeCallEventsTest.java
@ -4,16 +4,52 @@ import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.MultiAccountManager;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.RegistrationManager;
+import org.asamk.signal.manager.api.CallInfo;
+import org.asamk.signal.manager.api.CallOffer;
+import org.asamk.signal.manager.api.Configuration;
+import org.asamk.signal.manager.api.Device;
+import org.asamk.signal.manager.api.DeviceLinkUrl;
+import org.asamk.signal.manager.api.Group;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupInviteLinkUrl;
+import org.asamk.signal.manager.api.Identity;
+import org.asamk.signal.manager.api.IdentityVerificationCode;
+import org.asamk.signal.manager.api.Message;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.Pair;
+import org.asamk.signal.manager.api.ReceiveConfig;
+import org.asamk.signal.manager.api.Recipient;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.SendGroupMessageResults;
+import org.asamk.signal.manager.api.SendMessageResult;
+import org.asamk.signal.manager.api.SendMessageResults;
+import org.asamk.signal.manager.api.StickerPack;
+import org.asamk.signal.manager.api.StickerPackId;
+import org.asamk.signal.manager.api.StickerPackUrl;
+import org.asamk.signal.manager.api.TurnServer;
+import org.asamk.signal.manager.api.TypingAction;
+import org.asamk.signal.manager.api.UpdateGroup;
+import org.asamk.signal.manager.api.UpdateProfile;
+import org.asamk.signal.manager.api.UserStatus;
+import org.asamk.signal.manager.api.UsernameLinkUrl;
+import org.asamk.signal.manager.api.UsernameStatus;
 import org.asamk.signal.output.JsonWriter;
-import org.asamk.signal.testutil.ManagerMock;
 import org.junit.jupiter.api.Test;

+import java.io.File;
+import java.io.InputStream;
 import java.net.URI;
+import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;

 import static org.junit.jupiter.api.Assertions.assertEquals;
@ -53,12 +89,499 @@ class SubscribeCallEventsTest {
        }
    }

-    private record ManagedManager(Manager manager, ManagerMock.State state) {
-    }
+    /**
+     * Minimal Manager stub that tracks call event listener add/remove calls.
+     */
+    private static class StubManager implements Manager {

-    private static ManagedManager createManager(final String selfNumber) {
-        final var state = new ManagerMock.State();
-        return new ManagedManager(ManagerMock.create(selfNumber, state), state);
+        final List<CallEventListener> listeners = new ArrayList<>();
+        final AtomicInteger addCount = new AtomicInteger(0);
+        final AtomicInteger removeCount = new AtomicInteger(0);
+        final String selfNumber;
+
+        StubManager(String selfNumber) {
+            this.selfNumber = selfNumber;
+        }
+
+        @Override
+        public void addCallEventListener(CallEventListener listener) {
+            addCount.incrementAndGet();
+            listeners.add(listener);
+        }
+
+        @Override
+        public void removeCallEventListener(CallEventListener listener) {
+            removeCount.incrementAndGet();
+            listeners.remove(listener);
+        }
+
+        @Override
+        public String getSelfNumber() {
+            return selfNumber;
+        }
+
+        @Override
+        public String getSelfACI() {
+            return "00000000-0000-0000-0000-000000000000";
+        }
+
+        // --- Stubs for remaining Manager interface methods ---
+        @Override
+        public Map<String, UserStatus> getUserStatus(Set<String> n) {
+            return Map.of();
+        }
+
+        @Override
+        public Map<String, UsernameStatus> getUsernameStatus(Set<String> u) {
+            return Map.of();
+        }
+
+        @Override
+        public void updateAccountAttributes(String d, Boolean u, Boolean dn, Boolean ns) {
+        }
+
+        @Override
+        public Configuration getConfiguration() {
+            return null;
+        }
+
+        @Override
+        public void updateConfiguration(Configuration c) {
+        }
+
+        @Override
+        public void updateProfile(UpdateProfile u) {
+        }
+
+        @Override
+        public String getUsername() {
+            return null;
+        }
+
+        @Override
+        public UsernameLinkUrl getUsernameLink() {
+            return null;
+        }
+
+        @Override
+        public void setUsername(String u) {
+        }
+
+        @Override
+        public void deleteUsername() {
+        }
+
+        @Override
+        public void startChangeNumber(String n, boolean v, String c) {
+        }
+
+        @Override
+        public void finishChangeNumber(String n, String v, String p) {
+        }
+
+        @Override
+        public void unregister() {
+        }
+
+        @Override
+        public void deleteAccount() {
+        }
+
+        @Override
+        public void submitRateLimitRecaptchaChallenge(String c, String cap) {
+        }
+
+        @Override
+        public List<Device> getLinkedDevices() {
+            return List.of();
+        }
+
+        @Override
+        public void updateLinkedDevice(int d, String n) {
+        }
+
+        @Override
+        public void removeLinkedDevices(int d) {
+        }
+
+        @Override
+        public void addDeviceLink(DeviceLinkUrl u) {
+        }
+
+        @Override
+        public void setRegistrationLockPin(Optional<String> p) {
+        }
+
+        @Override
+        public List<Group> getGroups() {
+            return List.of();
+        }
+
+        @Override
+        public List<Group> getGroups(Collection<GroupId> g) {
+            return List.of();
+        }
+
+        @Override
+        public SendGroupMessageResults quitGroup(GroupId g, Set<RecipientIdentifier.Single> a) {
+            return null;
+        }
+
+        @Override
+        public void deleteGroup(GroupId g) {
+        }
+
+        @Override
+        public Pair<GroupId, SendGroupMessageResults> createGroup(
+                String n,
+                Set<RecipientIdentifier.Single> m,
+                String a
+        ) {
+            return null;
+        }
+
+        @Override
+        public SendGroupMessageResults updateGroup(GroupId g, UpdateGroup u) {
+            return null;
+        }
+
+        @Override
+        public Pair<GroupId, SendGroupMessageResults> joinGroup(GroupInviteLinkUrl u) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendTypingMessage(TypingAction a, Set<RecipientIdentifier> r) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendReadReceipt(RecipientIdentifier.Single s, List<Long> m) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendViewedReceipt(RecipientIdentifier.Single s, List<Long> m) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendMessage(Message m, Set<RecipientIdentifier> r, boolean n) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendEditMessage(Message m, Set<RecipientIdentifier> r, long t) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendRemoteDeleteMessage(long t, Set<RecipientIdentifier> r) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendMessageReaction(
+                String e,
+                boolean rm,
+                RecipientIdentifier.Single a,
+                long t,
+                Set<RecipientIdentifier> r,
+                boolean n,
+                boolean s
+        ) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendAdminDelete(
+                RecipientIdentifier.Single a,
+                long t,
+                Set<RecipientIdentifier.Group> r,
+                boolean n,
+                boolean s
+        ) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPinMessage(
+                int d,
+                RecipientIdentifier.Single a,
+                long t,
+                Set<RecipientIdentifier> r,
+                boolean n,
+                boolean s
+        ) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendUnpinMessage(
+                RecipientIdentifier.Single a,
+                long t,
+                Set<RecipientIdentifier> r,
+                boolean n,
+                boolean s
+        ) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPaymentNotificationMessage(byte[] r, String n, RecipientIdentifier.Single re) {
+            return null;
+        }
+
+        @Override
+        public void sendEndSessionMessage(Set<RecipientIdentifier.Single> r) {
+        }
+
+        @Override
+        public SendMessageResults sendMessageRequestResponse(
+                MessageEnvelope.Sync.MessageRequestResponse.Type t,
+                Set<RecipientIdentifier> r
+        ) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPollCreateMessage(
+                String q,
+                boolean a,
+                List<String> o,
+                Set<RecipientIdentifier> r,
+                boolean n
+        ) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPollVoteMessage(
+                RecipientIdentifier.Single a,
+                long t,
+                List<Integer> o,
+                int v,
+                Set<RecipientIdentifier> r,
+                boolean n
+        ) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendPollTerminateMessage(long t, Set<RecipientIdentifier> r, boolean n) {
+            return null;
+        }
+
+        @Override
+        public SendMessageResults sendStory(String attachment, boolean allowsReplies) {
+            return new SendMessageResults(0, Map.of());
+        }
+
+        @Override
+        public void hideRecipient(RecipientIdentifier.Single r) {
+        }
+
+        @Override
+        public void deleteRecipient(RecipientIdentifier.Single r) {
+        }
+
+        @Override
+        public void deleteContact(RecipientIdentifier.Single r) {
+        }
+
+        @Override
+        public void setContactName(RecipientIdentifier.Single r, String g, String f, String ng, String nf, String n) {
+        }
+
+        @Override
+        public void setContactsBlocked(Collection<RecipientIdentifier.Single> r, boolean b) {
+        }
+
+        @Override
+        public void setGroupsBlocked(Collection<GroupId> g, boolean b) {
+        }
+
+        @Override
+        public void setExpirationTimer(RecipientIdentifier.Single r, int t) {
+        }
+
+        @Override
+        public StickerPackUrl uploadStickerPack(File p) {
+            return null;
+        }
+
+        @Override
+        public void installStickerPack(StickerPackUrl u) {
+        }
+
+        @Override
+        public List<StickerPack> getStickerPacks() {
+            return List.of();
+        }
+
+        @Override
+        public void requestAllSyncData() {
+        }
+
+        @Override
+        public void addReceiveHandler(ReceiveMessageHandler h, boolean w) {
+        }
+
+        @Override
+        public void removeReceiveHandler(ReceiveMessageHandler h) {
+        }
+
+        @Override
+        public boolean isReceiving() {
+            return false;
+        }
+
+        @Override
+        public void receiveMessages(Optional<Duration> t, Optional<Integer> m, ReceiveMessageHandler h) {
+        }
+
+        @Override
+        public void stopReceiveMessages() {
+        }
+
+        @Override
+        public void setReceiveConfig(ReceiveConfig r) {
+        }
+
+        @Override
+        public boolean isContactBlocked(RecipientIdentifier.Single r) {
+            return false;
+        }
+
+        @Override
+        public void sendContacts() {
+        }
+
+        @Override
+        public List<Recipient> getRecipients(
+                boolean o,
+                Optional<Boolean> b,
+                Collection<RecipientIdentifier.Single> a,
+                Optional<String> n
+        ) {
+            return List.of();
+        }
+
+        @Override
+        public String getContactOrProfileName(RecipientIdentifier.Single r) {
+            return null;
+        }
+
+        @Override
+        public Group getGroup(GroupId g) {
+            return null;
+        }
+
+        @Override
+        public List<Identity> getIdentities() {
+            return List.of();
+        }
+
+        @Override
+        public List<Identity> getIdentities(RecipientIdentifier.Single r) {
+            return List.of();
+        }
+
+        @Override
+        public boolean trustIdentityVerified(RecipientIdentifier.Single r, IdentityVerificationCode v) {
+            return false;
+        }
+
+        @Override
+        public boolean trustIdentityAllKeys(RecipientIdentifier.Single r) {
+            return false;
+        }
+
+        @Override
+        public void addAddressChangedListener(Runnable l) {
+        }
+
+        @Override
+        public void addClosedListener(Runnable l) {
+        }
+
+        @Override
+        public InputStream retrieveAttachment(String id) {
+            return null;
+        }
+
+        @Override
+        public InputStream retrieveContactAvatar(RecipientIdentifier.Single r) {
+            return null;
+        }
+
+        @Override
+        public InputStream retrieveProfileAvatar(RecipientIdentifier.Single r) {
+            return null;
+        }
+
+        @Override
+        public InputStream retrieveGroupAvatar(GroupId g) {
+            return null;
+        }
+
+        @Override
+        public InputStream retrieveSticker(StickerPackId s, int i) {
+            return null;
+        }
+
+        @Override
+        public CallInfo startCall(RecipientIdentifier.Single r) {
+            return null;
+        }
+
+        @Override
+        public CallInfo acceptCall(long c) {
+            return null;
+        }
+
+        @Override
+        public void hangupCall(long c) {
+        }
+
+        @Override
+        public SendMessageResult rejectCall(long c) {
+            return null;
+        }
+
+        @Override
+        public List<CallInfo> listActiveCalls() {
+            return List.of();
+        }
+
+        @Override
+        public void sendCallOffer(RecipientIdentifier.Single r, CallOffer o) {
+        }
+
+        @Override
+        public void sendCallAnswer(RecipientIdentifier.Single r, long c, byte[] a) {
+        }
+
+        @Override
+        public void sendIceUpdate(RecipientIdentifier.Single r, long c, List<byte[]> i) {
+        }
+
+        @Override
+        public void sendHangup(RecipientIdentifier.Single r, long c, MessageEnvelope.Call.Hangup.Type t) {
+        }
+
+        @Override
+        public void sendBusy(RecipientIdentifier.Single r, long c) {
+        }
+
+        @Override
+        public List<TurnServer> getTurnServerInfo() {
+            return List.of();
+        }
+
+        @Override
+        public void close() {
+        }
    }

    /**
@ -129,21 +652,21 @@ class SubscribeCallEventsTest {

    @Test
    void callEventsNotSubscribedByDefault() {
-        var manager = createManager("+15551234567");
+        var manager = new StubManager("+15551234567");
        var feeder = new LineFeeder();
        var writer = new CapturingJsonWriter();

        // Send no subscribeCallEvents, just end the connection
        var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true);
-        handler.handleConnection(manager.manager());
+        handler.handleConnection(manager);

        // No listeners should have been added
-        assertEquals(0, manager.state().addCallEventListenerCount.get(), "call events should not be auto-subscribed");
+        assertEquals(0, manager.addCount.get(), "call events should not be auto-subscribed");
    }

    @Test
    void subscribeCallEventsAddsListener() {
-        var manager = createManager("+15551234567");
+        var manager = new StubManager("+15551234567");
        var feeder = new LineFeeder();
        var writer = new CapturingJsonWriter();

@ -151,17 +674,17 @@ class SubscribeCallEventsTest {
        // null terminates the read loop

        var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true);
-        handler.handleConnection(manager.manager());
+        handler.handleConnection(manager);

-        assertEquals(1, manager.state().addCallEventListenerCount.get(), "subscribeCallEvents should add one listener");
+        assertEquals(1, manager.addCount.get(), "subscribeCallEvents should add one listener");
        // Cleanup in finally block should remove it
-        assertEquals(1, manager.state().removeCallEventListenerCount.get(), "cleanup should remove the listener");
-        assertEquals(0, manager.state().callEventListeners.size(), "no listeners should remain after cleanup");
+        assertEquals(1, manager.removeCount.get(), "cleanup should remove the listener");
+        assertEquals(0, manager.listeners.size(), "no listeners should remain after cleanup");
    }

    @Test
    void subscribeCallEventsCanBeCalledMultipleTimes() {
-        var manager = createManager("+15551234567");
+        var manager = new StubManager("+15551234567");
        var feeder = new LineFeeder();
        var writer = new CapturingJsonWriter();

@ -169,15 +692,15 @@ class SubscribeCallEventsTest {
        feeder.addLine(jsonRpcCall(2, "subscribeCallEvents"));

        var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true);
-        handler.handleConnection(manager.manager());
+        handler.handleConnection(manager);

        // The implementation allows multiple subscriptions, so two calls add two listeners
-        assertEquals(2, manager.state().addCallEventListenerCount.get(), "multiple subscribeCallEvents should add multiple listeners");
+        assertEquals(2, manager.addCount.get(), "multiple subscribeCallEvents should add multiple listeners");
    }

    @Test
    void unsubscribeCallEventsRemovesListener() {
-        var manager = createManager("+15551234567");
+        var manager = new StubManager("+15551234567");
        var feeder = new LineFeeder();
        var writer = new CapturingJsonWriter();

@ -185,37 +708,37 @@ class SubscribeCallEventsTest {
        feeder.addLine(jsonRpcCall(2, "unsubscribeCallEvents", "{\"subscription\":0}"));

        var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true);
-        handler.handleConnection(manager.manager());
+        handler.handleConnection(manager);

-        assertEquals(1, manager.state().addCallEventListenerCount.get(), "should have subscribed once");
+        assertEquals(1, manager.addCount.get(), "should have subscribed once");
        // removeCount: 1 from explicit unsubscribe. The finally block's unsubscribeAllCallEvents
        // iterates an empty list so adds 0 more.
-        assertEquals(1, manager.state().removeCallEventListenerCount.get(), "should have unsubscribed once");
-        assertEquals(0, manager.state().callEventListeners.size());
+        assertEquals(1, manager.removeCount.get(), "should have unsubscribed once");
+        assertEquals(0, manager.listeners.size());
    }

    @Test
    void unsubscribeWithoutSubscribeIsNoOp() {
-        var manager = createManager("+15551234567");
+        var manager = new StubManager("+15551234567");
        var feeder = new LineFeeder();
        var writer = new CapturingJsonWriter();

        feeder.addLine(jsonRpcCall(1, "unsubscribeCallEvents"));

        var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true);
-        handler.handleConnection(manager.manager());
+        handler.handleConnection(manager);

-        assertEquals(0, manager.state().addCallEventListenerCount.get());
-        assertEquals(0, manager.state().removeCallEventListenerCount.get());
+        assertEquals(0, manager.addCount.get());
+        assertEquals(0, manager.removeCount.get());
    }

    // --- Multi-account mode tests ---

    @Test
    void multiAccountSubscribeCallEventsSubscribesAllManagers() {
-        var manager1 = createManager("+15551111111");
-        var manager2 = createManager("+15552222222");
-        var multi = new StubMultiAccountManager(List.of(manager1.manager(), manager2.manager()));
+        var manager1 = new StubManager("+15551111111");
+        var manager2 = new StubManager("+15552222222");
+        var multi = new StubMultiAccountManager(List.of(manager1, manager2));

        var feeder = new LineFeeder();
        var writer = new CapturingJsonWriter();
@ -225,17 +748,17 @@ class SubscribeCallEventsTest {
        var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true);
        handler.handleConnection(multi);

-        assertEquals(1, manager1.state().addCallEventListenerCount.get(), "manager1 should have one listener");
-        assertEquals(1, manager2.state().addCallEventListenerCount.get(), "manager2 should have one listener");
+        assertEquals(1, manager1.addCount.get(), "manager1 should have one listener");
+        assertEquals(1, manager2.addCount.get(), "manager2 should have one listener");
        // Also registers an onManagerAdded handler for receive and one for call events
        assertEquals(2, multi.addedHandlers.size(), "should register onManagerAdded handlers");
    }

    @Test
    void multiAccountUnsubscribeCallEventsCleansUpAll() {
-        var manager1 = createManager("+15551111111");
-        var manager2 = createManager("+15552222222");
-        var multi = new StubMultiAccountManager(List.of(manager1.manager(), manager2.manager()));
+        var manager1 = new StubManager("+15551111111");
+        var manager2 = new StubManager("+15552222222");
+        var multi = new StubMultiAccountManager(List.of(manager1, manager2));

        var feeder = new LineFeeder();
        var writer = new CapturingJsonWriter();
@ -246,16 +769,16 @@ class SubscribeCallEventsTest {
        var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true);
        handler.handleConnection(multi);

-        assertEquals(1, manager1.state().addCallEventListenerCount.get());
-        assertEquals(1, manager2.state().addCallEventListenerCount.get());
-        assertEquals(1, manager1.state().removeCallEventListenerCount.get(), "manager1 listener should be removed");
-        assertEquals(1, manager2.state().removeCallEventListenerCount.get(), "manager2 listener should be removed");
+        assertEquals(1, manager1.addCount.get());
+        assertEquals(1, manager2.addCount.get());
+        assertEquals(1, manager1.removeCount.get(), "manager1 listener should be removed");
+        assertEquals(1, manager2.removeCount.get(), "manager2 listener should be removed");
    }

    @Test
    void multiAccountCallEventsNotSubscribedByDefault() {
-        var manager1 = createManager("+15551111111");
-        var multi = new StubMultiAccountManager(List.of(manager1.manager()));
+        var manager1 = new StubManager("+15551111111");
+        var multi = new StubMultiAccountManager(List.of(manager1));

        var feeder = new LineFeeder();
        var writer = new CapturingJsonWriter();
@ -263,6 +786,6 @@ class SubscribeCallEventsTest {
        var handler = new SignalJsonRpcDispatcherHandler(writer, feeder::getLine, true);
        handler.handleConnection(multi);

-        assertEquals(0, manager1.state().addCallEventListenerCount.get(), "call events should not be auto-subscribed in multi mode");
+        assertEquals(0, manager1.addCount.get(), "call events should not be auto-subscribed in multi mode");
    }
 }
--- a/src/test/java/org/asamk/signal/testutil/ManagerMock.java
+++ b/src/test/java/org/asamk/signal/testutil/ManagerMock.java
@ -1,122 +0,0 @@
-package org.asamk.signal.testutil;
-
-import org.asamk.signal.manager.Manager;
-
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public final class ManagerMock {
-
-    private static final String DEFAULT_ACI = "00000000-0000-0000-0000-000000000000";
-
-    private ManagerMock() {
-    }
-
-    public static final class State {
-
-        public final List<Manager.CallEventListener> callEventListeners = new ArrayList<>();
-        public final AtomicInteger addCallEventListenerCount = new AtomicInteger(0);
-        public final AtomicInteger removeCallEventListenerCount = new AtomicInteger(0);
-
-        public final List<Manager.ReceiveMessageHandler> receiveHandlers = new ArrayList<>();
-        public final AtomicInteger addReceiveHandlerCount = new AtomicInteger(0);
-        public final AtomicInteger removeReceiveHandlerCount = new AtomicInteger(0);
-    }
-
-    public static Manager create(final String selfNumber) {
-        return create(selfNumber, new State());
-    }
-
-    public static Manager create(final String selfNumber, final State state) {
-        return (Manager) Proxy.newProxyInstance(
-                Manager.class.getClassLoader(),
-                new Class<?>[]{Manager.class},
-                (proxy, method, args) -> {
-                    final var methodName = method.getName();
-                    switch (methodName) {
-                        case "getSelfNumber":
-                            return selfNumber;
-                        case "getSelfACI":
-                            return DEFAULT_ACI;
-                        case "addCallEventListener":
-                            state.addCallEventListenerCount.incrementAndGet();
-                            state.callEventListeners.add((Manager.CallEventListener) args[0]);
-                            return null;
-                        case "removeCallEventListener":
-                            state.removeCallEventListenerCount.incrementAndGet();
-                            state.callEventListeners.remove((Manager.CallEventListener) args[0]);
-                            return null;
-                        case "addReceiveHandler":
-                            state.addReceiveHandlerCount.incrementAndGet();
-                            state.receiveHandlers.add((Manager.ReceiveMessageHandler) args[0]);
-                            return null;
-                        case "removeReceiveHandler":
-                            state.removeReceiveHandlerCount.incrementAndGet();
-                            state.receiveHandlers.remove((Manager.ReceiveMessageHandler) args[0]);
-                            return null;
-                        case "equals":
-                            return proxy == args[0];
-                        case "hashCode":
-                            return System.identityHashCode(proxy);
-                        case "toString":
-                            return "ManagerMock{" + selfNumber + "}";
-                        default:
-                            return defaultValue(method.getReturnType());
-                    }
-                }
-        );
-    }
-
-    private static Object defaultValue(final Class<?> returnType) {
-        if (returnType == Void.TYPE) {
-            return null;
-        }
-        if (returnType == Boolean.TYPE) {
-            return false;
-        }
-        if (returnType == Byte.TYPE) {
-            return (byte) 0;
-        }
-        if (returnType == Short.TYPE) {
-            return (short) 0;
-        }
-        if (returnType == Integer.TYPE) {
-            return 0;
-        }
-        if (returnType == Long.TYPE) {
-            return 0L;
-        }
-        if (returnType == Float.TYPE) {
-            return 0F;
-        }
-        if (returnType == Double.TYPE) {
-            return 0D;
-        }
-        if (returnType == Character.TYPE) {
-            return '\0';
-        }
-        if (returnType == Optional.class) {
-            return Optional.empty();
-        }
-        if (returnType == List.class) {
-            return List.of();
-        }
-        if (returnType == Set.class) {
-            return Set.of();
-        }
-        if (returnType == Collection.class) {
-            return List.of();
-        }
-        if (returnType == Map.class) {
-            return Map.of();
-        }
-
-        return null;
-    }
-}
 @ -1 +1 @@
 .96.3
 .94.4