X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/8cd8016c3d5259294c7baae5b1f1066e71c64b64..a738fb725b81ebf7801efe62d98e32c49857a327:/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java index e5733e06..dd74d22c 100644 --- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java +++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java @@ -78,6 +78,7 @@ import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage; import org.whispersystems.signalservice.api.push.ACI; import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException; +import org.whispersystems.signalservice.api.push.exceptions.UnregisteredUserException; import org.whispersystems.signalservice.api.util.DeviceNameUtil; import org.whispersystems.signalservice.api.util.InvalidNumberException; import org.whispersystems.signalservice.api.util.PhoneNumberFormatter; @@ -196,8 +197,7 @@ public class ManagerImpl implements Manager { avatarStore, unidentifiedAccessHelper::getAccessFor, this::resolveSignalServiceAddress); - final GroupV2Helper groupV2Helper = new GroupV2Helper(profileHelper::getRecipientProfileKeyCredential, - profileHelper::getRecipientProfile, + final GroupV2Helper groupV2Helper = new GroupV2Helper(profileHelper, account::getSelfRecipientId, dependencies.getGroupsV2Operations(), dependencies.getGroupsV2Api(), @@ -209,7 +209,7 @@ public class ManagerImpl implements Manager { account.getRecipientStore(), this::handleIdentityFailure, this::getGroupInfo, - profileHelper::getRecipientProfile, + profileHelper, this::refreshRegisteredUser); this.groupHelper = new GroupHelper(account, dependencies, @@ -911,11 +911,11 @@ public class ManagerImpl implements Manager { try { aciMap = getRegisteredUsers(Set.of(number)); } catch (NumberFormatException e) { - throw new IOException(number, e); + throw new UnregisteredUserException(number, e); } final var uuid = aciMap.get(number); if (uuid == null) { - throw new IOException(number, null); + throw new UnregisteredUserException(number, null); } return uuid; }