Merge branch 'develop' into emoji-skin-tone

app/build.gradle

@@ -16,6 +16,12 @@ android {
         versionName "2.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
     }
 
     signingConfigs {
@@ -63,6 +69,8 @@ dependencies {
     implementation project(':player')
     implementation project(':emoji')
     implementation project(':draw')
+    implementation project(':util')
+    implementation project(':core')
 
     implementation libraries.kotlin
     implementation libraries.coroutines

app/schemas/chat.rocket.android.db.RCDatabase/3.json

+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "06359a8c2943365dd094bc5dff210203",
+    "entities": [
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "REAL",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_users_username",
+            "unique": false,
+            "columnNames": [
+              "username"
+            ],
+            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "chatrooms",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subscriptionId",
+            "columnName": "subscriptionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullname",
+            "columnName": "fullname",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "readonly",
+            "columnName": "readonly",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDefault",
+            "columnName": "isDefault",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "favorite",
+            "columnName": "favorite",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "open",
+            "columnName": "open",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alert",
+            "columnName": "alert",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userMentions",
+            "columnName": "userMentions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "groupMentions",
+            "columnName": "groupMentions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastSeen",
+            "columnName": "lastSeen",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageText",
+            "columnName": "lastMessageText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageUserId",
+            "columnName": "lastMessageUserId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageTimestamp",
+            "columnName": "lastMessageTimestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_chatrooms_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_chatrooms_ownerId",
+            "unique": false,
+            "columnNames": [
+              "ownerId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
+          },
+          {
+            "name": "index_chatrooms_subscriptionId",
+            "unique": true,
+            "columnNames": [
+              "subscriptionId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
+          },
+          {
+            "name": "index_chatrooms_updatedAt",
+            "unique": false,
+            "columnNames": [
+              "updatedAt"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "ownerId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "lastMessageUserId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"06359a8c2943365dd094bc5dff210203\")"
+    ]
+  }
+}
\ No newline at end of file

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="chat.rocket.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -8,6 +9,7 @@
 
     <application
         android:name=".app.RocketChatApplication"
+        tools:replace="android:name"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_config"
         android:icon="@mipmap/ic_launcher"

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

@@ -8,6 +8,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.util.extension.launchUI
 import chat.rocket.android.util.extensions.*
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatAuthException
@@ -17,7 +18,6 @@ import chat.rocket.common.model.Token
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.*
-import com.google.android.gms.auth.api.credentials.Credential
 import kotlinx.coroutines.experimental.delay
 import timber.log.Timber
 import java.util.concurrent.TimeUnit

app/src/main/java/chat/rocket/android/authentication/registerusername/presentation/RegisterUsernamePresenter.kt

@@ -7,7 +7,7 @@ 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.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO

app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordPresenter.kt

@@ -3,10 +3,9 @@ package chat.rocket.android.authentication.resetpassword.presentation
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.isEmail
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.RocketChatInvalidResponseException

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

@@ -10,16 +10,17 @@ import chat.rocket.android.server.domain.SaveConnectingServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extensions.isValidUrl
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import javax.inject.Inject
 
-class ServerPresenter @Inject constructor(private val view: ServerView,
-                                          private val strategy: CancelStrategy,
-                                          private val navigator: AuthenticationNavigator,
-                                          private val serverInteractor: SaveConnectingServerInteractor,
-                                          private val refreshSettingsInteractor: RefreshSettingsInteractor,
-                                          private val getAccountsInteractor: GetAccountsInteractor,
-                                          factory: RocketChatClientFactory
+class ServerPresenter @Inject constructor(
+    private val view: ServerView,
+    private val strategy: CancelStrategy,
+    private val navigator: AuthenticationNavigator,
+    private val serverInteractor: SaveConnectingServerInteractor,
+    private val refreshSettingsInteractor: RefreshSettingsInteractor,
+    private val getAccountsInteractor: GetAccountsInteractor,
+    factory: RocketChatClientFactory
 ) : CheckServerPresenter(strategy, factory, view) {
 
     fun checkServer(server: String) {

app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt

@@ -6,6 +6,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.util.extension.launchUI
 import chat.rocket.android.util.extensions.*
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException

app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt

@@ -7,7 +7,7 @@ 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.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO

app/src/main/java/chat/rocket/android/chatroom/domain/UriInteractor.kt

@@ -3,7 +3,6 @@ package chat.rocket.android.chatroom.domain
 import android.content.Context
 import android.net.Uri
 import chat.rocket.android.util.extensions.*
-import java.io.File
 import javax.inject.Inject
 
 class UriInteractor @Inject constructor(private val context: Context) {
@@ -34,9 +33,4 @@ class UriInteractor @Inject constructor(private val context: Context) {
      * Note: It should be an image.
      */
     fun getBitmap(uri: Uri) = uri.getBitmpap(context)
-
-    /**
-     * Returns the Uri from the [File].
-     */
-    fun getUri(file: File) = Uri.fromFile(file)
 }
\ No newline at end of file

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

@@ -50,14 +50,6 @@ interface ChatRoomView : LoadingView, MessageView {
      */
     fun showFileSelection(filter: Array<String>?)
 
-    /**
-     * Uploads a file to a chat room.
-     *
-     * @param uri The file URI to send.
-     * @param msg Message to send with attachments
-     */
-    fun uploadFile(uri: Uri, msg: String)
-
     /**
      * Shows a invalid file message.
      */
@@ -68,7 +60,7 @@ interface ChatRoomView : LoadingView, MessageView {
      *
      * @param message The (recent) message sent to a chat room.
      */
-    fun showNewMessage(message: List<BaseUiModel<*>>)
+    fun showNewMessage(message: List<BaseUiModel<*>>, isMessageReceived: Boolean)
 
     /**
      * Dispatch to the recycler views adapter that we should remove a message.
@@ -119,7 +111,7 @@ interface ChatRoomView : LoadingView, MessageView {
     /**
      * Clears the message composition.
      */
-    fun clearMessageComposition()
+    fun clearMessageComposition(deleteMessage: Boolean)
 
     fun showInvalidFileSize(fileSize: Int, maxFileSize: Int)
 

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

+package chat.rocket.android.chatroom.ui
+
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import androidx.core.view.isVisible
+import chat.rocket.android.util.extensions.getFileName
+import chat.rocket.android.util.extensions.getMimeType
+
+fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
+    activity?.let { fragmentActivity ->
+        uri.getMimeType(fragmentActivity).let { mimeType ->
+            description.text.clear()
+            when {
+                mimeType.startsWith("image") -> {
+                    imagePreview.isVisible = true
+                    imagePreview.setImageURI(uri)
+                }
+                mimeType.startsWith("video") -> {
+                    audioVideoAttachment.isVisible = true
+                }
+                else -> {
+                    textFile.isVisible = true
+                    textFile.text = uri.getFileName(fragmentActivity)
+                }
+            }
+        }
+    }
+
+    sendButton.setOnClickListener {
+        presenter.uploadFile(chatRoomId, uri, (citation ?: "") + description.text.toString())
+        alertDialog.dismiss()
+    }
+    cancelButton.setOnClickListener { alertDialog.dismiss() }
+    alertDialog.show()
+}
+
+fun ChatRoomFragment.showDrawAttachmentDialog(byteArray: ByteArray) {
+    description.text.clear()
+    imagePreview.isVisible = true
+    imagePreview.setImageDrawable(Drawable.createFromStream(byteArray.inputStream(), ""))
+
+    sendButton.setOnClickListener {
+        presenter.uploadDrawingImage(
+            chatRoomId,
+            byteArray,
+            (citation ?: "") + description.text.toString()
+        )
+        alertDialog.dismiss()
+    }
+
+    cancelButton.setOnClickListener { alertDialog.dismiss() }
+    alertDialog.show()
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/adapter/LoadingItemHolder.kt

+package chat.rocket.android.chatrooms.adapter
+
+class LoadingItemHolder : ItemHolder<Unit> {
+    override val data: Unit
+        get() = Unit
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/adapter/LoadingViewHolder.kt

+package chat.rocket.android.chatrooms.adapter
+
+import android.view.View
+
+class LoadingViewHolder(itemView: View) : ViewHolder<ItemHolder<Unit>>(itemView) {
+    override fun bindViews(data: ItemHolder<Unit>) {
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt

@@ -18,8 +18,11 @@ import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.date
 import chat.rocket.android.util.extensions.localDateTime
 import chat.rocket.common.model.RoomType
+import chat.rocket.common.model.User
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.model.userStatusOf
+import chat.rocket.core.model.Room
+import chat.rocket.core.model.SpotlightResult
 
 class RoomUiModelMapper(
     private val context: Application,
@@ -34,7 +37,7 @@ class RoomUiModelMapper(
     private val messageUnreadColor = ContextCompat.getColor(context, android.R.color.primary_text_light)
     private val messageColor = ContextCompat.getColor(context, R.color.colorSecondaryText)
 
-    fun map(rooms: List<ChatRoom>, grouped: Boolean): List<ItemHolder<*>> {
+    fun map(rooms: List<ChatRoom>, grouped: Boolean = false): List<ItemHolder<*>> {
         val list = ArrayList<ItemHolder<*>>(rooms.size + 4)
         var lastType: String? = null
         rooms.forEach { room ->
@@ -48,6 +51,47 @@ class RoomUiModelMapper(
         return list
     }
 
+    fun map(spotlight: SpotlightResult): List<ItemHolder<*>> {
+        val list = ArrayList<ItemHolder<*>>(spotlight.users.size + spotlight.rooms.size)
+        spotlight.users.filterNot { it.username.isNullOrEmpty() }.forEach { user ->
+            list.add(RoomItemHolder(mapUser(user)))
+        }
+        spotlight.rooms.filterNot { it.name.isNullOrEmpty() }.forEach { room ->
+            list.add(RoomItemHolder(mapRoom(room)))
+        }
+
+        return list
+    }
+
+    private fun mapUser(user: User): RoomUiModel {
+        return with(user) {
+            val name = mapName(user.username!!, user.name, false)
+            val status = user.status
+            val avatar = serverUrl.avatarUrl(user.username!!)
+
+            RoomUiModel(
+                id = user.id,
+                name = name,
+                type = roomTypeOf(RoomType.DIRECT_MESSAGE),
+                avatar = avatar,
+                status = status
+            )
+        }
+    }
+
+    private fun mapRoom(room: Room): RoomUiModel {
+        return with(room) {
+            RoomUiModel(
+                id = id,
+                name = name!!,
+                type = type,
+                avatar = serverUrl.avatarUrl(name!!, isGroupOrChannel = true),
+                lastMessage = mapLastMessage(lastMessage?.sender?.username,
+                        lastMessage?.sender?.name, lastMessage?.message)
+            )
+        }
+    }
+
     fun map(chatRoom: ChatRoom): RoomUiModel {
         return with(chatRoom.chatRoom) {
             val isUnread = alert || unread > 0
@@ -89,7 +133,7 @@ class RoomUiModelMapper(
         }
     }
 
-    private fun mapLastMessage(name: String?, fullName: String?, text: String?, unread: Boolean): CharSequence? {
+    private fun mapLastMessage(name: String?, fullName: String?, text: String?, unread: Boolean = false): CharSequence? {
         return if (!settings.showLastMessage()) {
             null
         } else if (name != null && text != null) {

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt

@@ -6,12 +6,13 @@ import android.view.View
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import chat.rocket.android.R
+import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.UserStatus
 import kotlinx.android.synthetic.main.item_chat.view.*
 import kotlinx.android.synthetic.main.unread_messages_badge.view.*
 
-class RoomViewHolder(itemView: View, private val listener: (String) -> Unit) : ViewHolder<RoomItemHolder>(itemView) {
+class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit) : ViewHolder<RoomItemHolder>(itemView) {
 
     private val resources: Resources = itemView.resources
     private val channelUnread: Drawable = resources.getDrawable(R.drawable.ic_hashtag_black_12dp)
@@ -57,7 +58,7 @@ class RoomViewHolder(itemView: View, private val listener: (String) -> Unit) : V
             }
 
             setOnClickListener {
-                listener(room.id)
+                listener(room)
             }
         }
     }

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomsAdapter.kt

@@ -3,9 +3,10 @@ package chat.rocket.android.chatrooms.adapter
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.util.extensions.inflate
 
-class RoomsAdapter(private val listener: (String) -> Unit) : RecyclerView.Adapter<ViewHolder<*>>() {
+class RoomsAdapter(private val listener: (RoomUiModel) -> Unit) : RecyclerView.Adapter<ViewHolder<*>>() {
 
     init {
         setHasStableIds(true)
@@ -18,14 +19,17 @@ class RoomsAdapter(private val listener: (String) -> Unit) : RecyclerView.Adapte
         }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<*> {
-        if (viewType == 0) {
+        if (viewType == VIEW_TYPE_ROOM) {
             val view = parent.inflate(R.layout.item_chat)
             return RoomViewHolder(view, listener)
-        } else if (viewType == 1) {
+        } else if (viewType == VIEW_TYPE_HEADER) {
             val view = parent.inflate(R.layout.item_chatroom_header)
             return HeaderViewHolder(view)
+        } else if (viewType == VIEW_TYPE_LOADING) {
+            val view = parent.inflate(R.layout.item_loading)
+            return LoadingViewHolder(view)
         }
-        throw IllegalStateException("View type must be either Room or Header")
+        throw IllegalStateException("View type must be either Room, Header or Loading")
     }
 
     override fun getItemCount() = values.size
@@ -35,15 +39,17 @@ class RoomsAdapter(private val listener: (String) -> Unit) : RecyclerView.Adapte
         return when(item) {
             is HeaderItemHolder -> item.data.hashCode().toLong()
             is RoomItemHolder -> item.data.id.hashCode().toLong()
-            else -> throw IllegalStateException("View type must be either Room or Header")
+            is LoadingItemHolder -> "loading".hashCode().toLong()
+            else -> throw IllegalStateException("View type must be either Room, Header or Loading")
         }
     }
 
     override fun getItemViewType(position: Int): Int {
         return when(values[position]) {
-            is RoomItemHolder -> 0
-            is HeaderItemHolder -> 1
-            else -> throw IllegalStateException("View type must be either Room or Header")
+            is RoomItemHolder -> VIEW_TYPE_ROOM
+            is HeaderItemHolder -> VIEW_TYPE_HEADER
+            is LoadingItemHolder -> VIEW_TYPE_LOADING
+            else -> throw IllegalStateException("View type must be either Room, Header or Loading")
         }
     }
 
@@ -55,4 +61,9 @@ class RoomsAdapter(private val listener: (String) -> Unit) : RecyclerView.Adapte
         }
     }
 
+    companion object {
+        const val VIEW_TYPE_ROOM = 1
+        const val VIEW_TYPE_HEADER = 2
+        const val VIEW_TYPE_LOADING = 3
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt

@@ -8,9 +8,9 @@ data class RoomUiModel(
     val type: RoomType,
     val name: CharSequence,
     val avatar: String,
-    val date: CharSequence?,
-    val unread: String?,
-    val alert: Boolean,
-    val lastMessage: CharSequence?,
-    val status: UserStatus?
+    val date: CharSequence? = null,
+    val unread: String? = null,
+    val alert: Boolean = false,
+    val lastMessage: CharSequence? = null,
+    val status: UserStatus? = null
 )
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt

@@ -71,7 +71,8 @@ class ChatRoomsFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideFetchChatRoomsInteractor(client: RocketChatClient, dbManager: DatabaseManager): FetchChatRoomsInteractor {
+    fun provideFetchChatRoomsInteractor(client: RocketChatClient,
+                                        dbManager: DatabaseManager): FetchChatRoomsInteractor {
         return FetchChatRoomsInteractor(client, dbManager)
     }
 

app/src/main/java/chat/rocket/android/chatrooms/domain/FetchChatRoomsInteractor.kt

@@ -3,13 +3,12 @@ package chat.rocket.android.chatrooms.domain
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.model.ChatRoomEntity
 import chat.rocket.android.db.model.UserEntity
+import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.chatRooms
 import chat.rocket.core.model.ChatRoom
 import chat.rocket.core.model.userId
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
 
 class FetchChatRoomsInteractor(
@@ -18,21 +17,15 @@ class FetchChatRoomsInteractor(
 ) {
 
     suspend fun refreshChatRooms() {
-        launch(CommonPool) {
-            try {
-                val rooms = retryIO("fetch chatRooms", times = 10,
-                        initialDelay = 200, maxDelay = 2000) {
-                    client.chatRooms().update.map { room ->
-                        mapChatRoom(room)
-                    }
-                }
-
-                Timber.d("Refreshing rooms: $rooms")
-                dbManager.insert(rooms)
-            } catch (ex: Exception) {
-                Timber.d(ex, "Error getting chatrooms")
+        val rooms = retryIO("fetch chatRooms", times = 10,
+                initialDelay = 200, maxDelay = 2000) {
+            client.chatRooms().update.map { room ->
+                mapChatRoom(room)
             }
         }
+
+        Timber.d("Refreshing rooms: $rooms")
+        dbManager.insert(rooms)
     }
 
     private suspend fun mapChatRoom(room: ChatRoom): ChatRoomEntity {

app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt

@@ -5,7 +5,7 @@ import chat.rocket.android.db.ChatRoomDao
 import chat.rocket.android.db.model.ChatRoom
 import javax.inject.Inject
 
-class ChatRoomsRepository @Inject constructor(val dao: ChatRoomDao){
+class ChatRoomsRepository @Inject constructor(private val dao: ChatRoomDao){
     fun getChatRooms(order: Order): LiveData<List<ChatRoom>> {
         return when(order) {
             Order.ACTIVITY -> dao.getAll()
@@ -15,6 +15,10 @@ class ChatRoomsRepository @Inject constructor(val dao: ChatRoomDao){
         }
     }
 
+    fun search(query: String) = dao.searchSync(query)
+
+    fun count() = dao.count()
+
     enum class Order {
         ACTIVITY,
         GROUPED_ACTIVITY,

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt

 package chat.rocket.android.chatrooms.presentation
 
 import chat.rocket.android.R
+import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.model.ChatRoomEntity
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.main.presentation.MainNavigator
@@ -9,7 +12,7 @@ import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.infraestructure.ConnectionManager
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -26,6 +29,7 @@ class ChatRoomsPresenter @Inject constructor(
     private val strategy: CancelStrategy,
     private val navigator: MainNavigator,
     @Named("currentServer") private val currentServer: String,
+    private val dbManager: DatabaseManager,
     manager: ConnectionManager,
     private val localRepository: LocalRepository,
     private val userHelper: UserHelper,
@@ -34,8 +38,33 @@ class ChatRoomsPresenter @Inject constructor(
     private val client = manager.client
     private val settings = settingsRepository.get(currentServer)
 
-    fun loadChatRoom(chatRoom: chat.rocket.android.db.model.ChatRoom) {
-        with(chatRoom.chatRoom) {
+    fun loadChatRoom(chatRoom: RoomUiModel) {
+        launchUI(strategy) {
+            view.showLoadingRoom(chatRoom.name)
+            try {
+                val room = dbManager.getRoom(chatRoom.id)
+                if (room != null) {
+                    loadChatRoom(room.chatRoom)
+                } else {
+                    with(chatRoom) {
+                        val entity = ChatRoomEntity(
+                            id = id,
+                            subscriptionId = "",
+                            type = type.toString(),
+                            name = name.toString(),
+                            open = false
+                        )
+                        loadChatRoom(entity)
+                    }
+                }
+            } finally {
+                view.hideLoadingRoom()
+            }
+        }
+    }
+
+    fun loadChatRoom(chatRoom: ChatRoomEntity) {
+        with(chatRoom) {
             val isDirectMessage = roomTypeOf(type) is RoomType.DirectMessage
             val roomName = if (settings.useSpecialCharsOnRoom() || (isDirectMessage && settings.useRealName())) {
                     fullname ?: name
@@ -61,7 +90,7 @@ class ChatRoomsPresenter @Inject constructor(
                     }
 
                     navigator.toChatRoom(
-                        chatRoomId =  id,
+                        chatRoomId = id,
                         chatRoomName = roomName,
                         chatRoomType = type,
                         isReadOnly = readonly ?: false,

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsView.kt

@@ -2,22 +2,9 @@ package chat.rocket.android.chatrooms.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
-import chat.rocket.core.internal.realtime.socket.model.State
-import chat.rocket.core.model.ChatRoom
 
 interface ChatRoomsView : LoadingView, MessageView {
+    fun showLoadingRoom(name: CharSequence)
 
-    /**
-     * Shows the chat rooms.
-     *
-     * @param newDataSet The new data set to show.
-     */
-    suspend fun updateChatRooms(newDataSet: List<ChatRoom>)
-
-    /**
-     *  Shows no chat rooms to display.
-     */
-    fun showNoChatRoomsToDisplay()
-
-    fun showConnectionState(state: State)
+    fun hideLoadingRoom()
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt

 package chat.rocket.android.chatrooms.ui
 
 import android.app.AlertDialog
+import android.app.ProgressDialog
 import android.os.Bundle
 import android.os.Handler
 import android.view.LayoutInflater
@@ -21,27 +22,25 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import chat.rocket.android.R
 import chat.rocket.android.chatrooms.adapter.RoomsAdapter
-import chat.rocket.android.chatrooms.infrastructure.ChatRoomsRepository
 import chat.rocket.android.chatrooms.presentation.ChatRoomsPresenter
 import chat.rocket.android.chatrooms.presentation.ChatRoomsView
 import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModel
 import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModelFactory
+import chat.rocket.android.chatrooms.viewmodel.LoadingState
+import chat.rocket.android.chatrooms.viewmodel.Query
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.helper.ChatRoomsSortOrder
 import chat.rocket.android.helper.Constants
 import chat.rocket.android.helper.SharedPreferenceHelper
+import chat.rocket.android.util.extensions.fadeIn
+import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
-import chat.rocket.android.util.extensions.fadeIn
-import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.widget.DividerItemDecoration
 import chat.rocket.core.internal.realtime.socket.model.State
-import chat.rocket.core.model.ChatRoom
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_chat_rooms.*
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -58,9 +57,12 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     lateinit var viewModel: ChatRoomsViewModel
 
     private var searchView: SearchView? = null
+    private var sortView: MenuItem? = null
+
     private val handler = Handler()
 
     private var chatRoomId: String? = null
+    private var progressDialog: ProgressDialog? = null
 
     companion object {
         fun newInstance(chatRoomId: String? = null): ChatRoomsFragment {
@@ -109,16 +111,8 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
     private fun subscribeUi() {
         ui {
-
-            val adapter = RoomsAdapter { roomId ->
-                launch(UI) {
-                    dbManager.getRoom(roomId)?.let { room ->
-                        ui {
-                            presenter.loadChatRoom(room)
-                        }
-                    }
-
-                }
+            val adapter = RoomsAdapter { room ->
+                presenter.loadChatRoom(room)
             }
 
             recycler_view.layoutManager = LinearLayoutManager(it)
@@ -132,6 +126,23 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
                 rooms?.let {
                     Timber.d("Got items: $it")
                     adapter.values = it
+                    if (rooms.isNotEmpty()) {
+                        text_no_data_to_display.isVisible = false
+                    }
+                }
+            })
+
+            viewModel.loadingState.observe(viewLifecycleOwner, Observer { state ->
+                when(state) {
+                    is LoadingState.Loading -> if (state.count == 0L) showLoading()
+                    is LoadingState.Loaded -> {
+                        hideLoading()
+                        if (state.count == 0L) showNoChatRoomsToDisplay()
+                    }
+                    is LoadingState.Error -> {
+                        hideLoading()
+                        showGenericErrorMessage()
+                    }
                 }
             })
 
@@ -147,6 +158,8 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.chatrooms, menu)
 
+        sortView = menu.findItem(R.id.action_sort)
+
         val searchItem = menu.findItem(R.id.action_search)
         searchView = searchItem?.actionView as? SearchView
         searchView?.setIconifiedByDefault(false)
@@ -160,6 +173,21 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
                 return queryChatRoomsByName(newText)
             }
         })
+
+        val expandListener = object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                // Simply setting sortView to visible won't work, so we invalidate the options
+                // to recreate the entire menu...
+                activity?.invalidateOptionsMenu()
+                return true
+            }
+
+            override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                sortView?.isVisible = false
+                return true
+            }
+        }
+        searchItem?.setOnActionExpandListener(expandListener)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -209,25 +237,17 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         val sortType = SharedPreferenceHelper.getInt(Constants.CHATROOM_SORT_TYPE_KEY, ChatRoomsSortOrder.ACTIVITY)
         val grouped = SharedPreferenceHelper.getBoolean(Constants.CHATROOM_GROUP_BY_TYPE_KEY, false)
 
-        val order = when(sortType) {
+        val query = when(sortType) {
             ChatRoomsSortOrder.ALPHABETICAL -> {
-                if (grouped) {
-                    ChatRoomsRepository.Order.GROUPED_NAME
-                } else {
-                    ChatRoomsRepository.Order.NAME
-                }
+                Query.ByName(grouped)
             }
             ChatRoomsSortOrder.ACTIVITY -> {
-                if (grouped) {
-                    ChatRoomsRepository.Order.GROUPED_ACTIVITY
-                } else {
-                    ChatRoomsRepository.Order.ACTIVITY
-                }
+                Query.ByActivity(grouped)
             }
-            else -> ChatRoomsRepository.Order.ACTIVITY
+            else -> Query.ByActivity()
         }
 
-        viewModel.setOrdering(order)
+        viewModel.setQuery(query)
     }
 
     private fun invalidateQueryOnSearch() {
@@ -238,20 +258,16 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         }
     }
 
-    override suspend fun updateChatRooms(newDataSet: List<ChatRoom>) {}
-
-    override fun showNoChatRoomsToDisplay() {
+    private fun showNoChatRoomsToDisplay() {
         ui { text_no_data_to_display.isVisible = true }
     }
 
     override fun showLoading() {
-        ui { view_loading.isVisible = true }
+        view_loading.isVisible = true
     }
 
     override fun hideLoading() {
-        ui {
-            view_loading.isVisible = false
-        }
+        view_loading.isVisible = false
     }
 
     override fun showMessage(resId: Int) {
@@ -268,7 +284,17 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
 
-    override fun showConnectionState(state: State) {
+    override fun showLoadingRoom(name: CharSequence) {
+        ui {
+            progressDialog = ProgressDialog.show(activity, "Rocket.Chat", "Loading room $name")
+        }
+    }
+
+    override fun hideLoadingRoom() {
+        progressDialog?.dismiss()
+    }
+
+    private fun showConnectionState(state: State) {
         Timber.d("Got new state: $state")
         ui {
             connection_status_text.fadeIn()
@@ -298,7 +324,11 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     }
 
     private fun queryChatRoomsByName(name: String?): Boolean {
-        //presenter.chatRoomsByName(name ?: "")
+        if (name.isNullOrEmpty()) {
+            updateSort()
+        } else {
+            viewModel.setQuery(Query.Search(name!!))
+        }
         return true
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt

@@ -5,19 +5,30 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import chat.rocket.android.chatrooms.adapter.ItemHolder
+import chat.rocket.android.chatrooms.adapter.LoadingItemHolder
 import chat.rocket.android.chatrooms.adapter.RoomUiModelMapper
 import chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
 import chat.rocket.android.chatrooms.infrastructure.ChatRoomsRepository
-import chat.rocket.android.chatrooms.infrastructure.isGrouped
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.util.livedata.transform
+import chat.rocket.android.util.livedata.wrap
+import chat.rocket.android.util.retryIO
+import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.realtime.socket.model.State
+import chat.rocket.core.internal.rest.spotlight
+import chat.rocket.core.model.SpotlightResult
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.delay
+import kotlinx.coroutines.experimental.isActive
 import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.newSingleThreadContext
+import kotlinx.coroutines.experimental.withContext
 import me.henrytao.livedataktx.distinct
 import me.henrytao.livedataktx.map
 import me.henrytao.livedataktx.nonNull
 import timber.log.Timber
+import java.security.InvalidParameterException
+import kotlin.coroutines.experimental.coroutineContext
 
 class ChatRoomsViewModel(
     private val connectionManager: ConnectionManager,
@@ -25,31 +36,65 @@ class ChatRoomsViewModel(
     private val repository: ChatRoomsRepository,
     private val mapper: RoomUiModelMapper
 ) : ViewModel() {
-    private val ordering: MutableLiveData<ChatRoomsRepository.Order> = MutableLiveData()
+    private val query = MutableLiveData<Query>()
+    val loadingState = MutableLiveData<LoadingState>()
     private val runContext = newSingleThreadContext("chat-rooms-view-model")
+    private val client = connectionManager.client
+    private var loaded = false
 
-    init {
-        ordering.value = ChatRoomsRepository.Order.ACTIVITY
-    }
+    fun getChatRooms(): LiveData<RoomsModel> {
+        return Transformations.switchMap(query) { query ->
+            return@switchMap if (query.isSearch()) {
+                this@ChatRoomsViewModel.query.wrap(runContext) { _, data: MutableLiveData<RoomsModel> ->
+                    val string = (query as Query.Search).query
 
-    fun getChatRooms(): LiveData<List<ItemHolder<*>>> {
-        return Transformations.switchMap(ordering) { order ->
-            Timber.d("Querying rooms for order: $order")
-            repository.getChatRooms(order)
-                    .nonNull()
-                    .distinct()
-                    .transform(runContext) { rooms ->
-                        rooms?.let {
-                            mapper.map(rooms, order.isGrouped())
-                        }
+                    // debounce, to not query while the user is writing
+                    delay(200)
+                    // TODO - find a better way for cancellation checking
+                    if (!coroutineContext.isActive) return@wrap
+
+                    val rooms = repository.search(string).let { mapper.map(it) }
+                    data.postValue(rooms.toMutableList() + LoadingItemHolder())
+                    if (!coroutineContext.isActive) return@wrap
+
+                    val spotlight = spotlight(query.query)?.let { mapper.map(it) }
+                    if (!coroutineContext.isActive) return@wrap
+
+                    spotlight?.let {
+                        data.postValue(rooms.toMutableList() + spotlight)
+                    }.ifNull {
+                        data.postValue(rooms)
                     }
+                }
+            } else {
+                repository.getChatRooms(query.asSortingOrder())
+                        .nonNull()
+                        .distinct()
+                        .transform(runContext) { rooms ->
+                            val mappedRooms = rooms?.let {
+                                mapper.map(rooms, query.isGrouped())
+                            }
+                            if (loaded && mappedRooms?.isEmpty() == true) {
+                                loadingState.postValue(LoadingState.Loaded(0))
+                            }
+                            mappedRooms
+                        }
+            }
+        }
+    }
+
+    private suspend fun spotlight(query: String): SpotlightResult? {
+        return try {
+            retryIO { client.spotlight(query) }
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+            null
         }
     }
 
     fun getStatus(): MutableLiveData<State> {
         return connectionManager.statusLiveData.nonNull().distinct().map { state ->
             if (state is State.Connected) {
-                // TODO - add a loading status...
                 fetchRooms()
             }
             state
@@ -58,11 +103,69 @@ class ChatRoomsViewModel(
 
     private fun fetchRooms() {
         launch {
-            interactor.refreshChatRooms()
+            setLoadingState(LoadingState.Loading(repository.count()))
+            try {
+                interactor.refreshChatRooms()
+                setLoadingState(LoadingState.Loaded(repository.count()))
+                loaded = true
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error refreshing chatrooms")
+                setLoadingState(LoadingState.Error(repository.count()))
+            }
+        }
+    }
+
+    fun setQuery(query: Query) {
+        this.query.value = query
+    }
+
+    private suspend fun setLoadingState(state: LoadingState) {
+        withContext(UI) {
+            loadingState.value = state
         }
     }
+}
+
+typealias RoomsModel = List<ItemHolder<*>>
+
+sealed class LoadingState {
+    data class Loading(val count: Long) : LoadingState()
+    data class Loaded(val count: Long) : LoadingState()
+    data class Error(val count: Long) : LoadingState()
+}
+
+sealed class Query {
+    data class ByActivity(val grouped: Boolean = false) : Query()
+    data class ByName(val grouped: Boolean = false) : Query()
+    data class Search(val query: String) : Query()
+}
+
+fun Query.isSearch(): Boolean = this is Query.Search
 
-    fun setOrdering(order: ChatRoomsRepository.Order) {
-        ordering.value = order
+fun Query.isGrouped(): Boolean {
+    return when(this) {
+        is Query.Search -> false
+        is Query.ByName -> grouped
+        is Query.ByActivity -> grouped
+    }
+}
+
+fun Query.asSortingOrder(): ChatRoomsRepository.Order {
+    return when(this) {
+        is Query.ByName -> {
+            if (grouped) {
+                ChatRoomsRepository.Order.GROUPED_NAME
+            } else {
+                ChatRoomsRepository.Order.NAME
+            }
+        }
+        is Query.ByActivity -> {
+            if (grouped) {
+                ChatRoomsRepository.Order.GROUPED_ACTIVITY
+            } else {
+                ChatRoomsRepository.Order.ACTIVITY
+            }
+        }
+        else -> throw InvalidParameterException("Should be ByName or ByActivity")
     }
 }

app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelPresenter.kt

@@ -5,7 +5,7 @@ import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.util.ifNull

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

@@ -14,6 +14,8 @@ import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatrooms.di.ChatRoomsFragmentProvider
 import chat.rocket.android.createchannel.di.CreateChannelProvider
 import chat.rocket.android.dagger.scope.PerActivity
+import chat.rocket.android.draw.main.di.DrawModule
+import chat.rocket.android.draw.main.ui.DrawingActivity
 import chat.rocket.android.favoritemessages.di.FavoriteMessagesFragmentProvider
 import chat.rocket.android.files.di.FilesFragmentProvider
 import chat.rocket.android.main.di.MainModule
@@ -78,4 +80,8 @@ abstract class ActivityBuilder {
     @PerActivity
     @ContributesAndroidInjector(modules = [ChangeServerModule::class])
     abstract fun bindChangeServerActivity(): ChangeServerActivity
+
+    @PerActivity
+    @ContributesAndroidInjector(modules = [DrawModule::class])
+    abstract fun bindDrawingActivity(): DrawingActivity
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt

@@ -20,6 +20,17 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
         """)
     abstract fun get(id: String): ChatRoom?
 
+    @Transaction
+    @Query("$BASE_QUERY")
+    abstract fun getAllSync(): List<ChatRoom>
+
+    @Transaction
+    @Query("""$BASE_QUERY WHERE chatrooms.name LIKE '%' || :query || '%' OR  users.name LIKE '%' || :query || '%'""")
+    abstract fun searchSync(query: String): List<ChatRoom>
+
+    @Query("SELECT COUNT(id) FROM chatrooms")
+    abstract fun count(): Long
+
     @Transaction
     @Query("""
         $BASE_QUERY
@@ -62,6 +73,15 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
     @Query("DELETE FROM chatrooms WHERE ID = :id")
     abstract fun delete(id: String)
 
+    @Query("DELETE FROM chatrooms")
+    abstract fun delete()
+
+    @Transaction
+    open fun cleanInsert(chatRooms: List<ChatRoomEntity>) {
+        delete()
+        insert(chatRooms)
+    }
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insertOrReplace(chatRooms: List<ChatRoomEntity>)
 

app/src/main/java/chat/rocket/android/db/DatabaseManager.kt

@@ -35,6 +35,10 @@ class DatabaseManager(val context: Application,
     fun chatRoomDao(): ChatRoomDao = database.chatRoomDao()
     fun userDao(): UserDao = database.userDao()
 
+    fun logout() {
+        database.clearAllTables()
+    }
+
     suspend fun getRoom(id: String) = withContext(dbContext) {
         chatRoomDao().get(id)
     }
@@ -297,7 +301,7 @@ class DatabaseManager(val context: Application,
 
     suspend fun insert(rooms: List<ChatRoomEntity>) {
         withContext(dbContext) {
-            chatRoomDao().insert(rooms)
+            chatRoomDao().cleanInsert(rooms)
         }
     }
 

app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt

@@ -24,9 +24,9 @@ data class ChatRoomEntity(
     var subscriptionId: String,
     var type: String,
     var name: String,
-    var fullname: String?,
-    var userId: String?,
-    var ownerId: String?,
+    var fullname: String? = null,
+    var userId: String? = null,
+    var ownerId: String? = null,
     var readonly: Boolean? = false,
     var isDefault: Boolean? = false,
     var favorite: Boolean? = false,
@@ -38,9 +38,9 @@ data class ChatRoomEntity(
     var updatedAt: Long? = -1,
     var timestamp: Long? = -1,
     var lastSeen: Long? = -1,
-    var lastMessageText: String?,
-    var lastMessageUserId: String?,
-    var lastMessageTimestamp: Long?
+    var lastMessageText: String? = null,
+    var lastMessageUserId: String? = null,
+    var lastMessageTimestamp: Long? = null
 )
 
 data class ChatRoom(

app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt

@@ -4,7 +4,7 @@ import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull

app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt

@@ -6,7 +6,7 @@ import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.files.uimodel.FileUiModel
 import chat.rocket.android.files.uimodel.FileUiModelMapper
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull

app/src/main/java/chat/rocket/android/helper/OauthHelper.kt

@@ -84,7 +84,7 @@ object OauthHelper {
      * @return The Facebook Oauth URL.
      */
     fun getFacebookOauthUrl(clientId: String, serverUrl: String, state: String): String {
-        return  "https://facebook.com/v2.9/dialog/oauth" +
+        return "https://facebook.com/v2.9/dialog/oauth" +
                 "?client_id=$clientId" +
                 "&redirect_uri=${serverUrl.removeTrailingSlash()}/_oauth/facebook?close" +
                 "&state=$state" +
@@ -113,12 +113,18 @@ object OauthHelper {
         state: String,
         scope: String
     ): String {
-        return host +
-                authorizePath +
+        (authorizePath +
                 "?client_id=$clientId" +
                 "&redirect_uri=${serverUrl.removeTrailingSlash()}/_oauth/$serviceName" +
                 "&state=$state" +
                 "&scope=$scope" +
                 "&response_type=code"
+                ).let {
+            return if (it.contains(host)) {
+                it
+            } else {
+                host + it
+            }
+        }
     }
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/infrastructure/LocalRepository.kt

@@ -18,6 +18,8 @@ interface LocalRepository {
     fun clearAllFromServer(server: String)
     fun getCurrentUser(url: String): User?
     fun saveCurrentUser(url: String, user: User)
+    fun saveLastChatroomsRefresh(url: String, timestamp: Long)
+    fun getLastChatroomsRefresh(url: String): Long
 
     companion object {
         const val KEY_PUSH_TOKEN = "KEY_PUSH_TOKEN"
@@ -26,6 +28,7 @@ interface LocalRepository {
         const val PERMISSIONS_KEY = "permissions_"
         const val USER_KEY = "user_"
         const val CURRENT_USERNAME_KEY = "username_"
+        const val LAST_CHATROOMS_REFRESH = "_chatrooms_refresh"
     }
 }
 

app/src/main/java/chat/rocket/android/infrastructure/SharedPreferencesLocalRepository.kt

@@ -22,6 +22,13 @@ class SharedPreferencesLocalRepository(
         save("${url}_${LocalRepository.USER_KEY}", userAdapter.toJson(user))
     }
 
+    override fun saveLastChatroomsRefresh(url: String, timestamp: Long) {
+        save("$url${LocalRepository.LAST_CHATROOMS_REFRESH}", timestamp)
+    }
+
+    override fun getLastChatroomsRefresh(url: String) =
+        getLong("$url${LocalRepository.LAST_CHATROOMS_REFRESH}", 0L)
+
     override fun getBoolean(key: String, defValue: Boolean) = preferences.getBoolean(key, defValue)
 
     override fun getFloat(key: String, defValue: Float) = preferences.getFloat(key, defValue)

app/src/main/java/chat/rocket/android/main/di/MainModule.kt

 package chat.rocket.android.main.di
 
 import androidx.lifecycle.LifecycleOwner
-import android.content.Context
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity
-import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.main.presentation.MainView
 import chat.rocket.android.main.ui.MainActivity
@@ -30,5 +28,6 @@ class MainModule {
     fun provideLifecycleOwner(activity: MainActivity): LifecycleOwner = activity
 
     @Provides
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy = CancelStrategy(owner, jobs)
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy =
+        CancelStrategy(owner, jobs)
 }
\ No newline at end of file

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

 package chat.rocket.android.main.presentation
 
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.main.uimodel.NavHeaderUiModel
 import chat.rocket.android.main.uimodel.NavHeaderUiModelMapper
-import chat.rocket.android.server.domain.*
+import chat.rocket.android.server.domain.GetAccountsInteractor
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.domain.GetSettingsInteractor
+import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.RemoveAccountInteractor
+import chat.rocket.android.server.domain.SaveAccountInteractor
+import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.domain.favicon
 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.extension.launchUI
 import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO
@@ -23,7 +31,9 @@ import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.unregisterPushToken
 import chat.rocket.core.model.Myself
+import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.channels.Channel
+import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -39,11 +49,13 @@ class MainPresenter @Inject constructor(
         private val getAccountsInteractor: GetAccountsInteractor,
         private val removeAccountInteractor: RemoveAccountInteractor,
         private val factory: RocketChatClientFactory,
+        dbManagerFactory: DatabaseManagerFactory,
         getSettingsInteractor: GetSettingsInteractor,
         managerFactory: ConnectionManagerFactory
 ) : CheckServerPresenter(strategy, factory, view = view) {
     private val currentServer = serverInteractor.get()!!
     private val manager = managerFactory.create(currentServer)
+    private val dbManager = dbManagerFactory.create(currentServer)
     private val client: RocketChatClient = factory.create(currentServer)
     private var settings: PublicSettings = getSettingsInteractor.get(serverInteractor.get()!!)
 
@@ -91,6 +103,7 @@ class MainPresenter @Inject constructor(
      */
     fun logout() {
         launchUI(strategy) {
+            view.showProgress()
             try {
                 clearTokens()
                 retryIO("logout") { client.logout() }
@@ -107,10 +120,13 @@ class MainPresenter @Inject constructor(
                 disconnect()
                 removeAccountInteractor.remove(currentServer)
                 tokenRepository.remove(currentServer)
+
+                withContext(CommonPool) { dbManager.logout() }
                 navigator.toNewServer()
             } catch (ex: Exception) {
                 Timber.d(ex, "Error cleaning up the session...")
             }
+            view.hideProgress()
         }
     }
 

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

@@ -26,4 +26,7 @@ interface MainView : MessageView, VersionCheckView {
     fun closeServerSelection()
 
     fun invalidateToken(token: String)
+
+    fun showProgress()
+    fun hideProgress()
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package chat.rocket.android.main.ui
 import DrawableHelper
 import android.app.Activity
 import android.app.AlertDialog
+import android.app.ProgressDialog
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.appcompat.app.AppCompatActivity
@@ -269,4 +270,14 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     fun setCheckedNavDrawerItem(@IdRes item: Int) {
         view_navigation.setCheckedItem(item)
     }
+
+    private var progressDialog : ProgressDialog? = null
+    override fun showProgress() {
+        progressDialog = ProgressDialog.show(this, getString(R.string.app_name), getString(R.string.msg_log_out), true, false)
+    }
+
+    override fun hideProgress() {
+        progressDialog?.dismiss()
+        progressDialog = null
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt

@@ -5,7 +5,7 @@ import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.members.uimodel.MemberUiModel
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull

app/src/main/java/chat/rocket/android/mentions/presentention/MentionsPresenter.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.mentions.presentention
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.rest.getMentions

app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt

@@ -4,7 +4,7 @@ import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull

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

@@ -4,8 +4,8 @@ import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
@@ -15,10 +15,12 @@ import chat.rocket.core.internal.rest.setAvatar
 import chat.rocket.core.internal.rest.updateProfile
 import javax.inject.Inject
 
-class ProfilePresenter @Inject constructor(private val view: ProfileView,
-                                           private val strategy: CancelStrategy,
-                                           serverInteractor: GetCurrentServerInteractor,
-                                           factory: RocketChatClientFactory) {
+class ProfilePresenter @Inject constructor(
+    private val view: ProfileView,
+    private val strategy: CancelStrategy,
+    serverInteractor: GetCurrentServerInteractor,
+    factory: RocketChatClientFactory
+) {
     private val serverUrl = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(serverUrl)
     private lateinit var myselfId: String
@@ -37,10 +39,10 @@ class ProfilePresenter @Inject constructor(private val view: ProfileView,
                     val avatarUrl = serverUrl.avatarUrl(username)
                     val email = myself.emails?.getOrNull(0)?.address
                     view.showProfile(
-                            avatarUrl,
-                            myself.name ?: "",
-                            myself.username ?: "",
-                            email
+                        avatarUrl,
+                        myself.name ?: "",
+                        myself.username ?: "",
+                        email
                     )
                 }
             } catch (exception: RocketChatException) {
@@ -55,11 +57,14 @@ class ProfilePresenter @Inject constructor(private val view: ProfileView,
         launchUI(strategy) {
             view.showLoading()
             try {
-                if(avatarUrl!="") {
+                if (avatarUrl != "") {
                     retryIO { client.setAvatar(avatarUrl) }
                 }
-                val user = retryIO { client.updateProfile(
-                    userId = myselfId, email = email, name = name, username = username) }
+                val user = retryIO {
+                    client.updateProfile(
+                        userId = myselfId, email = email, name = name, username = username
+                    )
+                }
                 view.showProfileUpdateSuccessfullyMessage()
                 loadUserProfile()
             } catch (exception: RocketChatException) {

app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.server.infraestructure
 
 import androidx.lifecycle.MutableLiveData
 import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.common.model.BaseRoom
 import chat.rocket.common.model.User
 import chat.rocket.core.RocketChatClient
@@ -40,10 +41,8 @@ class ConnectionManager(
     private val statusChannel = Channel<State>(Channel.CONFLATED)
     private var connectJob: Job? = null
 
-    private val roomAndSubscriptionChannels = ArrayList<Channel<StreamMessage<BaseRoom>>>()
     private val roomMessagesChannels = LinkedHashMap<String, Channel<Message>>()
     private val userDataChannels = ArrayList<Channel<Myself>>()
-    private val activeUsersChannels = ArrayList<Channel<User>>()
     private val subscriptionIdMap = HashMap<String, String>()
 
     private var subscriptionId: String? = null
@@ -126,9 +125,6 @@ class ConnectionManager(
             for (room in client.roomsChannel) {
                 Timber.d("GOT Room streamed")
                 roomsActor.send(room)
-                for (channel in roomAndSubscriptionChannels) {
-                    channel.send(room)
-                }
             }
         }
 
@@ -137,9 +133,6 @@ class ConnectionManager(
             for (subscription in client.subscriptionsChannel) {
                 Timber.d("GOT Subscription streamed")
                 roomsActor.send(subscription)
-                for (channel in roomAndSubscriptionChannels) {
-                    channel.send(subscription)
-                }
             }
         }
 
@@ -170,9 +163,6 @@ class ConnectionManager(
                 totalUsers++
                 //Timber.d("Got activeUsers: $totalUsers")
                 userActor.send(user)
-                for (channel in activeUsersChannels) {
-                    channel.send(user)
-                }
             }
         }
 
@@ -205,20 +195,10 @@ class ConnectionManager(
 
     fun removeStatusChannel(channel: Channel<State>) = statusChannelList.remove(channel)
 
-    fun addRoomsAndSubscriptionsChannel(channel: Channel<StreamMessage<BaseRoom>>) =
-        roomAndSubscriptionChannels.add(channel)
-
-    fun removeRoomsAndSubscriptionsChannel(channel: Channel<StreamMessage<BaseRoom>>) =
-        roomAndSubscriptionChannels.remove(channel)
-
     fun addUserDataChannel(channel: Channel<Myself>) = userDataChannels.add(channel)
 
     fun removeUserDataChannel(channel: Channel<Myself>) = userDataChannels.remove(channel)
 
-    fun addActiveUserChannel(channel: Channel<User>) = activeUsersChannels.add(channel)
-
-    fun removeActiveUserChannel(channel: Channel<User>) = activeUsersChannels.remove(channel)
-
     fun subscribeRoomMessages(roomId: String, channel: Channel<Message>) {
         val oldSub = roomMessagesChannels.put(roomId, channel)
         if (oldSub != null) {

app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManagerFactory.kt

 package chat.rocket.android.server.infraestructure
 
 import chat.rocket.android.db.DatabaseManagerFactory
+import chat.rocket.android.infrastructure.LocalRepository
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton

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

@@ -4,7 +4,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.util.ifNull
 import javax.inject.Inject
 

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

@@ -5,15 +5,13 @@ import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.VersionInfo
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatInvalidProtocolException
 import chat.rocket.common.model.ServerInfo
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.serverInfo
-import kotlinx.coroutines.experimental.Deferred
 import kotlinx.coroutines.experimental.Job
-import kotlinx.coroutines.experimental.async
 import timber.log.Timber
 
 abstract class CheckServerPresenter constructor(private val strategy: CancelStrategy,
@@ -50,7 +48,7 @@ abstract class CheckServerPresenter constructor(private val strategy: CancelStra
                 }
             } catch (ex: Exception) {
                 Timber.d(ex, "Error getting server info")
-                when(ex) {
+                when (ex) {
                     is RocketChatInvalidProtocolException -> {
                         view.errorInvalidProtocol()
                     }

app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.settings.password.presentation
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.core.RocketChatClient

app/src/main/java/chat/rocket/android/util/HttpLoggingInterceptor.kt

 package chat.rocket.android.util
 
+import chat.rocket.android.BuildConfig
 import okhttp3.Headers
 import okhttp3.Interceptor
 import okhttp3.MediaType
@@ -28,6 +29,8 @@ class HttpLoggingInterceptor constructor(private val logger: Logger) : Intercept
     @Volatile
     internal var level = Level.NONE
 
+    private val isDebug = BuildConfig.DEBUG
+
     enum class Level {
         /** No logs.  */
         NONE,
@@ -140,7 +143,7 @@ class HttpLoggingInterceptor constructor(private val logger: Logger) : Intercept
                 val name = headers.name(i)
                 // Skip headers from the request body as they are explicitly logged above.
                 if (!"Content-Type".equals(name, ignoreCase = true) && !"Content-Length".equals(name, ignoreCase = true)) {
-                    if ("X-Auth-Token".equals(name, ignoreCase = true)) {
+                    if (!isDebug && "X-Auth-Token".equals(name, ignoreCase = true)) {
                         logger.log("$name: ${skipAuthToken(headers.value(i).length)}")
                     } else {
                         logger.log("$name: ${headers.value(i)}")

app/src/main/java/chat/rocket/android/util/IO.kt

 package chat.rocket.android.util
 
 import chat.rocket.common.RocketChatNetworkErrorException
+import kotlinx.coroutines.experimental.TimeoutCancellationException
 import kotlinx.coroutines.experimental.delay
+import kotlinx.coroutines.experimental.isActive
 import timber.log.Timber
+import kotlin.coroutines.experimental.coroutineContext
 
 const val DEFAULT_RETRY = 3
 
@@ -16,14 +19,19 @@ suspend fun <T> retryIO(
 {
     var currentDelay = initialDelay
     repeat(times - 1) { currentTry ->
+        if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
         try {
             return block()
         } catch (e: RocketChatNetworkErrorException) {
             Timber.d(e, "failed call($currentTry): $description")
             e.printStackTrace()
         }
+
+        if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
         delay(currentDelay)
         currentDelay = (currentDelay * factor).toLong().coerceAtMost(maxDelay)
     }
+
+    if (!coroutineContext.isActive) throw TimeoutCancellationException("job canceled")
     return block() // last attempt
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/extensions/Image.kt

-package chat.rocket.android.util.extensions
-
-import android.graphics.Bitmap
-
-fun Bitmap.getCompressFormat(mimeType: String): Bitmap.CompressFormat {
-    return when {
-        mimeType.contains("jpeg") -> Bitmap.CompressFormat.JPEG
-        mimeType.contains("webp") -> Bitmap.CompressFormat.WEBP
-        else -> Bitmap.CompressFormat.PNG
-    }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/livedata/WrappedLiveData.kt

+package chat.rocket.android.util.livedata
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.CoroutineScope
+import kotlinx.coroutines.experimental.Job
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.experimental.withContext
+import kotlin.coroutines.experimental.CoroutineContext
+
+
+class WrappedLiveData<Source, Output>(
+    private val runContext: CoroutineContext = CommonPool,
+    private val source: LiveData<Source>,
+    private val transformation: suspend (Source?, MutableLiveData<Output>) -> Unit)
+    : MutableLiveData<Output>() {
+    private var job: Job? = null
+
+    private val observer = Observer<Source> { source ->
+        job?.cancel()
+        job = launch(runContext) {
+            transformation(source, this@WrappedLiveData)
+        }
+    }
+
+    override fun onActive() {
+        source.observeForever(observer)
+    }
+
+    override fun onInactive() {
+        job?.cancel()
+        source.removeObserver(observer)
+    }
+}
+
+fun <Source, Output> LiveData<Source>.wrap(
+    runContext: CoroutineContext = CommonPool,
+    transformation: suspend (Source?, MutableLiveData<Output>) -> Unit) =
+        WrappedLiveData(runContext, this, transformation)
\ No newline at end of file

app/src/main/java/chat/rocket/android/widget/DividerItemDecoration.kt

@@ -2,7 +2,9 @@ package chat.rocket.android.widget
 
 import android.content.Context
 import android.graphics.Canvas
+import android.graphics.Rect
 import android.graphics.drawable.Drawable
+import android.view.View
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
@@ -51,6 +53,9 @@ class DividerItemDecoration() : RecyclerView.ItemDecoration() {
         for (i in 0 until childCount) {
             val child = parent.getChildAt(i)
 
+            if (isLastView(child, parent))
+                continue
+
             val params = child.layoutParams as RecyclerView.LayoutParams
 
             val top = child.bottom + params.bottomMargin
@@ -60,4 +65,9 @@ class DividerItemDecoration() : RecyclerView.ItemDecoration() {
             divider.draw(c)
         }
     }
+
+    private fun isLastView(view: View, parent: RecyclerView): Boolean {
+        val position = parent.getChildAdapterPosition(view)
+        return position == parent.adapter?.itemCount?.minus(1) ?: false
+    }
 }
\ No newline at end of file

app/src/main/res/drawable/round_textview.xml

+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+  <solid android:color="@color/colorAccent" />
+
+  <size
+      android:width="24dp"
+      android:height="24dp" />
+
+</shape>
\ No newline at end of file

app/src/main/res/layout/item_loading.xml

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="60dp">
+
+    <ProgressBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"/>
+
+</FrameLayout>
\ No newline at end of file

app/src/main/res/layout/message_list.xml

@@ -2,7 +2,8 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
@@ -14,14 +15,29 @@
         android:id="@+id/button_fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:visibility="invisible"
         android:layout_margin="16dp"
         android:src="@drawable/ic_arrow_downward_24dp"
         android:theme="@style/Theme.AppCompat"
         android:tint="@color/actionMenuColor"
-        android:visibility="invisible"
         app:backgroundTint="@color/colorWhite"
-        app:fabSize="mini"
-        app:layout_anchor="@id/recycler_view"
-        app:layout_anchorGravity="bottom|end" />
+        tools:visibility="visible"
+        android:layout_gravity="end|bottom" />
+
+    <TextView
+        android:id="@+id/text_count"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:elevation="6dp"
+        android:gravity="center"
+        android:textColor="@color/colorWhite"
+        android:visibility="invisible"
+        android:textSize="@dimen/message_time_text_size"
+        android:background="@drawable/round_textview"
+        tools:visibility="visible"
+        tools:text="1"
+        android:layout_gravity="center_vertical"
+        app:layout_anchor="@id/button_fab"
+        app:layout_anchorGravity="end" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

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

@@ -285,4 +285,5 @@
     <string name="notif_action_reply_hint">RESPUESTA</string>
     <string name="notif_error_sending">La respuesta ha fallado. Inténtalo de nuevo.</string>
     <string name="notif_success_sending">Mensaje enviado a %1$s!</string>
+    <string name="msg_log_out">Saliendo de tu cuenta...</string>
 </resources>

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

@@ -287,4 +287,5 @@
     <string name="notif_action_reply_hint">RÉPONDRE</string>
     <string name="notif_error_sending">La réponse a échoué. Veuillez réessayer.</string>
     <string name="notif_success_sending">Message envoyé à %1$s!</string>
+    <string name="msg_log_out">Logging out...</string>
 </resources>

app/src/main/res/values-hi-rIN/strings.xml

@@ -264,4 +264,5 @@
     <string name="notif_action_reply_hint">जवाब</string>
     <string name="notif_error_sending">उत्तर विफल हुआ है। कृपया फिर से प्रयास करें।</string>
     <string name="notif_success_sending">संदेश भेजा गया %1$s!</string>
+    <string name="msg_log_out">Logging out...</string>
 </resources>
\ No newline at end of file

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

@@ -266,4 +266,5 @@
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">Falha ao enviar a mensagem.</string>
     <string name="notif_success_sending">Mensagem enviada para %1$s!</string>
+    <string name="msg_log_out">Deslogando...</string>
 </resources>

app/src/main/res/values-uk-rRU/strings.xml

@@ -261,4 +261,5 @@
     <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
     <string name="notif_error_sending">Ошибка ответа. Пожалуйста, попробуйте еще раз.</string>
     <string name="notif_success_sending">Сообщение отправлено %1$s!</string>
+    <string name="msg_log_out">Logging out...</string>
 </resources>

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

@@ -120,6 +120,7 @@
     <string name="msg_are_typing">\u0020are typing…</string>
     <string name="msg_several_users_are_typing">Several users are typing…</string>
     <string name="msg_no_search_found">No result found</string>
+    <string name="msg_log_out">Logging out...</string>
     <string name="msg_upload_file">Upload file</string>
     <string name="msg_file_description">File description</string>
     <string name="msg_send">Send</string>

build.gradle

@@ -5,8 +5,8 @@ buildscript {
     repositories {
         google()
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
         mavenCentral()
+        maven { url 'https://maven.fabric.io/public' }
     }
 
     dependencies {

core/.gitignore

+/build

core/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
+        versionCode 1
+        versionName "1.0.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation libraries.kotlin
+    implementation libraries.coroutines
+
+    implementation libraries.lifecycleExtensions
+    kapt libraries.lifecycleCompiler
+}
\ No newline at end of file

core/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/src/main/AndroidManifest.xml

+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="chat.rocket.android.core" />

app/src/main/java/chat/rocket/android/core/lifecycle/CancelStrategy.kt → core/src/main/java/chat/rocket/android/core/lifecycle/CancelStrategy.kt

@@ -5,9 +5,8 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.OnLifecycleEvent
 import kotlinx.coroutines.experimental.Job
-import javax.inject.Inject
 
-class CancelStrategy @Inject constructor(owner: LifecycleOwner, val jobs: Job) : LifecycleObserver {
+class CancelStrategy(owner: LifecycleOwner, val jobs: Job) : LifecycleObserver {
 
     init {
         owner.lifecycle.addObserver(this)

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

+<resources>
+    <string name="app_name">Core</string>
+</resources>

dependencies.gradle

@@ -5,7 +5,7 @@ ext {
             targetSdk             : 28,
             minSdk                : 21,
             buildTools            : '28.0.0-rc2',
-            kotlin                : '1.2.50',
+            kotlin                : '1.2.51',
             coroutine             : '0.23.1',
             dokka                 : '0.9.16',
 
@@ -22,7 +22,7 @@ ext {
             playServices          : '15.0.0',
             firebase              : '15.0.0',
             room                  : '2.0.0-alpha1',
-            lifecycle             : '2.0.0-alpha1',
+            lifecycle             : '2.0.0-beta01',
             rxKotlin              : '2.2.0',
             rxAndroid             : '2.0.2',
             moshi                 : '1.6.0',

draw/build.gradle

 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion versions.compileSdk
     buildToolsVersion versions.buildTools
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
         versionCode 1
-        versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        versionName "1.0.0"
     }
 
     buildTypes {
@@ -18,21 +20,24 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation libraries.appCompat
+    implementation project(':util')
+    implementation project(':core')
+
     implementation libraries.kotlin
+    implementation libraries.coroutines
+
+    implementation libraries.appCompat
     implementation libraries.constraintlayout
-    implementation libraries.androidKtx
 
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-}
+    implementation libraries.androidKtx
 
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+    implementation libraries.dagger
+    implementation libraries.daggerSupport
\ No newline at end of file
+    kapt libraries.daggerProcessor
+    kapt libraries.daggerAndroidApt
+}
\ No newline at end of file

draw/src/main/AndroidManifest.xml

@@ -2,9 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="chat.rocket.android.draw">
 
-    <application>
+    <application android:name=".DrawApplication">
         <activity
-            android:name=".DrawingActivity"
+            android:name=".main.ui.DrawingActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
     </application>
 

draw/src/main/java/chat/rocket/android/draw/DrawApplication.kt

+package chat.rocket.android.draw
+
+import chat.rocket.android.draw.dagger.DaggerAppComponent
+import dagger.android.AndroidInjector
+import dagger.android.support.DaggerApplication
+
+class DrawApplication : DaggerApplication() {
+
+    override fun applicationInjector(): AndroidInjector<out DaggerApplication> =
+        DaggerAppComponent.builder().create(this)
+}
\ No newline at end of file

draw/src/main/java/chat/rocket/android/draw/dagger/AppComponent.kt

+package chat.rocket.android.draw.dagger
+
+import chat.rocket.android.draw.dagger.module.ActivityBuilderModule
+import dagger.Component
+import dagger.android.AndroidInjector
+import dagger.android.support.AndroidSupportInjectionModule
+import dagger.android.support.DaggerApplication
+
+@Component(modules = [AndroidSupportInjectionModule::class, ActivityBuilderModule::class])
+interface AppComponent : AndroidInjector<DaggerApplication> {
+
+    @Component.Builder
+    abstract class Builder : AndroidInjector.Builder<DaggerApplication>()
+}
\ No newline at end of file

draw/src/main/java/chat/rocket/android/draw/dagger/module/ActivityBuilderModule.kt

+package chat.rocket.android.draw.dagger.module
+
+import chat.rocket.android.draw.main.di.DrawModule
+import chat.rocket.android.draw.main.ui.DrawingActivity
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ActivityBuilderModule {
+
+    @ContributesAndroidInjector(modules = [DrawModule::class])
+    abstract fun contributeDrawingActivityInjector(): DrawingActivity
+}
\ No newline at end of file

draw/src/main/java/chat/rocket/android/draw/main/di/DrawModule.kt

+package chat.rocket.android.draw.main.di
+
+import androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.draw.main.presenter.DrawView
+import chat.rocket.android.draw.main.ui.DrawingActivity
+import dagger.Module
+import dagger.Provides
+import kotlinx.coroutines.experimental.Job
+
+@Module
+class DrawModule {
+
+    @Provides
+    fun provideMainView(activity: DrawingActivity): DrawView = activity
+
+    @Provides
+    fun provideJob() = Job()
+
+    @Provides
+    fun provideLifecycleOwner(activity: DrawingActivity): LifecycleOwner = activity
+
+    @Provides
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy =
+        CancelStrategy(owner, jobs)
+}
\ No newline at end of file

draw/src/main/java/chat/rocket/android/draw/main/presenter/DrawPresenter.kt

+package chat.rocket.android.draw.main.presenter
+
+import android.graphics.Bitmap
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.util.extension.compressImageAndGetByteArray
+import chat.rocket.android.util.extension.launchUI
+import javax.inject.Inject
+
+class DrawPresenter @Inject constructor(
+    private val view: DrawView,
+    private val strategy: CancelStrategy
+) {
+
+    fun processDrawingImage(bitmap: Bitmap) {
+        launchUI(strategy) {
+            val byteArray = bitmap.compressImageAndGetByteArray("image/png")
+            if (byteArray != null) {
+                view.sendByteArray(byteArray)
+            } else {
+                view.showWrongProcessingMessage()
+            }
+        }
+    }
+}
\ No newline at end of file

draw/src/main/java/chat/rocket/android/draw/main/presenter/DrawView.kt

+package chat.rocket.android.draw.main.presenter
+
+interface DrawView {
+
+    /**
+     * Sends the [ByteArray] of the processed draw image (compressed).
+     */
+    fun sendByteArray(byteArray: ByteArray)
+
+    /**
+     * Shows a message indicating that something was wrong while processing the draw image.
+     */
+    fun showWrongProcessingMessage()
+}
\ No newline at end of file

draw/src/main/java/chat/rocket/android/draw/DrawingActivity.kt → draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt

-package chat.rocket.android.draw
+package chat.rocket.android.draw.main.ui
 
 import android.app.Activity
 import android.content.Intent
 import android.content.res.Resources
-import android.graphics.Bitmap
 import android.os.Bundle
 import android.view.View
 import android.widget.SeekBar
-import androidx.appcompat.app.AppCompatActivity
+import android.widget.Toast
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isVisible
+import chat.rocket.android.draw.R
+import chat.rocket.android.draw.main.presenter.DrawPresenter
+import chat.rocket.android.draw.main.presenter.DrawView
+import dagger.android.support.DaggerAppCompatActivity
 import kotlinx.android.synthetic.main.activity_drawing.*
 import kotlinx.android.synthetic.main.color_palette_view.*
-import java.io.ByteArrayOutputStream
+import javax.inject.Inject
 
-class DrawingActivity : AppCompatActivity() {
+const val DRAWING_BYTE_ARRAY_EXTRA_DATA: String = "chat.rocket.android.DrawingByteArray"
+
+class DrawingActivity : DaggerAppCompatActivity(), DrawView {
+    @Inject
+    lateinit var presenter: DrawPresenter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_drawing)
 
-        image_close_drawing.setOnClickListener {
-            finish()
-        }
-        image_send_drawing.setOnClickListener {
-            val bStream = ByteArrayOutputStream()
-            val bitmap = custom_draw_view.getBitmap()
-            bitmap.compress(Bitmap.CompressFormat.PNG, 70, bStream)
-            val byteArray = bStream.toByteArray()
-            val returnIntent = Intent()
-            returnIntent.putExtra("bitmap", byteArray)
-            setResult(Activity.RESULT_OK,returnIntent)
-            finish()
-        }
+        setupListeners()
+        setupDrawTools()
+        colorSelector()
+        setPaintAlpha()
+        setPaintWidth()
+    }
 
-        setUpDrawTools()
+    override fun sendByteArray(byteArray: ByteArray) {
+        setResult(Activity.RESULT_OK, Intent().putExtra(DRAWING_BYTE_ARRAY_EXTRA_DATA, byteArray))
+        finish()
+    }
 
-        colorSelector()
+    override fun showWrongProcessingMessage() {
+        Toast.makeText(this, getText(R.string.msg_wrong_processing_draw_image), Toast.LENGTH_SHORT)
+            .show()
+    }
 
-        setPaintAlpha()
+    private fun setupListeners() {
+        image_close_drawing.setOnClickListener { finish() }
 
-        setPaintWidth()
+        image_send_drawing.setOnClickListener {
+            presenter.processDrawingImage(custom_draw_view.getBitmap())
+        }
     }
 
-    private fun setUpDrawTools() {
+    private fun setupDrawTools() {
         image_draw_eraser.setOnClickListener {
             custom_draw_view.clearCanvas()
-            toggleDrawTools(draw_tools,false)
+            toggleDrawTools(draw_tools, false)
         }
+
         image_draw_width.setOnClickListener {
-            if (draw_tools.translationY == (56).toPx){
-                toggleDrawTools(draw_tools,true)
-            }else if (draw_tools.translationY == (0).toPx && seekBar_width.isVisible){
-                toggleDrawTools(draw_tools,false)
+            if (draw_tools.translationY == (56).toPx) {
+                toggleDrawTools(draw_tools, true)
+            } else if (draw_tools.translationY == (0).toPx && seekBar_width.isVisible) {
+                toggleDrawTools(draw_tools, false)
             }
             seekBar_width.isVisible = true
             seekBar_opacity.isVisible = false
             draw_color_palette.isVisible = false
         }
+
         image_draw_opacity.setOnClickListener {
-            if (draw_tools.translationY == (56).toPx){
-                toggleDrawTools(draw_tools,true)
-            }else if (draw_tools.translationY == (0).toPx && seekBar_opacity.isVisible){
-                toggleDrawTools(draw_tools,false)
+            if (draw_tools.translationY == (56).toPx) {
+                toggleDrawTools(draw_tools, true)
+            } else if (draw_tools.translationY == (0).toPx && seekBar_opacity.isVisible) {
+                toggleDrawTools(draw_tools, false)
             }
             seekBar_width.isVisible = false
             seekBar_opacity.isVisible = true
             draw_color_palette.isVisible = false
         }
+
         image_draw_color.setOnClickListener {
-            if (draw_tools.translationY == (56).toPx){
-                toggleDrawTools(draw_tools,true)
-            }else if (draw_tools.translationY == (0).toPx && draw_color_palette.isVisible){
-                toggleDrawTools(draw_tools,false)
+            if (draw_tools.translationY == (56).toPx) {
+                toggleDrawTools(draw_tools, true)
+            } else if (draw_tools.translationY == (0).toPx && draw_color_palette.isVisible) {
+                toggleDrawTools(draw_tools, false)
             }
             seekBar_width.isVisible = false
             seekBar_opacity.isVisible = false
             draw_color_palette.isVisible = true
         }
+
         image_draw_undo.setOnClickListener {
             custom_draw_view.undo()
-            toggleDrawTools(draw_tools,false)
+            toggleDrawTools(draw_tools, false)
         }
+
         image_draw_redo.setOnClickListener {
             custom_draw_view.redo()
-            toggleDrawTools(draw_tools,false)
+            toggleDrawTools(draw_tools, false)
         }
     }
 
     private fun toggleDrawTools(view: View, showView: Boolean = true) {
-        if (showView){
+        if (showView) {
             view.animate().translationY((0).toPx)
-        }else{
+        } else {
             view.animate().translationY((56).toPx)
         }
     }
 
     private fun colorSelector() {
-        image_color_black.setOnClickListener {
-            custom_draw_view.setColor(ResourcesCompat.getColor(resources, R.color.color_black,null))
-            scaleColorView(image_color_black)
-        }
         image_color_red.setOnClickListener {
-            custom_draw_view.setColor(ResourcesCompat.getColor(resources, R.color.color_red,null))
+            custom_draw_view.setColor(
+                ResourcesCompat.getColor(resources, R.color.color_red, null)
+            )
             scaleColorView(image_color_red)
         }
+
         image_color_yellow.setOnClickListener {
-            custom_draw_view.setColor(ResourcesCompat.getColor(resources, R.color.color_yellow,null))
+            custom_draw_view.setColor(
+                ResourcesCompat.getColor(
+                    resources,
+                    R.color.color_yellow, null
+                )
+            )
             scaleColorView(image_color_yellow)
         }
+
         image_color_green.setOnClickListener {
-            custom_draw_view.setColor(ResourcesCompat.getColor(resources, R.color.color_green,null))
+            custom_draw_view.setColor(
+                ResourcesCompat.getColor(
+                    resources,
+                    R.color.color_green, null
+                )
+            )
             scaleColorView(image_color_green)
         }
+
         image_color_blue.setOnClickListener {
-            custom_draw_view.setColor(ResourcesCompat.getColor(resources, R.color.color_blue,null))
+            custom_draw_view.setColor(
+                ResourcesCompat.getColor(resources, R.color.color_blue, null)
+            )
             scaleColorView(image_color_blue)
         }
+
         image_color_pink.setOnClickListener {
-            custom_draw_view.setColor(ResourcesCompat.getColor(resources, R.color.color_pink,null))
+            custom_draw_view.setColor(
+                ResourcesCompat.getColor(
+                    resources,
+                    R.color.color_pink, null
+                )
+            )
             scaleColorView(image_color_pink)
         }
+
         image_color_brown.setOnClickListener {
-            custom_draw_view.setColor(ResourcesCompat.getColor(resources, R.color.color_brown,null))
+            custom_draw_view.setColor(
+                ResourcesCompat.getColor(
+                    resources,
+                    R.color.color_brown, null
+                )
+            )
             scaleColorView(image_color_brown)
         }
     }
@@ -156,7 +195,7 @@ class DrawingActivity : AppCompatActivity() {
     }
 
     private fun setPaintWidth() {
-        seekBar_width.setOnSeekBarChangeListener(object: SeekBar.OnSeekBarChangeListener{
+        seekBar_width.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
                 custom_draw_view.setStrokeWidth(progress.toFloat())
             }
@@ -168,7 +207,7 @@ class DrawingActivity : AppCompatActivity() {
     }
 
     private fun setPaintAlpha() {
-        seekBar_opacity.setOnSeekBarChangeListener(object: SeekBar.OnSeekBarChangeListener{
+        seekBar_opacity.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
                 custom_draw_view.setAlpha(progress)
             }
@@ -181,4 +220,4 @@ class DrawingActivity : AppCompatActivity() {
 
     private val Int.toPx: Float
         get() = (this * Resources.getSystem().displayMetrics.density)
-}
+}
\ No newline at end of file

draw/src/main/java/chat/rocket/android/draw/widget/Action.kt

@@ -6,5 +6,4 @@ import java.io.Serializable
 interface Action : Serializable {
 
     fun perform(path: Path)
-
-}
+}
\ No newline at end of file

draw/src/main/res/layout/activity_drawing.xml

 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".DrawingActivity">
+    tools:context=".ui.DrawingActivity">
 
     <chat.rocket.android.draw.widget.CustomDrawView
         android:id="@+id/custom_draw_view"
@@ -17,143 +16,143 @@
         android:id="@+id/image_close_drawing"
         android:layout_width="56dp"
         android:layout_height="56dp"
+        android:background="@color/color_white"
+        android:foreground="?selectableItemBackgroundBorderless"
+        android:padding="16dp"
         android:src="@drawable/ic_close_black_24dp"
         android:tint="@color/icon_color"
-        android:padding="16dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:background="@color/color_white"
-        android:foreground="?selectableItemBackgroundBorderless" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/image_send_drawing"
         android:layout_width="56dp"
         android:layout_height="56dp"
-        android:src="@drawable/ic_send_black_24dp"
+        android:background="@color/color_white"
+        android:foreground="?selectableItemBackgroundBorderless"
         android:padding="16dp"
+        android:src="@drawable/ic_send_black_24dp"
         android:tint="@color/colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:background="@color/color_white"
-        android:foreground="?selectableItemBackgroundBorderless" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/draw_tools"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:background="@color/color_white"
         android:elevation="4dp"
-        android:translationY="56dp" >
+        android:translationY="56dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <ImageView
             android:id="@+id/image_draw_eraser"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:src="@drawable/ic_eraser_black_24dp"
+            android:foreground="?selectableItemBackground"
             android:padding="16dp"
+            android:src="@drawable/ic_eraser_black_24dp"
             android:tint="@color/icon_color"
-            android:foreground="?selectableItemBackground"
+            app:layout_constraintEnd_toStartOf="@id/image_draw_width"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/image_draw_width"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/image_draw_width"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:src="@drawable/ic_adjust_black_24dp"
+            android:foreground="?selectableItemBackground"
             android:padding="16dp"
+            android:src="@drawable/ic_adjust_black_24dp"
             android:tint="@color/icon_color"
-            android:foreground="?selectableItemBackground"
-            app:layout_constraintStart_toEndOf="@id/image_draw_eraser"
             app:layout_constraintEnd_toStartOf="@id/image_draw_color"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintStart_toEndOf="@id/image_draw_eraser"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/image_draw_color"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:src="@drawable/ic_color_lens_black_24dp"
+            android:foreground="?selectableItemBackground"
             android:padding="16dp"
+            android:src="@drawable/ic_color_lens_black_24dp"
             android:tint="@color/icon_color"
-            android:foreground="?selectableItemBackground"
-            app:layout_constraintStart_toEndOf="@id/image_draw_width"
             app:layout_constraintEnd_toStartOf="@id/image_draw_opacity"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintStart_toEndOf="@id/image_draw_width"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/image_draw_opacity"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:src="@drawable/ic_opacity_black_24dp"
+            android:foreground="?selectableItemBackground"
             android:padding="16dp"
+            android:src="@drawable/ic_opacity_black_24dp"
             android:tint="@color/icon_color"
-            android:foreground="?selectableItemBackground"
-            app:layout_constraintStart_toEndOf="@id/image_draw_color"
             app:layout_constraintEnd_toStartOf="@id/image_draw_undo"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintStart_toEndOf="@id/image_draw_color"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/image_draw_undo"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:src="@drawable/ic_undo_black_24dp"
+            android:foreground="?selectableItemBackground"
             android:padding="16dp"
+            android:src="@drawable/ic_undo_black_24dp"
             android:tint="@color/icon_color"
-            android:foreground="?selectableItemBackground"
-            app:layout_constraintStart_toEndOf="@id/image_draw_opacity"
             app:layout_constraintEnd_toStartOf="@id/image_draw_redo"
+            app:layout_constraintStart_toEndOf="@id/image_draw_opacity"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/image_draw_redo"
             android:layout_width="56dp"
             android:layout_height="56dp"
-            android:src="@drawable/ic_redo_black_24dp"
+            android:foreground="?selectableItemBackground"
             android:padding="16dp"
+            android:src="@drawable/ic_redo_black_24dp"
             android:tint="@color/icon_color"
-            android:foreground="?selectableItemBackground"
-            app:layout_constraintStart_toEndOf="@id/image_draw_undo"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/image_draw_undo"
             app:layout_constraintTop_toTopOf="parent" />
 
         <SeekBar
             android:id="@+id/seekBar_width"
             android:layout_width="0dp"
             android:layout_height="56dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/image_draw_eraser"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:progress="8"
             android:progressTint="@color/colorAccent"
             android:thumbTint="@color/colorAccent"
-            android:progress="8"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/image_draw_eraser" />
 
         <SeekBar
             android:id="@+id/seekBar_opacity"
             android:layout_width="0dp"
             android:layout_height="56dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/image_draw_eraser"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
             android:progress="100"
             android:progressTint="@color/colorAccent"
             android:thumbTint="@color/colorAccent"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/image_draw_eraser" />
 
         <include
             android:id="@+id/draw_color_palette"
             layout="@layout/color_palette_view"
             android:layout_width="0dp"
             android:layout_height="56dp"
-            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/image_draw_eraser" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

 <resources>
     <string name="app_name">Draw</string>
+
+    // TODO: Add other translations like we did for the app module.
+    <string name="msg_wrong_processing_draw_image">Something was wrong while processing the draw image. Please, try again later.</string>
 </resources>

settings.gradle

-include ':app', ':player', ':emoji', ':draw' //, ':wear'
+include ':app', ':player', ':emoji', ':draw', ':util', ':core' //, ':wear'
\ No newline at end of file

util/.gitignore

+/build

util/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+android {
+    compileSdkVersion versions.compileSdk
+
+    defaultConfig {
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.targetSdk
+        versionCode 1
+        versionName "1.0.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation project(':core')
+
+    implementation libraries.kotlin
+    implementation libraries.coroutines
+    implementation libraries.coroutinesAndroid
+
+    // TODO This is a dependency from the core module, but the util module are unable to get that dependencies. Check why it is occurring since transitive is enable by default
+    implementation libraries.lifecycleExtensions
+    kapt libraries.lifecycleCompiler
+}
\ No newline at end of file

util/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

util/src/main/AndroidManifest.xml

+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="chat.rocket.android.util" />

app/src/main/java/chat/rocket/android/util/extensions/Coroutines.kt → util/src/main/java/chat/rocket/android/util/extension/Coroutines.kt

-package chat.rocket.android.util.extensions
+package chat.rocket.android.util.extension
 
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import kotlinx.coroutines.experimental.CoroutineScope

util/src/main/java/chat/rocket/android/util/extension/Image.kt

+package chat.rocket.android.util.extension
+
+import android.graphics.Bitmap
+import kotlinx.coroutines.experimental.DefaultDispatcher
+import kotlinx.coroutines.experimental.withContext
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+
+/**
+ * Compress a [Bitmap] image.
+ *
+ * @param mimeType The MimeType of what the compressed image should be.
+ * @return An [InputStream] of a compressed image, otherwise null if the compression couldn't be done.
+ */
+suspend fun Bitmap.compressImageAndGetInputStream(mimeType: String): InputStream? {
+    var inputStream: InputStream? = null
+
+    withContext(DefaultDispatcher) {
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        // TODO: Add an option the the app to the user be able to select the quality of the compressed image
+        val isCompressed =
+            this.compress(mimeType.getCompressFormat(), 70, byteArrayOutputStream)
+        if (isCompressed) {
+            inputStream = ByteArrayInputStream(byteArrayOutputStream.toByteArray())
+        }
+    }
+
+    return inputStream
+}
+
+/**
+ * Compress a [Bitmap] image.
+ *
+ * @param mimeType The MimeType of what the compressed image should be.
+ * @return An [ByteArray] of a compressed image, otherwise null if the compression couldn't be done.
+ */
+suspend fun Bitmap.compressImageAndGetByteArray(mimeType: String): ByteArray? {
+    var byteArray: ByteArray? = null
+
+    withContext(DefaultDispatcher) {
+        val byteArrayOutputStream = ByteArrayOutputStream()
+        // TODO: Add an option the the app to the user be able to select the quality of the compressed image
+        val isCompressed =
+            this.compress(mimeType.getCompressFormat(), 70, byteArrayOutputStream)
+        if (isCompressed) {
+            byteArray = byteArrayOutputStream.toByteArray()
+        }
+    }
+
+    return byteArray
+}
+
+/**
+ * Gets the [Bitmap.CompressFormat] based on the image MimeType.
+ * Note: Supported formats are: PNG, JPEG and WEBP.
+ */
+fun String.getCompressFormat(): Bitmap.CompressFormat {
+    return when {
+        this.contains("jpeg") -> Bitmap.CompressFormat.JPEG
+        this.contains("webp") -> Bitmap.CompressFormat.WEBP
+        else -> Bitmap.CompressFormat.PNG
+    }
+}
\ No newline at end of file

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

+<resources>
+    <string name="app_name">Util</string>
+</resources>