mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-26 03:16:02 +03:00
Code Issues Projects Releases Packages Wiki Activity

remove nullability

Browse source
This commit is contained in:
Hugh Nimmo-Smith 2022-10-17 17:36:35 +01:00
parent 8f4d998362
commit 6d17d51fe9
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
View file

@ -89,7 +89,7 @@ class Rendezvous(
} }
@Throws(RendezvousError::class) @Throws(RendezvousError::class)
suspend fun startAfterScanningCode(): String? { suspend fun startAfterScanningCode(): String {
val checksum = channel.connect() val checksum = channel.connect()
Timber.tag(TAG).i("Connected to secure channel with checksum: $checksum") Timber.tag(TAG).i("Connected to secure channel with checksum: $checksum")
@ -111,7 +111,7 @@ class Rendezvous(
} }
@Throws(RendezvousError::class) @Throws(RendezvousError::class)
suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session? { suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session {
Timber.tag(TAG).i("Waiting for login_token") Timber.tag(TAG).i("Waiting for login_token")
val loginToken = receive() val loginToken = receive()

22
vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
View file

@ -100,21 +100,19 @@ class QrCodeLoginViewModel @AssistedInject constructor(
try { try {
val confirmationCode = rendezvous.startAfterScanningCode() val confirmationCode = rendezvous.startAfterScanningCode()
Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode") Timber.tag(TAG).i("Established secure channel with checksum: $confirmationCode")
confirmationCode?.let {
onConnectionEstablished(it)
val session = rendezvous.waitForLoginOnNewDevice(authenticationService)
onSigningIn()
session?.let {
activeSessionHolder.setActiveSession(session)
authenticationService.reset()
configureAndStartSessionUseCase.execute(session) onConnectionEstablished(confirmationCode)
rendezvous.completeVerificationOnNewDevice(session) val session = rendezvous.waitForLoginOnNewDevice(authenticationService)
onSigningIn()
_viewEvents.post(QrCodeLoginViewEvents.NavigateToHomeScreen) activeSessionHolder.setActiveSession(session)
} authenticationService.reset()
} configureAndStartSessionUseCase.execute(session)
rendezvous.completeVerificationOnNewDevice(session)
_viewEvents.post(QrCodeLoginViewEvents.NavigateToHomeScreen)
} catch (t: Throwable) { } catch (t: Throwable) {
Timber.tag(TAG).e(t, "Error occurred during sign in") Timber.tag(TAG).e(t, "Error occurred during sign in")
if (t is RendezvousError) { if (t is RendezvousError) {