Merge pull request #1551 from RocketChat/fix/fix-auth-deeplink

[FIX] fix auth deeplink

app/src/main/java/chat/rocket/android/authentication/domain/model/LoginDeepLinkInfo.kt

@@ -11,8 +11,8 @@ import timber.log.Timber
 @Parcelize
 data class LoginDeepLinkInfo(
     val url: String,
-    val userId: String,
-    val token: String
+    val userId: String?,
+    val token: String?
 ) : Parcelable
 
 fun Intent.getLoginDeepLinkInfo(): LoginDeepLinkInfo? {

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

@@ -141,10 +141,15 @@ class LoginPresenter @Inject constructor(
     fun authenticateWithDeepLink(deepLinkInfo: LoginDeepLinkInfo) {
         val serverUrl = deepLinkInfo.url
         setupConnectionInfo(serverUrl)
-        deepLinkUserId = deepLinkInfo.userId
-        deepLinkToken = deepLinkInfo.token
-        tokenRepository.save(serverUrl, Token(deepLinkUserId, deepLinkToken))
-        doAuthentication(TYPE_LOGIN_DEEP_LINK)
+        if (deepLinkInfo.userId != null && deepLinkInfo.token != null) {
+            deepLinkUserId = deepLinkInfo.userId
+            deepLinkToken = deepLinkInfo.token
+            tokenRepository.save(serverUrl, Token(deepLinkUserId, deepLinkToken))
+            doAuthentication(TYPE_LOGIN_DEEP_LINK)
+        } else {
+            // If we don't have the login credentials, just go through normal setup and user input.
+            setupView()
+        }
     }
 
     private fun setupConnectionInfo(serverUrl: String) {

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

@@ -104,6 +104,8 @@ class ServerFragment : Fragment(), ServerView {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        // reset deep link info, so user can come back and log to another server...
+        deepLinkInfo = null
         relative_layout.viewTreeObserver.removeOnGlobalLayoutListener(layoutListener)
     }
 
@@ -144,9 +146,9 @@ class ServerFragment : Fragment(), ServerView {
             hideLoading()
             AlertDialog.Builder(it)
                 .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
-                .setPositiveButton(R.string.msg_ok, { _, _ ->
+                .setPositiveButton(R.string.msg_ok) { _, _ ->
                     performConnect()
-                })
+                }
                 .create()
                 .show()
         }

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

@@ -56,9 +56,7 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         val currentFragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
-        if (currentFragment != null) {
-            currentFragment.onActivityResult(requestCode, resultCode, data)
-        }
+        currentFragment?.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun supportFragmentInjector(): AndroidInjector<Fragment> {