Update libsignal-service-java

graalvm-config-dir/jni-config.json

@@ -56,24 +56,121 @@
 {
   "name":"org.asamk.signal.manager.storage.protocol.SignalProtocolStore",
   "methods":[
-    {"name":"getIdentity","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress"] }, 
+    {"name":"getIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, 
     {"name":"getIdentityKeyPair","parameterTypes":[] }, 
     {"name":"getLocalRegistrationId","parameterTypes":[] }, 
-    {"name":"isTrustedIdentity","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","org.whispersystems.libsignal.IdentityKey","org.whispersystems.libsignal.state.IdentityKeyStore$Direction"] }, 
+    {"name":"isTrustedIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey","org.signal.libsignal.protocol.state.IdentityKeyStore$Direction"] }, 
     {"name":"loadPreKey","parameterTypes":["int"] }, 
-    {"name":"loadSenderKey","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","java.util.UUID"] }, 
+    {"name":"loadSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID"] }, 
-    {"name":"loadSession","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress"] }, 
+    {"name":"loadSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress"] }, 
     {"name":"loadSignedPreKey","parameterTypes":["int"] }, 
     {"name":"removePreKey","parameterTypes":["int"] }, 
-    {"name":"saveIdentity","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","org.whispersystems.libsignal.IdentityKey"] }, 
+    {"name":"saveIdentity","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.IdentityKey"] }, 
-    {"name":"storeSenderKey","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","java.util.UUID","org.whispersystems.libsignal.groups.state.SenderKeyRecord"] }, 
+    {"name":"storeSenderKey","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","java.util.UUID","org.signal.libsignal.protocol.groups.state.SenderKeyRecord"] }, 
-    {"name":"storeSession","parameterTypes":["org.whispersystems.libsignal.SignalProtocolAddress","org.whispersystems.libsignal.state.SessionRecord"] }
+    {"name":"storeSession","parameterTypes":["org.signal.libsignal.protocol.SignalProtocolAddress","org.signal.libsignal.protocol.state.SessionRecord"] }
   ]
 },
 {
   "name":"org.graalvm.jniutils.JNIExceptionWrapperEntryPoints",
   "methods":[{"name":"getClassName","parameterTypes":["java.lang.Class"] }]
 },
