Merge pull request #1125 from RocketChat/fix/2.0.2-hotfix

[FIX] Fixes for the 2.0.2 hotfix

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

@@ -43,13 +43,11 @@ class LoginPresenter @Inject constructor(
     serverInteractor: GetCurrentServerInteractor,
     private val saveAccountInteractor: SaveAccountInteractor,
     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
     private lateinit var settings: PublicSettings
-    //private val client: RocketChatClient = factory.create(currentServer)
-    //private val settings: PublicSettings = settingsInteractor.get(currentServer)
     private lateinit var usernameOrEmail: String
     private lateinit var password: String
     private lateinit var credentialToken: String
@@ -98,19 +96,8 @@ class LoginPresenter @Inject constructor(
         deepLinkUserId = deepLinkInfo.userId
         deepLinkToken = deepLinkInfo.token
         tokenRepository.save(serverUrl, Token(deepLinkUserId, deepLinkToken))
-        launchUI(strategy) {
-            try {
-                val version = checkServerVersion(serverUrl).await()
-                when (version) {
-                    is Version.OutOfDateError -> {
-                        view.blockAndAlertNotRequiredVersion()
-                    }
-                    else -> doAuthentication(TYPE_LOGIN_DEEP_LINK)
-                }
-            } catch (ex: Exception) {
-                Timber.d(ex, "Error performing deep link login")
-            }
-        }
+
+        doAuthentication(TYPE_LOGIN_DEEP_LINK)
     }
 
     private fun setupConnectionInfo(serverUrl: String) {

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

@@ -4,7 +4,7 @@ import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 
-interface LoginView : LoadingView, MessageView, VersionCheckView {
+interface LoginView : LoadingView, MessageView {
 
     /**
      * Shows the form view (i.e the username/email and password fields) if it is enabled by the server settings.

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

@@ -370,27 +370,6 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
-    override fun alertNotRecommendedVersion() {
-        ui {
-            AlertDialog.Builder(it)
-                    .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
-                    .setPositiveButton(R.string.msg_ok, null)
-                    .create()
-                    .show()
-        }
-    }
-
-    override fun blockAndAlertNotRequiredVersion() {
-        ui {
-            AlertDialog.Builder(it)
-                    .setMessage(getString(R.string.msg_ver_not_minimum, BuildConfig.REQUIRED_SERVER_VERSION))
-                    .setOnDismissListener { activity?.onBackPressed() }
-                    .setPositiveButton(R.string.msg_ok, null)
-                    .create()
-                    .show()
-        }
-    }
-
     private fun showRemainingSocialAccountsView() {
         social_accounts_container.postDelayed(300) {
             ui {

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.net.Uri
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
@@ -14,6 +15,7 @@ import chat.rocket.android.authentication.server.presentation.ServerPresenter
 import chat.rocket.android.authentication.server.presentation.ServerView
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.util.extensions.*
+import chat.rocket.common.util.ifNull
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_server.*
 import javax.inject.Inject
@@ -52,6 +54,8 @@ class ServerFragment : Fragment(), ServerView {
         setupOnClickListener()
 
         deepLinkInfo?.let {
+            val uri = Uri.parse(it.url)
+            uri?.let { text_server_protocol.hintContent = it.host }
             presenter.deepLink(it)
         }
     }
@@ -99,8 +103,7 @@ class ServerFragment : Fragment(), ServerView {
             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)
+                    performConnect()
                 })
                 .create()
                 .show()
@@ -113,15 +116,27 @@ class ServerFragment : Fragment(), ServerView {
             AlertDialog.Builder(it)
                 .setMessage(getString(R.string.msg_ver_not_minimum, BuildConfig.REQUIRED_SERVER_VERSION))
                 .setPositiveButton(R.string.msg_ok, null)
+                .setOnDismissListener {
+                    // reset the deeplink info, so the user can log to another server...
+                    deepLinkInfo = null
+                }
                 .create()
                 .show()
         }
     }
 
     override fun versionOk() {
+        performConnect()
+    }
+
+    private fun performConnect() {
         ui {
-            val url = text_server_url.textContent.ifEmpty(text_server_url.hintContent)
-            presenter.connect(text_server_protocol.textContent + url)
+            deepLinkInfo?.let {
+                presenter.deepLink(it)
+            }.ifNull {
+                val url = text_server_url.textContent.ifEmpty(text_server_url.hintContent)
+                presenter.connect(text_server_protocol.textContent + url)
+            }
         }
     }
 

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

@@ -10,6 +10,7 @@ import chat.rocket.android.chatroom.viewmodel.ViewModelMapper
 import chat.rocket.android.chatroom.viewmodel.suggestion.ChatRoomSuggestionViewModel
 import chat.rocket.android.chatroom.viewmodel.suggestion.CommandSuggestionViewModel
 import chat.rocket.android.chatroom.viewmodel.suggestion.PeopleSuggestionViewModel
+import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.username
@@ -172,7 +173,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         launchUI(strategy) {
             view.showLoading()
             try {
-                val fileName = async { uriInteractor.getFileName(uri) }.await()
+                val fileName = async { uriInteractor.getFileName(uri) }.await() ?: uri.toString()
                 val mimeType = async { uriInteractor.getMimeType(uri) }.await()
                 val fileSize = async { uriInteractor.getFileSize(uri) }.await()
                 val maxFileSize = settings.uploadMaxFileSize()
@@ -189,12 +190,11 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                         }
                     }
                 }
-            } catch (ex: RocketChatException) {
-                Timber.d(ex)
-                ex.message?.let {
-                    view.showMessage(it)
-                }.ifNull {
-                    view.showGenericErrorMessage()
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error uploading file")
+                when(ex) {
+                    is RocketChatException -> view.showMessage(ex)
+                    else -> view.showGenericErrorMessage()
                 }
             } finally {
                 view.hideLoading()