Using sealed classes from the SDK instead of enums

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 21
         targetSdkVersion versions.targetSdk
-        versionCode 1005
-        versionName "2.0.0-dev4"
+        versionCode 1006
+        versionName "2.0.0-dev5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

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

@@ -6,7 +6,7 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.launchUI
-import chat.rocket.common.model.BaseRoom
+import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.realtime.State
 import chat.rocket.core.internal.realtime.connect
@@ -43,7 +43,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         launchUI(strategy) {
             view.showLoading()
             try {
-                val messages = client.messages(chatRoomId, BaseRoom.RoomType.valueOf(chatRoomType), offset, 30).result
+                val messages = client.messages(chatRoomId, roomTypeOf(chatRoomType), offset, 30).result
                 synchronized(roomMessages) {
                     roomMessages.addAll(messages)
                 }

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

@@ -76,14 +76,14 @@ data class MessageViewModel(val context: Context,
         val contentMessage: CharSequence
         when (message.type) {
         //TODO: Add implementation for Welcome type.
-            MESSAGE_REMOVED -> contentMessage = getSystemMessage(context.getString(R.string.message_removed))
-            USER_JOINED -> contentMessage = getSystemMessage(context.getString(R.string.message_user_joined_channel))
-            USER_LEFT -> contentMessage = getSystemMessage(context.getString(R.string.message_user_left))
-            USER_ADDED -> contentMessage = getSystemMessage(
+            is MessageRemoved -> contentMessage = getSystemMessage(context.getString(R.string.message_removed))
+            is UserJoined -> contentMessage = getSystemMessage(context.getString(R.string.message_user_joined_channel))
+            is UserLeft -> contentMessage = getSystemMessage(context.getString(R.string.message_user_left))
+            is UserAdded -> contentMessage = getSystemMessage(
                     context.getString(R.string.message_user_added_by, message.message, message.sender?.username))
-            ROOM_NAME_CHANGED -> contentMessage = getSystemMessage(
+            is RoomNameChanged -> contentMessage = getSystemMessage(
                     context.getString(R.string.message_room_name_changed, message.message, message.sender?.username))
-            USER_REMOVED -> contentMessage = getSystemMessage(
+            is UserRemoved -> contentMessage = getSystemMessage(
                     context.getString(R.string.message_user_removed_by, message.message, message.sender?.username))
             else -> contentMessage = getNormalMessage()
         }

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

@@ -39,7 +39,8 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
         }
     }
 
-    fun loadChatRoom(chatRoom: ChatRoom) = navigator.toChatRoom(chatRoom.id, chatRoom.name, chatRoom.type.name, chatRoom.readonly ?: false)
+    fun loadChatRoom(chatRoom: ChatRoom) = navigator.toChatRoom(chatRoom.id, chatRoom.name,
+            chatRoom.type.toString(), chatRoom.readonly ?: false)
 
     /**
      * Gets a [ChatRoom] list from local repository.

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

@@ -13,7 +13,7 @@ import chat.rocket.android.helper.UrlHelper
 import chat.rocket.android.util.inflate
 import chat.rocket.android.util.setVisible
 import chat.rocket.android.util.textContent
-import chat.rocket.common.model.BaseRoom.RoomType
+import chat.rocket.common.model.RoomType
 import chat.rocket.core.model.ChatRoom
 import com.facebook.drawee.view.SimpleDraweeView
 import kotlinx.android.synthetic.main.avatar.view.*
@@ -50,7 +50,7 @@ class ChatRoomsAdapter(private val context: Context,
 
         private fun bindAvatar(chatRoom: ChatRoom, avatarLayout: View, drawee: SimpleDraweeView, imageView: ImageView) {
             val chatRoomName = chatRoom.name
-            if (chatRoom.type == RoomType.ONE_TO_ONE) {
+            if (chatRoom.type is RoomType.OneToOne) {
                 drawee.setImageURI(UrlHelper.getAvatarUrl(chatRoom.client.url, chatRoomName))
                 imageView.setVisible(false)
                 avatarLayout.setVisible(true)