Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-04 15:35:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace usages of old getEncryptedUsernameFromLinkServerId for libsignal's lookUpUsernameLink.

Browse Source
This commit is contained in:
andrew-signal
2026-02-19 22:17:49 -05:00
committed by Cody Henthorne
parent caf2e555dd
commit 402f49edd9
3 changed files with 57 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/UsernameRepository.kt
+18 -17
View File
@@ -14,6 +14,8 @@ import org.signal.core.util.toByteArray
import org.signal.libsignal.net.RequestResult
import org.signal.libsignal.usernames.BaseUsernameException
import org.signal.libsignal.usernames.Username
import org.signal.libsignal.usernames.UsernameLinkInvalidEntropyDataLength
import org.signal.libsignal.usernames.UsernameLinkInvalidLinkData
import org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkResetResult
import org.thoughtcrime.securesms.database.SignalDatabase
import org.thoughtcrime.securesms.dependencies.AppDependencies
@@ -234,25 +236,24 @@ object UsernameRepository {
return Single
.fromCallable {
val encryptedUsername = when (val result = SignalNetwork.username.getEncryptedUsernameFromLinkServerId(components.serverId)) {
is NetworkResult.Success -> result.result
is NetworkResult.StatusCodeError -> {
return@fromCallable when (result.code) {
404 -> UsernameLinkConversionResult.NotFound(null)
422 -> UsernameLinkConversionResult.Invalid
else -> UsernameLinkConversionResult.NetworkError
val username = when (val result = SignalNetwork.username.getDecryptedUsernameFromLinkServerIdAndEntropy(components.serverId, components.entropy)) {
is RequestResult.Success ->
result.result ?: return@fromCallable UsernameLinkConversionResult.NotFound(null)
is RequestResult.NonSuccess -> {
when (result.error) {
is UsernameLinkInvalidEntropyDataLength,
is UsernameLinkInvalidLinkData -> {
Log.w(TAG, "[convertLinkToUsername] Bad username conversion. ${result.error}")
return@fromCallable UsernameLinkConversionResult.Invalid
}
}
}
is NetworkResult.NetworkError -> return@fromCallable UsernameLinkConversionResult.NetworkError
is NetworkResult.ApplicationError -> throw result.throwable
}
val link = Username.UsernameLink(components.entropy, encryptedUsername)
val username: Username = try {
Username.fromLink(link)
} catch (e: BaseUsernameException) {
Log.w(TAG, "[convertLinkToUsername] Bad username conversion.", e)
return@fromCallable UsernameLinkConversionResult.Invalid
is RequestResult.RetryableNetworkError -> {
return@fromCallable UsernameLinkConversionResult.NetworkError
}
is RequestResult.ApplicationError -> {
throw result.cause
}
}
when (val result = SignalNetwork.username.getAciByUsername(username)) {