Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 03:58:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix serialization issue during registration.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-08-27 12:14:01 -04:00
parent bb7ee5915c
commit cea8546ce5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJob.kt
View File

@@ -4,6 +4,7 @@ import androidx.annotation.VisibleForTesting
import org.signal.core.util.logging.Log import org.signal.core.util.logging.Log
import org.signal.core.util.roundedString import org.signal.core.util.roundedString
import org.signal.libsignal.protocol.InvalidKeyException import org.signal.libsignal.protocol.InvalidKeyException
import org.signal.libsignal.protocol.InvalidKeyIdException
import org.signal.libsignal.protocol.state.KyberPreKeyRecord import org.signal.libsignal.protocol.state.KyberPreKeyRecord
import org.signal.libsignal.protocol.state.PreKeyRecord import org.signal.libsignal.protocol.state.PreKeyRecord
import org.signal.libsignal.protocol.state.SignalProtocolStore import org.signal.libsignal.protocol.state.SignalProtocolStore
@@ -269,7 +270,10 @@ class PreKeysSyncJob private constructor(
lastResortKyberKey = protocolStore.loadKyberPreKey(metadataStore.lastResortKyberPreKeyId).keyPair.publicKey lastResortKyberKey = protocolStore.loadKyberPreKey(metadataStore.lastResortKyberPreKeyId).keyPair.publicKey
) )
} catch (e: InvalidKeyException) { } catch (e: InvalidKeyException) {
Log.w(TAG, "Unable to load keys", e) Log.w(TAG, "Unable to load keys.", e)
return false
} catch (e: InvalidKeyIdException) {
Log.w(TAG, "Unable to load keys.", e)
return false return false
} }

4
app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt
View File

@@ -22,10 +22,10 @@ object LocalRegistrationMetadataUtil {
return LocalRegistrationMetadata.Builder().apply { return LocalRegistrationMetadata.Builder().apply {
aciIdentityKeyPair = localAciIdentityKeyPair.serialize().toByteString() aciIdentityKeyPair = localAciIdentityKeyPair.serialize().toByteString()
aciSignedPreKey = remoteResult.aciPreKeyCollection.signedPreKey.serialize().toByteString() aciSignedPreKey = remoteResult.aciPreKeyCollection.signedPreKey.serialize().toByteString()
aciLastRestoreKyberPreKey = remoteResult.aciPreKeyCollection.signedPreKey.serialize().toByteString() aciLastRestoreKyberPreKey = remoteResult.aciPreKeyCollection.lastResortKyberPreKey.serialize().toByteString()
pniIdentityKeyPair = localPniIdentityKeyPair.serialize().toByteString() pniIdentityKeyPair = localPniIdentityKeyPair.serialize().toByteString()
pniSignedPreKey = remoteResult.pniPreKeyCollection.signedPreKey.serialize().toByteString() pniSignedPreKey = remoteResult.pniPreKeyCollection.signedPreKey.serialize().toByteString()
pniLastRestoreKyberPreKey = remoteResult.pniPreKeyCollection.signedPreKey.serialize().toByteString() pniLastRestoreKyberPreKey = remoteResult.pniPreKeyCollection.lastResortKyberPreKey.serialize().toByteString()
aci = remoteResult.uuid aci = remoteResult.uuid
pni = remoteResult.pni pni = remoteResult.pni
hasPin = remoteResult.storageCapable hasPin = remoteResult.storageCapable