Move version check logic into its own abstract presenter and its UI callbacks...

Move version check logic into its own abstract presenter and its UI callbacks to its own view and inherit all of them accordingly

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

@@ -10,6 +10,7 @@ import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.VersionInfo
 import chat.rocket.android.util.extensions.*
 import chat.rocket.common.RocketChatException
@@ -40,7 +41,8 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                                          settingsInteractor: GetSettingsInteractor,
                                          serverInteractor: GetCurrentServerInteractor,
                                          private val saveAccountInteractor: SaveAccountInteractor,
-                                         private val factory: RocketChatClientFactory) {
+                                         private val factory: RocketChatClientFactory)
+    : CheckServerPresenter(strategy, factory.create(serverInteractor.get()!!), view) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
     private val currentServer = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(currentServer)
@@ -265,80 +267,4 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
         val account = Account(currentServer, icon, logo, me.username!!, thumb)
         saveAccountInteractor.save(account)
     }
-
-    private fun checkServerInfo() {
-        launchUI(strategy) {
-            val serverInfo = client.serverInfo()
-            val thisServerVersion = serverInfo.version
-            val isRequiredVersion = isRequiredServerVersion(thisServerVersion)
-            val isRecommendedVersion = isRecommendedServerVersion(thisServerVersion)
-            if (isRequiredVersion) {
-                if (isRecommendedVersion) {
-                    Timber.i("Your version is nice! (Requires: 0.62.0, Yours: $thisServerVersion)")
-                } else {
-                    view.alertNotRecommendedVersion()
-                }
-            } else {
-                if (!isRecommendedVersion) {
-                    view.blockAndAlertNotRequiredVersion()
-                    Timber.i("Oops. Looks like your server is out-of-date! Minimum server version required ${BuildConfig.REQUIRED_SERVER_VERSION}!")
-                }
-            }
-        }
-    }
-
-    private fun isRequiredServerVersion(version: String): Boolean {
-        return isMinimumVersion(version, getVersionDistilled(BuildConfig.REQUIRED_SERVER_VERSION))
-    }
-
-    private fun isRecommendedServerVersion(version: String): Boolean {
-        return isMinimumVersion(version, getVersionDistilled(BuildConfig.RECOMMENDED_SERVER_VERSION))
-    }
-
-    private fun isMinimumVersion(version: String, required: VersionInfo): Boolean {
-        val thisVersion = getVersionDistilled(version)
-        with(thisVersion) {
-            if (major < required.major) {
-                return false
-            } else if (major > required.major) {
-                return true
-            }
-            if (minor < required.minor) {
-                return false
-            } else if (minor > required.minor) {
-                return true
-            }
-            return update >= required.update
-        }
-    }
-
-    private fun getVersionDistilled(version: String): VersionInfo {
-        var split = version.split("-")
-        if (split.isEmpty()) {
-            return VersionInfo(0, 0, 0, null, "0.0.0")
-        }
-        val ver = split[0]
-        var release: String? = null
-        if (split.size > 1) {
-            release = split[1]
-        }
-        split = ver.split(".")
-        val major = getVersionNumber(split, 0)
-        val minor = getVersionNumber(split, 1)
-        val update = getVersionNumber(split, 2)
-        return VersionInfo(
-                major = major,
-                minor = minor,
-                update = update,
-                release = release,
-                full = version)
-    }
-
-    private fun getVersionNumber(split: List<String>, index: Int): Int {
-        return try {
-            split.getOrNull(index)?.toInt() ?: 0
-        } catch (ex: NumberFormatException) {
-            0
-        }
-    }
 }
\ No newline at end of file

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

 package chat.rocket.android.authentication.login.presentation
 
