From 6d17d51fe9e7a5483288f833106f4e572fafcb46 Mon Sep 17 00:00:00 2001
From: Hugh Nimmo-Smith <hughns@element.io>
Date: Mon, 17 Oct 2022 17:36:35 +0100
Subject: [PATCH] remove nullability

---
 .../android/sdk/api/rendezvous/Rendezvous.kt  |  4 ++--
 .../features/login/qr/QrCodeLoginViewModel.kt | 22 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
index 9ad889fca0..e41a72db94 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
@@ -89,7 +89,7 @@ class Rendezvous(
     }
 
     @Throws(RendezvousError::class)
-    suspend fun startAfterScanningCode(): String? {
+    suspend fun startAfterScanningCode(): String {
         val checksum = channel.connect()
 
         Timber.tag(TAG).i("Connected to secure channel with checksum: $checksum")
@@ -111,7 +111,7 @@ class Rendezvous(
     }
 
     @Throws(RendezvousError::class)
-    suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session? {
+    suspend fun waitForLoginOnNewDevice(authenticationService: AuthenticationService): Session {
         Timber.tag(TAG).i("Waiting for login_token")
 
         val loginToken = receive()
diff --git a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
index 2647c5974d..4134dc8ab2 100644
--- a/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/login/qr/QrCodeLoginViewModel.kt
@@ -100,21 +100,19 @@ class QrCodeLoginViewModel @AssistedInject constructor(
             try {
                 val confirmationCode = rendezvous.startAfterScanningCode()
                 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) {
                 Timber.tag(TAG).e(t, "Error occurred during sign in")
                 if (t is RendezvousError) {