Notification deeplink to room

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

@@ -139,7 +139,7 @@ class ChatRoomPresenter @Inject constructor(
             } finally {
                 // User has at least an 'owner' or 'moderator' role.
                 val userCanMod = isOwnerOrMod()
-                val chatRoom = retryDB("getRoom($roomId)") { dbManager.getRoom(roomId) }
+                val chatRoom = dbManager.getRoom(roomId)
                 val muted = chatRoom?.chatRoom?.muted ?: emptyList()
                 // Can post anyway if has the 'post-readonly' permission on server.
                 val userCanPost = userCanMod || permissions.canPostToReadOnlyChannels() ||

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

@@ -42,6 +42,26 @@ class ChatRoomsPresenter @Inject constructor(
     private val client = manager.client
     private val settings = settingsRepository.get(currentServer)
 
+    fun loadChatRoom(roomId: String) {
+        launchUI(strategy) {
+            view.showLoadingRoom("")
+            try {
+                val room = dbManager.getRoom(roomId)
+                if (room != null) {
+                    loadChatRoom(room.chatRoom, true)
+                } else {
+                    Timber.d("Error loading channel")
+                    view.showGenericErrorMessage()
+                }
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error loading channel")
+                view.showGenericErrorMessage()
+            } finally {
+                view.hideLoadingRoom()
+            }
+        }
+    }
+
     fun loadChatRoom(chatRoom: RoomUiModel) {
         launchUI(strategy) {
             view.showLoadingRoom(chatRoom.name)

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

@@ -84,8 +84,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         if (bundle != null) {
             chatRoomId = bundle.getString(BUNDLE_CHAT_ROOM_ID)
             chatRoomId?.let {
-                // TODO - bring back support to load a room from id.
-                //presenter.goToChatRoomWithId(it)
+                presenter.loadChatRoom(it)
                 chatRoomId = null
             }
         }

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

@@ -35,16 +35,14 @@ class FavoriteMessagesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                retryDB("getRoom($roomId)") {
-                    dbManager.getRoom(roomId)?.let {
-                        val favoriteMessages =
-                                client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
-                        val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
-                        view.showFavoriteMessages(messageList)
-                        offset += 1 * 30
-                    }.ifNull {
-                        Timber.e("Couldn't find a room with id: $roomId at current server.")
-                    }
+                dbManager.getRoom(roomId)?.let {
+                    val favoriteMessages =
+                            client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
+                    val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
+                    view.showFavoriteMessages(messageList)
+                    offset += 1 * 30
+                }.ifNull {
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 Timber.e(exception)

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

@@ -37,15 +37,13 @@ class FilesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                retryDB("getRoom($roomId)") {
-                    dbManager.getRoom(roomId)?.let {
-                        val files = client.getFiles(roomId, roomTypeOf(it.chatRoom.type), offset)
-                        val filesUiModel = mapper.mapToUiModelList(files.result)
-                        view.showFiles(filesUiModel, files.total)
-                        offset += 1 * 30
-                    }.ifNull {
-                        Timber.e("Couldn't find a room with id: $roomId at current server.")
-                    }
+                dbManager.getRoom(roomId)?.let {
+                    val files = client.getFiles(roomId, roomTypeOf(it.chatRoom.type), offset)
+                    val filesUiModel = mapper.mapToUiModelList(files.result)
+                    view.showFiles(filesUiModel, files.total)
+                    offset += 1 * 30
+                }.ifNull {
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 exception.message?.let {

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

@@ -37,16 +37,14 @@ class MembersPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                retryDB("getRoom($roomId)") {
-                    dbManager.getRoom(roomId)?.let {
-                        val members =
-                                client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
-                        val memberUiModels = mapper.mapToUiModelList(members.result)
-                        view.showMembers(memberUiModels, members.total)
-                        offset += 1 * 60L
-                    }.ifNull {
-                        Timber.e("Couldn't find a room with id: $roomId at current server.")
-                    }
+                dbManager.getRoom(roomId)?.let {
+                    val members =
+                            client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
+                    val memberUiModels = mapper.mapToUiModelList(members.result)
+                    view.showMembers(memberUiModels, members.total)
+                    offset += 1 * 60L
+                }.ifNull {
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 exception.message?.let {

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

@@ -35,16 +35,14 @@ class PinnedMessagesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                retryDB("getRoom($roomId)") {
-                    dbManager.getRoom(roomId)?.let {
-                        val pinnedMessages =
-                                client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
-                        val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
-                        view.showPinnedMessages(messageList)
-                        offset += 1 * 30
-                    }.ifNull {
-                        Timber.e("Couldn't find a room with id: $roomId at current server.")
-                    }
+                dbManager.getRoom(roomId)?.let {
+                    val pinnedMessages =
+                            client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
+                    val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
+                    view.showPinnedMessages(messageList)
+                    offset += 1 * 30
+                }.ifNull {
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 Timber.e(exception)

app/src/main/java/chat/rocket/android/push/PushManager.kt

@@ -296,11 +296,8 @@ class PushManager @Inject constructor(
     }
 
     private fun getContentIntent(context: Context, notificationId: Int, pushMessage: PushMessage, grouped: Boolean = false): PendingIntent {
-        val notificationIntent = context.changeServerIntent(pushMessage.info.host, chatRoomId = pushMessage.info.roomId)
-        // TODO - add support to go directly to the chatroom
-        /*if (!isGrouped) {
-            notificationIntent.putExtra(EXTRA_ROOM_ID, pushMessage.info.roomId)
-        }*/
+        val roomId = if (!grouped) pushMessage.info.roomId else null
+        val notificationIntent = context.changeServerIntent(pushMessage.info.host, chatRoomId = roomId)
         return PendingIntent.getActivity(context, random.nextInt(), notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT)
     }
 

app/src/play/java/chat/rocket/android/push/FirebaseMessagingService.kt

 package chat.rocket.android.push
 
+import android.os.Bundle
 import androidx.core.os.bundleOf
 import androidx.work.Constraints
 import androidx.work.NetworkType
@@ -23,9 +24,12 @@ class FirebaseMessagingService : FirebaseMessagingService() {
     }
 
     override fun onMessageReceived(message: RemoteMessage) {
-        // XXX - for now this is ok, if we start to do network calls, use a Worker instead
-        message.data?.let {
-            pushManager.handle(bundleOf(*(it.map { Pair(it.key, it.value) }).toTypedArray()))
+        message.data?.let { data ->
+            val bundle = Bundle()
+            data.entries.forEach { entry ->
+                bundle.putString(entry.key, entry.value)
+            }
+            pushManager.handle(bundle)
         }
     }