Merge pull request #1121 from RocketChat/hotfix/check-version-on-enter-server

[HOTFIX] Move version check to server screen

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

@@ -32,7 +32,8 @@ private const val SERVICE_NAME_GOOGLE = "google"
 private const val SERVICE_NAME_LINKEDIN = "linkedin"
 private const val SERVICE_NAME_GILAB = "gitlab"
 
-class LoginPresenter @Inject constructor(private val view: LoginView,
+class LoginPresenter @Inject constructor(
+    private val view: LoginView,
     private val strategy: CancelStrategy,
     private val navigator: AuthenticationNavigator,
     private val tokenRepository: TokenRepository,
@@ -41,8 +42,8 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
     private val settingsInteractor: GetSettingsInteractor,
     serverInteractor: GetCurrentServerInteractor,
     private val saveAccountInteractor: SaveAccountInteractor,
-                                         private val factory: RocketChatClientFactory)
-    : CheckServerPresenter(strategy, factory, view) {
+    private val factory: RocketChatClientFactory
+) : CheckServerPresenter(strategy, factory, view) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
     private val currentServer = serverInteractor.get()!!
     private lateinit var client: RocketChatClient
@@ -62,7 +63,6 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
         setupUserRegistrationView()
         setupCasView()
         setupOauthServicesView()
-        checkServerInfo(currentServer)
     }
 
     fun authenticateWithUserAndPassword(usernameOrEmail: String, password: String) {
@@ -92,7 +92,7 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
         doAuthentication(TYPE_LOGIN_OAUTH)
     }
 