+import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.behaviours.InternetView
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 
-interface LoginView : LoadingView, MessageView, InternetView {
+interface LoginView : LoadingView, MessageView, InternetView, VersionCheckView {
 
     /**
      * Shows the form view (i.e the username/email and password fields) if it is enabled by the server settings.
@@ -186,14 +187,4 @@ interface LoginView : LoadingView, MessageView, InternetView {
      * Alerts the user about a wrong inputted password.
      */
     fun alertWrongPassword()
-
-    /**
-     * Alerts the user about the server version not meeting the recommended server version.
-     */
-    fun alertNotRecommendedVersion()
-
-    /**
-     * Block user to proceed and alert him due to server having an unsupported server version.
-     */
-    fun blockAndAlertNotRequiredVersion()
 }
\ No newline at end of file

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

+package chat.rocket.android.authentication.server.presentation
+
+interface VersionCheckView {
+    /**
+     * Alerts the user about the server version not meeting the recommended server version.
+     */
+    fun alertNotRecommendedVersion()
+
+    /**
+     * Block user to proceed and alert him due to server having an unsupported server version.
+     */
+    fun blockAndAlertNotRequiredVersion()
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -9,6 +9,7 @@ import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.common.RocketChatException
@@ -16,26 +17,25 @@ import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.me
-import chat.rocket.core.internal.rest.registerPushToken
 import chat.rocket.core.internal.rest.unregisterPushToken
 import timber.log.Timber
 import javax.inject.Inject
 
 class MainPresenter @Inject constructor(
-    private val view: MainView,
-    private val strategy: CancelStrategy,
-    private val navigator: MainNavigator,
-    private val tokenRepository: TokenRepository,
-    private val serverInteractor: GetCurrentServerInteractor,
-    private val localRepository: LocalRepository,
-    private val navHeaderMapper: NavHeaderViewModelMapper,
-    private val saveAccountInteractor: SaveAccountInteractor,
-    private val getAccountsInteractor: GetAccountsInteractor,
-    private val removeAccountInterector: RemoveAccountInterector,
-    private val factory: RocketChatClientFactory,
-    getSettingsInteractor: GetSettingsInteractor,
-    managerFactory: ConnectionManagerFactory
-) {
+        private val view: MainView,
+        private val strategy: CancelStrategy,
+        private val navigator: MainNavigator,
+        private val tokenRepository: TokenRepository,
+        private val serverInteractor: GetCurrentServerInteractor,
+        private val localRepository: LocalRepository,
+        private val navHeaderMapper: NavHeaderViewModelMapper,
+        private val saveAccountInteractor: SaveAccountInteractor,
+        private val getAccountsInteractor: GetAccountsInteractor,
+        private val removeAccountInterector: RemoveAccountInterector,
+        private val factory: RocketChatClientFactory,
+        getSettingsInteractor: GetSettingsInteractor,
+        managerFactory: ConnectionManagerFactory
+) : CheckServerPresenter(strategy, client = factory.create(serverInteractor.get()!!), view = view) {
     private val currentServer = serverInteractor.get()!!
     private val manager = managerFactory.create(currentServer)
     private val client: RocketChatClient = factory.create(currentServer)
@@ -48,10 +48,12 @@ class MainPresenter @Inject constructor(
     fun toSettings() = navigator.toSettings()
 
     fun loadCurrentInfo() {
+        checkServerInfo()
         launchUI(strategy) {
             try {
                 val me = client.me()
                 val model = navHeaderMapper.mapToViewModel(me)
+
                 saveAccount(model)
                 view.setupNavHeader(model, getAccountsInteractor.get())
             } catch (ex: Exception) {

app/src/main/java/chat/rocket/android/main/presentation/MainView.kt

 package chat.rocket.android.main.presentation
 
+import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.behaviours.MessageView
 import chat.rocket.android.main.viewmodel.NavHeaderViewModel
 import chat.rocket.android.server.domain.model.Account
 
-interface MainView : MessageView {
+interface MainView : MessageView, VersionCheckView {
     fun setupNavHeader(model: NavHeaderViewModel, accounts: List<Account>)
     fun closeServerSelection()
 }
\ No newline at end of file

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

 package chat.rocket.android.main.ui
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
@@ -8,6 +9,7 @@ import android.support.v7.widget.LinearLayoutManager
 import android.view.Gravity
 import android.view.MenuItem
 import android.view.View
+import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
 import chat.rocket.android.main.adapter.AccountSelector
 import chat.rocket.android.main.adapter.AccountsAdapter
@@ -39,6 +41,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
     @Inject lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
     @Inject lateinit var presenter: MainPresenter
     private var isFragmentAdded: Boolean = false
+    private var expanded = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -86,7 +89,22 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
         view_navigation.getHeaderView(0).account_container.performClick()
     }
 
-    private var expanded = false
+    override fun alertNotRecommendedVersion() {
+        AlertDialog.Builder(this)
+                .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
+                .setPositiveButton(R.string.msg_ok, null)
+                .create()
+                .show()
+    }
+
+    override fun blockAndAlertNotRequiredVersion() {
+        AlertDialog.Builder(this)
+                .setMessage(getString(R.string.msg_ver_not_minimum, BuildConfig.REQUIRED_SERVER_VERSION))
+                .setOnDismissListener { presenter.logout() }
+                .setPositiveButton(R.string.msg_ok, null)
+                .create()
+                .show()
+    }
 
     private fun setupAccountsList(header: View, accounts: List<Account>) {
         accounts_list.layoutManager = LinearLayoutManager(this)

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

+package chat.rocket.android.server.presentation
+
+import chat.rocket.android.BuildConfig
+import chat.rocket.android.authentication.server.presentation.VersionCheckView
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.util.VersionInfo
+import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.core.RocketChatClient
+import chat.rocket.core.internal.rest.serverInfo
+import timber.log.Timber
+
+abstract class CheckServerPresenter constructor(private val strategy: CancelStrategy,
+                                                private val client: RocketChatClient,
+                                                private val view: VersionCheckView) {
+    internal fun checkServerInfo() {
+        launchUI(strategy) {
+            val serverInfo = client.serverInfo()
+            val thisServerVersion = serverInfo.version
+            val isRequiredVersion = isRequiredServerVersion(thisServerVersion)
+            val isRecommendedVersion = isRecommendedServerVersion(thisServerVersion)
+            if (isRequiredVersion) {
+                if (isRecommendedVersion) {
+                    Timber.i("Your version is nice! (Requires: 0.62.0, Yours: $thisServerVersion)")
+                } else {
+                    view.alertNotRecommendedVersion()
+                }
+            } else {
+                if (!isRecommendedVersion) {
+                    view.blockAndAlertNotRequiredVersion()
+                    Timber.i("Oops. Looks like your server is out-of-date! Minimum server version required ${BuildConfig.REQUIRED_SERVER_VERSION}!")
+                }
+            }
+        }
+    }
+
+    private fun isRequiredServerVersion(version: String): Boolean {
+        return isMinimumVersion(version, getVersionDistilled(BuildConfig.REQUIRED_SERVER_VERSION))
+    }
+
+    private fun isRecommendedServerVersion(version: String): Boolean {
+        return isMinimumVersion(version, getVersionDistilled(BuildConfig.RECOMMENDED_SERVER_VERSION))
+    }
+
+    private fun isMinimumVersion(version: String, required: VersionInfo): Boolean {
+        val thisVersion = getVersionDistilled(version)
+        with(thisVersion) {
+            if (major < required.major) {
+                return false
+            } else if (major > required.major) {
+                return true
+            }
+            if (minor < required.minor) {
+                return false
+            } else if (minor > required.minor) {
+                return true
+            }
+            return update >= required.update
+        }
+    }
+
+    private fun getVersionDistilled(version: String): VersionInfo {
+        var split = version.split("-")
+        if (split.isEmpty()) {
+            return VersionInfo(0, 0, 0, null, "0.0.0")
+        }
+        val ver = split[0]
+        var release: String? = null
+        if (split.size > 1) {
+            release = split[1]
+        }
+        split = ver.split(".")
+        val major = getVersionNumber(split, 0)
+        val minor = getVersionNumber(split, 1)
+        val update = getVersionNumber(split, 2)
+        return VersionInfo(
+                major = major,
+                minor = minor,
+                update = update,
+                release = release,
+                full = version)
+    }
+
+    private fun getVersionNumber(split: List<String>, index: Int): Int {
+        return try {
+            split.getOrNull(index)?.toInt() ?: 0
+        } catch (ex: NumberFormatException) {
+            0
+        }
+    }
+}
\ No newline at end of file