Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into...

Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into fix/oauth-crashes-when-using-new-user

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

 package chat.rocket.android.authentication.login.presentation
 
+import chat.rocket.android.BuildConfig
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.NetworkHelper
@@ -9,8 +10,11 @@ import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.presentation.CheckServerPresenter
+import chat.rocket.android.util.VersionInfo
 import chat.rocket.android.util.extensions.*
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.RocketChatTwoFactorException
 import chat.rocket.common.model.Token
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
@@ -38,7 +42,8 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                                          settingsInteractor: GetSettingsInteractor,
                                          serverInteractor: GetCurrentServerInteractor,
                                          private val saveAccountInteractor: SaveAccountInteractor,
-                                         private val factory: RocketChatClientFactory) {
+                                         private val factory: RocketChatClientFactory)
+    : CheckServerPresenter(strategy, factory.create(serverInteractor.get()!!), view) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
     private val currentServer = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(currentServer)
@@ -53,6 +58,7 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
         setupUserRegistrationView()
         setupCasView()
         setupOauthServicesView()
+        checkServerInfo()
     }
 
     fun authenticateWithUserAndPassword(usernameOrEmail: String, password: String) {
@@ -223,10 +229,17 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                         view.alertRequiresUsername()
                     }
                 } catch (exception: RocketChatException) {
-                    exception.message?.let {
-                        view.showMessage(it)
-                    }.ifNull {
-                        view.showGenericErrorMessage()
+                    when (exception) {
+                        is RocketChatTwoFactorException -> {
+                            navigator.toTwoFA(usernameOrEmail, password)
+                        }
+                        else -> {
+                            exception.message?.let {
+                                view.showMessage(it)
+                            }.ifNull {
+                                view.showGenericErrorMessage()
+                            }
+                        }
                     }
                 } finally {
                     view.hideLoading()

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginView.kt

 package chat.rocket.android.authentication.login.presentation
 
+import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.behaviours.InternetView
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 
-interface LoginView : LoadingView, MessageView, InternetView {
+interface LoginView : LoadingView, MessageView, InternetView, VersionCheckView {
 
     /**
      * Shows the form view (i.e the username/email and password fields) if it is enabled by the server settings.

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.authentication.login.ui
 
 import DrawableHelper
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
@@ -13,6 +14,8 @@ import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.widget.ImageButton
 import android.widget.ScrollView
+import android.widget.Toast
+import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
 import chat.rocket.android.authentication.login.presentation.LoginPresenter
 import chat.rocket.android.authentication.login.presentation.LoginView
@@ -293,6 +296,27 @@ class LoginFragment : Fragment(), LoginView {
         showMessage(getString(R.string.msg_requires_username))
     }
 
+    override fun alertNotRecommendedVersion() {
+        context?.let {
+            AlertDialog.Builder(it)
+                    .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
+                    .setPositiveButton(R.string.msg_ok, null)
+                    .create()
+                    .show()
+        }
+    }
+
+    override fun blockAndAlertNotRequiredVersion() {
+        context?.let {
+            AlertDialog.Builder(it)
+                    .setMessage(getString(R.string.msg_ver_not_minimum, BuildConfig.REQUIRED_SERVER_VERSION))
+                    .setOnDismissListener { activity?.onBackPressed() }
+                    .setPositiveButton(R.string.msg_ok, null)
+                    .create()
+                    .show()
+        }
+    }
+
     private fun showRemainingSocialAccountsView() {
         social_accounts_container.postDelayed({
             (0..social_accounts_container.childCount)

app/src/main/java/chat/rocket/android/authentication/server/presentation/VersionCheckView.kt

+package chat.rocket.android.authentication.server.presentation
+
+interface VersionCheckView {
+    /**
+     * Alerts the user about the server version not meeting the recommended server version.
+     */
+    fun alertNotRecommendedVersion()
+
+    /**
+     * Block user to proceed and alert him due to server having an unsupported server version.
+     */
+    fun blockAndAlertNotRequiredVersion()
+}
\ No newline at end of file

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

@@ -6,12 +6,7 @@ import chat.rocket.android.helper.ChatRoomsSortOrder
 import chat.rocket.android.helper.Constants
 import chat.rocket.android.helper.SharedPreferenceHelper
 import chat.rocket.android.main.presentation.MainNavigator
-import chat.rocket.android.server.domain.GetChatRoomsInteractor
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.domain.RefreshSettingsInteractor
-import chat.rocket.android.server.domain.SaveChatRoomsInteractor
-import chat.rocket.android.server.domain.SettingsRepository
-import chat.rocket.android.server.domain.useRealName
+import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.chatRooms
@@ -29,13 +24,9 @@ import chat.rocket.core.internal.realtime.Type
 import chat.rocket.core.internal.rest.spotlight
 import chat.rocket.core.model.ChatRoom
 import chat.rocket.core.model.Room
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.Deferred
+import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.async
 import kotlinx.coroutines.experimental.channels.Channel
-import kotlinx.coroutines.experimental.delay
-import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
 import javax.inject.Inject
 import kotlin.reflect.KProperty1

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

@@ -9,33 +9,34 @@ import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.android.util.extensions.registerPushToken
+import chat.rocket.common.RocketChatAuthException
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.me
-import chat.rocket.core.internal.rest.registerPushToken
 import chat.rocket.core.internal.rest.unregisterPushToken
 import timber.log.Timber
 import javax.inject.Inject
 
 class MainPresenter @Inject constructor(
-    private val view: MainView,
-    private val strategy: CancelStrategy,
-    private val navigator: MainNavigator,
-    private val tokenRepository: TokenRepository,
-    private val serverInteractor: GetCurrentServerInteractor,
-    private val localRepository: LocalRepository,
-    private val navHeaderMapper: NavHeaderViewModelMapper,
-    private val saveAccountInteractor: SaveAccountInteractor,
-    private val getAccountsInteractor: GetAccountsInteractor,
-    private val removeAccountInterector: RemoveAccountInterector,
-    private val factory: RocketChatClientFactory,
-    getSettingsInteractor: GetSettingsInteractor,
-    managerFactory: ConnectionManagerFactory
-) {
+        private val view: MainView,
+        private val strategy: CancelStrategy,
+        private val navigator: MainNavigator,
+        private val tokenRepository: TokenRepository,
+        private val serverInteractor: GetCurrentServerInteractor,
+        private val localRepository: LocalRepository,
+        private val navHeaderMapper: NavHeaderViewModelMapper,
+        private val saveAccountInteractor: SaveAccountInteractor,
+        private val getAccountsInteractor: GetAccountsInteractor,
+        private val removeAccountInterector: RemoveAccountInterector,
+        private val factory: RocketChatClientFactory,
+        getSettingsInteractor: GetSettingsInteractor,
+        managerFactory: ConnectionManagerFactory
+) : CheckServerPresenter(strategy, client = factory.create(serverInteractor.get()!!), view = view) {
     private val currentServer = serverInteractor.get()!!
     private val manager = managerFactory.create(currentServer)
     private val client: RocketChatClient = factory.create(currentServer)
@@ -48,18 +49,27 @@ class MainPresenter @Inject constructor(
     fun toSettings() = navigator.toSettings()
 
     fun loadCurrentInfo() {
+        checkServerInfo()
         launchUI(strategy) {
             try {
                 val me = client.me()
                 val model = navHeaderMapper.mapToViewModel(me)
+
                 saveAccount(model)
                 view.setupNavHeader(model, getAccountsInteractor.get())
             } catch (ex: Exception) {
-                Timber.d(ex, "Error loading my information for navheader")
-                ex.message?.let {
-                    view.showMessage(it)
-                }.ifNull {
-                    view.showGenericErrorMessage()
+                when (ex) {
+                    is RocketChatAuthException -> {
+                        logout()
+                    }
+                    else -> {
+                        Timber.d(ex, "Error loading my information for navheader")
+                        ex.message?.let {
+                            view.showMessage(it)
+                        }.ifNull {
+                            view.showGenericErrorMessage()
+                        }
+                    }
                 }
             }
         }
@@ -81,17 +91,25 @@ class MainPresenter @Inject constructor(
             try {
                 clearTokens()
                 client.logout()
-                disconnect()
-                removeAccountInterector.remove(currentServer)
-                tokenRepository.remove(currentServer)
-                navigator.toNewServer()
             } catch (exception: RocketChatException) {
+                Timber.d(exception, "Error calling logout")
                 exception.message?.let {
                     view.showMessage(it)
                 }.ifNull {
                     view.showGenericErrorMessage()
                 }
             }
+
+            try {
+                disconnect()
+                removeAccountInterector.remove(currentServer)
+                tokenRepository.remove(currentServer)
+                navigator.toNewServer()
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error cleaning up the session...")
+            }
+
+            navigator.toNewServer()
         }
     }
 
@@ -100,7 +118,6 @@ class MainPresenter @Inject constructor(
         val pushToken = localRepository.get(LocalRepository.KEY_PUSH_TOKEN)
         if (pushToken != null) {
             client.unregisterPushToken(pushToken)
-            localRepository.clear(LocalRepository.KEY_PUSH_TOKEN)
         }
         localRepository.clearAllFromServer(currentServer)
     }

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

 package chat.rocket.android.main.presentation
 
+import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.behaviours.MessageView
 import chat.rocket.android.main.viewmodel.NavHeaderViewModel
 import chat.rocket.android.server.domain.model.Account
 
-interface MainView : MessageView {
+interface MainView : MessageView, VersionCheckView {
     fun setupNavHeader(model: NavHeaderViewModel, accounts: List<Account>)
     fun closeServerSelection()
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

 package chat.rocket.android.main.ui
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
@@ -8,6 +9,7 @@ import android.support.v7.widget.LinearLayoutManager
 import android.view.Gravity
 import android.view.MenuItem
 import android.view.View
+import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
 import chat.rocket.android.main.adapter.AccountSelector
 import chat.rocket.android.main.adapter.AccountsAdapter
@@ -39,6 +41,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
     @Inject lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
     @Inject lateinit var presenter: MainPresenter
     private var isFragmentAdded: Boolean = false
+    private var expanded = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -86,7 +89,22 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
         view_navigation.getHeaderView(0).account_container.performClick()
     }
 
-    private var expanded = false
+    override fun alertNotRecommendedVersion() {
+        AlertDialog.Builder(this)
+                .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
+                .setPositiveButton(R.string.msg_ok, null)
+                .create()
+                .show()
+    }
+
+    override fun blockAndAlertNotRequiredVersion() {
+        AlertDialog.Builder(this)
+                .setMessage(getString(R.string.msg_ver_not_minimum, BuildConfig.REQUIRED_SERVER_VERSION))
+                .setOnDismissListener { presenter.logout() }
+                .setPositiveButton(R.string.msg_ok, null)
+                .create()
+                .show()
+    }
 
     private fun setupAccountsList(header: View, accounts: List<Account>) {
         accounts_list.layoutManager = LinearLayoutManager(this)

app/src/main/java/chat/rocket/android/main/viewmodel/NavHeaderViewModelMapper.kt

@@ -7,16 +7,16 @@ import javax.inject.Inject
 
 class NavHeaderViewModelMapper @Inject constructor(serverInteractor: GetCurrentServerInteractor,
                                                    getSettingsInteractor: GetSettingsInteractor) {
-    private var settings: PublicSettings = getSettingsInteractor.get(serverInteractor.get()!!)
-    private val baseUrl = settings.baseUrl()!!
+    private val currentServer = serverInteractor.get()!!
+    private var settings: PublicSettings = getSettingsInteractor.get(currentServer)
 
     fun mapToViewModel(me: Myself): NavHeaderViewModel {
         val username = mapUsername(me)
-        val thumb = me.username?.let { UrlHelper.getAvatarUrl(baseUrl, it) }
+        val thumb = me.username?.let { UrlHelper.getAvatarUrl(currentServer, it) }
         val image = settings.wideTile() ?: settings.faviconLarge()
-        val logo = image?.let { UrlHelper.getServerLogoUrl(baseUrl, it) }
+        val logo = image?.let { UrlHelper.getServerLogoUrl(currentServer, it) }
 
-        return NavHeaderViewModel(username, baseUrl, thumb, logo)
+        return NavHeaderViewModel(username, currentServer, thumb, logo)
     }
 
     private fun mapUsername(me: Myself): String {

app/src/main/java/chat/rocket/android/server/domain/SettingsRepository.kt

@@ -95,5 +95,5 @@ fun PublicSettings.uploadMaxFileSize(): Int {
     return this[UPLOAD_MAX_FILE_SIZE]?.value?.let { it as Int } ?: Int.MAX_VALUE
 }
 
-fun PublicSettings.baseUrl(): String? = this[SITE_URL]?.value as String
+fun PublicSettings.baseUrl(): String? = this[SITE_URL]?.value as String?
 fun PublicSettings.siteName(): String? = this[SITE_NAME]?.value as String?
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt

+package chat.rocket.android.server.presentation
+
+import chat.rocket.android.BuildConfig
+import chat.rocket.android.authentication.server.presentation.VersionCheckView
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.util.VersionInfo
+import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.core.RocketChatClient
+import chat.rocket.core.internal.rest.serverInfo
+import timber.log.Timber
+
+abstract class CheckServerPresenter constructor(private val strategy: CancelStrategy,
+                                                private val client: RocketChatClient,
+                                                private val view: VersionCheckView) {
+    internal fun checkServerInfo() {
+        launchUI(strategy) {
+            val serverInfo = client.serverInfo()
+            val thisServerVersion = serverInfo.version
+            val isRequiredVersion = isRequiredServerVersion(thisServerVersion)
+            val isRecommendedVersion = isRecommendedServerVersion(thisServerVersion)
+            if (isRequiredVersion) {
+                if (isRecommendedVersion) {
+                    Timber.i("Your version is nice! (Requires: 0.62.0, Yours: $thisServerVersion)")
+                } else {
+                    view.alertNotRecommendedVersion()
+                }
+            } else {
+                if (!isRecommendedVersion) {
+                    view.blockAndAlertNotRequiredVersion()
+                    Timber.i("Oops. Looks like your server is out-of-date! Minimum server version required ${BuildConfig.REQUIRED_SERVER_VERSION}!")
+                }
+            }
+        }
+    }
+
+    private fun isRequiredServerVersion(version: String): Boolean {
+        return isMinimumVersion(version, getVersionDistilled(BuildConfig.REQUIRED_SERVER_VERSION))
+    }
+
+    private fun isRecommendedServerVersion(version: String): Boolean {
+        return isMinimumVersion(version, getVersionDistilled(BuildConfig.RECOMMENDED_SERVER_VERSION))
+    }
+
+    private fun isMinimumVersion(version: String, required: VersionInfo): Boolean {
+        val thisVersion = getVersionDistilled(version)
+        with(thisVersion) {
+            if (major < required.major) {
+                return false
+            } else if (major > required.major) {
+                return true
+            }
+            if (minor < required.minor) {
+                return false
+            } else if (minor > required.minor) {
+                return true
+            }
+            return update >= required.update
+        }
+    }
+
+    private fun getVersionDistilled(version: String): VersionInfo {
+        var split = version.split("-")
+        if (split.isEmpty()) {
+            return VersionInfo(0, 0, 0, null, "0.0.0")
+        }
+        val ver = split[0]
+        var release: String? = null
+        if (split.size > 1) {
+            release = split[1]
+        }
+        split = ver.split(".")
+        val major = getVersionNumber(split, 0)
+        val minor = getVersionNumber(split, 1)
+        val update = getVersionNumber(split, 2)
+        return VersionInfo(
+                major = major,
+                minor = minor,
+                update = update,
+                release = release,
+                full = version)
+    }
+
+    private fun getVersionNumber(split: List<String>, index: Int): Int {
+        return try {
+            split.getOrNull(index)?.toInt() ?: 0
+        } catch (ex: NumberFormatException) {
+            0
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/VersionInfo.kt

+package chat.rocket.android.util
+
+data class VersionInfo(
+        val major: Int,
+        val minor: Int,
+        val update: Int = 0,
+        val release: String?,
+        val full: String
+)
\ No newline at end of file

app/src/main/res/drawable/ic_launcher_foreground.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="1055.0303"
+    android:viewportWidth="1055.0303">
+
+    <group
+        android:translateX="281.28394"
+        android:translateY="271.51514">
+        <path
+            android:fillColor="#CC3333"
+            android:pathData="M491.3,255.3c0,-24.1 -7.2,-47.2 -21.4,-68.7c-12.8,-19.3 -30.7,-36.4 -53.2,-50.7c-43.5,-27.8 -100.6,-43.1 -160.9,-43.1c-20.1,0 -40,1.7 -59.2,5.1c-11.9,-11.2 -25.9,-21.2 -40.7,-29.2c-79,-38.3 -144.6,-0.9 -144.6,-0.9s60.9,50.1 51,93.9c-27.3,27 -42,59.6 -42,93.6c0,0.1 0,0.2 0,0.3c0,0.1 0,0.2 0,0.3c0,33.9 14.8,66.6 42,93.6c9.9,43.9 -51,93.9 -51,93.9s65.5,37.4 144.6,-0.9c14.8,-8 28.8,-18 40.7,-29.2c19.2,3.4 39.1,5.1 59.2,5.1c60.3,0 117.4,-15.3 160.9,-43.1c22.5,-14.4 40.4,-31.5 53.2,-50.7c14.2,-21.5 21.4,-44.6 21.4,-68.7c0,-0.1 0,-0.2 0,-0.3C491.3,255.6 491.3,255.4 491.3,255.3z" />
+        <path
+            android:fillColor="#FFFFFF"
+            android:pathData="M255.9,124.2c113.9,0 206.3,59 206.3,131.8c0,72.8 -92.4,131.8 -206.3,131.8c-25.4,0 -49.7,-2.9 -72.1,-8.3c-22.8,27.4 -73,65.6 -121.7,53.3c15.9,-17 39.4,-45.8 34.3,-93.2c-29.2,-22.7 -46.8,-51.8 -46.8,-83.5C49.6,183.2 142,124.2 255.9,124.2" />
+        <path
+            android:fillColor="#CC3333"
+            android:pathData="M255.9,256m-27.4,0a27.4,27.4 0,1 1,54.8 0a27.4,27.4 0,1 1,-54.8 0" />
+        <path
+            android:fillColor="#CC3333"
+            android:pathData="M351.2,256m-27.4,0a27.4,27.4 0,1 1,54.8 0a27.4,27.4 0,1 1,-54.8 0" />
+        <path
+            android:fillColor="#CC3333"
+            android:pathData="M160.6,256m-27.4,0a27.4,27.4 0,1 1,54.8 0a27.4,27.4 0,1 1,-54.8 0" />
+        <path
+            android:fillColor="#CCCCCC"
+            android:pathData="M255.8,372.8c-25.4,0 -56.2,-4.9 -78.7,-9.5c-20.1,21 -53.7,52.7 -99.6,50.3c-5.7,8.6 -10.2,13.5 -15.5,19.2c48.7,12.3 98.9,-25.8 121.7,-53.3c22.4,5.4 46.7,8.3 72.1,8.3c113,0 204.8,-58.1 206.3,-130C460.7,320.1 368.8,372.8 255.8,372.8z" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M172,350.9"
+            android:strokeColor="#000000"
+            android:strokeWidth="1" />
+        <path
+            android:fillColor="#00000000"
+            android:pathData="M200.4,422.9"
+            android:strokeColor="#000000"
+            android:strokeWidth="1" />
+    </group>
+</vector>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file

app/src/main/res/values-hi-rIN/strings.xml

@@ -25,6 +25,7 @@
     <string name="action_files">फ़ाइलें</string>
     <string name="action_confirm_password">पासवर्ड परिवर्तन की पुष्टि करें</string>
     <string name="action_join_chat">चैट में शामिल हों</string>
+    <string name="action_add_account">खाता जोड़ो</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -67,7 +68,18 @@
     <string name="msg_utc_offset">यूटीसी ऑफ़सेट</string>
     <string name="msg_new_password">नया पासवर्ड दर्ज करें</string>
     <string name="msg_confirm_password">नए पासवर्ड की पुष्टि करें</string>
+    <string name="msg_preview_video">वीडियो</string>
+    <string name="msg_preview_audio">ऑडियो</string>
+    <string name="msg_preview_photo">तस्वीरें</string>
     <string name="msg_unread_messages">अपठित संदेश</string>
+    <string name="msg_no_messages_yet">अभी तक कोई पोस्ट नहीं</string>
+    <string name="msg_ok">OK</string>
+    <string name="msg_ver_not_recommended">
+        ऐसा लगता है कि आपका सर्वर संस्करण अनुशंसित संस्करण %1$s के नीचे है।\nआप अभी भी लॉगिन कर सकते हैं लेकिन आप अप्रत्याशित व्यवहार का अनुभव कर सकते हैं
+    </string>
+    <string name="msg_ver_not_minimum">
+        ऐसा लगता है कि आपका सर्वर संस्करण न्यूनतम आवश्यक संस्करण %1$s से कम है।\nकृपया लॉगिन करने के लिए अपने सर्वर को अपग्रेड करें!
+    </string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">%2$s ने रूम का नाम बदलकर %1$s किया</string>
@@ -114,6 +126,10 @@
     <string name="status_disconnecting">डिसकनेक्टिंग</string>
     <string name="status_waiting">%d सेकेंड में कनेक्ट हो रहा है</string>
 
+    <!--Suggestions-->
+    <string name="suggest_all_description">इस कमरे में सभी को सूचित करें</string>
+    <string name="suggest_here_description">इस कमरे में सक्रिय उपयोगकर्ताओं को सूचित करना</string>
+
     <!-- Slash Commands -->
     <string name="Slash_Gimme_Description">आपके संदेश से पहले ༼ つ ◕_◕ ༽つ दिखाता है</string>
     <string name="Slash_LennyFace_Description">आपके संदेश के बाद ( ͡° ͜ʖ ͡°) दिखाता है</string>
@@ -139,4 +155,20 @@
 
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji"> कोई नया इमोजी नहीं</string>
+
+    <!-- Sorting and grouping-->
+    <string name="menu_chatroom_sort">क्रम</string>
+    <string name="dialog_sort_title">द्वारा सॉर्ट करें</string>
+    <string name="dialog_sort_by_alphabet">वर्णानुक्रम</string>
+    <string name="dialog_sort_by_activity">गतिविधि</string>
+    <string name="dialog_group_by_type">प्रकार के आधार पर समूह</string>
+    <string name="dialog_group_favourites">पसंदीदा समूह</string>
+    <string name="chatroom_header">हैडर</string>
+
+    <!--ChatRooms Headers-->
+    <string name="header_channel">चैनलों</string>
+    <string name="header_private_groups">निजी समूहों</string>
+    <string name="header_direct_messages">प्रत्यक्ष संदेश</string>
+    <string name="header_live_chats">Live Chats</string>
+    <string name="header_unknown">अज्ञात</string>
 </resources>
\ No newline at end of file

app/src/main/res/values-pt-rBR/strings.xml

@@ -74,6 +74,13 @@
     <string name="msg_preview_photo">Foto</string>
     <string name="msg_no_messages_yet">Nenhuma mensagem ainda</string>
     <string name="msg_requires_username">Nome de usuário requerido: Por favor, erie um nome de usuário através da versão web e volte para fazer login</string>
+    <string name="msg_ok">OK</string>
+    <string name="msg_ver_not_recommended">
+        Parece que a versão do seu servidor está abaixo da recomendada %1$s.\nVocê ainda assim pode logar e continuar mas podem ocorrer alguns problemas inesperados.
+    </string>
+    <string name="msg_ver_not_minimum">
+        Parece que a versão do seu servidor está abaixo da mínima requerida %1$s.\nPor favor, atualize seus servidores antes de continuar!
+    </string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>

app/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#15293F</color>
 
     <!-- Main colors -->
     <color name="colorPrimary">#FF303030</color> <!-- Material Grey 850 -->
@@ -17,6 +16,8 @@
     <color name="colorUserStatusAway">#FDD236</color>
     <color name="colorUserStatusOffline">#d9d9d9</color>
 
+    <color name="ic_launcher_background">#FFFFFF</color>
+
     <color name="colorDrawableTintGrey">#9FA2A8</color>
 
     <color name="colorDividerMessageComposer">#D8D8D8</color>

app/src/main/res/values/strings.xml

@@ -76,6 +76,12 @@
     <string name="msg_preview_photo">Photo</string>
     <string name="msg_no_messages_yet">No messages yet</string>
     <string name="msg_requires_username">Username required: Please, create an username through the web version and come back to log in</string>
+    <string name="msg_ok">OK</string>
+    <string name="msg_ver_not_recommended">
+        Looks like your server version is below the recommended version %1$s.\nYou can still login but you may experience unexpected behaviors.</string>
+    <string name="msg_ver_not_minimum">
+        Looks like your server version is below the minimum required version %1$s.\nPlease upgrade your server to login!
+    </string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>
@@ -151,7 +157,7 @@
 
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">No recent emoji</string>
-    
+
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Sort</string>
     <string name="dialog_sort_title">Sort by</string>

dependencies.gradle

@@ -9,7 +9,7 @@ ext {
         dokka             : '0.9.16',
 
         // Main dependencies
-        support                : '27.0.2',
+        support                : '27.1.0',
         constraintLayout       : '1.0.2',
         androidKtx             : '0.2',
         dagger                 : '2.14.1',
@@ -20,7 +20,7 @@ ext {
         rxAndroid              : '2.0.2',
         moshi                  : '1.6.0-SNAPSHOT',
         okhttp                 : '3.10.0',
-        timber                 : '4.6.1',
+        timber                 : '4.7.0',
         threeTenABP            : '1.0.5',
         rxBinding              : '2.0.0',
         fresco                 : '1.8.1',
@@ -37,67 +37,68 @@ ext {
         expresso               : '3.0.1',
         mockito                : '2.10.0'
     ]
-
     libraries = [
-        kotlin                 : "org.jetbrains.kotlin:kotlin-stdlib-jre8:${versions.kotlin}",
-        coroutines             : "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutine}",
-        coroutinesAndroid      : "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutine}",
-
-        appCompat              : "com.android.support:appcompat-v7:${versions.support}",
-        annotations            : "com.android.support:support-annotations:${versions.support}",
-        recyclerview           : "com.android.support:recyclerview-v7:${versions.support}",
-        design                 : "com.android.support:design:${versions.support}",
-        constraintLayout       : "com.android.support.constraint:constraint-layout:${versions.constraintLayout}",
-        cardView               : "com.android.support:cardview-v7:${versions.support}",
-        flexbox                : "com.google.android:flexbox:${versions.flexbox}",
-
-        androidKtx             : "androidx.core:core-ktx:${versions.androidKtx}",
-
-        dagger                 : "com.google.dagger:dagger:${versions.dagger}",
-        daggerSupport          : "com.google.dagger:dagger-android-support:${versions.dagger}",
-        daggerProcessor        : "com.google.dagger:dagger-compiler:${versions.dagger}",
-        daggerAndroidApt       : "com.google.dagger:dagger-android-processor:${versions.dagger}",
-        playServicesGcm        : "com.google.android.gms:play-services-gcm:${versions.playServices}",
-        exoPlayer              : "com.google.android.exoplayer:exoplayer:${versions.exoPlayer}",
-
-        room                   : "android.arch.persistence.room:runtime:${versions.room}",
-        roomProcessor          : "android.arch.persistence.room:compiler:${versions.room}",
-        roomRxjava             : "android.arch.persistence.room:rxjava2:${versions.room}",
-
-        rxKotlin               : "io.reactivex.rxjava2:rxkotlin:${versions.rxKotlin}",
-        rxAndroid              : "io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}",
-
-        moshi                  : "com.squareup.moshi:moshi:${versions.moshi}",
-        moshiKotlin            : "com.squareup.moshi:moshi-kotlin:${versions.moshi}",
-        okhttp                 : "com.squareup.okhttp3:okhttp:${versions.okhttp}",
-        okhttpLogger           : "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}",
-
-        timber                 : "com.jakewharton.timber:timber:${versions.timber}",
-        threeTenABP            : "com.jakewharton.threetenabp:threetenabp:${versions.threeTenABP}",
-        rxBinding              : "com.jakewharton.rxbinding2:rxbinding-kotlin:${versions.rxBinding}",
-
-        fresco                 : "com.facebook.fresco:fresco:${versions.fresco}",
-        frescoOkHttp           : "com.facebook.fresco:imagepipeline-okhttp3:${versions.fresco}",
-        frescoAnimatedGif      : "com.facebook.fresco:animated-gif:${versions.fresco}",
-        frescoWebP             : "com.facebook.fresco:webpsupport:${versions.fresco}",
-        frescoAnimatedWebP     : "com.facebook.fresco:animated-webp:${versions.fresco}",
-
-        kotshiApi              : "se.ansman.kotshi:api:${versions.kotshi}",
-        kotshiCompiler         : "se.ansman.kotshi:compiler:${versions.kotshi}",
-
-        frescoImageViewer      : "com.github.luciofm:FrescoImageViewer:${versions.frescoImageViewer}",
-
-        markwon                : "ru.noties:markwon:${versions.markwon}",
-        markwonImageLoader     : "ru.noties:markwon-image-loader:${versions.markwon}",
-
-        sheetMenu              : "com.github.whalemare:sheetmenu:${versions.sheetMenu}",
-
-        aVLoadingIndicatorView : "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
-
-        // For testing
-        junit         : "junit:junit:$versions.junit",
-        expressoCore  : "com.android.support.test.espresso:espresso-core:${versions.expresso}",
-        roomTest      : "android.arch.persistence.room:testing:${versions.room}",
-        truth         : "com.google.truth:truth:$versions.truth",
+            kotlin                 : "org.jetbrains.kotlin:kotlin-stdlib-jre8:${versions.kotlin}",
+            coroutines             : "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutine}",
+            coroutinesAndroid      : "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutine}",
+
+            appCompat              : "com.android.support:appcompat-v7:${versions.support}",
+            annotations            : "com.android.support:support-annotations:${versions.support}",
+            recyclerview           : "com.android.support:recyclerview-v7:${versions.support}",
+            design                 : "com.android.support:design:${versions.support}",
+            constraintLayout       : "com.android.support.constraint:constraint-layout:${versions.constraintLayout}",
+            cardView               : "com.android.support:cardview-v7:${versions.support}",
+            flexbox                : "com.google.android:flexbox:${versions.flexbox}",
+            customTabs             : "com.android.support:customtabs:${versions.support}",
+
+            androidKtx             : "androidx.core:core-ktx:${versions.androidKtx}",
+
+            dagger                 : "com.google.dagger:dagger:${versions.dagger}",
+            daggerSupport          : "com.google.dagger:dagger-android-support:${versions.dagger}",
+            daggerProcessor        : "com.google.dagger:dagger-compiler:${versions.dagger}",
+            daggerAndroidApt       : "com.google.dagger:dagger-android-processor:${versions.dagger}",
+            playServicesGcm        : "com.google.android.gms:play-services-gcm:${versions.playServices}",
+            exoPlayer              : "com.google.android.exoplayer:exoplayer:${versions.exoPlayer}",
+
+            room                   : "android.arch.persistence.room:runtime:${versions.room}",
+            roomProcessor          : "android.arch.persistence.room:compiler:${versions.room}",
+            roomRxjava             : "android.arch.persistence.room:rxjava2:${versions.room}",
+
+            rxKotlin               : "io.reactivex.rxjava2:rxkotlin:${versions.rxKotlin}",
+            rxAndroid              : "io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}",
+
+            moshi                  : "com.squareup.moshi:moshi:${versions.moshi}",
+            moshiKotlin            : "com.squareup.moshi:moshi-kotlin:${versions.moshi}",
+            okhttp                 : "com.squareup.okhttp3:okhttp:${versions.okhttp}",
+            okhttpLogger           : "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}",
+
+            timber                 : "com.jakewharton.timber:timber:${versions.timber}",
+            threeTenABP            : "com.jakewharton.threetenabp:threetenabp:${versions.threeTenABP}",
+            rxBinding              : "com.jakewharton.rxbinding2:rxbinding-kotlin:${versions.rxBinding}",
+
+            fresco                 : "com.facebook.fresco:fresco:${versions.fresco}",
+            frescoOkHttp           : "com.facebook.fresco:imagepipeline-okhttp3:${versions.fresco}",
+            frescoAnimatedGif      : "com.facebook.fresco:animated-gif:${versions.fresco}",
+            frescoWebP             : "com.facebook.fresco:webpsupport:${versions.fresco}",
+            frescoAnimatedWebP     : "com.facebook.fresco:animated-webp:${versions.fresco}",
+
+            kotshiApi              : "se.ansman.kotshi:api:${versions.kotshi}",
+            kotshiCompiler         : "se.ansman.kotshi:compiler:${versions.kotshi}",
+
+            frescoImageViewer      : "com.github.luciofm:FrescoImageViewer:${versions.frescoImageViewer}",
+
+            markwon                : "ru.noties:markwon:${versions.markwon}",
+            markwonImageLoader     : "ru.noties:markwon-image-loader:${versions.markwon}",
+
+            sheetMenu              : "com.github.whalemare:sheetmenu:${versions.sheetMenu}",
+
+            aVLoadingIndicatorView : "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
+
+            // For testing
+            junit         : "junit:junit:$versions.junit",
+            expressoCore  : "com.android.support.test.espresso:espresso-core:${versions.expresso}",
+            roomTest      : "android.arch.persistence.room:testing:${versions.room}",
+            truth         : "com.google.truth:truth:$versions.truth",
     ]
+
 }
\ No newline at end of file