Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible invalid username link export.

Browse Source
This commit is contained in:
Greyson Parrelli
2025-12-03 11:15:19 -05:00
committed by jeffrey-signal
parent 5d08906afd
commit bafa9a26c6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
View File

@@ -86,6 +86,8 @@ object AccountDataArchiveProcessor {
val mobileAutoDownload = TextSecurePreferences.getMobileMediaDownloadAllowed(context)
val wifiAutoDownload = TextSecurePreferences.getWifiMediaDownloadAllowed(context)
val username = selfRecord.username?.takeIf { it.isValidUsername() }
emitter.emit(
Frame(
account = AccountData(
@@ -94,8 +96,8 @@ object AccountDataArchiveProcessor {
familyName = selfRecord.signalProfileName.familyName,
avatarUrlPath = selfRecord.signalProfileAvatar ?: "",
svrPin = SignalStore.svr.pin ?: "",
username = selfRecord.username?.takeIf { it.isValidUsername() },
usernameLink = if (selfRecord.username.isNotNullOrBlank() && signalStore.accountValues.usernameLink != null) {
username = username,
usernameLink = if (username != null && signalStore.accountValues.usernameLink != null) {
AccountData.UsernameLink(
entropy = signalStore.accountValues.usernameLink?.entropy?.toByteString() ?: EMPTY,
serverId = signalStore.accountValues.usernameLink?.serverId?.toByteArray()?.toByteString() ?: EMPTY,