Merge branch 'new/reactions-with-custom-emojis' of...

Merge branch 'new/reactions-with-custom-emojis' of github.com:RocketChat/Rocket.Chat.Android into new/reactions-with-custom-emojis

app/build.gradle

@@ -6,6 +6,7 @@ if (isPlay) { apply plugin: 'io.fabric' }
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: "com.github.ben-manes.versions"
 
 android {
     compileSdkVersion versions.compileSdk
@@ -15,8 +16,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2036
-        versionName "2.5.1"
+        versionCode 2042
+        versionName "2.6.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
@@ -104,6 +105,7 @@ dependencies {
     implementation libraries.browser
 
     implementation libraries.androidKtx
+    implementation libraries.fragmentsKtx
 
     implementation libraries.dagger
     implementation libraries.daggerSupport
@@ -117,6 +119,8 @@ dependencies {
     kapt libraries.roomProcessor
     implementation libraries.lifecycleExtensions
     kapt libraries.lifecycleCompiler
+    implementation libraries.viewmodelKtx
+    implementation libraries.workmanager
 
     implementation libraries.rxKotlin
     implementation libraries.rxAndroid
@@ -145,14 +149,14 @@ dependencies {
 
     implementation libraries.aVLoadingIndicatorView
 
-    implementation "com.github.luciofm:livedata-ktx:b1e8bbc25a"
+    implementation libraries.livedataKtx
 
     // Proprietary libraries
     playImplementation libraries.fcm
     playImplementation libraries.firebaseAnalytics
     playImplementation libraries.playServicesAuth
-    playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') { transitive = true }
-    playImplementation('com.crashlytics.sdk.android:answers:1.4.2@aar') { transitive = true }
+    playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.5@aar') { transitive = true }
+    playImplementation('com.crashlytics.sdk.android:answers:1.4.3@aar') { transitive = true }
 
     testImplementation libraries.junit
     testImplementation libraries.truth

app/src/foss/java/chat/rocket/android/push/FirebaseTokenService.kt → app/src/foss/java/chat/rocket/android/push/PushToken.kt

 package chat.rocket.android.push
 
-class FirebaseTokenService {
-
+fun refreshPushToken() {
 }

app/src/foss/java/chat/rocket/android/util/GMSManager.kt

 package chat.rocket.android.util
 
-
-import chat.rocket.android.main.presentation.MainPresenter
-
-fun refreshFCMToken(presenter: MainPresenter) {
-    //Do absolutely nothing
-}
-
 fun invalidateFirebaseToken(token: String) {
     //Do absolutely nothing
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/about/di/AboutFragmentProvider.kt

+package chat.rocket.android.about.di
+
+import chat.rocket.android.about.ui.AboutFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class AboutFragmentProvider {
+
+    @ContributesAndroidInjector()
+    abstract fun provideAboutFragment(): AboutFragment
+}

app/src/main/java/chat/rocket/android/about/ui/AboutFragment.kt

@@ -10,6 +10,7 @@ import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.main.ui.MainActivity
+import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_about.*
 import javax.inject.Inject
@@ -20,6 +21,11 @@ class AboutFragment : Fragment() {
     @Inject
     lateinit var analyticsManager: AnalyticsManager
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -36,8 +42,10 @@ class AboutFragment : Fragment() {
 
     private fun setupViews() {
         text_version_name.text = BuildConfig.VERSION_NAME
-        text_build_number.text = getString(R.string.msg_build, BuildConfig.VERSION_CODE,
-                BuildConfig.GIT_SHA, BuildConfig.FLAVOR)
+        text_build_number.text = getString(
+            R.string.msg_build, BuildConfig.VERSION_CODE,
+            BuildConfig.GIT_SHA, BuildConfig.FLAVOR
+        )
     }
 
     private fun setupToolbar() {

app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt

@@ -8,9 +8,15 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.work.Worker
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.dagger.DaggerAppComponent
+import chat.rocket.android.dagger.injector.HasWorkerInjector
 import chat.rocket.android.dagger.qualifier.ForMessages
+import chat.rocket.android.emoji.Emoji
+import chat.rocket.android.emoji.EmojiRepository
+import chat.rocket.android.emoji.Fitzpatrick
+import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.helper.CrashlyticsTree
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.AccountsRepository
@@ -18,22 +24,26 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.SITE_URL
 import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.retryIO
 import chat.rocket.android.util.setupFabric
+import chat.rocket.common.RocketChatException
+import chat.rocket.core.internal.rest.getCustomEmojis
 import com.facebook.drawee.backends.pipeline.DraweeConfig
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.core.ImagePipelineConfig
 import com.jakewharton.threetenabp.AndroidThreeTen
-import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
 import dagger.android.HasBroadcastReceiverInjector
 import dagger.android.HasServiceInjector
+import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
 import java.lang.ref.WeakReference
 import javax.inject.Inject
 
 class RocketChatApplication : Application(), HasActivityInjector, HasServiceInjector,
-    HasBroadcastReceiverInjector {
+    HasBroadcastReceiverInjector, HasWorkerInjector {
 
     @Inject
     lateinit var appLifecycleObserver: AppLifecycleObserver
@@ -47,6 +57,9 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
     @Inject
     lateinit var broadcastReceiverInjector: DispatchingAndroidInjector<BroadcastReceiver>
 
+    @Inject
+    lateinit var workerInjector: DispatchingAndroidInjector<Worker>
+
     @Inject
     lateinit var imagePipelineConfig: ImagePipelineConfig
     @Inject
@@ -63,6 +76,8 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
     lateinit var localRepository: LocalRepository
     @Inject
     lateinit var accountRepository: AccountsRepository
+    @Inject
+    lateinit var factory: RocketChatClientFactory
 
     @Inject
     @field:ForMessages
@@ -98,6 +113,9 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         // TODO - remove REALM files.
         // TODO - remove this
         checkCurrentServer()
+
+        // TODO - FIXME - we need to proper inject the EmojiRepository and initialize it properly
+        loadEmojis()
     }
 
     private fun checkCurrentServer() {
@@ -132,17 +150,13 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         }
     }
 
-    override fun activityInjector(): AndroidInjector<Activity> {
-        return activityDispatchingAndroidInjector
-    }
+    override fun activityInjector() = activityDispatchingAndroidInjector
 
-    override fun serviceInjector(): AndroidInjector<Service> {
-        return serviceDispatchingAndroidInjector
-    }
+    override fun serviceInjector() = serviceDispatchingAndroidInjector
 
-    override fun broadcastReceiverInjector(): AndroidInjector<BroadcastReceiver> {
-        return broadcastReceiverInjector
-    }
+    override fun broadcastReceiverInjector() = broadcastReceiverInjector
+
+    override fun workerInjector() = workerInjector
 
     companion object {
         var context: WeakReference<Context>? = null
@@ -150,6 +164,44 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
             return context?.get()
         }
     }
+
+    // TODO - FIXME - This is a big Workaround
+    /**
+     * Load all emojis for the current server. Simple emojis are always the same for every server,
+     * but custom emojis vary according to the its url.
+     */
+    fun loadEmojis() {
+        EmojiRepository.init(this)
+        val currentServer = getCurrentServerInteractor.get()
+        currentServer?.let { server ->
+            launch {
+                val client = factory.create(server)
+                EmojiRepository.setCurrentServerUrl(server)
+                val customEmojiList = mutableListOf<Emoji>()
+                try {
+                    for (customEmoji in retryIO("getCustomEmojis()") { client.getCustomEmojis() }) {
+                        customEmojiList.add(Emoji(
+                                shortname = ":${customEmoji.name}:",
+                                category = EmojiCategory.CUSTOM.name,
+                                url = "$currentServer/emoji-custom/${customEmoji.name}.${customEmoji.extension}",
+                                count = 0,
+                                fitzpatrick = Fitzpatrick.Default.type,
+                                keywords = customEmoji.aliases,
+                                shortnameAlternates = customEmoji.aliases,
+                                siblings = mutableListOf(),
+                                unicode = "",
+                                isDefault = true
+                        ))
+                    }
+
+                    EmojiRepository.load(this@RocketChatApplication, customEmojis = customEmojiList)
+                } catch (ex: RocketChatException) {
+                    Timber.e(ex)
+                    EmojiRepository.load(this@RocketChatApplication as Context)
+                }
+            }
+        }
+    }
 }
 
 private fun LocalRepository.needOldMessagesCleanUp() = getBoolean(CLEANUP_OLD_MESSAGES_NEEDED, true)

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

@@ -7,8 +7,29 @@ import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.OauthHelper
 import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.*
+import chat.rocket.android.server.domain.GetConnectingServerInteractor
+import chat.rocket.android.server.domain.GetSettingsInteractor
+import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.SaveAccountInteractor
+import chat.rocket.android.server.domain.SaveCurrentServerInteractor
+import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.domain.casLoginUrl
+import chat.rocket.android.server.domain.favicon
+import chat.rocket.android.server.domain.gitlabUrl
+import chat.rocket.android.server.domain.isCasAuthenticationEnabled
+import chat.rocket.android.server.domain.isFacebookAuthenticationEnabled
+import chat.rocket.android.server.domain.isGithubAuthenticationEnabled
+import chat.rocket.android.server.domain.isGitlabAuthenticationEnabled
+import chat.rocket.android.server.domain.isGoogleAuthenticationEnabled
+import chat.rocket.android.server.domain.isLdapAuthenticationEnabled
+import chat.rocket.android.server.domain.isLinkedinAuthenticationEnabled
+import chat.rocket.android.server.domain.isLoginFormEnabled
+import chat.rocket.android.server.domain.isPasswordResetEnabled
+import chat.rocket.android.server.domain.isRegistrationEnabledForNewUsers
+import chat.rocket.android.server.domain.isWordpressAuthenticationEnabled
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.wideTile
+import chat.rocket.android.server.domain.wordpressUrl
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
@@ -17,7 +38,6 @@ import chat.rocket.android.util.extensions.encodeToBase64
 import chat.rocket.android.util.extensions.generateRandomString
 import chat.rocket.android.util.extensions.isEmail
 import chat.rocket.android.util.extensions.parseColor
-import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.android.util.extensions.samlUrl
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO
@@ -60,7 +80,6 @@ class LoginPresenter @Inject constructor(
     private val navigator: AuthenticationNavigator,
     private val tokenRepository: TokenRepository,
     private val localRepository: LocalRepository,
-    private val getAccountsInteractor: GetAccountsInteractor,
     private val settingsInteractor: GetSettingsInteractor,
     private val analyticsManager: AnalyticsManager,
     serverInteractor: GetConnectingServerInteractor,
@@ -454,9 +473,9 @@ class LoginPresenter @Inject constructor(
                     )
                     localRepository.saveCurrentUser(currentServer, user)
                     saveCurrentServer.save(currentServer)
+                    localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, myself.username)
                     saveAccount(myself.username!!)
                     saveToken(token)
-                    registerPushToken()
                     analyticsManager.logLogin(loginMethod, true)
                     if (loginType == TYPE_LOGIN_USER_EMAIL) {
                         view.saveSmartLockCredentials(usernameOrEmail, password)
@@ -610,12 +629,4 @@ class LoginPresenter @Inject constructor(
     private fun saveToken(token: Token) {
         tokenRepository.save(currentServer, token)
     }
-
-    private suspend fun registerPushToken() {
-        localRepository.get(LocalRepository.KEY_PUSH_TOKEN)?.let {
-            client.registerPushToken(it, getAccountsInteractor.get(), factory)
-        }
-        // TODO: When the push token is null, at some point we should receive it with
-        // onTokenRefresh() on FirebaseTokenService, we need to confirm it.
-    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/registerusername/presentation/RegisterUsernamePresenter.kt

@@ -4,8 +4,6 @@ import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.AuthenticationEvent
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
@@ -18,7 +16,6 @@ import chat.rocket.android.server.domain.wideTile
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
@@ -33,10 +30,8 @@ class RegisterUsernamePresenter @Inject constructor(
     private val strategy: CancelStrategy,
     private val navigator: AuthenticationNavigator,
     private val tokenRepository: TokenRepository,
-    private val localRepository: LocalRepository,
-    private val factory: RocketChatClientFactory,
+    factory: RocketChatClientFactory,
     private val saveAccountInteractor: SaveAccountInteractor,
-    private val getAccountsInteractor: GetAccountsInteractor,
     private val analyticsManager: AnalyticsManager,
     serverInteractor: GetConnectingServerInteractor,
     private val saveCurrentServer: SaveCurrentServerInteractor,
@@ -61,7 +56,6 @@ class RegisterUsernamePresenter @Inject constructor(
                         saveAccount(registeredUsername)
                         saveCurrentServer.save(currentServer)
                         tokenRepository.save(currentServer, Token(userId, authToken))
-                        registerPushToken()
                         analyticsManager.logSignUp(
                             AuthenticationEvent.AuthenticationWithOauth,
                             true
@@ -82,14 +76,6 @@ class RegisterUsernamePresenter @Inject constructor(
         }
     }
 
-    private suspend fun registerPushToken() {
-        localRepository.get(LocalRepository.KEY_PUSH_TOKEN)?.let {
-            client.registerPushToken(it, getAccountsInteractor.get(), factory)
-        }
-        // TODO: When the push token is null, at some point we should receive it with
-        // onTokenRefresh() on FirebaseTokenService, we need to confirm it.
-    }
-
     private suspend fun saveAccount(username: String) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)

app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt

@@ -5,7 +5,6 @@ import chat.rocket.android.analytics.event.AuthenticationEvent
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
@@ -18,13 +17,11 @@ import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.privacyPolicyUrl
-import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.extensions.termsOfServiceUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
-import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.login
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.signup
@@ -41,11 +38,9 @@ class SignupPresenter @Inject constructor(
     private val analyticsManager: AnalyticsManager,
     private val factory: RocketChatClientFactory,
     private val saveAccountInteractor: SaveAccountInteractor,
-    private val getAccountsInteractor: GetAccountsInteractor,
     settingsInteractor: GetSettingsInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(currentServer)
     private var settings: PublicSettings = settingsInteractor.get(serverInteractor.get()!!)
 
     fun signup(name: String, username: String, password: String, email: String) {
@@ -79,7 +74,6 @@ class SignupPresenter @Inject constructor(
                         saveCurrentServerInteractor.save(currentServer)
                         localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, me.username)
                         saveAccount(me)
-                        registerPushToken()
                         analyticsManager.logSignUp(
                             AuthenticationEvent.AuthenticationWithUserAndPassword,
                             true
@@ -117,14 +111,6 @@ class SignupPresenter @Inject constructor(
         }
     }
 
-    private suspend fun registerPushToken() {
-        localRepository.get(LocalRepository.KEY_PUSH_TOKEN)?.let {
-            client.registerPushToken(it, getAccountsInteractor.get(), factory)
-        }
-        // TODO: When the push token is null, at some point we should receive it with
-        // onTokenRefresh() on FirebaseTokenService, we need to confirm it.
-    }
-
     private suspend fun saveAccount(me: Myself) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)

app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt

@@ -5,7 +5,6 @@ import chat.rocket.android.analytics.event.AuthenticationEvent
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
@@ -18,13 +17,11 @@ import chat.rocket.android.server.domain.wideTile
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO
 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.login
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.model.Myself
@@ -41,11 +38,9 @@ class TwoFAPresenter @Inject constructor(
     private val analyticsManager: AnalyticsManager,
     private val factory: RocketChatClientFactory,
     private val saveAccountInteractor: SaveAccountInteractor,
-    private val getAccountsInteractor: GetAccountsInteractor,
     settingsInteractor: GetSettingsInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(currentServer)
     private var settings: PublicSettings = settingsInteractor.get(serverInteractor.get()!!)
 
     // TODO: If the usernameOrEmail and password was informed by the user on the previous screen, then we should pass only the pin, like this: fun authenticate(pin: EditText)
@@ -75,7 +70,7 @@ class TwoFAPresenter @Inject constructor(
                         saveAccount(me)
                         saveCurrentServerInteractor.save(currentServer)
                         tokenRepository.save(server, token)
-                        registerPushToken()
+                        localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, me.username)
                         analyticsManager.logLogin(
                             AuthenticationEvent.AuthenticationWithUserAndPassword,
                             true
@@ -105,14 +100,6 @@ class TwoFAPresenter @Inject constructor(
 
     fun signup() = navigator.toSignUp()
 
-    private suspend fun registerPushToken() {
-        localRepository.get(LocalRepository.KEY_PUSH_TOKEN)?.let {
-            client.registerPushToken(it, getAccountsInteractor.get(), factory)
-        }
-        // TODO: When the push token is null, at some point we should receive it with
-        // onTokenRefresh() on FirebaseTokenService, we need to confirm it.
-    }
-
     private suspend fun saveAccount(me: Myself) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)

app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt

@@ -158,23 +158,36 @@ class ChatRoomAdapter(
     }
 
     fun prependData(dataSet: List<BaseUiModel<*>>) {
-        val item = dataSet.indexOfFirst { newItem ->
-            this.dataSet.indexOfFirst { it.messageId == newItem.messageId && it.viewType == newItem.viewType } > -1
-        }
-        if (item == -1) {
-            this.dataSet.addAll(0, dataSet)
-            notifyItemRangeInserted(0, dataSet.size)
-        } else {
-            dataSet.forEach { item ->
-                val index = this.dataSet.indexOfFirst {
-                    item.messageId == it.messageId && item.viewType == it.viewType
-                }
-                if (index > -1) {
-                    this.dataSet[index] = item
-                    notifyItemChanged(index)
-                }
-            }
-        }
+        //---At first we will update all already saved elements with received updated ones
+        val filteredDataSet = dataSet.filter { newItem ->
+            val matchedIndex = this.dataSet.indexOfFirst { it.messageId == newItem.messageId && it.viewType == newItem.viewType }
+            if (matchedIndex > -1) {
+                this.dataSet[matchedIndex] = newItem
+                notifyItemChanged(matchedIndex)
+            }
+            return@filter (matchedIndex < 0)
+        }
+        val minAdditionDate = filteredDataSet.minBy { it.message.timestamp } ?: return
+        //---In the most cases we will just add new elements to the top of messages heap
+        if (this.dataSet.isEmpty() || minAdditionDate.message.timestamp > this.dataSet[0].message.timestamp) {
+            this.dataSet.addAll(0, filteredDataSet)
+            notifyItemRangeInserted(0, filteredDataSet.size)
+            return
+        }
+        //---Else branch: merging messages---
+        //---We are inserting new received elements into set. Sort them by time+type and show
+        if (filteredDataSet.isEmpty()) return
+        this.dataSet.addAll(0, filteredDataSet)
+        val tmp = this.dataSet.sortedWith(Comparator { t, t2 ->
+            val timeComparison = t.message.timestamp.compareTo(t2.message.timestamp)
+            if (timeComparison == 0) {
+                return@Comparator t.viewType.compareTo(t2.viewType)
+            }
+            timeComparison
+        }).reversed()
+        this.dataSet.clear()
+        this.dataSet.addAll(tmp)
+        notifyDataSetChanged()
     }
 
     fun updateItem(message: BaseUiModel<*>) {

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

 package chat.rocket.android.chatroom.presentation
 
+import android.graphics.Bitmap
 import android.net.Uri
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
@@ -32,6 +33,7 @@ import chat.rocket.android.server.domain.uploadMimeTypeFilter
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.state
+import chat.rocket.android.util.extension.compressImageAndGetByteArray
 import chat.rocket.android.util.extension.compressImageAndGetInputStream
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
@@ -80,6 +82,7 @@ import org.threeten.bp.Instant
 import timber.log.Timber
 import java.io.InputStream
 import java.util.*
+import java.util.zip.DeflaterInputStream
 import javax.inject.Inject
 
 class ChatRoomPresenter @Inject constructor(
@@ -182,7 +185,8 @@ class ChatRoomPresenter @Inject constructor(
                             isBroadcast = chatIsBroadcast, isRoom = true
                         )
                     )
-                    if (oldMessages.isNotEmpty()) {
+                    val lastSyncDate = messagesRepository.getLastSyncDate(chatRoomId)
+                    if (oldMessages.isNotEmpty() && lastSyncDate != null) {
                         view.showMessages(oldMessages, clearDataSet)
                         loadMissingMessages()
                     } else {
@@ -224,6 +228,19 @@ class ChatRoomPresenter @Inject constructor(
                 client.messages(chatRoomId, roomTypeOf(chatRoomType), offset, 30).result
             }
         messagesRepository.saveAll(messages)
+
+        //we are saving last sync date of latest synced chat room message
+        if (offset == 0L) {
+            //if success - saving last synced time
+            if (messages.isEmpty()) {
+                //chat history is empty - just saving current date
+                messagesRepository.saveLastSyncDate(chatRoomId, System.currentTimeMillis())
+            } else {
+                //assume that BE returns ordered messages, the first message is the latest one
+                messagesRepository.saveLastSyncDate(chatRoomId, messages.first().timestamp)
+            }
+        }
+
         view.showMessages(
             mapper.map(
                 messages,
@@ -273,7 +290,7 @@ class ChatRoomPresenter @Inject constructor(
                         timestamp = Instant.now().toEpochMilli(),
                         sender = SimpleUser(null, username, username),
                         attachments = null,
-                        avatar = currentServer.avatarUrl(username!!),
+                        avatar = currentServer.avatarUrl(username ?: ""),
                         channels = null,
                         editedAt = null,
                         editedBy = null,
@@ -331,14 +348,15 @@ class ChatRoomPresenter @Inject constructor(
         view.showFileSelection(settings.uploadMimeTypeFilter())
     }
 
-    fun uploadFile(roomId: String, uri: Uri, msg: String) {
+    fun uploadFile(roomId: String, uri: Uri, msg: String, bitmap: Bitmap? = null) {
         launchUI(strategy) {
             view.showLoading()
             try {
                 withContext(DefaultDispatcher) {
                     val fileName = uriInteractor.getFileName(uri) ?: uri.toString()
-                    val fileSize = uriInteractor.getFileSize(uri)
                     val mimeType = uriInteractor.getMimeType(uri)
+                    val byteArray = bitmap?.compressImageAndGetByteArray(mimeType)
+                    val fileSize = byteArray?.size ?: uriInteractor.getFileSize(uri)
                     val maxFileSizeAllowed = settings.uploadMaxFileSize()
 
                     when {
@@ -346,16 +364,6 @@ class ChatRoomPresenter @Inject constructor(
                         fileSize > maxFileSizeAllowed && maxFileSizeAllowed !in -1..0 ->
                             view.showInvalidFileSize(fileSize, maxFileSizeAllowed)
                         else -> {
-                            var inputStream: InputStream? = uriInteractor.getInputStream(uri)
-
-                            if (mimeType.contains("image")) {
-                                uriInteractor.getBitmap(uri)?.let {
-                                    it.compressImageAndGetInputStream(mimeType)?.let {
-                                        inputStream = it
-                                    }
-                                }
-                            }
-
                             retryIO("uploadFile($roomId, $fileName, $mimeType") {
                                 client.uploadFile(
                                     roomId,
@@ -364,7 +372,7 @@ class ChatRoomPresenter @Inject constructor(
                                     msg,
                                     description = fileName
                                 ) {
-                                    inputStream
+                                    byteArray?.inputStream() ?: uriInteractor.getInputStream(uri)
                                 }
                             }
                             logMediaUploaded(mimeType)
@@ -485,11 +493,13 @@ class ChatRoomPresenter @Inject constructor(
 
     private fun loadMissingMessages() {
         launch(parent = strategy.jobs) {
-            if (chatRoomId != null && chatRoomType != null) {
-                val roomType = roomTypeOf(chatRoomType!!)
-                messagesRepository.getByRoomId(chatRoomId!!)
-                    .sortedByDescending { it.timestamp }.firstOrNull()?.let { lastMessage ->
-                        val instant = Instant.ofEpochMilli(lastMessage.timestamp).toString()
+            chatRoomId?.let { chatRoomId ->
+                val roomType = roomTypeOf(chatRoomType)
+                val lastSyncDate = messagesRepository.getLastSyncDate(chatRoomId)
+                // lastSyncDate or 0. LastSyncDate could be in case when we sent some messages offline(and saved them locally),
+                // but never has obtained chatMessages(or history) from remote. In this case we should sync all chat history from beginning
+                val instant = Instant.ofEpochMilli(lastSyncDate ?: 0).toString()
+                //
                 try {
                     val messages =
                         retryIO(description = "history($chatRoomId, $roomType, $instant)") {
@@ -508,6 +518,9 @@ class ChatRoomPresenter @Inject constructor(
                             isRoom = true
                         ))
                         messagesRepository.saveAll(messages.result)
+                        //if success - saving last synced time
+                        //assume that BE returns ordered messages, the first message is the latest one
+                        messagesRepository.saveLastSyncDate(chatRoomId, messages.result.first().timestamp)
 
                         launchUI(strategy) {
                             view.showNewMessage(models, true)
@@ -526,7 +539,6 @@ class ChatRoomPresenter @Inject constructor(
             }
         }
     }
-    }
 
     /**
      * Delete the message with the given id.

app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt

@@ -5,7 +5,6 @@ import android.app.job.JobService
 import chat.rocket.android.server.domain.CurrentServerRepository
 import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.common.RocketChatException
 import chat.rocket.core.internal.rest.sendMessage
 import chat.rocket.core.model.Message
 import dagger.android.AndroidInjection

app/src/main/java/chat/rocket/android/chatroom/ui/Dialog.kt

 package chat.rocket.android.chatroom.ui
 
+import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import androidx.core.view.isVisible
+import chat.rocket.android.emoji.internal.GlideApp
 import chat.rocket.android.util.extensions.getFileName
 import chat.rocket.android.util.extensions.getMimeType
+import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.transition.Transition
 
 fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
-    activity?.let { fragmentActivity ->
-        uri.getMimeType(fragmentActivity).let { mimeType ->
+    imagePreview.isVisible = false
+    audioVideoAttachment.isVisible = false
+    textFile.isVisible = false
+    var bitmap: Bitmap? = null
+
+    activity?.let { context ->
+        uri.getMimeType(context).let { mimeType ->
             description.text.clear()
             when {
                 mimeType.startsWith("image") -> {
+                    GlideApp
+                        .with(context)
+                        .asBitmap()
+                        .load(uri)
+                        .override(imagePreview.width, imagePreview.height)
+                        .fitCenter()
+                        .into(object : SimpleTarget<Bitmap>() {
+                            override fun onResourceReady(
+                                resource: Bitmap,
+                                transition: Transition<in Bitmap>?
+                            ) {
+                                bitmap = resource
+                                imagePreview.setImageBitmap(resource)
                                 imagePreview.isVisible = true
-                    imagePreview.setImageURI(uri)
                             }
-                mimeType.startsWith("video") -> {
-                    audioVideoAttachment.isVisible = true
+                        })
                 }
+                mimeType.startsWith("video") -> audioVideoAttachment.isVisible = true
                 else -> {
                     textFile.isVisible = true
-                    textFile.text = uri.getFileName(fragmentActivity)
+                    textFile.text = uri.getFileName(context)
                 }
             }
         }
     }
 
     sendButton.setOnClickListener {
-        presenter.uploadFile(chatRoomId, uri, (citation ?: "") + description.text.toString())
+        presenter.uploadFile(
+            chatRoomId,
+            uri,
+            (citation ?: "") + description.text.toString(),
+            bitmap
+        )
         alertDialog.dismiss()
     }
     cancelButton.setOnClickListener { alertDialog.dismiss() }

app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt

@@ -17,15 +17,15 @@ import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.realtime.socket.model.State
 import chat.rocket.core.internal.rest.spotlight
 import chat.rocket.core.model.SpotlightResult
+import com.shopify.livedataktx.distinct
+import com.shopify.livedataktx.map
+import com.shopify.livedataktx.nonNull
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.delay
 import kotlinx.coroutines.experimental.isActive
 import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.newSingleThreadContext
 import kotlinx.coroutines.experimental.withContext
-import me.henrytao.livedataktx.distinct
-import me.henrytao.livedataktx.map
-import me.henrytao.livedataktx.nonNull
 import timber.log.Timber
 import java.security.InvalidParameterException
 import kotlin.coroutines.experimental.coroutineContext

app/src/main/java/chat/rocket/android/dagger/AppComponent.kt

 package chat.rocket.android.dagger
 
 import android.app.Application
-import chat.rocket.android.app.AppLifecycleObserver
 import chat.rocket.android.app.RocketChatApplication
 import chat.rocket.android.chatroom.service.MessageService
 import chat.rocket.android.dagger.module.ActivityBuilder
+import chat.rocket.android.dagger.module.AndroidWorkerInjectionModule
 import chat.rocket.android.dagger.module.AppModule
 import chat.rocket.android.dagger.module.ReceiverBuilder
 import chat.rocket.android.dagger.module.ServiceBuilder
-import chat.rocket.android.push.FirebaseTokenService
 import dagger.BindsInstance
 import dagger.Component
 import dagger.android.support.AndroidSupportInjectionModule
@@ -16,7 +15,8 @@ import javax.inject.Singleton
 
 @Singleton
 @Component(modules = [AndroidSupportInjectionModule::class,
-    AppModule::class, ActivityBuilder::class, ServiceBuilder::class, ReceiverBuilder::class])
+    AppModule::class, ActivityBuilder::class, ServiceBuilder::class, ReceiverBuilder::class,
+    AndroidWorkerInjectionModule::class])
 interface AppComponent {
 
     @Component.Builder
@@ -29,10 +29,5 @@ interface AppComponent {
 
     fun inject(app: RocketChatApplication)
 
-    fun inject(service: FirebaseTokenService)
-
     fun inject(service: MessageService)
-
-    /*@Component.Builder
-    abstract class Builder : AndroidInjector.Builder<RocketChatApplication>()*/
 }

app/src/main/java/chat/rocket/android/dagger/injector/AndroidWorkerInjection.kt

+package chat.rocket.android.dagger.injector
+
+import androidx.work.Worker
+
+object AndroidWorkerInjection {
+
+    fun inject(worker: Worker) {
+        val application = worker.applicationContext
+        if (application !is HasWorkerInjector) {
+            throw RuntimeException("${application.javaClass.canonicalName} does not implement ${HasWorkerInjector::class.java.canonicalName}")
+        }
+
+        val workerInjector = (application as HasWorkerInjector).workerInjector()
+        checkNotNull(workerInjector) { "${application.javaClass}.workerInjector() return null" }
+        workerInjector.inject(worker)
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/dagger/injector/HasWorkerInjector.kt

+package chat.rocket.android.dagger.injector
+
+import androidx.work.Worker
+import dagger.android.AndroidInjector
+
+interface HasWorkerInjector {
+    fun workerInjector(): AndroidInjector<Worker>
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt

 package chat.rocket.android.dagger.module
 
+import chat.rocket.android.about.di.AboutFragmentProvider
 import chat.rocket.android.authentication.di.AuthenticationModule
 import chat.rocket.android.authentication.login.di.LoginFragmentProvider
 import chat.rocket.android.authentication.registerusername.di.RegisterUsernameFragmentProvider
@@ -58,6 +59,7 @@ abstract class ActivityBuilder {
             CreateChannelProvider::class,
             ProfileFragmentProvider::class,
             SettingsFragmentProvider::class,
+            AboutFragmentProvider::class,
             PreferencesFragmentProvider::class
         ]
     )

app/src/main/java/chat/rocket/android/dagger/module/AndroidWorkerInjectionModule.kt

+package chat.rocket.android.dagger.module
+
+import androidx.work.Worker
+import dagger.Module
+import dagger.android.AndroidInjector
+import dagger.multibindings.Multibinds
+
+@Module
+abstract class AndroidWorkerInjectionModule {
+    @Multibinds
+    abstract fun workerInjectorFactories(): Map<Class<out Worker>, AndroidInjector.Factory<out Worker>>
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/dagger/qualifier/WorkerKey.kt

+package chat.rocket.android.dagger.qualifier
+
+import androidx.work.Worker
+import dagger.MapKey
+import kotlin.reflect.KClass
+
+@MapKey
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.FUNCTION)
+annotation class WorkerKey(val value: KClass<out Worker>)

app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt

@@ -78,6 +78,7 @@ class FilesFragment : Fragment(), FilesView {
     }
 
     override fun showFiles(dataSet: List<FileUiModel>, total: Long) {
+        ui {
             setupToolbar(total)
             if (adapter.itemCount == 0) {
                 adapter.prependData(dataSet)
@@ -96,7 +97,7 @@ class FilesFragment : Fragment(), FilesView {
                 group_no_file.isVisible = dataSet.isEmpty()
             } else {
                 adapter.appendData(dataSet)
-
+            }
         }
     }
 

app/src/main/java/chat/rocket/android/files/uimodel/FileUiModel.kt

@@ -34,8 +34,8 @@ class FileUiModel(
     }
 
     private fun getUserDisplayName(): String {
-        val username = "@${genericAttachment.user?.username}"
-        val realName = genericAttachment.user?.name
+        val username = "@${genericAttachment.user.username}"
+        val realName = genericAttachment.user.name
         val uploaderName = if (settings.useRealName()) realName else username
         return uploaderName ?: username
     }

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -131,7 +131,7 @@ class MessageParser @Inject constructor(
         private val builder: SpannableBuilder
     ) : SpannableMarkdownVisitor(configuration, builder) {
 
-        private val emojiSize = context.resources.getDimensionPixelSize(R.dimen.radius_mention)
+        private val emojiSize = context.resources.getDimensionPixelSize(R.dimen.custom_emoji_small)
 
         override fun visit(document: Document) {
             val spannable = EmojiParser.parse(context, builder.text())

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

@@ -59,7 +59,7 @@ class MainPresenter @Inject constructor(
     private val saveAccountInteractor: SaveAccountInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
     private val removeAccountInteractor: RemoveAccountInteractor,
-    private val factory: RocketChatClientFactory,
+    factory: RocketChatClientFactory,
     private val groupedPush: GroupedPush,
     dbManagerFactory: DatabaseManagerFactory,
     getSettingsInteractor: GetSettingsInteractor,
@@ -233,13 +233,6 @@ class MainPresenter @Inject constructor(
         }
     }
 
-    suspend fun refreshToken(token: String?) {
-        token?.let {
-            localRepository.save(LocalRepository.KEY_PUSH_TOKEN, token)
-            client.registerPushToken(token, getAccountsInteractor.get(), factory)
-        }
-    }
-
     private suspend fun saveAccount(uiModel: NavHeaderUiModel) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)

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

@@ -18,6 +18,7 @@ import chat.rocket.android.main.adapter.Selector
 import chat.rocket.android.main.presentation.MainPresenter
 import chat.rocket.android.main.presentation.MainView
 import chat.rocket.android.main.uimodel.NavHeaderUiModel
+import chat.rocket.android.push.refreshPushToken
 import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.ui.INTENT_CHAT_ROOM_ID
@@ -26,7 +27,6 @@ import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.rotateBy
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.invalidateFirebaseToken
-import chat.rocket.android.util.refreshFCMToken
 import chat.rocket.common.model.UserStatus
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
@@ -36,9 +36,6 @@ import dagger.android.support.HasSupportFragmentInjector
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.nav_header.view.*
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.launch
-import timber.log.Timber
 import javax.inject.Inject
 
 private const val CURRENT_STATE = "current_state"
@@ -64,9 +61,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        launch(CommonPool) {
-            refreshFCMToken(presenter)
-        }
+        refreshPushToken()
 
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
 

app/src/main/java/chat/rocket/android/members/di/MembersFragmentProvider.kt

@@ -2,6 +2,7 @@ package chat.rocket.android.members.di
 
 import chat.rocket.android.members.ui.MembersFragment
 import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.members.ui.MemberBottomSheetFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -11,4 +12,9 @@ abstract class MembersFragmentProvider {
     @ContributesAndroidInjector(modules = [MembersFragmentModule::class])
     @PerFragment
     abstract fun provideMembersFragment(): MembersFragment
+
+    @ContributesAndroidInjector()
+    @PerFragment
+    abstract fun provideMemberBottomSheetFragment(): MemberBottomSheetFragment
+
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/members/ui/MemberBottomSheetFragment.kt

@@ -11,6 +11,7 @@ import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.util.extensions.content
 import chat.rocket.android.util.extensions.textContent
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_member_bottom_sheet.*
 import javax.inject.Inject
 
@@ -51,6 +52,7 @@ class MemberBottomSheetFragment : BottomSheetDialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
 
         val bundle = arguments
         if (bundle != null) {

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

@@ -4,7 +4,6 @@ import android.app.NotificationManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.RemoteInput
 import android.widget.Toast
 import chat.rocket.android.R

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

@@ -72,4 +72,22 @@ interface MessagesRepository {
     suspend fun getAllUnsent(): List<Message>
 
     suspend fun getUnsentByRoomId(roomId: String): List<Message>
+
+    /**
+     * Save time of the latest room messages sync.
+     * Call this fun only when the latest messages list being received via /history or /messages network calls
+     *
+     * @param rid The id of the room the messages are.
+     * @param timeMillis time of room messages sync or the latest room message timestamp(which came with /history request)
+     */
+    suspend fun saveLastSyncDate(rid: String, timeMillis: Long)
+
+    /**
+     * Get time when the room chat history has been loaded last time.
+     *
+     * @param rid The id of the room the messages are.
+     *
+     * @return Last Sync time or Null.
+     */
+    suspend fun getLastSyncDate(rid: String): Long?
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/infraestructure/MemoryMessagesRepository.kt

@@ -7,8 +7,16 @@ import kotlinx.coroutines.experimental.withContext
 
 class MemoryMessagesRepository : MessagesRepository {
 
+    private var lastSyncDates: HashMap<String, Long> = HashMap()
+
     private val messages: HashMap<String, Message> = HashMap()
 
+    override suspend fun saveLastSyncDate(rid: String, timeMillis: Long) {
+        lastSyncDates[rid] = timeMillis
+    }
+
+    override suspend fun getLastSyncDate(rid: String) = lastSyncDates[rid]
+
     override suspend fun getById(id: String): Message? = withContext(CommonPool) {
         return@withContext messages[id]
     }

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesMessagesRepository.kt

@@ -13,6 +13,27 @@ class SharedPreferencesMessagesRepository(
     private val moshi: Moshi,
     private val currentServerInteractor: GetCurrentServerInteractor
 ) : MessagesRepository {
+    private val KEY_LAST_SYNC_DATE = "KEY_LAST_SYNC_DATE"
+
+    override suspend fun saveLastSyncDate(rid: String, timeMillis: Long) {
+        withContext(CommonPool) {
+            currentServerInteractor.get()?.let {
+                prefs.edit().putLong(getSyncDateKey(it, rid), timeMillis).apply()
+            }
+        }
+    }
+
+    override suspend fun getLastSyncDate(rid: String): Long? = withContext(CommonPool) {
+        currentServerInteractor.get()?.also { server ->
+            if (!prefs.contains(getSyncDateKey(server, rid)))
+                return@withContext null
+            val time = prefs.getLong(getSyncDateKey(server, rid), -1)
+            return@withContext if (time == -1L) null else time
+        }
+        return@withContext null
+    }
+
+    private fun getSyncDateKey(server: String, rid: String) = "${KEY_LAST_SYNC_DATE}_$server $rid"
 
     override suspend fun getById(id: String): Message? = withContext(CommonPool) {
         currentServerInteractor.get()?.also { server ->

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

@@ -27,7 +27,7 @@ class PasswordPresenter @Inject constructor(
 
                 val me = retryIO("me") { client.me() }
                 retryIO("updateProfile(${me.id})") {
-                    client.updateProfile(me.id!!, null, null, password, null)
+                    client.updateProfile(me.id, null, null, password, null)
                 }
 
                 view.showPasswordSuccessfullyUpdatedMessage()

app/src/main/java/chat/rocket/android/util/extensions/RocketChatClient.kt

@@ -7,18 +7,18 @@ import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.registerPushToken
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 
-suspend fun RocketChatClient.registerPushToken(
+suspend fun RocketChatClientFactory.registerPushToken(
     token: String,
-    accounts: List<Account>,
-    factory: RocketChatClientFactory
+    accounts: List<Account>
 ) {
-    launch(CommonPool) {
+    withContext(CommonPool) {
         accounts.forEach { account ->
             try {
                 retryIO(description = "register push token: ${account.serverUrl}") {
-                    factory.create(account.serverUrl).registerPushToken(token)
+                    create(account.serverUrl).registerPushToken(token)
                 }
             } catch (ex: Exception) {
                 Timber.d(ex, "Error registering Push token for ${account.serverUrl}")

app/src/main/java/chat/rocket/android/util/extensions/Uri.kt

@@ -10,15 +10,19 @@ import android.provider.DocumentsContract
 import android.provider.MediaStore
 import android.provider.OpenableColumns
 import android.webkit.MimeTypeMap
-import java.io.*
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.io.InputStream
 
 fun Uri.getFileName(context: Context): String? {
     val cursor = context.contentResolver.query(this, null, null, null, null, null)
 
     var fileName: String? = null
-    cursor.use { cursor ->
-        if (cursor != null && cursor.moveToFirst()) {
-            fileName = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME))
+    cursor?.use {
+        if (it.moveToFirst()) {
+            fileName = it.getString(it.getColumnIndex(OpenableColumns.DISPLAY_NAME))
         }
     }
     return fileName
@@ -29,7 +33,7 @@ fun Uri.getFileSize(context: Context): Int {
     if (scheme == ContentResolver.SCHEME_CONTENT) {
         try {
             val fileInputStream = context.contentResolver.openInputStream(this)
-            fileSize = fileInputStream.available().toString()
+            fileSize = fileInputStream?.available().toString()
         } catch (e: Exception) {
             e.printStackTrace()
         }
@@ -67,14 +71,17 @@ fun Uri.isVirtualFile(context: Context): Boolean {
     val cursor = context.contentResolver.query(
         this,
         arrayOf(DocumentsContract.Document.COLUMN_FLAGS),
-        null, null, null
+        null,
+        null,
+        null
     )
 
     var flags = 0
-    if (cursor.moveToFirst()) {
-        flags = cursor.getInt(0)
+    cursor?.use {
+        if (it.moveToFirst()) {
+            flags = it.getInt(0)
+        }
     }
-    cursor.close()
 
     return flags and DocumentsContract.Document.FLAG_VIRTUAL_DOCUMENT != 0
 }

app/src/main/java/chat/rocket/android/util/livedata/WrappedLiveData.kt

@@ -4,11 +4,8 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.CoroutineScope
 import kotlinx.coroutines.experimental.Job
-import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.withContext
 import kotlin.coroutines.experimental.CoroutineContext
 
 class WrappedLiveData<Source, Output>(

app/src/main/java/chat/rocket/android/webview/adminpanel/ui/AdminPanelWebViewFragment.kt

@@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.ui
 import kotlinx.android.synthetic.main.fragment_admin_panel_web_view.*
 
 private const val BUNDLE_WEB_PAGE_URL = "web_page_url"
@@ -58,10 +59,12 @@ class AdminPanelWebViewFragment : Fragment() {
         web_view.webViewClient = object : WebViewClient() {
             override fun onPageFinished(view: WebView, url: String) {
                 super.onPageFinished(view, url)
+                ui { _ ->
                     view_loading.hide()
                     web_view.evaluateJavascript("Meteor.loginWithToken('$userToken', function() { })") {}
                 }
             }
+        }
         web_view.loadUrl(webPageUrl)
     }
 

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

@@ -8,32 +8,19 @@
         android:translateX="281.28394"
         android:translateY="271.51514">
         <path
-            android:fillColor="#CC3333"
+            android:fillColor="#FFDB2323"
             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:fillColor="#FFDB2323"
             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:fillColor="#FFDB2323"
             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:fillColor="#FFDB2323"
             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>
\ No newline at end of file

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

 <resources>
+
     <!-- Titles -->
     <string name="title_sign_in_your_server">Anmelden am Server</string>
     <string name="title_log_in">Anmelden</string>
@@ -70,7 +71,6 @@
     <string name="msg_invalid_email">Bitte eine korrekte E-Mail Adresse eingeben</string>
     <string name="msg_new_user_agreement">Beim weitergehen akzeptieren Sie usere\n%1$s und %2$s</string>
     <string name="msg_2fa_code">2FA Code</string>
-    <!-- <string name="msg_more_than_ninety_nine_unread_messages" translatable="false">99+</string> -->
     <string name="msg_yesterday">Gestern</string>
     <string name="msg_today">Heute</string>
     <string name="msg_message">Nachricht</string>
@@ -104,11 +104,8 @@
     <string name="msg_no_messages_yet">Noch keine Nachrichten</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Server Version veraltet. Bitte kontaktieren Sie ihren Server Administrator.</string>
-    <string name="msg_ver_not_recommended">
-        Die Server Version scheint älter als die empfolene Version %1$s zu sein.\nSie können sich trotzdem einloggen, aber es kann zu einem unerwartetem Verhalten kommen.</string>
-    <string name="msg_ver_not_minimum">
-        Die Server Version scheint älter als die minimale Version %1$s zu sein.\nBitte updaten Sie Ihren Server um sich einloggen zu können!
-    </string>
+    <string name="msg_ver_not_recommended">Die Server Version scheint älter als die empfolene Version %1$s zu sein.\nSie können sich trotzdem einloggen, aber es kann zu einem unerwartetem Verhalten kommen.</string>
+    <string name="msg_ver_not_minimum">Die Server Version scheint älter als die minimale Version %1$s zu sein.\nBitte updaten Sie Ihren Server um sich einloggen zu können!</string>
     <string name="msg_no_chat_title">Keine Chat Nachrichten</string>
     <string name="msg_no_chat_description">Starte die Konversation um Ihre \nNachrichten hier zu sehen.</string>
     <string name="msg_proceed">WEITER</string>

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

 <resources>
+
     <!-- Titles -->
     <string name="title_sign_in_your_server">Connectez-vous sur votre serveur</string>
     <string name="title_log_in">S\'identifier</string>

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

@@ -12,9 +12,9 @@
     <string name="title_profile">प्रोफाइल</string>
     <string name="title_members">सदस्य (%d)</string>
     <string name="title_settings">सेटिंग्स</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_preferences">प्राथमिकताएँ</string>
     <string name="title_change_password">पासवर्ड बदलें</string>
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">एडमिन पैनल</string>
     <string name="title_password">पासवर्ड बदलें</string>
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
     <string name="title_about">परिचय</string>
@@ -42,13 +42,13 @@
     <string name="action_invisible">अदृश्य</string>
     <string name="action_save_to_gallery">गैलरी में सहेजें</string>
     <string name="action_drawing">चित्रकारी</string>
-    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_take_photo">Select photo from gallery</string> <!-- TODO Add translation -->
-    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
+    <string name="action_select_photo_from_gallery">गैलरी से फोटो का चयन करें</string>
+    <string name="action_take_photo">फोटो खेचिये</string>
+    <string name="action_reset_avatar">अवतार रीसेट करें</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_preferences">प्राथमिकताएँ</item>
         <item name="item_password">पासवर्ड बदलें</item>
         <item name="item_password">परिचय</item>
     </string-array>
@@ -85,7 +85,7 @@
     <string name="msg_content_description_log_in_using_meteor">Meteor द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_twitter">Twitter द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_gitlab">Gitlab द्वारा लॉगिन करें</string>
-    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">WordPress द्वारा लॉगिन करें</string>
     <string name="msg_content_description_send_message">मेसेज भेजें</string>
     <string name="msg_content_description_show_attachment_options">अटैचमेंट विकल्प दिखाएं</string>
     <string name="msg_you">आप</string>
@@ -147,10 +147,10 @@
     <string name="msg_channel_created_successfully">चैनल सफलतापूर्वक बनाया गया</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">एनालिटिक्स ट्रैकिंग</string>
+    <string name="msg_send_analytics_tracking">इस ऐप को बेहतर बनाने में मदद के लिए अज्ञात स्टेटिक्स भेजें</string>
+    <string name="msg_do_not_send_analytics_tracking">इस ऐप को बेहतर बनाने में मदद के लिए अनाम स्टेटिक न भेजें</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">लागू नहीं है क्योंकि यह एक FOSS संस्करण है</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">%2$s ने रूम का नाम बदलकर %1$s किया</string>
@@ -190,8 +190,7 @@
     <string name="permission_starring_not_allowed">तारांकित की अनुमति नहीं है</string>
 
     <!-- Search message -->
-    <!-- TODO Add proper translation-->
-    <string name="title_search_message">Search message</string>
+    <string name="title_search_message">संदेश खोजें</string>
 
     <!-- Favorite/Unfavorite chat room -->
     <string name="title_favorite_chat">पसंदीदा चैट</string>
@@ -270,7 +269,7 @@
     <string name="dialog_sort_by_activity">गतिविधि</string>
     <string name="dialog_group_by_type">प्रकार के आधार पर समूह</string>
     <string name="dialog_group_favourites">पसंदीदा समूह</string>
-    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
+    <string name="dialog_button_done">पूर्ण</string>
     <string name="chatroom_header">हैडर</string>
 
     <!--ChatRooms Headers-->

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

+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+    <string name="app_name" translatable="false">Rocket.Chat</string>
+
+    <!-- Titles -->
+    <string name="title_sign_in_your_server">サーバーに接続</string>
+    <string name="title_log_in">ログイン</string>
+    <string name="title_register_username">ユーザー名を登録する</string>
+    <string name="title_reset_password">パスワードリセット</string>
+    <string name="title_sign_up">サインアップ</string>
+    <string name="title_authentication">認証</string>
+    <string name="title_legal_terms">Legal Terms</string>
+    <string name="title_chats">チャット</string>
+    <string name="title_profile">プロフィール</string>
+    <string name="title_members">メンバー (%d)</string>
+    <string name="title_settings">設定</string>
+    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_change_password">Change Password</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_password">パスワードの変更</string>
+    <string name="title_update_profile">プロフィールの更新</string>
+    <string name="title_about">About</string>
+    <string name="title_create_channel">新しいチャネルを作成します</string>
+
+    <!-- Actions -->
+    <string name="action_connect">接続</string>
+    <string name="action_use_this_username">このユーザー名を使用する</string>
+    <string name="action_login_or_sign_up">ログインまたはアカウントを作成するにはこのボタンを押してください</string>
+    <string name="action_terms_of_service">サービス利用規約</string>
+    <string name="action_privacy_policy">プライバシーポリシー</string>
+    <string name="action_search">検索</string>
+    <string name="action_update">更新</string>
+    <string name="action_settings">設定</string>
+    <string name="action_create_channel">チャンネル作成</string>
+    <string name="action_create">作ります</string>
+    <string name="action_logout">ログアウト</string>
+    <string name="action_files">ファイル</string>
+    <string name="action_confirm_password">変更したパスワードの確認</string>
+    <string name="action_join_chat">チャットに参加</string>
+    <string name="action_add_account">サーバーの追加</string>
+    <string name="action_online">オンライン</string>
+    <string name="action_away">離席中</string>
+    <string name="action_busy">取り込み中</string>
+    <string name="action_invisible">状態を隠す</string>
+    <string name="action_drawing">絵を描く</string>
+    <string name="action_save_to_gallery">ギャラリーに保存</string>
+    <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
+    <string name="action_take_photo">Take photo</string> <!-- TODO Add translation -->
+    <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
+
+    <!-- Settings List -->
+    <string-array name="settings_actions">
+        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_password">Change Password</item> <!-- TODO Add translation -->
+        <item name="item_password">About</item> <!-- TODO Add translation -->
+    </string-array>
+
+    <!-- Regular information messages -->
+    <string name="msg_generic_error">エラーが発生しました。もう一度お試しください。</string>
+    <string name="msg_no_data_to_display">表示するデータがありません</string>
+    <string name="msg_profile_update_successfully">プロフィールの更新に成功しました</string>
+    <string name="msg_username">ユーザー名</string>
+    <string name="msg_username_or_email">メールアドレスまたはユーザー名</string>
+    <string name="msg_password">パスワード</string>
+    <string name="msg_name">名前</string>
+    <string name="msg_email">メール</string>
+    <string name="msg_avatar_url">アバター URL</string>
+    <string name="msg_or_continue_using_social_accounts">またはソーシャルアカウントを使用する</string>
+    <string name="msg_new_user">新規ユーザー? %1$s</string>
+    <string name="msg_forgot_password">パスワードをお忘れですか? %1$s</string>
+    <string name="msg_reset">リセット</string>
+    <string name="msg_check_your_email_to_reset_your_password">メールが送信されました! パスワードを変更するためには、受信ボックスを確認してください。</string>
+    <string name="msg_invalid_email">有効なメールアドレスを入力してください</string>
+    <string name="msg_new_user_agreement">サインアップすることで、\n%1$s と %2$s に同意したとみなします。</string>
+    <string name="msg_2fa_code">2FA コード</string>
+    <string name="msg_today">Today</string> <!-- TODO Add translation -->
+    <string name="msg_yesterday">昨日</string>
+    <string name="msg_message">メッセージ</string>
+    <string name="msg_this_room_is_read_only">この部屋は読み取り専用です</string>
+    <string name="msg_invalid_2fa_code">無効な 2FA コード</string>
+    <string name="msg_invalid_file">無効なファイル</string>
+    <string name="msg_invalid_server_url">無効なサーバー URL</string>
+    <string name="msg_content_description_log_in_using_facebook">Login using Facebook</string>
+    <string name="msg_content_description_log_in_using_github">Login using Github</string>
+    <string name="msg_content_description_log_in_using_google">Login using Google</string>
+    <string name="msg_content_description_log_in_using_linkedin">Login using Linkedin</string>
+    <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string>
+    <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string>
+    <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string>
+    <string name="msg_content_description_send_message">メッセージを送信</string> <!-- TODO Add translation -->
+    <string name="msg_content_description_show_attachment_options">添付ファイルオプションを表示する</string>
+    <string name="msg_you">あなた</string>
+    <string name="msg_unknown">不明</string>
+    <string name="msg_email_address">電子メールアドレス</string>
+    <string name="msg_utc_offset">UTC offset</string>
+    <string name="msg_new_password">新しいパスワード</string>
+    <string name="msg_confirm_password">新しいパスワードの確認</string>
+    <string name="msg_channel_name">チャンネル名</string>
+    <string name="msg_search">検索</string>
+    <string name="msg_unread_messages">未読メッセージ</string>
+    <string name="msg_preview_video">ビデオ</string>
+    <string name="msg_preview_audio">音声</string>
+    <string name="msg_preview_photo">写真</string>
+    <string name="msg_preview_file">ファイル</string>
+    <string name="msg_no_messages_yet">メッセージはまだありません</string>
+    <string name="msg_ok">OK</string>
+    <string name="msg_update_app_version_in_order_to_continue">古いバージョンのサーバーを使用しています。続行するには、管理者にサーバーのバージョンを更新するよう連絡してください。</string>
+    <string name="msg_ver_not_recommended">
+        ご使用のサーバーのバージョンは推薦バージョン %1$s よりも古いものです。\nログインは可能ですが、予期しない動作が発生する可能性があります。</string>
+    <string name="msg_ver_not_minimum">
+        サーバーのバージョンが最低限必要なバージョン %1$s よりも古いものです。\nサーバーのバージョンを更新してからログインしてください!
+    </string>
+    <string name="msg_no_chat_title">メッセージがまだありません</string>
+    <string name="msg_no_chat_description">ここから会話を始めましょう</string>
+    <string name="msg_proceed">PROCEED</string>
+    <string name="msg_cancel">キャンセル</string>
+    <string name="msg_warning">警告</string>
+    <string name="msg_http_insecure">HTTPを使用している場合、安全ではないサーバーに接続します。安全なサーバーに接続することをお勧めします。</string>
+    <string name="msg_error_checking_server_version">サーバーのバージョンを確認中にエラーが発生しました。もう一度お試しください。</string>
+    <string name="msg_invalid_server_protocol">選択したプロトコルはこのサーバーでは使用できません。HTTPSを選択してください。</string>
+    <string name="msg_image_saved_successfully">画像をギャラリーに保存しました</string>
+    <string name="msg_image_saved_failed">画像を保存できませんでした</string>
+    <string name="msg_edited">(編集済)</string>
+    <string name="msg_and">\u0020and\u0020</string>
+    <string name="msg_is_typing">\u0020is 入力中…</string>
+    <string name="msg_are_typing">\u0020are 入力中…</string>
+    <string name="msg_several_users_are_typing">複数のユーザーが入力中…</string>
+    <string name="msg_no_search_found">結果が見つかりません</string>
+    <string name="msg_log_out">ログアウト…</string>
+    <string name="msg_upload_file">ファイルをアップロード</string>
+    <string name="msg_file_description">ファイルの説明</string>
+    <string name="msg_send">送信</string>
+    <string name="msg_sent_attachment">添付ファイルを送信しました</string>
+
+    <!-- Create channel messages -->
+    <string name="msg_private_channel">プライベート</string>
+    <string name="msg_public_channel">パブリック</string>
+    <string name="msg_private_channel_description">招待されたユーザーだけがアクセスできます</string>
+    <string name="msg_public_channel_description">誰もがこのチャンネルにアクセスできます</string>
+    <string name="msg_ready_only_channel">読み取り専用チャネル</string>
+    <string name="msg_ready_only_channel_description">許可されたユーザーのみ新しいメッセージを書けます</string>
+    <string name="msg_invite_members">メンバーを招待する</string>
+    <string name="msg_member_already_added">あなたは既にこのユーザーを選択しています</string>
+    <string name="msg_member_not_found">メンバーが見つかりません</string>
+    <string name="msg_channel_created_successfully">チャンネルが正常に作成されました</string>
+    <string name="msg_message_copied">メッセージをコピー</string>
+    <string name="msg_delete_message">メッセージを削除</string>
+    <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
+
+    <!-- Preferences messages -->
+    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
+    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
+    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+
+    <!-- System messages -->
+    <string name="message_room_name_changed">ルーム名を %1$s から %2$s へ変更しました。</string>
+    <string name="message_user_added_by">%1$s がユーザー %2$s を追加しました。</string>
+    <string name="message_user_removed_by">%1$s がユーザー %2$s を削除しました。</string>
+    <string name="message_user_left">チャンネルを退去しました。</string>
+    <string name="message_user_joined_channel">チャンネルへ参加しました。</string>
+    <string name="message_welcome">ようこそ %s</string>
+    <string name="message_removed">メッセージを削除しました。</string>
+    <string name="message_pinned">メッセージをピン留めしました:</string>
+    <string name="message_muted">%2$sでミュートされたユーザー %1$s</string>
+    <string name="message_unmuted">ユーザー %1$s は %2$s によってミュートされていません</string>
+    <string name="message_role_add">%1$s は %3$s によって %2$s に設定されました</string>
+    <string name="message_role_removed">%1$s は %3$s で、もう %2$s ではありません</string>
+    <string name="message_credentials_saved_successfully">資格情報を正常に保存しました</string>
+
+    <!-- Message actions -->
+    <string name="action_msg_reply">返信</string>
+    <string name="action_msg_info">メッセージ情報</string>
+    <string name="action_msg_edit">編集</string>
+    <string name="action_msg_copy">コピー</string>
+    <string name="action_msg_quote">引用</string>
+    <string name="action_msg_delete">削除</string>
+    <string name="action_msg_pin">ピン留めする</string>
+    <string name="action_msg_unpin">ピン留を外す</string>
+    <string name="action_msg_star">スターをつける</string>
+    <string name="action_msg_unstar">スターを外す</string>
+    <string name="action_msg_share">Share</string>
+    <string name="action_title_editing">メッセージの編集</string>
+    <string name="action_msg_add_reaction">リアクションする</string>
+
+    <!-- Permission messages -->
+    <string name="permission_editing_not_allowed">編集は許可されていません</string>
+    <string name="permission_deleting_not_allowed">削除は許可されていません</string>
+    <string name="permission_pinning_not_allowed">ピン留めは許可されていません</string>
+    <string name="permission_starring_not_allowed">閲覧は許可されていません</string>
+
+    <!-- Search message -->
+    <string name="title_search_message">メッセージを検索</string>
+
+    <!-- Favorite/Unfavorite chat room -->
+    <string name="title_favorite_chat">お気に入り</string>
+    <string name="title_unfavorite_chat">お気に入り解除</string>
+
+    <!-- Members List -->
+    <string name="title_members_list">メンバー</string>
+
+    <!-- Mentions -->
+    <string name="msg_mentions">メンション</string>
+    <string name="msg_no_mention">メンションされたメッセージはありません</string>
+    <string name="msg_all_the_mentions_appear_here">全てのメンションされたメッセージが\ここに表示されます</string>
+
+    <!-- Pinned Messages -->
+    <string name="title_pinned_messages">ピン留めされたメッセージ</string>
+    <string name="no_pinned_messages">ピン留めされたメッセージはありません</string>
+    <string name="no_pinned_description">ピン留めされたすべてのメッセージが\ここに表示されます</string>
+
+    <!-- Favorite Messages -->
+    <string name="title_favorite_messages">お気に入りのメッセージ</string>
+    <string name="no_favorite_messages">お気に入りのメッセージはありません</string>
+    <string name="no_favorite_description">全てのお気に入りメッセージが\ここに表示されます</string>
+
+    <!-- Files -->
+    <string name="title_files">ファイル</string>
+    <string name="title_files_total">ファイル (%d)</string>
+    <string name="msg_no_files">ファイルがありません</string>
+    <string name="msg_all_files_appear_here">全てのファイルがここに表示されます</string>
+
+    <!-- Upload Messages -->
+    <string name="max_file_size_exceeded">ファイルサイズ %1$d バイトが最大アップロードサイズ %2$d バイトとを超えました</string>
+
+    <!-- Socket status -->
+    <string name="status_connected">接続済み</string>
+    <string name="status_disconnected">接続切断</string>
+    <string name="status_connecting">接続中</string>
+    <string name="status_authenticating">認証中</string>
+    <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>
+    <string name="Slash_Shrug_Description">あなたのメッセージの後に表示¯\\ _（ツ）_ /¯</string>
+    <string name="Slash_Tableflip_Description">表示（╯°□°）╯(┻━┻</string>
+    <string name="Slash_TableUnflip_Description">表示┬─┬ノ（゜ - ゜ノ）</string>
+    <string name="Create_A_New_Channel">新しいチャネルを作成します</string>
+    <string name="Show_the_keyboard_shortcut_list">キーボードショートカットリストを表示する</string>
+    <string name="Invite_user_to_join_channel_all_from">[#channel]のすべてのユーザーをこのチャンネルに招待する</string>
+    <string name="Invite_user_to_join_channel_all_to">このチャンネルのすべてのユーザーを[#channel]に招待する</string>
+    <string name="Archive">アーカイブ</string>
+    <string name="Remove_someone_from_room">誰かをルームから削除</string>
+    <string name="Leave_the_current_channel">現在のチャンネルを残す</string>
+    <string name="Displays_action_text">操作テキストを表示</string>
+    <string name="Direct_message_someone">誰かへダイレクトメッセージ</string>
+    <string name="Mute_someone_in_room">誰かをルームでミュートにする</string>
+    <string name="Unmute_someone_in_room">誰かをルームでミュートを解除されました</string>
+    <string name="Invite_user_to_join_channel">ユーザーをこのチャンネルへ招待します</string>
+    <string name="Unarchive">アーカイブを解除</string>
+    <string name="Join_the_given_channel">チャンネルへ参加する</string>
+    <string name="Guggy_Command_Description">提供されたテキストに基づいてgifを生成する</string>
+    <string name="Slash_Topic_Description">設定トピック</string>
+
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">最近の絵文字はありません</string>
+    <string name="alert_title_default_skin_tone">デフォルトスキントークン</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>
+    <string name="dialog_button_done">完了</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">ライブチャット</string>
+    <string name="header_unknown">不明</string>
+
+    <!--Notifications-->
+    <string name="share_label">Edit shared message</string> <!-- TODO Add translation -->
+    <string name="notif_action_reply_hint">返信</string>
+    <string name="notif_error_sending">送信に失敗しました。もう一度お試しください。</string>
+    <string name="notif_success_sending">メッセージは %1$s に送信されました!</string>
+    <string name="read_by">読者</string>
+    <string name="message_information_title">メッセージ情報</string>
+</resources>
\ No newline at end of file

app/src/main/res/values-ru/strings.xml → app/src/main/res/values-ru-rRU/strings.xml

@@ -12,9 +12,9 @@
     <string name="title_profile">Профиль</string>
     <string name="title_members">Пользователи (%d)</string>
     <string name="title_settings">Настройки</string>
-    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_preferences">Персональные</string>
     <string name="title_change_password">Изменить пароль</string>
-    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_admin_panel">Панель админа</string>
     <string name="title_password">Изменить пароль</string>
     <string name="title_update_profile">Обновить профиль</string>
     <string name="title_about">О программе</string>
@@ -48,7 +48,7 @@
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_preferences">Персональные</item>
         <item name="item_password">Изменить пароль</item>
         <item name="item_password">О программе</item>
     </string-array>
@@ -144,10 +144,10 @@
     <string name="msg_channel_created_successfully">Канал создан успешно</string>
 
     <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_analytics_tracking">Отслеживание Analytics</string>
+    <string name="msg_send_analytics_tracking">Отправлять анонимную статистику для улучшения приложения.</string>
+    <string name="msg_do_not_send_analytics_tracking">Не отправлять анонимную статистику для улучшения приложения</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Не применимо, так как это FOSS версия</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">%2$s изменил название канала на %1$s</string>

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

+<resources>
+
+    <!-- Titles -->
+    <string name="title_sign_in_your_server">Ваш сервер</string>
+    <string name="title_log_in">Увійти</string>
+    <string name="title_register_username">Зареєструвати ім\'я</string>
+    <string name="title_reset_password">Відновлення паролю</string>
+    <string name="title_sign_up">Зареєструватися</string>
+    <string name="title_authentication">Аутентифікація</string>
+    <string name="title_legal_terms">Юридичні умови</string>
+    <string name="title_chats">Чати</string>
+    <string name="title_profile">Профіль</string>
+    <string name="title_members">Користувачі (%d)</string>
+    <string name="title_settings">Налаштування</string>
+    <string name="title_preferences">Персональні</string>
+    <string name="title_change_password">Змінити пароль</string>
+    <string name="title_admin_panel">Панель адміністратора</string>
+    <string name="title_password">Змінити пароль</string>
+    <string name="title_update_profile">Оновити профіль</string>
+    <string name="title_about">"Про програму"</string>
+    <string name="title_create_channel">Створити новий канал</string>
+
+    <!-- Actions -->
+    <string name="action_connect">Підключитися</string>
+    <string name="action_use_this_username">Використати це ім\'я</string>
+    <string name="action_login_or_sign_up">Натисніть цю кнопку, щоб увійти до системи або створити аккаунт</string>
+    <string name="action_terms_of_service">Умови використання</string>
+    <string name="action_privacy_policy">Політика конфіденційності</string>
+    <string name="action_search">Пошук</string>
+    <string name="action_update">Оновити</string>
+    <string name="action_settings">Налаштування</string>
+    <string name="action_create_channel">Створити канал</string>
+    <string name="action_create">Створити</string>
+    <string name="action_logout">Вийти</string>
+    <string name="action_files">Файли</string>
+    <string name="action_confirm_password">Підтвердження зміни пароля</string>
+    <string name="action_join_chat">Приєднатися до чату</string>
+    <string name="action_add_account">Додати аккаунт</string>
+    <string name="action_online">Онлайн</string>
+    <string name="action_away">Відійшов</string>
+    <string name="action_busy">Зайнятий</string>
+    <string name="action_invisible">Невидимий</string>
+    <string name="action_drawing">Малюнок</string>
+    <string name="action_save_to_gallery">Зберегти до галереї</string>
+    <string name="action_select_photo_from_gallery">Вибрати з галереї</string>
+    <string name="action_take_photo">Зробити знімок</string>
+    <string name="action_reset_avatar">Відновити аватар</string>
+
+    <!-- Settings List -->
+    <string-array name="settings_actions">
+        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_password">Change Password</item> <!-- TODO Add translation -->
+        <item name="item_password">About</item> <!-- TODO Add translation -->
+    </string-array>
+
+    <!-- Regular information messages -->
+    <string name="msg_generic_error">Сталася помилка, спробуйте ще раз.</string>
+    <string name="msg_no_data_to_display">Немає даних для відображення</string>
+    <string name="msg_profile_update_successfully">"Профіль оновлено успішно "</string>
+    <string name="msg_username">Ім\'я користувача</string>
+    <string name="msg_username_or_email">Ім\'я користувача або e-mail</string>
+    <string name="msg_password">пароль</string>
+    <string name="msg_name">ім\'я</string>
+    <string name="msg_email">e-mail</string>
+    <string name="msg_avatar_url">URL аватара</string>
+    <string name="msg_or_continue_using_social_accounts">Або продовжити, за допомогою акаунта у соціальних мережах</string>
+    <string name="msg_new_user">Новий користувач? %1$s</string>
+    <string name="msg_forgot_password">Забули пароль? %1$s</string>
+    <string name="msg_reset">Скинути</string>
+    <string name="msg_check_your_email_to_reset_your_password">Лист було відправлено! Перевірте свою поштову скриньку, щоб скинути пароль.</string>
+    <string name="msg_invalid_email">Введіть діючий e-mail</string>
+    <string name="msg_new_user_agreement">Продовжуючи, ви погоджуєтеся з %1$s і %2$s</string>
+    <string name="msg_2fa_code">Код 2FA</string>
+    <string name="msg_yesterday">Вчора</string>
+    <string name="msg_today">Сьогодні</string>
+    <string name="msg_message">"Повідомлення "</string>
+    <string name="msg_this_room_is_read_only">Канал тільки для читання</string>
+    <string name="msg_invalid_2fa_code">Неправильний код 2FA</string>
+    <string name="msg_invalid_file">Неправильний файл</string>
+    <string name="msg_invalid_server_url">Неправильний URL-адреса сервера.</string>
+    <string name="msg_content_description_log_in_using_facebook">Увійти за допомогою Facebook</string>
+    <string name="msg_content_description_log_in_using_github">Увійти за допомогою Github</string>
+    <string name="msg_content_description_log_in_using_google">Увійти за допомогою Google</string>
+    <string name="msg_content_description_log_in_using_linkedin">Увійти за допомогою Linkedin</string>
+    <string name="msg_content_description_log_in_using_meteor">Увійти за допомогою Meteor</string>
+    <string name="msg_content_description_log_in_using_twitter">Увійти за допомогою Twitter</string>
+    <string name="msg_content_description_log_in_using_gitlab">Увійти за допомогою Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordpress">Увійти за допомогою Wordpress</string>
+    <string name="msg_content_description_send_message">Надіслати повідомлення</string>
+    <string name="msg_content_description_show_attachment_options">Показати параметри долучення</string>
+    <string name="msg_you">Ви</string>
+    <string name="msg_unknown">Невідомий</string>
+    <string name="msg_email_address">E-mail адреса</string>
+    <string name="msg_utc_offset">UTC зсув</string>
+    <string name="msg_new_password">Введіть новий пароль</string>
+    <string name="msg_confirm_password">Підтвердіть новий пароль</string>
+    <string name="msg_unread_messages">Непрочитані повідомлення</string>
+    <string name="msg_preview_video">Відео</string>
+    <string name="msg_preview_audio">Аудіо</string>
+    <string name="msg_preview_photo">Фото</string>
+    <string name="msg_preview_file">Файл</string>
+    <string name="msg_no_messages_yet">"Немає повідомлень "</string>
+    <string name="msg_build">Збірка %1$d - %2$s - %3$s</string>
+    <string name="msg_ok">ОК</string>
+    <string name="msg_update_app_version_in_order_to_continue">Версія сервера застаріла. Будь ласка, зв\'яжіться з адміністратором, щоб оновити сервер.</string>
+    <string name="msg_ver_not_recommended">Здається, версія сервера менше ніж рекомендована %1$s. \nМожна увійти, але можуть виникнути ті чи інші проблеми під час роботи.</string>
+    <string name="msg_ver_not_minimum">Здається, версія сервера менше ніж мінімально необхідна %1$s.\nДля роботи потрібно оновити сервер!</string>
+    <string name="msg_proceed">ПРОДОВЖИТИ</string>
+    <string name="msg_cancel">ВІДМІНА</string>
+    <string name="msg_warning">ПОПЕРЕДЖЕННЯ</string>
+    <string name="msg_http_insecure">При використанні HTTP ви підключаєтеся до потенційно небезпечного сервера. Ми не радимо вам це робити.</string>
+    <string name="msg_error_checking_server_version">Під час перевірки версії вашого сервера сталася помилка, спробуйте ще раз.</string>
+    <string name="msg_invalid_server_protocol">Використання обраного протоколу не дозволено на цьому сервері, спробуйте використати HTTPS</string>
+    <string name="msg_image_saved_successfully">Зображення збережено до галереї</string>
+    <string name="msg_image_saved_failed">Не вдалося зберегти зображення</string>
+    <string name="msg_no_chat_title">Повідомлення відсутні</string>
+    <string name="msg_no_chat_description">Почніть спілкуватися, щоб побачити тут повідомлення.</string>
+    <string name="msg_edited">(змінено)</string>
+    <string name="msg_and">\\u0020і\\u0020</string>
+    <string name="msg_is_typing">\\u0020друкує…</string>
+    <string name="msg_are_typing">\\u0020друкують…</string>
+    <string name="msg_several_users_are_typing">Декілька користувачів друкують…</string>
+    <string name="msg_no_search_found">Результатів не знайдено</string>
+    <string name="msg_channel_name">Назва каналу</string>
+    <string name="msg_search">Пошук</string>
+    <string name="msg_message_copied">Повідомлення було скопійовано</string>
+    <string name="msg_upload_file">Завантажити файл</string>
+    <string name="msg_file_description">Опис файлу</string>
+    <string name="msg_send">Надіслати</string>
+    <string name="msg_delete_message">Видалити повідомлення</string>
+    <string name="msg_delete_description">Ви впевнені, що хочете видалити це повідомлення?</string>
+
+    <!-- Create channel messages -->
+    <string name="msg_private_channel">Приватний</string>
+    <string name="msg_public_channel">Публічний</string>
+    <string name="msg_private_channel_description">Тільки ви та запрошені користувачі можуть отримати доступ до цього каналу</string>
+    <string name="msg_public_channel_description">Кожен може отримати доступ до цього каналу</string>
+    <string name="msg_ready_only_channel">Канал тільки для читання</string>
+    <string name="msg_ready_only_channel_description">Тільки адміністратор може писати нові повідомлення</string>
+    <string name="msg_invite_members">Запросити користувачів до каналу</string>
+    <string name="msg_member_already_added">Ви вже обрали цього користувача</string>
+    <string name="msg_member_not_found">"Користувача не знайдено "</string>
+    <string name="msg_channel_created_successfully">Канал був створений успішно</string>
+
+    <!-- Preferences messages -->
+    <string name="msg_analytics_tracking">Збір аналітики</string>
+    <string name="msg_send_analytics_tracking">Надсилати анонімну статистику для покращення роботи програми</string>
+    <string name="msg_do_not_send_analytics_tracking">Не надсилати анонімну статистику для покращення роботи програми</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Недоступно у FOSS версії</string>
+
+    <!-- System messages -->
+    <string name="message_room_name_changed">%2$s змінив назву каналу на %1$s</string>
+    <string name="message_user_added_by">Користувач %2$s додав користувача %1$s</string>
+    <string name="message_user_removed_by">Користувач %2$s видалив користувача %1$s</string>
+    <string name="message_user_left">Залишив канал.</string>
+    <string name="message_user_joined_channel">Приєднався до каналу.</string>
+    <string name="message_welcome">Привіт, %s</string>
+    <string name="message_removed">"Повідомлення видалено "</string>
+    <string name="message_pinned">Зафіксоване повідомлення:</string>
+    <string name="message_muted">Користувач %2$s позбавив %1$s дару мови</string>
+    <string name="message_unmuted">Користувачу і%1$s повернули дар мови за рішенням %2$s</string>
+    <string name="message_role_add">%1$s був призначений як %2$s користувачем %3$s</string>
+    <string name="message_role_removed">%1$s більше не %2$s за рішенням %3$s</string>
+    <string name="message_credentials_saved_successfully">Облікові дані було успішно збережено</string>
+
+    <!-- Message actions -->
+    <string name="action_msg_reply">Відповісти</string>
+    <string name="action_msg_info">Інформація про прочитання</string>
+    <string name="action_msg_edit">Відредагувати</string>
+    <string name="action_msg_copy">Скопіювати</string>
+    <string name="action_msg_quote">Цитувати</string>
+    <string name="action_msg_delete">Видалити</string>
+    <string name="action_msg_pin">Зафіксувати повідомлення</string>
+    <string name="action_msg_unpin">Відмінити фіксацію повідомлення</string>
+    <string name="action_msg_star">До обраного</string>
+    <string name="action_msg_unstar">Видалити з обраного</string>
+    <string name="action_msg_share">Поділитися</string>
+    <string name="action_title_editing">Редагування повідомлення</string>
+    <string name="action_msg_add_reaction">Відреагувати</string>
+
+    <!-- Permission messages -->
+    <string name="permission_editing_not_allowed">Редагування заборонено</string>
+    <string name="permission_deleting_not_allowed">Видалення заборонено</string>
+    <string name="permission_pinning_not_allowed">Неможливо зафіксувати</string>
+    <string name="permission_starring_not_allowed">Неможливо додати до обраного</string>
+
+    <!-- Search message -->
+    <string name="title_search_message">Пошук повідомлення</string>
+
+    <!-- Favorite/Unfavorite chat room -->
+    <string name="title_favorite_chat">Додати до обраного</string>
+    <string name="title_unfavorite_chat">Видалити з обраного</string>
+
+    <!-- Members List -->
+    <string name="title_members_list">Користувачі</string>
+
+    <!-- Mentions -->
+    <string name="msg_mentions">Згадування</string>
+    <string name="msg_no_mention">Згадування відсутні</string>
+    <string name="msg_all_the_mentions_appear_here">Згадування відображаються тут</string>
+
+    <!-- Pinned Messages -->
+    <string name="title_pinned_messages">Зафіксовані повідомлення</string>
+    <string name="no_pinned_messages">Немає зафіксованих повідомлень</string>
+    <string name="no_pinned_description">Зафіксовані повідомлення відображаються тут</string>
+
+    <!-- Favorite Messages -->
+    <string name="title_favorite_messages">Обрані повідомлення</string>
+    <string name="no_favorite_messages">Немає обраних повідомлень</string>
+    <string name="no_favorite_description">Обрані повідомлення відображаються тут</string>
+
+    <!-- Files -->
+    <string name="title_files">Файли</string>
+    <string name="title_files_total">Файли (%d)</string>
+    <string name="msg_no_files">Файли відсутні</string>
+    <string name="msg_all_files_appear_here">Усі файли відображаються тут</string>
+
+    <!-- Upload Messages -->
+    <string name="max_file_size_exceeded">Розмір файлу %1$d перевищив максимально допустимий %2$d байт</string>
+
+    <!-- Socket status -->
+    <string name="status_connected">Підключено</string>
+    <string name="status_disconnected">Відключено</string>
+    <string name="status_connecting">Підключаємося…</string>
+    <string name="status_authenticating">Аутентифікація</string>
+    <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>
+    <string name="Slash_Shrug_Description">Показує ¯_(ツ)_/¯ після Вашого повідомлення</string>
+    <string name="Slash_Tableflip_Description">Показує (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Показує ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Створити новий канал</string>
+    <string name="Show_the_keyboard_shortcut_list">Показати список гарячих клавіш</string>
+    <string name="Invite_user_to_join_channel_all_from">Запросити всіх користувачів з [#channel] приєднатися до цього каналу</string>
+    <string name="Invite_user_to_join_channel_all_to">Запросити всіх користувачів приєднатися до [#channel]</string>
+    <string name="Archive">Архівувати</string>
+    <string name="Remove_someone_from_room">Видалити когось з каналу</string>
+    <string name="Leave_the_current_channel">Покинути цей канал</string>
+    <string name="Direct_message_someone">Особисте повідомлення</string>
+    <string name="Displays_action_text">Відображає текст дії</string>
+    <string name="Mute_someone_in_room">Позбавити користувача дару мови на каналі</string>
+    <string name="Unmute_someone_in_room">Повернути користувачу дар мови на каналі</string>
+    <string name="Invite_user_to_join_channel">Запросити користувача на канал</string>
+    <string name="Unarchive">Розархівувати</string>
+    <string name="Join_the_given_channel">Приєднатися до цього каналу</string>
+    <string name="Guggy_Command_Description">Створює gif використовуючи наданий текст</string>
+    <string name="Slash_Topic_Description">Встановити тему</string>
+
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">Пусто</string>
+    <string name="alert_title_default_skin_tone">Тон шкіри за замовчуванням</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="dialog_button_done">Ок</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">Живі чати</string>
+    <string name="header_unknown">Невідомі</string>
+
+    <!--Notifications-->
+    <string name="share_label">Редагувати повідомлення</string>
+    <string name="notif_action_reply_hint">ВІДПОВІСТИ</string>
+    <string name="notif_error_sending">Не вдалося відповісти. Будь ласка, спробуйте ще раз.</string>
+    <string name="notif_success_sending">Повідомлення надіслано %1$s!</string>
+    <string name="read_by">Прочитано</string>
+    <string name="message_information_title">Інформація про прочитання</string>
+    <string name="msg_log_out">Виходимо…</string>
+    <string name="msg_sent_attachment">Долучення відправлено</string>
+</resources>

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

+<!--
+REMARK:
+
+When adding a new string in this file do not forget to add a proper translation for the
+corresponding supported language - if applicable.
+
+Please, follow the rules as shown here (by adding a new string in the correct section).
+
+Coding style:
+https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strings
+-->
 <resources xmlns:tools="http://schemas.android.com/tools">
     <string name="app_name" translatable="false">Rocket.Chat</string>
 

app/src/play/AndroidManifest.xml

@@ -2,14 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="chat.rocket.android">
 
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-
-    <permission
-        android:name="${applicationId}.permission.C2D_MESSAGE"
-        android:protectionLevel="signature" />
-
-    <uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
-
     <application
         android:name=".app.RocketChatApplication"
         android:allowBackup="true"
@@ -20,25 +12,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true">
 
-        <receiver
-            android:name="com.google.android.gms.gcm.GcmReceiver"
-            android:exported="true"
-            android:permission="com.google.android.c2dm.permission.SEND">
-            <intent-filter>
-                <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-                <action android:name="com.google.android.c2dm.intent.REGISTRATION" />
-
-                <category android:name="${applicationId}" />
-            </intent-filter>
-        </receiver>
-
-        <service
-            android:name=".push.FirebaseTokenService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
-            </intent-filter>
-        </service>
         <service
             android:name=".push.FirebaseMessagingService"
             android:enabled="true"

app/src/play/java/chat/rocket/android/dagger/module/ServiceBuilder.kt

 package chat.rocket.android.dagger.module
 
+import androidx.work.Worker
 import chat.rocket.android.chatroom.di.MessageServiceProvider
 import chat.rocket.android.chatroom.service.MessageService
+import chat.rocket.android.dagger.qualifier.WorkerKey
 import chat.rocket.android.push.FirebaseMessagingService
-import chat.rocket.android.push.FirebaseTokenService
 import chat.rocket.android.push.di.FirebaseMessagingServiceProvider
-import chat.rocket.android.push.di.FirebaseTokenServiceProvider
+import chat.rocket.android.push.di.TokenRegistrationSubComponent
+import chat.rocket.android.push.worker.TokenRegistrationWorker
+import dagger.Binds
 import dagger.Module
+import dagger.android.AndroidInjector
 import dagger.android.ContributesAndroidInjector
+import dagger.multibindings.IntoMap
 
-@Module abstract class ServiceBuilder {
-
-    @ContributesAndroidInjector(modules = [FirebaseTokenServiceProvider::class])
-    abstract fun bindFirebaseTokenService(): FirebaseTokenService
+@Module(subcomponents = [TokenRegistrationSubComponent::class])
+abstract class ServiceBuilder {
 
     @ContributesAndroidInjector(modules = [FirebaseMessagingServiceProvider::class])
     abstract fun bindGcmListenerService(): FirebaseMessagingService
 
     @ContributesAndroidInjector(modules = [MessageServiceProvider::class])
     abstract fun bindMessageService(): MessageService
+
+    @Binds
+    @IntoMap
+    @WorkerKey(TokenRegistrationWorker::class)
+    abstract fun bindTokenRegistrationWorkerFactory(
+        builder: TokenRegistrationSubComponent.Builder
+    ): AndroidInjector.Factory<out Worker>
 }
\ No newline at end of file

app/src/play/java/chat/rocket/android/extensions/GooglePlayServices.kt

+package chat.rocket.android.extensions
+
+import com.google.android.gms.tasks.Task
+import kotlin.coroutines.experimental.suspendCoroutine
+
+@JvmName("awaitVoid")
+suspend fun Task<Void>.await() = suspendCoroutine<Unit> { continuation ->
+    addOnSuccessListener { continuation.resume(Unit) }
+    addOnFailureListener { continuation.resumeWithException(it) }
+}
+
+suspend fun <TResult> Task<TResult>.await() = suspendCoroutine<TResult> { continuation ->
+    addOnSuccessListener { continuation.resume(it) }
+    addOnFailureListener { continuation.resumeWithException(it) }
+}
\ No newline at end of file

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

 package chat.rocket.android.push
 
 import androidx.core.os.bundleOf
+import androidx.work.Constraints
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.workDataOf
+import chat.rocket.android.push.worker.TokenRegistrationWorker
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import dagger.android.AndroidInjection
@@ -17,8 +23,22 @@ 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()))
         }
     }
+
+    override fun onNewToken(token: String) {
+        val data = workDataOf("token" to token)
+        val constraint =
+                Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
+        val work = OneTimeWorkRequestBuilder<TokenRegistrationWorker>()
+                .setInputData(data)
+                .setConstraints(constraint)
+                .build()
+
+        // Schedule a job since we are using network...
+        WorkManager.getInstance().enqueue(work)
+    }
 }
\ No newline at end of file

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

-package chat.rocket.android.push
-
-import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.retryIO
-import chat.rocket.common.RocketChatException
-import chat.rocket.core.internal.rest.registerPushToken
-import com.google.firebase.iid.FirebaseInstanceId
-import com.google.firebase.iid.FirebaseInstanceIdService
-import dagger.android.AndroidInjection
-import kotlinx.coroutines.experimental.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-class FirebaseTokenService : FirebaseInstanceIdService() {
-
-    @Inject
-    lateinit var factory: RocketChatClientFactory
-    @Inject
-    lateinit var getCurrentServerInteractor: GetCurrentServerInteractor
-
-    @Inject
-    lateinit var localRepository: LocalRepository
-
-    override fun onCreate() {
-        super.onCreate()
-        AndroidInjection.inject(this)
-    }
-
-    override fun onTokenRefresh() {
-        try {
-            val fcmToken = FirebaseInstanceId.getInstance().token
-            val currentServer = getCurrentServerInteractor.get()
-            val client = currentServer?.let { factory.create(currentServer) }
-
-            fcmToken?.let {
-                localRepository.save(LocalRepository.KEY_PUSH_TOKEN, fcmToken)
-                client?.let {
-                    launch {
-                        try {
-                            Timber.d("Registering push token: $fcmToken for ${client.url}")
-                            retryIO("register push token") { client.registerPushToken(fcmToken) }
-                        } catch (ex: RocketChatException) {
-                            Timber.e(ex, "Error registering push token")
-                        }
-                    }
-                }
-            }
-        } catch (ex: Exception) {
-            Timber.e(ex, "Error refreshing Firebase TOKEN")
-        }
-    }
-}
\ No newline at end of file

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

+package chat.rocket.android.push
+
+import androidx.work.Constraints
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import chat.rocket.android.push.worker.TokenRegistrationWorker
+
+fun refreshPushToken() {
+    val constraint =
+            Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build()
+    val work = OneTimeWorkRequestBuilder<TokenRegistrationWorker>()
+            .setConstraints(constraint)
+            .build()
+
+    // Schedule a job since we are using network...
+    WorkManager.getInstance().enqueue(work)
+}
\ No newline at end of file

app/src/play/java/chat/rocket/android/push/di/FirebaseTokenServiceProvider.kt

-package chat.rocket.android.push.di
-
-import chat.rocket.android.dagger.module.AppModule
-import chat.rocket.android.push.FirebaseTokenService
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-
-@Module abstract class FirebaseTokenServiceProvider {
-    @ContributesAndroidInjector(modules = [AppModule::class])
-    abstract fun provideFirebaseTokenService(): FirebaseTokenService
-}
\ No newline at end of file

app/src/play/java/chat/rocket/android/push/di/TokenRegistrationSubComponent.kt

+package chat.rocket.android.push.di
+
+import chat.rocket.android.push.worker.TokenRegistrationWorker
+import dagger.Subcomponent
+import dagger.android.AndroidInjector
+
+@Subcomponent
+interface TokenRegistrationSubComponent : AndroidInjector<TokenRegistrationWorker> {
+    @Subcomponent.Builder
+    abstract class Builder : AndroidInjector.Builder<TokenRegistrationWorker>()
+}
\ No newline at end of file

app/src/play/java/chat/rocket/android/push/worker/TokenRegistrationWorker.kt

+package chat.rocket.android.push.worker
+
+import androidx.work.Worker
+import chat.rocket.android.dagger.injector.AndroidWorkerInjection
+import chat.rocket.android.extensions.await
+import chat.rocket.android.infrastructure.LocalRepository
+import chat.rocket.android.server.domain.GetAccountsInteractor
+import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.extensions.registerPushToken
+import chat.rocket.common.util.ifNull
+import com.google.firebase.iid.FirebaseInstanceId
+import kotlinx.coroutines.experimental.runBlocking
+import timber.log.Timber
+import javax.inject.Inject
+
+class TokenRegistrationWorker : Worker() {
+
+    @Inject
+    lateinit var factory: RocketChatClientFactory
+    @Inject
+    lateinit var getAccountsInteractor: GetAccountsInteractor
+    @Inject
+    lateinit var localRepository: LocalRepository
+
+    override fun doWork(): Result {
+        AndroidWorkerInjection.inject(this)
+
+        runBlocking {
+            val token = inputData.getString("token") ?: refreshToken()
+
+            token?.let { fcmToken ->
+                localRepository.save(LocalRepository.KEY_PUSH_TOKEN, fcmToken)
+                factory.registerPushToken(fcmToken, getAccountsInteractor.get())
+            }.ifNull {
+                Timber.d("Unavailable FCM Token...")
+            }
+        }
+
+        return Result.SUCCESS
+    }
+
+    private fun refreshToken(): String? {
+        return runBlocking {
+            try {
+                FirebaseInstanceId.getInstance().instanceId.await().token
+            } catch (ex: Exception) {
+                Timber.e(ex, "Error refreshing Firebase TOKEN")
+                null
+            }
+        }
+    }
+}
\ No newline at end of file

app/src/play/java/chat/rocket/android/util/GMSManager.kt

 package chat.rocket.android.util
 
-import chat.rocket.android.main.presentation.MainPresenter
 import com.google.firebase.iid.FirebaseInstanceId
 import com.google.firebase.messaging.FirebaseMessaging
-import timber.log.Timber
-
-suspend fun refreshFCMToken(presenter: MainPresenter) {
-    try {
-        val token = FirebaseInstanceId.getInstance().token
-        Timber.d("FCM token: $token")
-        presenter.refreshToken(token)
-    } catch (ex: Exception) {
-        Timber.d(ex, "Missing play services...")
-    }
-}
 
 fun invalidateFirebaseToken(token: String) {
     FirebaseInstanceId.getInstance().deleteToken(token, FirebaseMessaging.INSTANCE_ID_SCOPE)

build.gradle

@@ -16,6 +16,8 @@ buildscript {
         classpath 'com.google.gms:google-services:4.0.2'
         classpath 'io.fabric.tools:gradle:1.25.4'
 
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.20.0"
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

dependencies.gradle

@@ -10,28 +10,31 @@ ext {
 
             // For app
             kotlin                : '1.2.61',
-            coroutine             : '0.24.0',
+            coroutine             : '0.25.0',
 
-            appCompat             : '1.0.0-beta01',
-            recyclerview          : '1.0.0-beta01',
-            constraintLayout      : '2.0.0-alpha1',
-            cardview              : '1.0.0-beta01',
-            browser               : '1.0.0-beta01',
-            androidKtx            : '1.0.0-beta01',
+            appCompat             : '1.0.0-rc02',
+            recyclerview          : '1.0.0-rc02',
+            constraintLayout      : '2.0.0-alpha2',
+            cardview              : '1.0.0-rc02',
+            browser               : '1.0.0-rc02',
+            androidKtx            : '1.0.0-rc02',
+            workmanager           : '1.0.0-alpha08',
 
             dagger                : '2.16',
-            firebaseCloudMessage  : '17.1.0',
+            firebaseCloudMessage  : '17.3.0',
             firebaseAnalytics     : '16.0.3',
-            playServices          : '15.0.1',
+            playServices          : '16.0.0',
             exoPlayer             : '2.8.2',
             flexbox               : '1.0.0',
             material              : '1.0.0-beta01',
 
-            room                  : '2.0.0-beta01',
-            lifecycle             : '2.0.0-beta01',
+            room                  : '2.0.0-rc01',
+            lifecycle             : '2.0.0-rc01',
 
-            rxKotlin              : '2.2.0',
-            rxAndroid             : '2.0.2',
+            livedataKtx           : '2.0.1',
+
+            rxKotlin              : '2.3.0',
+            rxAndroid             : '2.1.0',
 
             moshi                 : '1.6.0',
             okhttp                : '3.11.0',
@@ -45,9 +48,9 @@ ext {
             kotshi                : '1.0.4',
 
             frescoImageViewer     : '0.5.1',
-            markwon               : '1.1.0',
+            markwon               : '1.1.1',
             aVLoadingIndicatorView: '2.1.3',
-            glide                 : '4.8.0-SNAPSHOT',
+            glide                 : '4.8.0',
 
             // For wearable
             wear                  : '2.3.0',
@@ -71,6 +74,9 @@ ext {
             cardview              : "androidx.cardview:cardview:${versions.cardview}",
             browser               : "androidx.browser:browser:${versions.browser}",
             androidKtx            : "androidx.core:core-ktx:${versions.androidKtx}",
+            fragmentsKtx          : "androidx.fragment:fragment-ktx:${versions.androidKtx}",
+            workmanager           : "android.arch.work:work-runtime-ktx:${versions.workmanager}",
+            workmanagerFirebase   : "android.arch.work:work-firebase:${versions.workmanager}",
 
             dagger                : "com.google.dagger:dagger:${versions.dagger}",
             daggerSupport         : "com.google.dagger:dagger-android-support:${versions.dagger}",
@@ -84,6 +90,9 @@ ext {
             roomProcessor         : "androidx.room:room-compiler:${versions.room}",
             lifecycleExtensions   : "androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}",
             lifecycleCompiler     : "androidx.lifecycle:lifecycle-compiler:${versions.lifecycle}",
+            viewmodelKtx          : "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.lifecycle}",
+
+            livedataKtx           : "com.shopify:livedata-ktx:${versions.livedataKtx}",
 
             rxKotlin              : "io.reactivex.rxjava2:rxkotlin:${versions.rxKotlin}",
             rxAndroid             : "io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}",

emoji/schemas/chat.rocket.android.emoji.internal.db.EmojiDatabase/1.json

+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "5d591429a85289a5fe608ab2c4d77b0b",
+    "entities": [
+      {
+        "tableName": "Emoji",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`shortname` TEXT NOT NULL, `shortnameAlternates` TEXT NOT NULL, `unicode` TEXT NOT NULL, `category` TEXT NOT NULL, `count` INTEGER NOT NULL, `siblings` TEXT NOT NULL, `fitzpatrick` TEXT NOT NULL, `url` TEXT, `isDefault` INTEGER NOT NULL, PRIMARY KEY(`shortname`))",
+        "fields": [
+          {
+            "fieldPath": "shortname",
+            "columnName": "shortname",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "shortnameAlternates",
+            "columnName": "shortnameAlternates",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unicode",
+            "columnName": "unicode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "category",
+            "columnName": "category",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "count",
+            "columnName": "count",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "siblings",
+            "columnName": "siblings",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fitzpatrick",
+            "columnName": "fitzpatrick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDefault",
+            "columnName": "isDefault",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "shortname"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"5d591429a85289a5fe608ab2c4d77b0b\")"
+    ]
+  }
+}
\ No newline at end of file

emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt

@@ -139,9 +139,11 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
     @ColorInt
     private fun getFitzpatrickColor(tone: Fitzpatrick): Int {
         val sharedPreferences = context.getSharedPreferences("emoji", Context.MODE_PRIVATE)
+
         sharedPreferences.edit {
             putString(PREF_EMOJI_SKIN_TONE, tone.type)
         }
+
         return when (tone) {
             Fitzpatrick.Default -> ContextCompat.getColor(context, R.color.tone_default)
             Fitzpatrick.LightTone -> ContextCompat.getColor(context, R.color.tone_light)
@@ -194,6 +196,7 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
     }
 
     class EmojiTextWatcher(private val editor: EditText) : TextWatcher {
+
         @Volatile
         private var emojiToRemove = mutableListOf<EmojiTypefaceSpan>()
 

emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt

@@ -79,10 +79,10 @@ class EmojiParser {
 
             val px = context.resources.getDimensionPixelSize(R.dimen.custom_emoji_small)
 
-            return spannable.also {
+            return spannable.also { sp ->
                 regex.findAll(spannable).iterator().forEach { match ->
-                    customEmojis.find { it.shortname.toLowerCase() == match.value.toLowerCase() }?.let {
-                        it.url?.let { url ->
+                    customEmojis.find { it.shortname.toLowerCase() == match.value.toLowerCase() }?.let { emoji ->
+                        emoji.url?.let { url ->
                             try {
                                 val glideRequest = if (url.endsWith("gif", true)) {
                                     GlideApp.with(context).asGif()

emoji/src/main/java/chat/rocket/android/emoji/EmojiPickerPopup.kt

@@ -37,10 +37,12 @@ class EmojiPickerPopup(context: Context) : Dialog(context) {
 
     private fun setSize() {
         val lp = WindowManager.LayoutParams()
-        lp.copyFrom(window.attributes)
+        window?.let {
+            lp.copyFrom(it.attributes)
             val dialogWidth = lp.width
             val dialogHeight = context.resources.getDimensionPixelSize(R.dimen.picker_popup_height)
-        window.setLayout(dialogWidth, dialogHeight)
+            it.setLayout(dialogWidth, dialogHeight)
+        }
     }
 
     private suspend fun setupViewPager() {

emoji/src/main/java/chat/rocket/android/emoji/EmojiRepository.kt

@@ -3,11 +3,13 @@ package chat.rocket.android.emoji
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.Typeface
+import android.util.Log
 import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.emoji.internal.PREF_EMOJI_RECENTS
 import chat.rocket.android.emoji.internal.db.EmojiDatabase
 import chat.rocket.android.emoji.internal.isCustom
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.GlideException
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
@@ -46,7 +48,11 @@ object EmojiRepository {
             this@EmojiRepository.customEmojis = customEmojis
             val allEmojis = mutableListOf<Emoji>()
             db = EmojiDatabase.getInstance(context)
+
+            if (!::cachedTypeface.isInitialized) {
                 cachedTypeface = Typeface.createFromAsset(context.assets, "fonts/emojione-android.ttf")
+            }
+
             preferences = context.getSharedPreferences("emoji", Context.MODE_PRIVATE)
             val stream = context.assets.open(path)
             // Load emojis from emojione ttf file temporarily here. We still need to work on them.
@@ -110,10 +116,17 @@ object EmojiRepository {
             val px = context.resources.getDimensionPixelSize(R.dimen.custom_emoji_large)
 
             customEmojis.forEach {
+                try {
                     val future = Glide.with(context)
                             .load(it.url)
                             .submit(px, px)
                     future.get()
+                } catch (ex: Exception) {
+                    Log.d("EmojiRepository", "Error fetching custom emoji ${it.shortname}", ex)
+                    if (ex is GlideException) {
+                        ex.logRootCauses("EmojiRepository")
+                    }
+                }
             }
         }
     }
@@ -300,4 +313,12 @@ object EmojiRepository {
         val s2: Int = ((scalar - 0x10000) % 0x400) + 0xDC00
         return Pair(s1, s2)
     }
+
+    fun init(context: Context) {
+        launch {
+            db = EmojiDatabase.getInstance(context)
+            preferences = context.getSharedPreferences("emoji", Context.MODE_PRIVATE)
+            cachedTypeface = Typeface.createFromAsset(context.assets, "fonts/emojione-android.ttf")
+        }
+    }
 }
\ No newline at end of file

emoji/src/main/java/chat/rocket/android/emoji/OverKeyboardPopupWindow.kt

@@ -57,9 +57,6 @@ abstract class OverKeyboardPopupWindow(
 
     init {
         setBackgroundDrawable(null)
-        if (BuildConfig.VERSION_CODE >= Build.VERSION_CODES.LOLLIPOP) {
-            elevation = 0f
-        }
         val view = onCreateView(LayoutInflater.from(context))
         onViewCreated(view)
         contentView = view
@@ -89,7 +86,7 @@ abstract class OverKeyboardPopupWindow(
     /**
      * Call this function to resize the emoji popup according to your soft keyboard size
      */
-    fun setSizeForSoftKeyboard() {
+    private fun setSizeForSoftKeyboard() {
         val viewTreeObserver = rootView.viewTreeObserver
         viewTreeObserver.addOnGlobalLayoutListener(this)
     }

emoji/src/main/java/chat/rocket/android/emoji/internal/EmojiPagerAdapter.kt

@@ -147,10 +147,11 @@ internal class EmojiPagerAdapter(private val listener: EmojiKeyboardListener) :
         }
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EmojiRowViewHolder {
+            val inflater = LayoutInflater.from(parent.context)
             val view = if (viewType == CUSTOM) {
-                LayoutInflater.from(parent.context).inflate(R.layout.emoji_image_row_item, parent, false)
+                inflater.inflate(R.layout.emoji_image_row_item, parent, false)
             } else {
-                LayoutInflater.from(parent.context).inflate(R.layout.emoji_row_item, parent, false)
+                inflater.inflate(R.layout.emoji_row_item, parent, false)
             }
             return EmojiRowViewHolder(view, listener)
         }

emoji/src/main/res/layout/emoji_category_layout.xml

@@ -6,18 +6,16 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/emoji_recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp" />
+        android:layout_height="match_parent" />
 
     <TextView
         android:id="@+id/text_no_recent_emoji"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/msg_no_recent_emoji"
         android:layout_gravity="center"
         android:elevation="10dp"
+        android:text="@string/msg_no_recent_emoji"
         android:textSize="16sp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

emoji/src/main/res/layout/emoji_picker.xml

@@ -20,8 +20,6 @@
         android:id="@+id/pager_categories"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
         android:background="@color/colorWhite" />
 
 </LinearLayout>

emoji/src/main/res/layout/emoji_row_item.xml

@@ -2,11 +2,11 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/emoji_view"
-    style="@style/TextAppearance.AppCompat.Title"
     android:layout_width="48dp"
     android:layout_height="48dp"
     android:foreground="?selectableItemBackground"
+    android:layout_gravity="center"
     android:gravity="center"
     android:textColor="#000000"
-    android:textSize="26sp"
+    android:textSize="24sp"
     tools:text="😀" />