Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 10:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix prekey generation during registration.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-07-10 23:05:36 -04:00
committed by GitHub
parent 61cd9767c8
commit f438ef543b
12 changed files with 137 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt
View File

@@ -141,7 +141,13 @@ class ChangeNumberRepository(
}
}
VerifyResponse.from(changeNumberResponse, null, null)
VerifyResponse.from(
response = changeNumberResponse,
kbsData = null,
pin = null,
aciPreKeyCollection = null,
pniPreKeyCollection = null
)
}.subscribeOn(Schedulers.single())
.onErrorReturn { t -> ServiceResponse.forExecutionError(t) }
}
@@ -191,7 +197,13 @@ class ChangeNumberRepository(
}
}
VerifyResponse.from(changeNumberResponse, kbsData, pin)
VerifyResponse.from(
response = changeNumberResponse,
kbsData = kbsData,
pin = pin,
aciPreKeyCollection = null,
pniPreKeyCollection = null
)
}.subscribeOn(Schedulers.single())
.onErrorReturn { t -> ServiceResponse.forExecutionError(t) }
}
@@ -341,7 +353,7 @@ class ChangeNumberRepository(
val lastResortKyberPreKeyRecord: KyberPreKeyRecord = if (deviceId == primaryDeviceId) {
PreKeyUtil.generateAndStoreLastResortKyberPreKey(ApplicationDependencies.getProtocolStore().pni(), SignalStore.account().pniPreKeys, pniIdentity.privateKey)
} else {
PreKeyUtil.generateKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey)
PreKeyUtil.generateLastRestortKyberPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), pniIdentity.privateKey)
}
devicePniLastResortKyberPreKeys[deviceId] = KyberPreKeyEntity(lastResortKyberPreKeyRecord.id, lastResortKyberPreKeyRecord.keyPair.publicKey, lastResortKyberPreKeyRecord.signature)