More retryDB

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

@@ -39,6 +39,7 @@ import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.exhaustive
+import chat.rocket.android.util.retryDB
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -138,7 +139,7 @@ class ChatRoomPresenter @Inject constructor(
             } finally {
                 // User has at least an 'owner' or 'moderator' role.
                 val userCanMod = isOwnerOrMod()
-                val chatRoom = dbManager.getRoom(roomId)
+                val chatRoom = retryDB("getRoom($roomId)") { 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() ||
@@ -904,7 +905,8 @@ class ChatRoomPresenter @Inject constructor(
 
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomAsync(roomId: String): ChatRoom? = withContext(CommonPool) {
-        return@withContext dbManager.chatRoomDao().get(roomId)?.let {
+        retryDB("getRoom($roomId)") {
+            dbManager.chatRoomDao().get(roomId)?.let {
                 with(it.chatRoom) {
                     ChatRoom(
                             id = id,
@@ -937,10 +939,12 @@ class ChatRoomPresenter @Inject constructor(
                 }
             }
         }
+    }
 
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomsAsync(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
-        return@withContext dbManager.chatRoomDao().getAllSync().filter {
+        retryDB("getAllSync()") {
+            dbManager.chatRoomDao().getAllSync().filter {
                 if (name == null) {
                     return@filter true
                 }
@@ -978,6 +982,7 @@ class ChatRoomPresenter @Inject constructor(
                 }
             }
         }
+    }
 
     fun joinChat(chatRoomId: String) {
         launchUI(strategy) {

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

@@ -13,6 +13,7 @@ import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -45,7 +46,7 @@ class ChatRoomsPresenter @Inject constructor(
         launchUI(strategy) {
             view.showLoadingRoom(chatRoom.name)
             try {
-                val room = dbManager.getRoom(chatRoom.id)
+                val room = retryDB("getRoom(${chatRoom.id}") { dbManager.getRoom(chatRoom.id) }
                 if (room != null) {
                     loadChatRoom(room.chatRoom, true)
                 } else {

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

@@ -92,8 +92,8 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         }
     }
 
-    fun logout() {
-        database.clearAllTables()
+    suspend fun logout() {
+        retryDB("clearAllTables") { database.clearAllTables() }
     }
 
     suspend fun getRoom(id: String) = withContext(dbManagerContext) {

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

@@ -5,6 +5,7 @@ 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.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -34,6 +35,7 @@ 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)
@@ -43,6 +45,7 @@ class FavoriteMessagesPresenter @Inject constructor(
                     }.ifNull {
                         Timber.e("Couldn't find a room with id: $roomId at current server.")
                     }
+                }
             } catch (exception: RocketChatException) {
                 Timber.e(exception)
             } finally {

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

@@ -7,6 +7,7 @@ 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.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -36,6 +37,7 @@ 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)
@@ -44,6 +46,7 @@ class FilesPresenter @Inject constructor(
                     }.ifNull {
                         Timber.e("Couldn't find a room with id: $roomId at current server.")
                     }
+                }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)

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

@@ -6,6 +6,7 @@ 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.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -36,6 +37,7 @@ 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)
@@ -45,6 +47,7 @@ class MembersPresenter @Inject constructor(
                     }.ifNull {
                         Timber.e("Couldn't find a room with id: $roomId at current server.")
                     }
+                }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)

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

@@ -5,6 +5,7 @@ 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.extension.launchUI
+import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -34,6 +35,7 @@ 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)
@@ -43,6 +45,7 @@ class PinnedMessagesPresenter @Inject constructor(
                     }.ifNull {
                         Timber.e("Couldn't find a room with id: $roomId at current server.")
                     }
+                }
             } catch (exception: RocketChatException) {
                 Timber.e(exception)
             } finally {