-    fun authenticadeWithDeepLink(deepLinkInfo: LoginDeepLinkInfo) {
+    fun authenticateWithDeepLink(deepLinkInfo: LoginDeepLinkInfo) {
         val serverUrl = deepLinkInfo.url
         setupConnectionInfo(serverUrl)
         deepLinkUserId = deepLinkInfo.userId

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -72,7 +72,7 @@ class LoginFragment : Fragment(), LoginView {
         }
 
         deepLinkInfo?.let {
-            presenter.authenticadeWithDeepLink(it)
+            presenter.authenticateWithDeepLink(it)
         }.ifNull {
             presenter.setupView()
         }

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

@@ -7,9 +7,10 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 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.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extensions.isValidUrl
 import chat.rocket.android.util.extensions.launchUI
-import chat.rocket.common.util.ifNull
 import javax.inject.Inject
 
 class ServerPresenter @Inject constructor(private val view: ServerView,
@@ -17,7 +18,18 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
                                           private val navigator: AuthenticationNavigator,
                                           private val serverInteractor: SaveCurrentServerInteractor,
                                           private val refreshSettingsInteractor: RefreshSettingsInteractor,
-                                          private val getAccountsInteractor: GetAccountsInteractor) {
+                                          private val getAccountsInteractor: GetAccountsInteractor,
+                                          factory: RocketChatClientFactory
+) : CheckServerPresenter(strategy, factory, view) {
+
+    fun checkServer(server: String) {
+        if (!server.isValidUrl()) {
+            view.showInvalidServerUrlMessage()
+        } else {
+            view.showLoading()
+            checkServerInfo(server)
+        }
+    }
 
     fun connect(server: String) {
         connectToServer(server) {
@@ -25,7 +37,7 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
         }
     }
 
-    fun connectToServer(server: String, block: () -> Unit) {
+    private fun connectToServer(server: String, block: () -> Unit) {
         if (!server.isValidUrl()) {
             view.showInvalidServerUrlMessage()
         } else {

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

@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.server.presentation
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 
-interface ServerView : LoadingView, MessageView {
+interface ServerView : LoadingView, MessageView, VersionCheckView {
 
     /**
      * Shows an invalid server URL message.

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

@@ -10,4 +10,9 @@ interface VersionCheckView {
      * Block user to proceed and alert him due to server having an unsupported server version.
      */
     fun blockAndAlertNotRequiredVersion()
+
+    /**
+     * Do some action if version is ok. This is optional.
+     */
+    fun versionOk() {}
 }
\ No newline at end of file

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

 package chat.rocket.android.authentication.server.ui
 
+import android.app.AlertDialog
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
+import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.server.presentation.ServerPresenter
@@ -17,7 +19,8 @@ import kotlinx.android.synthetic.main.fragment_authentication_server.*
 import javax.inject.Inject
 
 class ServerFragment : Fragment(), ServerView {
-    @Inject lateinit var presenter: ServerPresenter
+    @Inject
+    lateinit var presenter: ServerPresenter
     private var deepLinkInfo: LoginDeepLinkInfo? = null
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         text_server_url.isCursorVisible = KeyboardHelper.isSoftKeyboardShown(relative_layout.rootView)
@@ -74,7 +77,7 @@ class ServerFragment : Fragment(), ServerView {
         }
     }
 
-    override fun showMessage(resId: Int){
+    override fun showMessage(resId: Int) {
         ui {
             showToast(resId)
         }
@@ -90,15 +93,49 @@ class ServerFragment : Fragment(), ServerView {
         showMessage(getString(R.string.msg_generic_error))
     }
 
+    override fun alertNotRecommendedVersion() {
+        ui {
+            hideLoading()
+            AlertDialog.Builder(it)
+                .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
+                .setPositiveButton(R.string.msg_ok, { _, _ ->
+                    val url = text_server_url.textContent.ifEmpty(text_server_url.hintContent)
+                    presenter.connect(text_server_protocol.textContent + url)
+                })
+                .create()
+                .show()
+        }
+    }
+
+    override fun blockAndAlertNotRequiredVersion() {
+        ui {
+            hideLoading()
+            AlertDialog.Builder(it)
+                .setMessage(getString(R.string.msg_ver_not_minimum, BuildConfig.REQUIRED_SERVER_VERSION))
+                .setPositiveButton(R.string.msg_ok, null)
+                .create()
+                .show()
+        }
+    }
+
+    override fun versionOk() {
+        ui {
+            val url = text_server_url.textContent.ifEmpty(text_server_url.hintContent)
+            presenter.connect(text_server_protocol.textContent + url)
+        }
+    }
+
     private fun enableUserInput(value: Boolean) {
         button_connect.isEnabled = value
         text_server_url.isEnabled = value
     }
 
     private fun setupOnClickListener() {
+        ui {
             button_connect.setOnClickListener {
                 val url = text_server_url.textContent.ifEmpty(text_server_url.hintContent)
-            presenter.connect(text_server_protocol.textContent + url)
+                presenter.checkServer(text_server_protocol.textContent + url)
+            }
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt

@@ -34,7 +34,7 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
         val deepLinkInfo = intent.getLoginDeepLinkInfo()
         launch(UI + job) {
             val newServer = intent.getBooleanExtra(INTENT_ADD_NEW_SERVER, false)
-            // if we got authenticadeWithDeepLink information, pass true to newServer also
+            // if we got authenticateWithDeepLink information, pass true to newServer also
             presenter.loadCredentials(newServer || deepLinkInfo != null) { authenticated ->
                 if (!authenticated) {
                     showServerInput(savedInstanceState, deepLinkInfo)

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

@@ -18,17 +18,18 @@ abstract class CheckServerPresenter constructor(private val strategy: CancelStra
                                                 private val factory: RocketChatClientFactory,
                                                 private val view: VersionCheckView) {
     private lateinit var currentServer: String
-    private val client: RocketChatClient by lazy {
-        factory.create(currentServer)
-    }
+    private lateinit var client: RocketChatClient
 
     internal fun checkServerInfo(serverUrl: String): Job {
         return launchUI(strategy) {
             try {
+                currentServer = serverUrl
+                client = factory.create(currentServer)
                 val version = checkServerVersion(serverUrl).await()
                 when (version) {
                     is Version.VersionOk -> {
                         Timber.i("Your version is nice! (Requires: 0.62.0, Yours: ${version.version})")
+                        view.versionOk()
                     }
                     is Version.RecommendedVersionWarning -> {
                         Timber.i("Your server ${version.version} is bellow recommended version ${BuildConfig.RECOMMENDED_SERVER_VERSION}")