Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix blocking bugs for internal link and sync testing.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-08 16:09:01 -04:00
parent 33a7f55fa3
commit f8eaa96412
27 changed files with 212 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt
View File

@@ -171,6 +171,11 @@ object RegistrationRepository {
suspend fun registerAccountLocally(context: Context, data: LocalRegistrationMetadata) =
withContext(Dispatchers.IO) {
Log.v(TAG, "registerAccountLocally()")
if (data.linkedDeviceInfo != null) {
SignalStore.account.deviceId = data.linkedDeviceInfo.deviceId
SignalStore.account.deviceName = data.linkedDeviceInfo.deviceName
}
val aciIdentityKeyPair = data.getAciIdentityKeyPair()
val pniIdentityKeyPair = data.getPniIdentityKeyPair()
SignalStore.account.restoreAciIdentityKeyFromBackup(aciIdentityKeyPair.publicKey.serialize(), aciIdentityKeyPair.privateKey.serialize())
@@ -219,9 +224,6 @@ object RegistrationRepository {
saveOwnIdentityKey(selfId, pni, pniProtocolStore, now)
if (data.linkedDeviceInfo != null) {
SignalStore.account.deviceId = data.linkedDeviceInfo.deviceId
SignalStore.account.deviceName = data.linkedDeviceInfo.deviceName
if (data.linkedDeviceInfo.accountEntropyPool != null) {
SignalStore.account.setAccountEntropyPoolFromPrimaryDevice(AccountEntropyPool(data.linkedDeviceInfo.accountEntropyPool))
}
@@ -254,7 +256,6 @@ object RegistrationRepository {
RotateSignedPreKeyListener.schedule(context)
} else {
SignalStore.account.isMultiDevice = true
SignalStore.registration.hasUploadedProfile = true
jobManager.runJobBlocking(RefreshOwnProfileJob(), 30.seconds)
jobManager.add(RotateCertificateJob())

2
app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/StorageServiceRestore.kt
View File

@@ -51,7 +51,7 @@ object StorageServiceRestore {
val isMissingProfileData = RegistrationRepository.isMissingProfileData()
RegistrationUtil.maybeMarkRegistrationComplete()
if (!isMissingProfileData) {
if (!isMissingProfileData && SignalStore.account.isPrimaryDevice) {
AppDependencies.jobManager.add(ProfileUploadJob())
}
}

2
app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationUtil.java
View File

@@ -36,7 +36,7 @@ public final class RegistrationUtil {
if (!SignalStore.registration().isRegistrationComplete() &&
SignalStore.account().isRegistered() &&
!Recipient.self().getProfileName().isEmpty() &&
(SignalStore.svr().hasPin() || SignalStore.svr().hasOptedOut()) &&
(SignalStore.svr().hasPin() || SignalStore.svr().hasOptedOut() || SignalStore.account().isLinkedDevice()) &&
RestoreDecisionStateUtil.isTerminal(SignalStore.registration().getRestoreDecisionState()))
{
Log.i(TAG, "Marking registration completed.", new Throwable());