+{
+  "name":"org.signal.libsignal.protocol.DuplicateMessageException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.IdentityKey",
+  "methods":[
+    {"name":"<init>","parameterTypes":["byte[]"] }, 
+    {"name":"serialize","parameterTypes":[] }
+  ]
+},
+{
+  "name":"org.signal.libsignal.protocol.IdentityKeyPair",
+  "methods":[{"name":"serialize","parameterTypes":[] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.InvalidKeyException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.InvalidKeyIdException"
+},
+{
+  "name":"org.signal.libsignal.protocol.InvalidMessageException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.SignalProtocolAddress",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","int"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.UntrustedIdentityException",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.groups.state.SenderKeyRecord",
+  "fields":[{"name":"unsafeHandle"}],
+  "methods":[{"name":"<init>","parameterTypes":["long"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.groups.state.SenderKeyStore"
+},
+{
+  "name":"org.signal.libsignal.protocol.logging.Log",
+  "methods":[{"name":"log","parameterTypes":["int","java.lang.String","java.lang.String"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.message.PlaintextContent",
+  "fields":[{"name":"unsafeHandle"}]
+},
+{
+  "name":"org.signal.libsignal.protocol.message.PreKeySignalMessage",
+  "fields":[{"name":"unsafeHandle"}],
+  "methods":[{"name":"<init>","parameterTypes":["long"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.message.SenderKeyMessage",
+  "fields":[{"name":"unsafeHandle"}],
+  "methods":[{"name":"<init>","parameterTypes":["long"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.message.SignalMessage",
+  "fields":[{"name":"unsafeHandle"}],
+  "methods":[{"name":"<init>","parameterTypes":["long"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore"
+},
+{
+  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore$Direction",
+  "fields":[
+    {"name":"RECEIVING"}, 
+    {"name":"SENDING"}
+  ]
+},
+{
+  "name":"org.signal.libsignal.protocol.state.PreKeyRecord",
+  "fields":[{"name":"unsafeHandle"}]
+},
+{
+  "name":"org.signal.libsignal.protocol.state.PreKeyStore"
+},
+{
+  "name":"org.signal.libsignal.protocol.state.SessionRecord",
+  "fields":[{"name":"unsafeHandle"}],
+  "methods":[{"name":"<init>","parameterTypes":["byte[]"] }]
+},
+{
+  "name":"org.signal.libsignal.protocol.state.SessionStore"
+},
+{
+  "name":"org.signal.libsignal.protocol.state.SignedPreKeyRecord",
+  "fields":[{"name":"unsafeHandle"}]
+},
+{
+  "name":"org.signal.libsignal.protocol.state.SignedPreKeyStore"
+},
 {
   "name":"org.sqlite.Collation"
 },
@@ -103,102 +200,5 @@
     {"name":"pointer"}, 
     {"name":"udfdatalist"}
   ]
-},
-{
-  "name":"org.whispersystems.libsignal.DuplicateMessageException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.IdentityKey",
-  "methods":[
-    {"name":"<init>","parameterTypes":["byte[]"] }, 
-    {"name":"serialize","parameterTypes":[] }
-  ]
-},
-{
-  "name":"org.whispersystems.libsignal.IdentityKeyPair",
-  "methods":[{"name":"serialize","parameterTypes":[] }]
-},
-{
-  "name":"org.whispersystems.libsignal.InvalidKeyException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.InvalidKeyIdException"
-},
-{
-  "name":"org.whispersystems.libsignal.InvalidMessageException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.SignalProtocolAddress",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","int"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.UntrustedIdentityException",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.String"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.groups.state.SenderKeyRecord",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.groups.state.SenderKeyStore"
-},
-{
-  "name":"org.whispersystems.libsignal.logging.Log",
-  "methods":[{"name":"log","parameterTypes":["int","java.lang.String","java.lang.String"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.protocol.PlaintextContent",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.whispersystems.libsignal.protocol.PreKeySignalMessage",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.protocol.SenderKeyMessage",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.protocol.SignalMessage",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["long"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.state.IdentityKeyStore"
-},
-{
-  "name":"org.whispersystems.libsignal.state.IdentityKeyStore$Direction",
-  "fields":[
-    {"name":"RECEIVING"}, 
-    {"name":"SENDING"}
-  ]
-},
-{
-  "name":"org.whispersystems.libsignal.state.PreKeyRecord",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.whispersystems.libsignal.state.PreKeyStore"
-},
-{
-  "name":"org.whispersystems.libsignal.state.SessionRecord",
-  "fields":[{"name":"unsafeHandle"}],
-  "methods":[{"name":"<init>","parameterTypes":["byte[]"] }]
-},
-{
-  "name":"org.whispersystems.libsignal.state.SessionStore"
-},
-{
-  "name":"org.whispersystems.libsignal.state.SignedPreKeyRecord",
-  "fields":[{"name":"unsafeHandle"}]
-},
-{
-  "name":"org.whispersystems.libsignal.state.SignedPreKeyStore"
 }
 ]

graalvm-config-dir/reflect-config.json

@@ -1553,6 +1553,43 @@
   "name":"org.freedesktop.dbus.interfaces.Properties$PropertiesChanged",
   "allPublicConstructors":true
 },
+{
+  "name":"org.signal.libsignal.protocol.state.IdentityKeyStore",
+  "allDeclaredMethods":true
+},
+{
+  "name":"org.signal.libsignal.protocol.state.PreKeyStore",
+  "allDeclaredMethods":true
+},
+{
+  "name":"org.signal.libsignal.protocol.state.SessionStore",
+  "allDeclaredMethods":true
+},
+{
+  "name":"org.signal.libsignal.protocol.state.SignalProtocolStore",
+  "allDeclaredMethods":true
+},
+{
+  "name":"org.signal.libsignal.protocol.state.SignedPreKeyStore",
+  "allDeclaredMethods":true
+},
+{
+  "name":"org.signal.libsignal.zkgroup.internal.ByteArray",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true
+},
+{
+  "name":"org.signal.libsignal.zkgroup.profiles.ProfileKey",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
+{
+  "name":"org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},
 {
   "name":"org.signal.storageservice.protos.groups.AccessControl",
   "fields":[
@@ -1575,7 +1612,10 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.BannedMember",
-  "fields":[{"name":"userId_"}]
+  "fields":[
+    {"name":"timestamp_"}, 
+    {"name":"userId_"}
+  ]
 },
 {
   "name":"org.signal.storageservice.protos.groups.Group",
@@ -1794,7 +1834,10 @@
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedBannedMember",
-  "fields":[{"name":"uuid_"}]
+  "fields":[
+    {"name":"timestamp_"}, 
+    {"name":"uuid_"}
+  ]
 },
 {
   "name":"org.signal.storageservice.protos.groups.local.DecryptedGroup",
@@ -1903,46 +1946,9 @@
   "name":"org.signal.storageservice.protos.groups.local.DecryptedTimer",
   "fields":[{"name":"duration_"}]
 },
-{
-  "name":"org.signal.zkgroup.internal.ByteArray",
-  "allDeclaredFields":true,
-  "queryAllDeclaredMethods":true
-},
-{
-  "name":"org.signal.zkgroup.profiles.ProfileKey",
-  "allDeclaredFields":true,
-  "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
-},
-{
-  "name":"org.signal.zkgroup.profiles.ProfileKeyCredential",
-  "allDeclaredFields":true,
-  "queryAllDeclaredMethods":true,
-  "queryAllDeclaredConstructors":true
-},
 {
   "name":"org.sqlite.JDBC"
 },
-{
-  "name":"org.whispersystems.libsignal.state.IdentityKeyStore",
-  "allDeclaredMethods":true
-},
-{
-  "name":"org.whispersystems.libsignal.state.PreKeyStore",
-  "allDeclaredMethods":true
-},
-{
-  "name":"org.whispersystems.libsignal.state.SessionStore",
-  "allDeclaredMethods":true
-},
-{
-  "name":"org.whispersystems.libsignal.state.SignalProtocolStore",
-  "allDeclaredMethods":true
-},
-{
-  "name":"org.whispersystems.libsignal.state.SignedPreKeyStore",
-  "allDeclaredMethods":true
-},
 {
   "name":"org.whispersystems.signalservice.api.account.AccountAttributes",
   "allDeclaredFields":true,
@@ -2793,6 +2799,17 @@
     {"name":"type_"}
   ]
 },
+{
+  "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$StoryMessage",
+  "fields":[
+    {"name":"allowsReplies_"}, 
+    {"name":"attachmentCase_"}, 
+    {"name":"attachment_"}, 
+    {"name":"bitField0_"}, 
+    {"name":"group_"}, 
+    {"name":"profileKey_"}
+  ]
+},
 {
   "name":"org.whispersystems.signalservice.internal.push.SignalServiceProtos$SyncMessage",
   "fields":[
@@ -2806,6 +2823,7 @@
     {"name":"messageRequestResponse_"}, 
     {"name":"outgoingPayment_"}, 
     {"name":"padding_"}, 
+    {"name":"pniIdentity_"}, 
     {"name":"read_"}, 
     {"name":"request_"}, 
     {"name":"sent_"}, 

lib/build.gradle.kts

@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_45")
+    implementation("com.github.turasa", "signal-service-java", "2.15.3_unofficial_46")
     implementation("com.fasterxml.jackson.core", "jackson-databind", "2.13.1")
     implementation("com.google.protobuf", "protobuf-javalite", "3.11.4")
     implementation("org.bouncycastle", "bcprov-jdk15on", "1.70")

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

@@ -2,9 +2,9 @@ package org.asamk.signal.manager;
 
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.util.Utils;
-import org.whispersystems.libsignal.InvalidKeyException;
+import org.signal.libsignal.protocol.InvalidKeyException;
-import org.whispersystems.libsignal.ecc.Curve;
+import org.signal.libsignal.protocol.ecc.Curve;
-import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 
 import java.net.URI;
 import java.net.URISyntaxException;

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

@@ -1,9 +1,9 @@
 package org.asamk.signal.manager;
 
+import org.signal.libsignal.protocol.logging.SignalProtocolLogger;
+import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.logging.SignalProtocolLogger;
-import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
 
 public class LibSignalLogger implements SignalProtocolLogger {
 

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

@@ -23,10 +23,10 @@ import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.util.KeyHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.util.KeyHelper;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.groupsv2.ClientZkOperations;
 import org.whispersystems.signalservice.api.groupsv2.GroupsV2Operations;
@@ -74,7 +74,8 @@ class ProvisioningManagerImpl implements ProvisioningManager {
         password = KeyUtils.createPassword();
         GroupsV2Operations groupsV2Operations;
         try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()));
+            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
+                    ServiceConfig.GROUP_MAX_SIZE);
         } catch (Throwable ignored) {
             groupsV2Operations = null;
         }

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

@@ -73,7 +73,8 @@ class RegistrationManagerImpl implements RegistrationManager {
 
         GroupsV2Operations groupsV2Operations;
         try {
-            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()));
+            groupsV2Operations = new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
+                    ServiceConfig.GROUP_MAX_SIZE);
         } catch (Throwable ignored) {
             groupsV2Operations = null;
         }

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

@@ -9,9 +9,9 @@ import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.accounts.AccountsStore;
 import org.asamk.signal.manager.storage.identities.TrustNewIdentity;
 import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.protocol.util.KeyHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.util.KeyHelper;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -3,7 +3,7 @@ package org.asamk.signal.manager;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
-import org.signal.zkgroup.profiles.ClientZkProfileOperations;
+import org.signal.libsignal.zkgroup.profiles.ClientZkProfileOperations;
 import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
@@ -94,7 +94,8 @@ public class SignalDependencies {
                 SignalServiceAddress.DEFAULT_DEVICE_ID,
                 password,
                 userAgent,
-                ServiceConfig.AUTOMATIC_NETWORK_RETRY);
+                ServiceConfig.AUTOMATIC_NETWORK_RETRY,
+                ServiceConfig.GROUP_MAX_SIZE);
     }
 
     public GroupsV2Api getGroupsV2Api() {
@@ -103,8 +104,10 @@ public class SignalDependencies {
 
     public GroupsV2Operations getGroupsV2Operations() {
         return getOrCreate(() -> groupsV2Operations,
-                () -> groupsV2Operations = capabilities.isGv2() ? new GroupsV2Operations(ClientZkOperations.create(
+                () -> groupsV2Operations = capabilities.isGv2()
-                        serviceEnvironmentConfig.getSignalServiceConfiguration())) : null);
+                        ? new GroupsV2Operations(ClientZkOperations.create(serviceEnvironmentConfig.getSignalServiceConfiguration()),
+                        ServiceConfig.GROUP_MAX_SIZE)
+                        : null);
     }
 
     private ClientZkOperations getClientZkOperations() {

lib/src/main/java/org/asamk/signal/manager/actions/SendRetryMessageRequestAction.java

@@ -4,8 +4,8 @@ import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.helper.Context;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.metadata.ProtocolException;
-import org.whispersystems.libsignal.protocol.CiphertextMessage;
+import org.signal.libsignal.protocol.message.CiphertextMessage;
-import org.whispersystems.libsignal.protocol.DecryptionErrorMessage;
+import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 

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

@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.api;
 
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.whispersystems.libsignal.IdentityKey;
+import org.signal.libsignal.protocol.IdentityKey;
 
 import java.util.Date;
 

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

@@ -3,7 +3,7 @@ package org.asamk.signal.manager.api;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.whispersystems.libsignal.IdentityKey;
+import org.signal.libsignal.protocol.IdentityKey;
 
 public record SendMessageResult(
         RecipientAddress address,

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

@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.config;
 
 import org.bouncycastle.util.encoders.Hex;
-import org.whispersystems.libsignal.InvalidKeyException;
+import org.signal.libsignal.protocol.InvalidKeyException;
-import org.whispersystems.libsignal.ecc.Curve;
+import org.signal.libsignal.protocol.ecc.Curve;
-import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdshUrl;

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

@@ -24,6 +24,7 @@ public class ServiceConfig {
     public final static long MAX_ENVELOPE_SIZE = 0;
     public final static long AVATAR_DOWNLOAD_FAILSAFE_MAX_SIZE = 10 * 1024 * 1024;
     public final static boolean AUTOMATIC_NETWORK_RETRY = true;
+    public final static int GROUP_MAX_SIZE = 1001;
 
     private final static KeyStore iasKeyStore;
 
@@ -48,7 +49,7 @@ public class ServiceConfig {
     public static boolean isSignalClientAvailable() {
         try {
             try {
-                org.signal.client.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
+                org.signal.libsignal.internal.Native.UuidCiphertext_CheckValidContents(new byte[0]);
             } catch (IllegalArgumentException ignored) {
             }
             return true;

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

@@ -1,6 +1,6 @@
 package org.asamk.signal.manager.config;
 
-import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration;
 
 public class ServiceEnvironmentConfig {

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

@@ -1,9 +1,9 @@
 package org.asamk.signal.manager.config;
 
 import org.bouncycastle.util.encoders.Hex;
-import org.whispersystems.libsignal.InvalidKeyException;
+import org.signal.libsignal.protocol.InvalidKeyException;
-import org.whispersystems.libsignal.ecc.Curve;
+import org.signal.libsignal.protocol.ecc.Curve;
-import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.whispersystems.signalservice.api.push.TrustStore;
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl;
 import org.whispersystems.signalservice.internal.configuration.SignalCdshUrl;

lib/src/main/java/org/asamk/signal/manager/groups/GroupInviteLinkUrl.java

@@ -2,10 +2,10 @@ package org.asamk.signal.manager.groups;
 
 import com.google.protobuf.ByteString;
 
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.storageservice.protos.groups.GroupInviteLink;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.groups.GroupMasterKey;
 import org.whispersystems.util.Base64UrlSafe;
 
 import java.io.IOException;

lib/src/main/java/org/asamk/signal/manager/groups/GroupUtils.java

@@ -3,10 +3,10 @@ package org.asamk.signal.manager.groups;
 import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.groups.GroupInfoV1;
 import org.asamk.signal.manager.storage.groups.GroupInfoV2;
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.libsignal.protocol.kdf.HKDF;
-import org.signal.zkgroup.groups.GroupMasterKey;
+import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.groups.GroupSecretParams;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
-import org.whispersystems.libsignal.kdf.HKDF;
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;

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

@@ -10,9 +10,9 @@ import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
 import org.asamk.signal.manager.util.NumberVerificationUtils;
+import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.PNI;
 import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;

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

@@ -6,9 +6,9 @@ import org.asamk.signal.manager.api.AttachmentInvalidException;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.InvalidMessageException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidMessageException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId;

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

@@ -25,13 +25,13 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.signal.storageservice.protos.groups.GroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
-import org.signal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.groups.GroupMasterKey;
-import org.signal.zkgroup.groups.GroupSecretParams;
-import org.signal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.groupsv2.GroupLinkNotActiveException;

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

@@ -13,6 +13,12 @@ import org.asamk.signal.manager.storage.groups.GroupInfoV2;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.Utils;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.VerificationFailedException;
+import org.signal.libsignal.zkgroup.auth.AuthCredentialResponse;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
+import org.signal.libsignal.zkgroup.groups.GroupSecretParams;
+import org.signal.libsignal.zkgroup.groups.UuidCiphertext;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.GroupChange;
 import org.signal.storageservice.protos.groups.Member;
@@ -20,12 +26,6 @@ import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupChange;
 import org.signal.storageservice.protos.groups.local.DecryptedGroupJoinInfo;
 import org.signal.storageservice.protos.groups.local.DecryptedPendingMember;
-import org.signal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.VerificationFailedException;
-import org.signal.zkgroup.auth.AuthCredentialResponse;
-import org.signal.zkgroup.groups.GroupMasterKey;
-import org.signal.zkgroup.groups.GroupSecretParams;
-import org.signal.zkgroup.groups.UuidCiphertext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
@@ -46,6 +46,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -409,7 +410,7 @@ class GroupV2Helper {
             GroupInfoV2 groupInfoV2, Set<UUID> uuids
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(uuids, false));
+        return commitChange(groupInfoV2, groupOperations.createRemoveMembersChange(uuids, false, List.of()));
     }
 
     private Pair<DecryptedGroup, GroupChange> commitChange(

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

@@ -4,13 +4,13 @@ import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.Utils;
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.fingerprint.Fingerprint;
+import org.signal.libsignal.protocol.fingerprint.FingerprintParsingException;
+import org.signal.libsignal.protocol.fingerprint.FingerprintVersionMismatchException;
+import org.signal.libsignal.protocol.fingerprint.ScannableFingerprint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.fingerprint.Fingerprint;
-import org.whispersystems.libsignal.fingerprint.FingerprintParsingException;
-import org.whispersystems.libsignal.fingerprint.FingerprintVersionMismatchException;
-import org.whispersystems.libsignal.fingerprint.ScannableFingerprint;
 import org.whispersystems.signalservice.api.messages.SendMessageResult;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 

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

@@ -39,12 +39,12 @@ import org.signal.libsignal.metadata.ProtocolInvalidMessageException;
 import org.signal.libsignal.metadata.ProtocolNoSessionException;
 import org.signal.libsignal.metadata.ProtocolUntrustedIdentityException;
 import org.signal.libsignal.metadata.SelfSendException;
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.protocol.DecryptionErrorMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;

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

@@ -2,7 +2,7 @@ package org.asamk.signal.manager.helper;
 
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.util.PinHashing;
-import org.whispersystems.libsignal.InvalidKeyException;
+import org.signal.libsignal.protocol.InvalidKeyException;
 import org.whispersystems.signalservice.api.KbsPinData;
 import org.whispersystems.signalservice.api.KeyBackupService;
 import org.whispersystems.signalservice.api.KeyBackupServicePinException;

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

@@ -4,11 +4,11 @@ import org.asamk.signal.manager.SignalDependencies;
 import org.asamk.signal.manager.config.ServiceConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.util.KeyUtils;
+import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.state.PreKeyRecord;
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 import org.whispersystems.signalservice.api.push.ServiceIdType;
 
 import java.io.IOException;

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

@@ -9,12 +9,12 @@ import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.ProfileUtils;
 import org.asamk.signal.manager.util.Utils;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.protocol.IdentityKey;
-import org.signal.zkgroup.profiles.ProfileKeyCredential;
+import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.profiles.AvatarUploadParams;
 import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;

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

@@ -8,9 +8,9 @@ import org.asamk.signal.manager.config.ServiceEnvironmentConfig;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
+import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.signalservice.api.push.ACI;
 import org.whispersystems.signalservice.api.push.ServiceId;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;

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

@@ -14,13 +14,13 @@ import org.asamk.signal.manager.storage.groups.GroupInfo;
 import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.sendLog.MessageSendLogEntry;
+import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.protocol.InvalidRegistrationIdException;
+import org.signal.libsignal.protocol.NoSessionException;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.message.DecryptionErrorMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.libsignal.InvalidRegistrationIdException;
-import org.whispersystems.libsignal.NoSessionException;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.protocol.DecryptionErrorMessage;
 import org.whispersystems.signalservice.api.SignalServiceMessageSender;
 import org.whispersystems.signalservice.api.crypto.ContentHint;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;

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

@@ -6,9 +6,9 @@ import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack;
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.InvalidMessageException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidMessageException;
 import org.whispersystems.signalservice.internal.util.Hex;
 
 import java.io.IOException;

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

@@ -6,13 +6,13 @@ import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.groups.GroupId;
 import org.asamk.signal.manager.storage.SignalAccount;
 import org.asamk.signal.manager.storage.recipients.Contact;
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.libsignal.protocol.IdentityKey;
-import org.signal.zkgroup.groups.GroupMasterKey;
+import org.signal.libsignal.protocol.InvalidKeyException;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest;
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord;

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

@@ -9,9 +9,9 @@ import org.asamk.signal.manager.storage.recipients.Contact;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.manager.util.AttachmentUtils;
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.IdentityKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentStream;
 import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;

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

@@ -7,7 +7,7 @@ import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
 import org.signal.libsignal.metadata.certificate.SenderCertificate;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;

lib/src/main/java/org/asamk/signal/manager/jobs/RetrieveStickerPackJob.java

@@ -2,9 +2,9 @@ package org.asamk.signal.manager.jobs;
 
 import org.asamk.signal.manager.api.StickerPackId;
 import org.asamk.signal.manager.helper.Context;
+import org.signal.libsignal.protocol.InvalidMessageException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidMessageException;
 import org.whispersystems.signalservice.internal.util.Hex;
 
 import java.io.IOException;

lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java

@@ -34,16 +34,17 @@ import org.asamk.signal.manager.storage.stickers.StickerStore;
 import org.asamk.signal.manager.storage.threads.LegacyJsonThreadStore;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.KeyUtils;
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.state.PreKeyRecord;
+import org.signal.libsignal.protocol.state.SessionRecord;
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
+import org.signal.libsignal.protocol.util.Medium;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.SessionRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-import org.whispersystems.libsignal.util.Medium;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
 import org.whispersystems.signalservice.api.SignalServiceDataStore;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
@@ -618,7 +619,7 @@ public class SignalAccount implements Closeable {
             for (var entry : legacySignalProtocolStore.getLegacyPreKeyStore().getPreKeys().entrySet()) {
                 try {
                     getPreKeyStore().storePreKey(entry.getKey(), new PreKeyRecord(entry.getValue()));
-                } catch (IOException e) {
+                } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate pre key, ignoring", e);
                 }
             }
@@ -630,7 +631,7 @@ public class SignalAccount implements Closeable {
             for (var entry : legacySignalProtocolStore.getLegacySignedPreKeyStore().getSignedPreKeys().entrySet()) {
                 try {
                     getSignedPreKeyStore().storeSignedPreKey(entry.getKey(), new SignedPreKeyRecord(entry.getValue()));
-                } catch (IOException e) {
+                } catch (InvalidMessageException e) {
                     logger.warn("Failed to migrate signed pre key, ignoring", e);
                 }
             }

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

@@ -5,11 +5,11 @@ import org.asamk.signal.manager.groups.GroupInviteLinkUrl;
 import org.asamk.signal.manager.groups.GroupPermission;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.storageservice.protos.groups.AccessControl;
 import org.signal.storageservice.protos.groups.Member;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.storageservice.protos.groups.local.EnabledState;
-import org.signal.zkgroup.groups.GroupMasterKey;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.push.ServiceId;
 

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

@@ -19,9 +19,9 @@ 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.util.IOUtils;
+import org.signal.libsignal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.groups.GroupMasterKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.DistributionId;

lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityInfo.java

@@ -2,7 +2,7 @@ package org.asamk.signal.manager.storage.identities;
 
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.whispersystems.libsignal.IdentityKey;
+import org.signal.libsignal.protocol.IdentityKey;
 
 import java.util.Date;
 

lib/src/main/java/org/asamk/signal/manager/storage/identities/IdentityKeyStore.java

@@ -6,12 +6,12 @@ import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.InvalidKeyException;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.libsignal.SignalProtocolAddress;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 import io.reactivex.rxjava3.subjects.Subject;
 
-public class IdentityKeyStore implements org.whispersystems.libsignal.state.IdentityKeyStore {
+public class IdentityKeyStore implements org.signal.libsignal.protocol.state.IdentityKeyStore {
 
     private final static Logger logger = LoggerFactory.getLogger(IdentityKeyStore.class);
     private final ObjectMapper objectMapper = org.asamk.signal.manager.storage.Utils.createStorageObjectMapper();

lib/src/main/java/org/asamk/signal/manager/storage/prekeys/PreKeyStore.java

@@ -1,10 +1,11 @@
 package org.asamk.signal.manager.storage.prekeys;
 
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.InvalidKeyIdException;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.state.PreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidKeyIdException;
-import org.whispersystems.libsignal.state.PreKeyRecord;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -12,7 +13,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 
-public class PreKeyStore implements org.whispersystems.libsignal.state.PreKeyStore {
+public class PreKeyStore implements org.signal.libsignal.protocol.state.PreKeyStore {
 
     private final static Logger logger = LoggerFactory.getLogger(PreKeyStore.class);
 
@@ -31,7 +32,7 @@ public class PreKeyStore implements org.whispersystems.libsignal.state.PreKeySto
         }
         try (var inputStream = new FileInputStream(file)) {
             return new PreKeyRecord(inputStream.readAllBytes());
-        } catch (IOException e) {
+        } catch (IOException | InvalidMessageException e) {
             logger.error("Failed to load pre key: {}", e.getMessage());
             throw new AssertionError(e);
         }

lib/src/main/java/org/asamk/signal/manager/storage/prekeys/SignedPreKeyStore.java

@@ -1,10 +1,11 @@
 package org.asamk.signal.manager.storage.prekeys;
 
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.InvalidKeyIdException;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidKeyIdException;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -15,7 +16,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
-public class SignedPreKeyStore implements org.whispersystems.libsignal.state.SignedPreKeyStore {
+public class SignedPreKeyStore implements org.signal.libsignal.protocol.state.SignedPreKeyStore {
 
     private final static Logger logger = LoggerFactory.getLogger(SignedPreKeyStore.class);
 
@@ -117,7 +118,7 @@ public class SignedPreKeyStore implements org.whispersystems.libsignal.state.Sig
     private SignedPreKeyRecord loadSignedPreKeyRecord(final File file) {
         try (var inputStream = new FileInputStream(file)) {
             return new SignedPreKeyRecord(inputStream.readAllBytes());
-        } catch (IOException e) {
+        } catch (IOException | InvalidMessageException e) {
             logger.error("Failed to load signed pre key: {}", e.getMessage());
             throw new AssertionError(e);
         }

lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacyProfileStore.java

@@ -9,9 +9,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.zkgroup.profiles.ProfileKeyCredential;
+import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;

lib/src/main/java/org/asamk/signal/manager/storage/profiles/LegacySignalProfileEntry.java

@@ -1,8 +1,8 @@
 package org.asamk.signal.manager.storage.profiles;
 
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.zkgroup.profiles.ProfileKeyCredential;
+import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 
 public class LegacySignalProfileEntry {
 

lib/src/main/java/org/asamk/signal/manager/storage/profiles/ProfileStore.java

@@ -2,8 +2,8 @@ package org.asamk.signal.manager.storage.profiles;
 
 import org.asamk.signal.manager.storage.recipients.Profile;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.zkgroup.profiles.ProfileKeyCredential;
+import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 
 public interface ProfileStore {
 

lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyIdentityInfo.java

@@ -2,7 +2,7 @@ package org.asamk.signal.manager.storage.protocol;
 
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
-import org.whispersystems.libsignal.IdentityKey;
+import org.signal.libsignal.protocol.IdentityKey;
 
 import java.util.Date;
 

lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java

@@ -8,11 +8,11 @@ import com.fasterxml.jackson.databind.JsonNode;
 import org.asamk.signal.manager.api.TrustLevel;
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.recipients.RecipientAddress;
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.IdentityKeyPair;
+import org.signal.libsignal.protocol.InvalidKeyException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.InvalidKeyException;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;

lib/src/main/java/org/asamk/signal/manager/storage/protocol/SignalProtocolStore.java

@@ -1,17 +1,17 @@
 package org.asamk.signal.manager.storage.protocol;
 
-import org.whispersystems.libsignal.IdentityKey;
+import org.signal.libsignal.protocol.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
+import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.whispersystems.libsignal.InvalidKeyIdException;
+import org.signal.libsignal.protocol.InvalidKeyIdException;
-import org.whispersystems.libsignal.NoSessionException;
+import org.signal.libsignal.protocol.NoSessionException;
-import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
-import org.whispersystems.libsignal.groups.state.SenderKeyRecord;
+import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
-import org.whispersystems.libsignal.state.IdentityKeyStore;
+import org.signal.libsignal.protocol.state.IdentityKeyStore;
-import org.whispersystems.libsignal.state.PreKeyRecord;
+import org.signal.libsignal.protocol.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.PreKeyStore;
+import org.signal.libsignal.protocol.state.PreKeyStore;
-import org.whispersystems.libsignal.state.SessionRecord;
+import org.signal.libsignal.protocol.state.SessionRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyStore;
+import org.signal.libsignal.protocol.state.SignedPreKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceAccountDataStore;
 import org.whispersystems.signalservice.api.SignalServiceSenderKeyStore;
 import org.whispersystems.signalservice.api.SignalServiceSessionStore;

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

@@ -1,7 +1,7 @@
 package org.asamk.signal.manager.storage.recipients;
 
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.zkgroup.profiles.ProfileKeyCredential;
+import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 
 import java.util.Objects;
 

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

@@ -7,9 +7,9 @@ import org.asamk.signal.manager.api.UnregisteredRecipientException;
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.contacts.ContactsStore;
 import org.asamk.signal.manager.storage.profiles.ProfileStore;
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.zkgroup.profiles.ProfileKeyCredential;
+import org.signal.libsignal.zkgroup.profiles.ProfileKeyCredential;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.push.ACI;

lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java

@@ -5,8 +5,8 @@ import org.asamk.signal.manager.groups.GroupUtils;
 import org.asamk.signal.manager.storage.Database;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.signal.zkgroup.groups.GroupMasterKey;
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.ContentHint;

lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyRecordStore.java

@@ -3,10 +3,11 @@ package org.asamk.signal.manager.storage.senderKeys;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.InvalidMessageException;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.groups.state.SenderKeyRecord;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -22,7 +23,7 @@ import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class SenderKeyRecordStore implements org.whispersystems.libsignal.groups.state.SenderKeyStore {
+public class SenderKeyRecordStore implements org.signal.libsignal.protocol.groups.state.SenderKeyStore {
 
     private final static Logger logger = LoggerFactory.getLogger(SenderKeyRecordStore.class);
 
@@ -203,7 +204,7 @@ public class SenderKeyRecordStore implements org.whispersystems.libsignal.groups
             final var senderKeyRecord = new SenderKeyRecord(inputStream.readAllBytes());
             cachedSenderKeys.put(key, senderKeyRecord);
             return senderKeyRecord;
-        } catch (IOException e) {
+        } catch (IOException | InvalidMessageException e) {
             logger.warn("Failed to load sender key, resetting sender key: {}", e.getMessage());
             return null;
         }

lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeySharedStore.java

@@ -6,9 +6,9 @@ import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.Utils;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.signalservice.api.push.DistributionId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 

lib/src/main/java/org/asamk/signal/manager/storage/senderKeys/SenderKeyStore.java

@@ -3,8 +3,8 @@ package org.asamk.signal.manager.storage.senderKeys;
 import org.asamk.signal.manager.helper.RecipientAddressResolver;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
-import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
-import org.whispersystems.libsignal.groups.state.SenderKeyRecord;
+import org.signal.libsignal.protocol.groups.state.SenderKeyRecord;
 import org.whispersystems.signalservice.api.SignalServiceSenderKeyStore;
 import org.whispersystems.signalservice.api.push.DistributionId;
 

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

@@ -3,13 +3,13 @@ package org.asamk.signal.manager.storage.sessions;
 import org.asamk.signal.manager.storage.recipients.RecipientId;
 import org.asamk.signal.manager.storage.recipients.RecipientResolver;
 import org.asamk.signal.manager.util.IOUtils;
+import org.signal.libsignal.protocol.NoSessionException;
+import org.signal.libsignal.protocol.SignalProtocolAddress;
+import org.signal.libsignal.protocol.ecc.ECPublicKey;
+import org.signal.libsignal.protocol.message.CiphertextMessage;
+import org.signal.libsignal.protocol.state.SessionRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.NoSessionException;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.ecc.ECPublicKey;
-import org.whispersystems.libsignal.protocol.CiphertextMessage;
-import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.signalservice.api.SignalServiceSessionStore;
 
 import java.io.File;

lib/src/main/java/org/asamk/signal/manager/storage/stickerPacks/StickerPackStore.java

@@ -3,7 +3,6 @@ package org.asamk.signal.manager.storage.stickerPacks;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.asamk.signal.manager.api.StickerPackId;
-import org.asamk.signal.manager.storage.stickerPacks.JsonStickerPack;
 import org.asamk.signal.manager.util.IOUtils;
 import org.asamk.signal.manager.util.Utils;
 import org.whispersystems.signalservice.api.util.StreamDetails;

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

@@ -1,15 +1,15 @@
 package org.asamk.signal.manager.util;
 
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.libsignal.protocol.IdentityKey;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.protocol.IdentityKeyPair;
-import org.whispersystems.libsignal.IdentityKey;
+import org.signal.libsignal.protocol.InvalidKeyException;
-import org.whispersystems.libsignal.IdentityKeyPair;
+import org.signal.libsignal.protocol.ecc.Curve;
-import org.whispersystems.libsignal.InvalidKeyException;
+import org.signal.libsignal.protocol.ecc.ECPrivateKey;
-import org.whispersystems.libsignal.ecc.Curve;
+import org.signal.libsignal.protocol.state.PreKeyRecord;
-import org.whispersystems.libsignal.ecc.ECPrivateKey;
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord;
-import org.whispersystems.libsignal.state.PreKeyRecord;
+import org.signal.libsignal.protocol.util.Medium;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
+import org.signal.libsignal.zkgroup.InvalidInputException;
-import org.whispersystems.libsignal.util.Medium;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
 
 import java.security.SecureRandom;

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

@@ -2,7 +2,7 @@ package org.asamk.signal.manager.util;
 
 import org.asamk.signal.manager.api.Pair;
 import org.asamk.signal.manager.storage.recipients.Profile;
-import org.signal.zkgroup.profiles.ProfileKey;
+import org.signal.libsignal.zkgroup.profiles.ProfileKey;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.crypto.InvalidCiphertextException;

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

@@ -1,10 +1,10 @@
 package org.asamk.signal.manager.util;
 
+import org.signal.libsignal.protocol.IdentityKey;
+import org.signal.libsignal.protocol.fingerprint.Fingerprint;
+import org.signal.libsignal.protocol.fingerprint.NumericFingerprintGenerator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.fingerprint.Fingerprint;
-import org.whispersystems.libsignal.fingerprint.NumericFingerprintGenerator;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 import org.whispersystems.signalservice.api.util.StreamDetails;
 

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

@@ -7,10 +7,10 @@ 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.UserAlreadyExistsException;
 import org.asamk.signal.manager.api.CaptchaRequiredException;
 import org.asamk.signal.manager.api.IncorrectPinException;
 import org.asamk.signal.manager.api.PinLockedException;
+import org.asamk.signal.manager.api.UserAlreadyExistsException;
 import org.freedesktop.dbus.DBusPath;
 
 import java.io.IOException;