mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-19 08:09:12 +01:00
Drop legacy field from provisioning and sync messages.
This commit is contained in:
committed by
Alex Hart
parent
4ce2c6ef73
commit
5ae51f844e
@@ -56,7 +56,6 @@ class MultiDeviceKeysUpdateJob private constructor(parameters: Parameters) : Bas
|
||||
val syncMessage = SignalServiceSyncMessage.forKeys(
|
||||
KeysMessage(
|
||||
storageService = SignalStore.storageService.storageKey,
|
||||
master = SignalStore.svr.masterKey,
|
||||
accountEntropyPool = SignalStore.account.accountEntropyPool,
|
||||
mediaRootBackupKey = SignalStore.backup.mediaRootBackupKey
|
||||
)
|
||||
|
||||
@@ -515,6 +515,8 @@ object RegistrationRepository {
|
||||
.registrationApi
|
||||
.registerAsSecondaryDevice(message.provisioningCode!!, accountAttributes, aciPreKeys, pniPreKeys, registrationData.fcmToken)
|
||||
.map { respone ->
|
||||
val aep = AccountEntropyPool(message.accountEntropyPool!!)
|
||||
|
||||
RegisterAsLinkedDeviceResponse(
|
||||
deviceId = respone.deviceId.toInt(),
|
||||
accountRegistrationResult = AccountRegistrationResult(
|
||||
@@ -522,7 +524,7 @@ object RegistrationRepository {
|
||||
pni = pni.toString(),
|
||||
storageCapable = false,
|
||||
number = message.number!!,
|
||||
masterKey = MasterKey(message.masterKey!!.toByteArray()),
|
||||
masterKey = aep.deriveMasterKey(),
|
||||
pin = null,
|
||||
aciPreKeyCollection = aciPreKeys,
|
||||
pniPreKeyCollection = pniPreKeys,
|
||||
|
||||
Reference in New Issue
Block a user