Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-26 03:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert SvrValues to kotlin.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-11-06 11:35:10 -05:00
parent 35b80be8c8
commit 16e36c94de
16 changed files with 276 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt
View File

@@ -507,7 +507,7 @@ class ChangeNumberViewModel : ViewModel() {
val currentState = store.value
val code = currentState.enteredCode ?: throw IllegalStateException("Can't construct registration data without entered code!")
val e164: String = number.e164Number ?: throw IllegalStateException("Can't construct registration data without E164!")
val recoveryPassword = if (currentState.sessionId == null) SignalStore.svr.getRecoveryPassword() else null
val recoveryPassword = if (currentState.sessionId == null) SignalStore.svr.recoveryPassword else null
val fcmToken = RegistrationRepository.getFcmToken(context)
return RegistrationData(code, e164, password, RegistrationRepository.getRegistrationId(), RegistrationRepository.getProfileKey(e164), fcmToken, RegistrationRepository.getPniRegistrationId(), recoveryPassword)
}

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/svr/InternalSvrPlaygroundViewModel.kt
View File

@@ -52,7 +52,7 @@ class InternalSvrPlaygroundViewModel : ViewModel() {
disposables += Single
.fromCallable {
_state.value.selected.toImplementation()
.setPin(_state.value.userPin, SignalStore.svr.getOrCreateMasterKey())
.setPin(_state.value.userPin, SignalStore.svr.masterKey)
.execute()
}
.subscribeOn(Schedulers.io())