Merge branch 'master' into beta

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

@@ -1101,9 +1101,13 @@ class ChatRoomPresenter @Inject constructor(
                         }
                     }
                 }
-            } catch (ex: Exception) {
-                Timber.e(ex)
-                view.showMessage(ex.message!!)
+            } catch (exception: Exception) {
+                Timber.e(exception)
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
             }
         }
     }
@@ -1120,8 +1124,13 @@ class ChatRoomPresenter @Inject constructor(
                         }
                     }
                 }
-            } catch (ex: Exception) {
-                Timber.e(ex)
+            } catch (exception: Exception) {
+                Timber.e(exception)
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
             }
         }
     }
@@ -1136,8 +1145,13 @@ class ChatRoomPresenter @Inject constructor(
                     client.toggleReaction(messageId, emoji.removeSurrounding(":"))
                 }
                 logReactionEvent()
-            } catch (ex: RocketChatException) {
-                Timber.e(ex)
+            } catch (exception: RocketChatException) {
+                Timber.e(exception)
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
             }
         }
     }

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

 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.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 timber.log.Timber
 
 class FetchChatRoomsInteractor(

dependencies.gradle

@@ -9,7 +9,7 @@ ext {
             dokka                 : '0.9.16',
 
             // For app
-            kotlin                : '1.3.21',
+            kotlin                : '1.3.31',
             coroutine             : '1.1.1',
 
             appCompat             : '1.0.2',