Cleanup after BillCarsonFr's review

vector/src/main/java/im/vector/riotx/features/login/LoginViewModel.kt

@@ -34,6 +34,7 @@ import im.vector.riotx.core.extensions.configureAndStart
 import im.vector.riotx.core.platform.VectorViewModel
 import im.vector.riotx.core.utils.LiveEvent
 import im.vector.riotx.features.notifications.PushRuleTriggerListener
+import timber.log.Timber
 
 class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginViewState,
                                                  private val authenticator: Authenticator,
@@ -123,9 +124,16 @@ class LoginViewModel @AssistedInject constructor(@Assisted initialState: LoginVi
     }
 
     private fun handleSsoLoginSuccess(action: LoginActions.SsoLoginSuccess) {
-        val session = authenticator.createSessionFromSso(action.credentials, homeServerConnectionConfig!!)
+        val homeServerConnectionConfigFinal = homeServerConnectionConfig
 
-        onSessionCreated(session)
+        if (homeServerConnectionConfigFinal == null) {
+            // Should not happen
+            Timber.w("homeServerConnectionConfig is null")
+        } else {
+            val session = authenticator.createSessionFromSso(action.credentials, homeServerConnectionConfigFinal)
+
+            onSessionCreated(session)
+        }
     }
 
 

vector/src/main/res/layout/activity_progress.xml

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/listView_spinner_views"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/vctr_waiting_background_color">
 
     <ProgressBar
-        android:id="@+id/listView_spinner"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_gravity="center"
+        android:layout_gravity="center" />
-        android:visibility="visible" />
 
 </FrameLayout>