Fix some issues.

app/src/main/java/chat/rocket/android/authentication/presentation/AuthenticationNavigator.kt

@@ -6,7 +6,9 @@ import chat.rocket.android.authentication.login.ui.LoginFragment
 import chat.rocket.android.authentication.signup.ui.SignupFragment
 import chat.rocket.android.authentication.twofactor.ui.TwoFAFragment
 import chat.rocket.android.authentication.ui.AuthenticationActivity
+import chat.rocket.android.authentication.ui.newServerIntent
 import chat.rocket.android.main.ui.MainActivity
+import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.android.util.extensions.addFragmentBackStack
 import chat.rocket.android.webview.ui.webViewIntent
 
@@ -40,7 +42,13 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
         activity.finish()
     }
 
+    fun toChatList(serverUrl: String) {
+        activity.startActivity(activity.changeServerIntent(serverUrl))
+        activity.finish()
+    }
+
     fun toServerScreen() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        activity.startActivity(activity.newServerIntent())
+        activity.finish()
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt

@@ -4,6 +4,7 @@ import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.NetworkHelper
 import chat.rocket.android.helper.UrlHelper
+import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
 import chat.rocket.android.server.domain.SaveCurrentServerInteractor
 import chat.rocket.android.util.extensions.launchUI
@@ -14,12 +15,20 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
                                           private val strategy: CancelStrategy,
                                           private val navigator: AuthenticationNavigator,
                                           private val serverInteractor: SaveCurrentServerInteractor,
-                                          private val refreshSettingsInteractor: RefreshSettingsInteractor) {
+                                          private val refreshSettingsInteractor: RefreshSettingsInteractor,
+                                          private val getAccountsInteractor: GetAccountsInteractor) {
     fun connect(server: String) {
         if (!UrlHelper.isValidUrl(server)) {
             view.showInvalidServerUrlMessage()
         } else {
             launchUI(strategy) {
+                // Check if we already have an account for this server...
+                val account = getAccountsInteractor.get().firstOrNull { it.serverUrl == server }
+                if (account != null) {
+                    navigator.toChatList(server)
+                    return@launchUI
+                }
+
                 if (NetworkHelper.hasInternetAccess()) {
                     view.showLoading()
                     try {

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -75,7 +75,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
     }
 
     override fun closeServerSelection() {
-
+        view_navigation.getHeaderView(0).account_container.performClick()
     }
 
     private var expanded = false

app/src/main/res/layout/fragment_authentication_server.xml

@@ -27,7 +27,7 @@
         android:digits="0123456789abcdefghijklmnopqrstuvwxyz.-/:"
         android:inputType="textUri"
         android:paddingEnd="0dp"
-        android:paddingStart="2dp" />
+        android:paddingStart="4dp" />
 
     <TextView
         android:id="@+id/text_server_protocol"