Merge branch 'master' into patch-4

Author: philipbrito

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2067
-        versionName "3.4.0"
+        versionCode 2069
+        versionName "3.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsPresenter.kt

@@ -147,6 +147,7 @@ class LoginOptionsPresenter @Inject constructor(
                     )
                     localRepository.saveCurrentUser(url = currentServer, user = user)
                     saveCurrentServer.save(currentServer)
+                    localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, username)
                     saveAccount(username)
                     saveToken(token)
                     analyticsManager.logLogin(loginMethod, true)

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

@@ -1,13 +1,9 @@
 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(

app/src/main/java/chat/rocket/android/directory/presentation/DirectoryPresenter.kt

@@ -136,7 +136,7 @@ class DirectoryPresenter @Inject constructor(
         }
     }
 
-    fun tiDirectMessage(username: String, name: String) {
+    fun toDirectMessage(username: String, name: String) {
         launchUI(strategy) {
             try {
                 view.showLoading()

app/src/main/java/chat/rocket/android/directory/ui/DirectoryFragment.kt

@@ -49,10 +49,10 @@ class DirectoryFragment : Fragment(), DirectoryView {
             presenter.toChannel(channelId, channelName)
         }
         override fun onUserSelected(username: String, name: String) {
-            presenter.tiDirectMessage(username, name)
+            presenter.toDirectMessage(username, name)
         }
         override fun onGlobalUserSelected(username: String, name: String) {
-            presenter.tiDirectMessage(username, name)
+            presenter.toDirectMessage(username, name)
         }
     })
     private val hashtagDrawable by lazy {

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

@@ -1,5 +1,6 @@
 package chat.rocket.android.main.presentation
 
+import android.content.Intent
 import chat.rocket.android.R
 import chat.rocket.android.authentication.ui.newServerIntent
 import chat.rocket.android.chatroom.ui.chatRoomIntent
@@ -100,4 +101,9 @@ class MainNavigator(internal val activity: MainActivity) {
     fun toServerScreen() {
         activity.startActivity(activity.newServerIntent())
     }
+
+    fun recreateActivity() {
+        activity.startActivity(Intent(activity, MainActivity::class.java))
+        activity.finish()
+    }
 }

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

@@ -148,4 +148,6 @@ class SettingsPresenter @Inject constructor(
 
     fun toLicense(licenseUrl: String, licenseTitle: String) =
         navigator.toLicense(licenseUrl, licenseTitle)
+
+    fun recreateActivity() = navigator.recreateActivity()
 }

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

@@ -132,7 +132,7 @@ class SettingsFragment : Fragment(), SettingsView, AppLanguageView {
 
     override fun updateLanguage(language: String, country: String?) {
         presenter.saveLocale(language, country)
-        activity?.recreate()
+        presenter.recreateActivity()
     }
 
     override fun invalidateToken(token: String) = invalidateFirebaseToken(token)

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',