Go to change server/new server if serverInteractor.get() is null

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomNavigator.kt

@@ -3,6 +3,7 @@ package chat.rocket.android.chatroom.presentation
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.members.ui.newInstance
+import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.android.util.extensions.addFragmentBackStack
 
 class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
@@ -12,4 +13,9 @@ class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
             newInstance(chatRoomId, chatRoomType)
         }
     }
+
+    fun toNewServer() {
+        activity.startActivity(activity.changeServerIntent())
+        activity.finish()
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt

@@ -8,12 +8,14 @@ import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
 import chat.rocket.android.R
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.util.extensions.addFragment
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
+import chat.rocket.common.util.ifNull
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -51,6 +53,7 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
 
     // TODO - workaround for now... We will move to a single activity
     @Inject lateinit var serverInteractor: GetCurrentServerInteractor
+    @Inject lateinit var navigator: ChatRoomNavigator
     @Inject lateinit var managerFactory: ConnectionManagerFactory
 
     private lateinit var chatRoomId: String
@@ -66,7 +69,13 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
         setContentView(R.layout.activity_chat_room)
 
         // Workaround for when we are coming to the app via the recents app and the app was killed.
-        managerFactory.create(serverInteractor.get()!!).connect()
+        val serverUrl = serverInteractor.get()
+        if (serverUrl != null) {
+            managerFactory.create(serverUrl).connect()
+        } else {
+            navigator.toNewServer()
+            return
+        }
 
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
         requireNotNull(chatRoomId) { "no chat_room_id provided in Intent extras" }

app/src/main/java/chat/rocket/android/server/ui/ChangeServerActivity.kt

@@ -41,7 +41,7 @@ private const val INTENT_SERVER_URL = "INTENT_SERVER_URL"
 private const val INTENT_CHAT_ROOM_NAME = "INTENT_CHAT_ROOM_NAME"
 private const val INTENT_CHAT_ROOM_TYPE = "INTENT_CHAT_ROOM_TYPE"
 
-fun Context.changeServerIntent(serverUrl: String?): Intent {
+fun Context.changeServerIntent(serverUrl: String? = null): Intent {
     return Intent(this, ChangeServerActivity::class.java).apply {
         serverUrl?.let { url ->
             putExtra(INTENT_SERVER_URL, url)