Revert "Merge branch 'develop-2.x' of...

Revert "Merge branch 'develop-2.x' of https://github.com/RocketChat/Rocket.Chat.Android into feature/show-and-update-user-profile"

This reverts commit edb216b0, reversing
changes made to fcc334c2.

app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt

@@ -25,10 +25,6 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
     @Inject
     lateinit var serviceDispatchingAndroidInjector: DispatchingAndroidInjector<Service>
 
-    companion object {
-        lateinit var instance: RocketChatApplication
-    }
-
     override fun onCreate() {
         super.onCreate()
 
@@ -38,7 +34,6 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
 
         setupFresco()
         setupTimber()
-        instance = this
     }
 
     private fun setupFresco() {

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

 package chat.rocket.android.chatroom.presentation
 
-import chat.rocket.android.chatroom.viewmodel.MessageViewModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.launchUI
 import chat.rocket.common.model.BaseRoom
@@ -13,7 +11,6 @@ import chat.rocket.core.internal.realtime.unsubscibre
 import chat.rocket.core.internal.rest.messages
 import chat.rocket.core.internal.rest.sendMessage
 import chat.rocket.core.model.Message
-import chat.rocket.core.model.Value
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
@@ -21,17 +18,11 @@ import javax.inject.Inject
 
 class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                                             private val strategy: CancelStrategy,
-                                            getSettingsInteractor: GetSettingsInteractor,
                                             private val serverInteractor: GetCurrentServerInteractor,
                                             factory: RocketChatClientFactory) {
     private val client = factory.create(serverInteractor.get()!!)
     private val roomMessages = ArrayList<Message>()
     private var subId: String? = null
-    private var settings: Map<String, Value<Any>>? = null
-
-    init {
-        settings = getSettingsInteractor.get(serverInteractor.get()!!)
-    }
 
     fun loadMessages(chatRoomId: String, chatRoomType: String, offset: Int = 0) {
         launchUI(strategy) {
@@ -42,8 +33,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                     synchronized(roomMessages) {
                         roomMessages.addAll(messages)
                     }
-                    val messagesViewModels = MessageViewModelMapper.mapToViewModelList(messages, settings)
-                    view.showMessages(messagesViewModels, serverInteractor.get()!!)
+                    view.showMessages(messages, serverInteractor.get()!!)
                 } else {
                     view.showGenericErrorMessage()
                 }
@@ -111,17 +101,16 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
 
     private fun updateMessage(streamedMessage: Message) {
         launchUI(strategy) {
-            val viewModelStreamedMessage = MessageViewModelMapper.mapToViewModel(streamedMessage, settings)
             synchronized(roomMessages) {
                 val index = roomMessages.indexOfFirst { msg -> msg.id == streamedMessage.id }
                 if (index != -1) {
                     Timber.d("Updatind message at $index")
                     roomMessages[index] = streamedMessage
-                    view.dispatchUpdateMessage(index, viewModelStreamedMessage)
+                    view.dispatchUpdateMessage(index, streamedMessage)
                 } else {
                     Timber.d("Adding new message")
                     roomMessages.add(0, streamedMessage)
-                    view.showNewMessage(viewModelStreamedMessage)
+                    view.showNewMessage(streamedMessage)
                 }
             }
         }

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

 package chat.rocket.android.chatroom.presentation
 
-import chat.rocket.android.chatroom.viewmodel.MessageViewModel
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
+import chat.rocket.core.model.Message
 
 interface ChatRoomView : LoadingView, MessageView {
 
@@ -12,7 +12,7 @@ interface ChatRoomView : LoadingView, MessageView {
      * @param dataSet The data set to show.
      * @param serverUrl The server URL.
      */
-    fun showMessages(dataSet: List<MessageViewModel>, serverUrl: String)
+    fun showMessages(dataSet: List<Message>, serverUrl: String)
 
     /**
      * Send a message to a chat room.
@@ -26,14 +26,14 @@ interface ChatRoomView : LoadingView, MessageView {
      *
      * @param message The (recent) message sent to a chat room.
      */
-    fun showNewMessage(message: MessageViewModel)
+    fun showNewMessage(message: Message)
 
     /**
      * Dispatch a update to the recycler views adapter about a changed message.
      *
      * @param index The index of the changed message
      */
-    fun dispatchUpdateMessage(index: Int, message: MessageViewModel)
+    fun dispatchUpdateMessage(index: Int, message: Message)
 
     fun disableMessageInput()
 

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

 package chat.rocket.android.chatroom.ui
 
+import DateTimeHelper
+import android.content.Context
 import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.TextView
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.viewmodel.MessageViewModel
+import chat.rocket.android.helper.UrlHelper
 import chat.rocket.android.util.inflate
 import chat.rocket.android.util.setVisibility
 import chat.rocket.android.util.textContent
 import chat.rocket.common.util.ifNull
+import chat.rocket.core.model.Message
 import com.facebook.drawee.view.SimpleDraweeView
 import kotlinx.android.synthetic.main.avatar.view.*
 import kotlinx.android.synthetic.main.item_message.view.*
 
-class ChatRoomAdapter(private val serverUrl: String) : RecyclerView.Adapter<ChatRoomAdapter.ViewHolder>() {
-    private val dataSet = ArrayList<MessageViewModel>()
+class ChatRoomAdapter(private val context: Context,
+                      private val serverUrl: String) : RecyclerView.Adapter<ChatRoomAdapter.ViewHolder>() {
 
     init {
         setHasStableIds(true)
     }
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(parent.inflate(R.layout.item_message), serverUrl)
+    val dataSet = ArrayList<Message>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder = ViewHolder(parent.inflate(R.layout.item_message))
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) = holder.bind(dataSet[position])
 
@@ -33,18 +39,18 @@ class ChatRoomAdapter(private val serverUrl: String) : RecyclerView.Adapter<Chat
 
     override fun getItemViewType(position: Int): Int = position
 
-    fun addDataSet(dataSet: List<MessageViewModel>) {
+    fun addDataSet(dataSet: List<Message>) {
         val previousDataSetSize = this.dataSet.size
         this.dataSet.addAll(previousDataSetSize, dataSet)
         notifyItemRangeInserted(previousDataSetSize, dataSet.size)
     }
 
-    fun addItem(message: MessageViewModel) {
+    fun addItem(message: Message) {
         dataSet.add(0, message)
         notifyItemInserted(0)
     }
 
-    fun updateItem(index: Int, message: MessageViewModel) {
+    fun updateItem(index: Int, message: Message) {
         dataSet[index] = message
         notifyItemChanged(index)
     }
@@ -53,19 +59,33 @@ class ChatRoomAdapter(private val serverUrl: String) : RecyclerView.Adapter<Chat
         return dataSet[position].id.hashCode().toLong()
     }
 
-    class ViewHolder(itemView: View, val serverUrl: String) : RecyclerView.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
-        fun bind(message: MessageViewModel) = with(itemView) {
+        fun bind(message: Message) = with(itemView) {
             bindUserAvatar(message, image_avatar, image_unknown_avatar)
-            text_user_name.textContent = message.sender
-            text_message_time.textContent = message.time
-            text_content.text = message.content
+            bindUserName(message, text_user_name)
+            bindTime(message, text_message_time)
+            bindContent(message, text_content)
         }
 
-        private fun bindUserAvatar(message: MessageViewModel, drawee: SimpleDraweeView, imageUnknownAvatar: ImageView) = message.getAvatarUrl(serverUrl).let {
-            drawee.setImageURI(it.toString())
+        private fun bindUserAvatar(message: Message, drawee: SimpleDraweeView, imageUnknownAvatar: ImageView) = message.sender?.username.let {
+            drawee.setImageURI(UrlHelper.getAvatarUrl(serverUrl, it.toString()))
         }.ifNull {
             imageUnknownAvatar.setVisibility(true)
         }
+
+        private fun bindUserName(message: Message, textView: TextView) = message.sender?.username.let {
+            textView.textContent = it.toString()
+        }.ifNull {
+            textView.textContent = context.getString(R.string.msg_unknown)
+        }
+
+        private fun bindTime(message: Message, textView: TextView) {
+            textView.textContent = DateTimeHelper.getTime(DateTimeHelper.getLocalDateTime(message.timestamp))
+        }
+
+        private fun bindContent(message: Message, textView: TextView) {
+            textView.textContent = message.message
+        }
     }
 }
\ No newline at end of file

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

@@ -12,11 +12,11 @@ import android.widget.Toast
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.presentation.ChatRoomPresenter
 import chat.rocket.android.chatroom.presentation.ChatRoomView
-import chat.rocket.android.chatroom.viewmodel.MessageViewModel
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.util.inflate
 import chat.rocket.android.util.setVisibility
 import chat.rocket.android.util.textContent
+import chat.rocket.core.model.Message
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_composer.*
@@ -76,10 +76,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView {
         super.onDestroyView()
     }
 
-    override fun showMessages(dataSet: List<MessageViewModel>, serverUrl: String) {
+    override fun showMessages(dataSet: List<Message>, serverUrl: String) {
         activity?.apply {
             if (recycler_view.adapter == null) {
-                adapter = ChatRoomAdapter(serverUrl)
+                adapter = ChatRoomAdapter(this, serverUrl)
                 recycler_view.adapter = adapter
                 val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, true)
                 recycler_view.layoutManager = linearLayoutManager
@@ -103,7 +103,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView {
         }
     }
 
-    override fun showNewMessage(message: MessageViewModel) {
+    override fun showNewMessage(message: Message) {
         text_message.textContent = ""
         adapter.addItem(message)
         recycler_view.smoothScrollToPosition(0)
@@ -120,7 +120,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView {
         if (clear) text_message.textContent = ""
     }
 
-    override fun dispatchUpdateMessage(index: Int, message: MessageViewModel) {
+    override fun dispatchUpdateMessage(index: Int, message: Message) {
         adapter.updateItem(index, message)
     }
 

app/src/main/java/chat/rocket/android/chatroom/viewmodel/MessageViewModel.kt

-package chat.rocket.android.chatroom.viewmodel
-
-import DateTimeHelper
-import android.content.Context
-import android.graphics.Color
-import android.graphics.Typeface
-import android.text.SpannableString
-import android.text.style.ForegroundColorSpan
-import android.text.style.StyleSpan
-import chat.rocket.android.R
-import chat.rocket.android.app.RocketChatApplication
-import chat.rocket.android.helper.UrlHelper
-import chat.rocket.android.server.domain.USE_REALNAME
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.MessageType.*
-import chat.rocket.core.model.Value
-
-data class MessageViewModel(private val message: Message,
-                            private val settings: Map<String, Value<Any>>?) {
-    val id: String = message.id
-    val time: String
-    val sender: String
-    val content: SpannableString
-
-    init {
-        sender = getSenderName()
-        content = getContent(RocketChatApplication.instance)
-        time = getStringTime()
-    }
-
-    fun getAvatarUrl(serverUrl: String): String? {
-        return message.sender?.username.let {
-            return@let UrlHelper.getAvatarUrl(serverUrl, it.toString())
-        }
-    }
-
-    private fun getStringTime() = DateTimeHelper.getTime(DateTimeHelper.getLocalDateTime(message.timestamp))
-
-    private fun getSenderName(): String {
-        val useRealName = settings?.get(USE_REALNAME)?.value as Boolean
-        val username = message.sender?.username
-        val realName = message.sender?.name
-        val senderName = if (useRealName) realName else username
-        return senderName ?: username ?: "?"
-    }
-
-    private fun getContent(context: Context): SpannableString {
-        return when (message.type) {
-            //TODO: Add implementation for Welcome type.
-            MESSAGE_REMOVED -> getSystemMessage(context.getString(R.string.message_removed))
-            USER_JOINED -> getSystemMessage(context.getString(R.string.message_user_joined_channel))
-            USER_LEFT -> getSystemMessage(context.getString(R.string.message_user_left))
-            USER_ADDED -> getSystemMessage(context.getString(R.string.message_user_added_by, message.message, message.sender?.username))
-            ROOM_NAME_CHANGED -> getSystemMessage(context.getString(R.string.message_room_name_changed, message.message, message.sender?.username))
-            USER_REMOVED -> getSystemMessage(context.getString(R.string.message_user_removed_by, message.message, message.sender?.username))
-            else -> getNormalMessage()
-        }
-    }
-
-    private fun getNormalMessage(): SpannableString = SpannableString(message.message)
-
-    private fun getSystemMessage(content: String): SpannableString {
-        val spannableMsg = SpannableString(content)
-        spannableMsg.setSpan(StyleSpan(Typeface.ITALIC),
-                0,
-                spannableMsg.length,
-                0)
-        spannableMsg.setSpan(ForegroundColorSpan(Color.GRAY),
-                0,
-                spannableMsg.length,
-                0)
-
-        val username = message.sender?.username
-        val message = message.message
-
-        val usernameTextStartIndex = if (username != null) content.indexOf(username) else -1
-        val usernameTextEndIndex = if (username != null) usernameTextStartIndex + username.length else -1
-        val messageTextStartIndex = if (message.isNotEmpty()) content.indexOf(message) else -1
-        val messageTextEndIndex = messageTextStartIndex + message.length
-
-        if (usernameTextStartIndex > -1) {
-            spannableMsg.setSpan(StyleSpan(Typeface.BOLD_ITALIC),
-                    usernameTextStartIndex,
-                    usernameTextEndIndex,
-                    0)
-        }
-
-        if (messageTextStartIndex > -1) {
-            spannableMsg.setSpan(StyleSpan(Typeface.BOLD_ITALIC),
-                    messageTextStartIndex,
-                    messageTextEndIndex,
-                    0)
-        }
-
-        return spannableMsg
-    }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/viewmodel/MessageViewModelMapper.kt

-package chat.rocket.android.chatroom.viewmodel
-
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.Value
-
-object MessageViewModelMapper {
-
-    suspend fun mapToViewModel(message: Message, settings: Map<String, Value<Any>>?) = MessageViewModel(message, settings)
-
-    suspend fun mapToViewModelList(messageList: List<Message>, settings: Map<String, Value<Any>>?): List<MessageViewModel> {
-        val vmList = mutableListOf<MessageViewModel>()
-        for (msg in messageList) {
-            vmList.add(MessageViewModel(msg, settings))
-        }
-        return vmList
-    }
-}
\ No newline at end of file

app/src/main/res/values-pt-rBR/strings.xml

@@ -46,13 +46,4 @@
     <string name="msg_you">Você</string>
     <string name="msg_unknown">Desconhecido</string>
 
-    <!-- System messages -->
-    <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>
-    <string name="message_user_added_by">Usuário %1$s adicionado por %2$s</string>
-    <string name="message_user_removed_by">Usuário %1$s removido por %2$s</string>
-    <string name="message_user_left">Saiu da sala.</string>
-    <string name="message_user_joined_channel">Entrou no sala.</string>
-    <string name="message_welcome">Bem-vindo, %s</string>
-    <string name="message_removed">Mensagem removida</string>
-
 </resources>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -48,13 +48,4 @@
     <string name="msg_you">You</string>
     <string name="msg_unknown">Unknown</string>
 
-    <!-- System messages -->
-    <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>
-    <string name="message_user_added_by">User %1$s added by %2$s</string>
-    <string name="message_user_removed_by">User %1$s removed by %2$s</string>
-    <string name="message_user_left">Has left the channel.</string>
-    <string name="message_user_joined_channel">Has joined the channel.</string>
-    <string name="message_welcome">Welcome %s</string>
-    <string name="message_removed">Message removed</string>
-
 </resources>
\ No newline at end of file