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

Attempt to restore AccountRecord in regV5.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-06-09 17:21:47 -04:00
committed by Cody Henthorne
parent 754dd15c94
commit 118231a328
45 changed files with 1618 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationNetworkController.kt
+65
View File
@@ -37,9 +37,11 @@ import org.signal.registration.NetworkController.RegisterAccountError
import org.signal.registration.NetworkController.RegisterAccountResponse
import org.signal.registration.NetworkController.RegistrationLockResponse
import org.signal.registration.NetworkController.RequestVerificationCodeError
import org.signal.registration.NetworkController.RestoreAccountRecordError
import org.signal.registration.NetworkController.RestoreMasterKeyError
import org.signal.registration.NetworkController.SessionMetadata
import org.signal.registration.NetworkController.SetAccountAttributesError
import org.signal.registration.NetworkController.SetProfileError
import org.signal.registration.NetworkController.SetRegistrationLockError
import org.signal.registration.NetworkController.SetRestoreMethodError
import org.signal.registration.NetworkController.SubmitVerificationCodeError
@@ -49,15 +51,24 @@ import org.signal.registration.NetworkController.UpdateSessionError
import org.signal.registration.NetworkController.VerificationCodeTransport
import org.signal.registration.proto.RegistrationProvisionMessage
import org.thoughtcrime.securesms.BuildConfig
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.gcm.FcmUtil
import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob
import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob
import org.thoughtcrime.securesms.jobs.ProfileUploadJob
import org.thoughtcrime.securesms.jobs.RefreshAttributesJob
import org.thoughtcrime.securesms.jobs.ResetSvrGuessCountJob
import org.thoughtcrime.securesms.jobs.StorageAccountRestoreJob
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.net.SignalNetwork
import org.thoughtcrime.securesms.pin.SvrRepository
import org.thoughtcrime.securesms.pin.SvrWrongPinException
import org.thoughtcrime.securesms.profiles.AvatarHelper
import org.thoughtcrime.securesms.profiles.ProfileName
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.registration.fcm.PushChallengeRequest
import org.thoughtcrime.securesms.registration.util.RegistrationUtil
import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
import org.whispersystems.signalservice.api.SvrNoDataException
import org.whispersystems.signalservice.api.archive.ArchiveServiceAccess
@@ -602,6 +613,60 @@ class AppRegistrationNetworkController(
AppDependencies.jobManager.add(RefreshAttributesJob())
}
override suspend fun setProfile(
givenName: String,
familyName: String,
avatar: ByteArray?,
discoverableByPhoneNumber: Boolean
): RequestResult<Unit, SetProfileError> = withContext(Dispatchers.IO) {
if (!SignalStore.account.isRegistered) {
Log.w(TAG, "[setProfile] Not registered.")
return@withContext RequestResult.NonSuccess(SetProfileError.NotRegistered)
}
val profileName = ProfileName.fromParts(givenName, familyName)
SignalDatabase.recipients.setProfileName(Recipient.self().id, profileName)
if (avatar != null) {
try {
AvatarHelper.setAvatar(context, Recipient.self().id, java.io.ByteArrayInputStream(avatar))
} catch (e: IOException) {
Log.w(TAG, "[setProfile] Failed to write avatar.", e)
return@withContext RequestResult.NonSuccess(SetProfileError.IOError(e))
}
SignalStore.misc.hasEverHadAnAvatar = true
}
SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode = if (discoverableByPhoneNumber) {
org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.DISCOVERABLE
} else {
org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE
}
AppDependencies.jobManager
.startChain(ProfileUploadJob())
.then(listOf(MultiDeviceProfileKeyUpdateJob(), MultiDeviceProfileContentUpdateJob()))
.enqueue()
RegistrationUtil.maybeMarkRegistrationComplete()
RequestResult.Success(Unit)
}
override suspend fun restoreAccountRecord(
timeout: Duration
): RequestResult<Unit, RestoreAccountRecordError> = withContext(Dispatchers.IO) {
Log.i(TAG, "[restoreAccountRecord] Enqueuing StorageAccountRestoreJob (timeout=${timeout.inWholeSeconds}s).")
val state = AppDependencies.jobManager.runSynchronously(StorageAccountRestoreJob(), timeout.inWholeMilliseconds)
if (state.isPresent) {
Log.i(TAG, "[restoreAccountRecord] Completed within timeout: ${state.get()}")
RequestResult.Success(Unit)
} else {
Log.w(TAG, "[restoreAccountRecord] Timed out. Job continues in background.")
RequestResult.NonSuccess(RestoreAccountRecordError.Timeout)
}
}
override suspend fun setRestoreMethod(token: String, method: NetworkController.RestoreMethod): RequestResult<Unit, SetRestoreMethodError> = withContext(Dispatchers.IO) {
val serviceMethod = when (method) {
NetworkController.RestoreMethod.REMOTE_BACKUP -> ServiceRestoreMethod.REMOTE_BACKUP
app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
+37
View File
@@ -23,9 +23,11 @@ import org.greenrobot.eventbus.ThreadMode
import org.signal.archive.LocalBackupRestoreProgress
import org.signal.core.models.AccountEntropyPool
import org.signal.core.models.MasterKey
import org.signal.core.util.StreamUtil
import org.signal.core.util.logging.Log
import org.signal.registration.PreExistingRegistrationData
import org.signal.registration.StorageController
import org.signal.registration.StoredProfileData
import org.signal.registration.proto.RegistrationData
import org.signal.registration.screens.localbackuprestore.LocalBackupInfo
import org.signal.registration.screens.remotebackuprestore.RemoteBackupRestoreProgress
@@ -41,6 +43,8 @@ import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.database.model.databaseprotos.LocalRegistrationMetadata
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.pin.SvrRepository
import org.thoughtcrime.securesms.profiles.AvatarHelper
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.registration.data.RegistrationRepository
import java.io.File
import java.io.IOException
@@ -91,6 +95,39 @@ class AppRegistrationStorageController(private val context: Context) : StorageCo
Unit
}
override suspend fun getStoredProfileData(): StoredProfileData = withContext(Dispatchers.IO) {
if (!SignalStore.account.isRegistered) {
return@withContext StoredProfileData()
}
val self = Recipient.self()
val profileName = self.profileName
val avatar: ByteArray? = if (AvatarHelper.hasAvatar(context, self.id)) {
try {
AvatarHelper.getAvatar(context, self.id)?.use { StreamUtil.readFully(it) }
} catch (e: IOException) {
Log.w(TAG, "[getStoredProfileData] Failed to read self avatar.", e)
null
}
} else {
null
}
val discoverable: Boolean? = when (SignalStore.phoneNumberPrivacy.phoneNumberDiscoverabilityMode) {
org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.DISCOVERABLE -> true
org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.NOT_DISCOVERABLE -> false
org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues.PhoneNumberDiscoverabilityMode.UNDECIDED -> null
}
StoredProfileData(
givenName = profileName.givenName,
familyName = profileName.familyName,
avatar = avatar,
discoverableByPhoneNumber = discoverable
)
}
override suspend fun readInProgressRegistrationData(): RegistrationData = withContext(Dispatchers.IO) {
val file = File(context.cacheDir, TEMP_PROTO_FILENAME)
if (file.exists()) {