Merge pull request #1107 from RocketChat/fix/fixes-for-2.0.1

[FIX] Fixes for 2.0.1

app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt

@@ -15,9 +15,6 @@ import kotlinx.coroutines.experimental.Job
 @PerFragment
 class ChatRoomFragmentModule {
 
-    @Provides
-    fun provideChatRoomNavigator(activity: ChatRoomActivity) = ChatRoomNavigator(activity)
-
     @Provides
     fun chatRoomView(frag: ChatRoomFragment): ChatRoomView {
         return frag

app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomModule.kt

+package chat.rocket.android.chatroom.di
+
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
+import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.dagger.scope.PerActivity
+import dagger.Module
+import dagger.Provides
+
+@Module
+@PerActivity
+class ChatRoomModule {
+    @Provides
+    fun provideChatRoomNavigator(activity: ChatRoomActivity) = ChatRoomNavigator(activity)
+}
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package chat.rocket.android.chatroom.presentation
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.members.ui.newInstance
+import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.android.util.extensions.addFragmentBackStack
 
 class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
@@ -12,4 +13,9 @@ class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
             newInstance(chatRoomId, chatRoomType)
         }
     }
+
+    fun toNewServer() {
+        activity.startActivity(activity.changeServerIntent())
+        activity.finish()
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt

@@ -8,12 +8,14 @@ import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
 import chat.rocket.android.R
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.util.extensions.addFragment
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
+import chat.rocket.common.util.ifNull
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -51,6 +53,7 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
 
     // TODO - workaround for now... We will move to a single activity
     @Inject lateinit var serverInteractor: GetCurrentServerInteractor
+    @Inject lateinit var navigator: ChatRoomNavigator
     @Inject lateinit var managerFactory: ConnectionManagerFactory
 
     private lateinit var chatRoomId: String
@@ -66,7 +69,13 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
         setContentView(R.layout.activity_chat_room)
 
         // Workaround for when we are coming to the app via the recents app and the app was killed.
-        managerFactory.create(serverInteractor.get()!!).connect()
+        val serverUrl = serverInteractor.get()
+        if (serverUrl != null) {
+            managerFactory.create(serverUrl).connect()
+        } else {
+            navigator.toNewServer()
+            return
+        }
 
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
         requireNotNull(chatRoomId) { "no chat_room_id provided in Intent extras" }

app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt

@@ -8,6 +8,7 @@ import chat.rocket.android.authentication.signup.di.SignupFragmentProvider
 import chat.rocket.android.authentication.twofactor.di.TwoFAFragmentProvider
 import chat.rocket.android.authentication.ui.AuthenticationActivity
 import chat.rocket.android.chatroom.di.ChatRoomFragmentProvider
+import chat.rocket.android.chatroom.di.ChatRoomModule
 import chat.rocket.android.chatroom.di.PinnedMessagesFragmentProvider
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.PinnedMessagesActivity
@@ -45,7 +46,9 @@ abstract class ActivityBuilder {
     abstract fun bindMainActivity(): MainActivity
 
     @PerActivity
-    @ContributesAndroidInjector(modules = [ChatRoomFragmentProvider::class, MembersFragmentProvider::class])
+    @ContributesAndroidInjector(modules = [ChatRoomModule::class,
+        ChatRoomFragmentProvider::class,
+        MembersFragmentProvider::class])
     abstract fun bindChatRoomActivity(): ChatRoomActivity
 
     @PerActivity

app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt

@@ -28,14 +28,21 @@ class ProfilePresenter @Inject constructor(private val view: ProfileView,
             view.showLoading()
             try {
                 val myself = retryIO("me") { client.me() }
-                myselfId = myself.id!!
-                val avatarUrl = serverUrl.avatarUrl(myself.username!!)
-                view.showProfile(
-                        avatarUrl,
-                        myself.name ?: "",
-                        myself.username ?: "",
-                        myself.emails?.get(0)?.address!!
-                )
+                val id = myself.id
+                val username = myself.username
+                if (id == null || username == null) {
+                    view.showGenericErrorMessage()
+                } else {
+                    myselfId = id
+                    val avatarUrl = serverUrl.avatarUrl(username)
+                    val email = myself.emails?.getOrNull(0)?.address
+                    view.showProfile(
+                            avatarUrl,
+                            myself.name ?: "",
+                            myself.username ?: "",
+                            email
+                    )
+                }
             } catch (exception: RocketChatException) {
                 view.showMessage(exception)
             } finally {

app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt

@@ -2,7 +2,6 @@ package chat.rocket.android.profile.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
-import chat.rocket.core.model.Myself
 
 interface ProfileView : LoadingView, MessageView {
 
@@ -14,7 +13,7 @@ interface ProfileView : LoadingView, MessageView {
      * @param username The user username.
      * @param email The user email.
      */
-    fun showProfile(avatarUrl: String, name: String, username: String, email: String)
+    fun showProfile(avatarUrl: String, name: String, username: String, email: String?)
 
     /**
      * Shows a profile update successfully message

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -55,18 +55,18 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         super.onDestroyView()
     }
 
-    override fun showProfile(avatarUrl: String, name: String, username: String, email: String) {
+    override fun showProfile(avatarUrl: String, name: String, username: String, email: String?) {
         ui {
             image_avatar.setImageURI(avatarUrl)
 
             text_name.textContent = name
             text_username.textContent = username
-            text_email.textContent = email
+            text_email.textContent = email ?: ""
             text_avatar_url.textContent = ""
 
             currentName = name
             currentUsername = username
-            currentEmail = email
+            currentEmail = email ?: ""
             currentAvatar = avatarUrl
 
             profile_container.setVisible(true)

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

@@ -41,7 +41,7 @@ private const val INTENT_SERVER_URL = "INTENT_SERVER_URL"
 private const val INTENT_CHAT_ROOM_NAME = "INTENT_CHAT_ROOM_NAME"
 private const val INTENT_CHAT_ROOM_TYPE = "INTENT_CHAT_ROOM_TYPE"
 
-fun Context.changeServerIntent(serverUrl: String?): Intent {
+fun Context.changeServerIntent(serverUrl: String? = null): Intent {
     return Intent(this, ChangeServerActivity::class.java).apply {
         serverUrl?.let { url ->
             putExtra(INTENT_SERVER_URL, url)