diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt index 9d323d4235..4e4b36313c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt @@ -264,7 +264,6 @@ class ChangeNumberRepository( accountManager.setPreKeys( PreKeyUpload( serviceIdType = ServiceIdType.PNI, - identityKey = pniProtocolStore.identityKeyPair.publicKey, signedPreKey = signedPreKey, oneTimeEcPreKeys = oneTimePreKeys, lastResortKyberPreKey = null, diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt index c93b799707..3f5f60bc67 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt @@ -146,7 +146,6 @@ class PreKeysSyncJob private constructor(parameters: Parameters) : BaseJob(param accountManager.setPreKeys( PreKeyUpload( serviceIdType = serviceIdType, - identityKey = protocolStore.identityKeyPair.publicKey, signedPreKey = signedPreKeyToUpload, oneTimeEcPreKeys = oneTimeEcPreKeysToUpload, lastResortKyberPreKey = lastResortKyberPreKeyToUpload, diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java index 309047050c..9d5ca9fd22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/PniAccountInitializationMigrationJob.java @@ -79,7 +79,7 @@ public class PniAccountInitializationMigrationJob extends MigrationJob { SignedPreKeyRecord signedPreKey = PreKeyUtil.generateAndStoreSignedPreKey(protocolStore, metadataStore); List oneTimePreKeys = PreKeyUtil.generateAndStoreOneTimeEcPreKeys(protocolStore, metadataStore); - accountManager.setPreKeys(new PreKeyUpload(ServiceIdType.PNI, protocolStore.getIdentityKeyPair().getPublicKey(), signedPreKey, oneTimePreKeys, null, null)); + accountManager.setPreKeys(new PreKeyUpload(ServiceIdType.PNI, signedPreKey, oneTimePreKeys, null, null)); metadataStore.setActiveSignedPreKeyId(signedPreKey.getId()); metadataStore.setSignedPreKeyRegistered(true); } else { diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt index b3f39fa821..59d2cf45a2 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt @@ -5,7 +5,6 @@ package org.whispersystems.signalservice.api.account -import org.signal.libsignal.protocol.IdentityKey import org.signal.libsignal.protocol.state.KyberPreKeyRecord import org.signal.libsignal.protocol.state.PreKeyRecord import org.signal.libsignal.protocol.state.SignedPreKeyRecord @@ -18,7 +17,6 @@ import org.whispersystems.signalservice.api.push.ServiceIdType */ data class PreKeyUpload( val serviceIdType: ServiceIdType, - val identityKey: IdentityKey, val signedPreKey: SignedPreKeyRecord?, val oneTimeEcPreKeys: List?, val lastResortKyberPreKey: KyberPreKeyRecord?, diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java index f90f35301e..22ec7d519c 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java @@ -12,11 +12,6 @@ import java.util.List; public class PreKeyState { - @JsonProperty("identityKey") - @JsonSerialize(using = JsonUtil.IdentityKeySerializer.class) - @JsonDeserialize(using = JsonUtil.IdentityKeyDeserializer.class) - private IdentityKey identityKey; - @JsonProperty("preKeys") private List oneTimeEcPreKeys; @@ -32,23 +27,17 @@ public class PreKeyState { public PreKeyState() {} public PreKeyState( - IdentityKey identityKey, SignedPreKeyEntity signedPreKey, List oneTimeEcPreKeys, KyberPreKeyEntity lastResortKyberPreKey, List oneTimeKyberPreKeys ) { - this.identityKey = identityKey; this.signedPreKey = signedPreKey; this.oneTimeEcPreKeys = oneTimeEcPreKeys; this.lastResortKyberKey = lastResortKyberPreKey; this.oneTimeKyberKeys = oneTimeKyberPreKeys; } - public IdentityKey getIdentityKey() { - return identityKey; - } - public List getPreKeys() { return oneTimeEcPreKeys; } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java index acc954bcfa..4afbef5d17 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java @@ -745,8 +745,7 @@ public class PushServiceSocket { makeServiceRequest(String.format(Locale.US, PREKEY_PATH, preKeyUpload.getServiceIdType().queryParam()), "PUT", - JsonUtil.toJson(new PreKeyState(preKeyUpload.getIdentityKey(), - signedPreKey, + JsonUtil.toJson(new PreKeyState(signedPreKey, oneTimeEcPreKeys, lastResortKyberPreKey, oneTimeKyberPreKeys)));