Merge pull request #1621 from RocketChat/beta

[RELEASE] 2.6.0 release

.circleci/config.yml

@@ -64,7 +64,7 @@ jobs:
       - store_artifacts:
           path: app/build/reports/
           destination: reports
-  build-apk:
+  build-play-apk:
     docker:
       - image: circleci/android:api-27-alpha
     environment:
@@ -93,7 +93,40 @@ jobs:
       - run:
           name: Build APK
           command: |
-            ./gradlew assembleRelease --info --console=plain --stacktrace
+            ./gradlew assemblePlayRelease --info --console=plain --stacktrace
+      - store_artifacts:
+          path: app/build/outputs/apk
+          destination: apks
+  build-foss-apk:
+    docker:
+      - image: circleci/android:api-27-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - run:
+          name: restore files from ENV
+          command: |
+            echo $ROCKET_JKS_BASE64 | base64 --decode > Rocket.jks
+            echo $ROCKET_PLAY_JSON | base64 --decode > app/rocket-chat.json
+      - run:
+          name: checkout Rocket.Chat.Kotlin.SDK
+          command: git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
+      - restore_cache:
+          key: kotlin-sdk-{{ .Revision }}
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies --quiet --console=plain
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
+      - run:
+          name: Build APK
+          command: |
+            ./gradlew assembleFossRelease --info --console=plain --stacktrace
       - store_artifacts:
           path: app/build/outputs/apk
           destination: apks
@@ -112,6 +145,9 @@ workflows:
                 - develop
                 - develop-2.x
                 - master
-      - build-apk:
+      - build-play-apk:
+          requires:
+            - build-kotlin-sdk
+      - build-foss-apk:
           requires:
             - build-kotlin-sdk

app/build-sdk.sh

 #!/bin/bash
 
 CURRENT_DIR=$(pwd)
-# The SDK dir should be 2 directories up in the tree, so we use dirname 2 times
-# to get the common parent dir of the SDK and the app
 GIT=$(which git)
-cd ../..
-tmp=$(pwd)
-SDK_DIR="$tmp/Rocket.Chat.Kotlin.SDK"
-cd "${CURRENT_DIR}"
+
+if [ "$#" -eq 1 ] && [ ! -z "$1" ]; then
+    # if in an argument is given this is the (relative) path to SDK_DIR
+    SDK_DIR=$(readlink -f $1)
+else
+    # The SDK dir should be 2 directories up in the tree, so we use dirname 2 times
+    # to get the common parent dir of the SDK and the app
+    cd ../..
+    tmp=$(pwd)
+    SDK_DIR="$tmp/Rocket.Chat.Kotlin.SDK"
+    cd "${CURRENT_DIR}"
+fi
 
 echo "CURRENT DIR: $CURRENT_DIR"
 echo "SDK DIR: $SDK_DIR"
@@ -99,4 +105,4 @@ cp -v "${SDK_DIR}"/core/build/libs/core-0.1-SNAPSHOT.jar "${CURRENT_DIR}"/libs/c
 
 echo "$SHA" > "${SDK_DIR}"/.last_commit_hash
 
-exit 0
\ No newline at end of file
+exit 0

app/build.gradle

+def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
+def isPlay = !(taskRequests.contains("Foss") || taskRequests.contains("foss"))
+
 apply plugin: 'com.android.application'
-apply plugin: 'io.fabric'
+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
@@ -12,11 +16,15 @@ 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
 
+        def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()
+        def buildTime = new GregorianCalendar().format("MM-dd-yyyy' 'h:mm:ss a z")
+        buildConfigField "String", "GIT_SHA", "\"${gitSha}\""
+
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -57,6 +65,20 @@ android {
         }
     }
 
+    flavorDimensions "type"
+
+    productFlavors {
+        // includes proprietary libs
+        play {
+            dimension "type"
+        }
+
+        // only foss
+        foss {
+            dimension "type"
+        }
+    }
+
     packagingOptions {
         exclude 'META-INF/core.kotlin_module'
         exclude 'META-INF/main.kotlin_module'
@@ -78,26 +100,27 @@ dependencies {
 
     implementation libraries.appCompat
     implementation libraries.recyclerview
-    implementation libraries.material
     implementation libraries.constraintlayout
     implementation libraries.cardview
-    implementation libraries.flexbox
     implementation libraries.browser
 
     implementation libraries.androidKtx
+    implementation libraries.fragmentsKtx
 
     implementation libraries.dagger
     implementation libraries.daggerSupport
     kapt libraries.daggerProcessor
     kapt libraries.daggerAndroidApt
 
-    implementation libraries.fcm
-    implementation libraries.playServicesAuth
+    implementation libraries.flexbox
+    implementation libraries.material
 
     implementation libraries.room
     kapt libraries.roomProcessor
     implementation libraries.lifecycleExtensions
     kapt libraries.lifecycleCompiler
+    implementation libraries.viewmodelKtx
+    implementation libraries.workmanager
 
     implementation libraries.rxKotlin
     implementation libraries.rxAndroid
@@ -115,6 +138,8 @@ dependencies {
     implementation libraries.frescoWebP
     implementation libraries.frescoAnimatedWebP
 
+    implementation libraries.glide
+
     kapt libraries.kotshiCompiler
     implementation libraries.kotshiApi
 
@@ -124,11 +149,14 @@ dependencies {
 
     implementation libraries.aVLoadingIndicatorView
 
-    implementation "com.github.luciofm:livedata-ktx:b1e8bbc25a"
+    implementation libraries.livedataKtx
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
-        transitive = true
-    }
+    // Proprietary libraries
+    playImplementation libraries.fcm
+    playImplementation libraries.firebaseAnalytics
+    playImplementation libraries.playServicesAuth
+    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
@@ -148,13 +176,16 @@ androidExtensions {
 
 // FIXME - build and install the sdk into the app/libs directory
 // We were having some issues with the kapt generated files from the sdk when importing as a module
+
+def sdk_location=project.properties['sdk_location'] ?: ""
 task compileSdk(type:Exec) {
     if (System.getProperty('os.name').toLowerCase(Locale.ROOT).contains('windows')) {
-        commandLine 'cmd', '/c', 'build-sdk.sh'
+        commandLine 'cmd', '/c', 'build-sdk.sh', sdk_location
     } else {
-        commandLine './build-sdk.sh'
+        commandLine './build-sdk.sh', sdk_location
     }
 }
 preBuild.dependsOn compileSdk
-
-apply plugin: 'com.google.gms.google-services'
+if (isPlay) {
+    apply plugin: 'com.google.gms.google-services'
+}

app/gradle/wrapper/gradle-wrapper.properties

-#Thu Feb 15 15:50:42 BRST 2018
+#Wed Aug 01 21:56:00 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

app/src/androidTest/java/chat/rocket/android/chatroom/ui/ChatRoomFragmentTest.kt

@@ -24,35 +24,44 @@ class ChatRoomFragmentTest {
 
     @Before
     fun stubAllExternalIntents() {
-        val activityIntent = InstrumentationRegistry.getTargetContext().chatRoomIntent("id", "name", "type", false, 0L)
+        val activityIntent = InstrumentationRegistry.getTargetContext()
+            .chatRoomIntent("id", "name", "type", false, 0L)
         activityRule.launchActivity(activityIntent)
         intending(not(isInternal())).respondWith(ActivityResult(Activity.RESULT_OK, null))
     }
 
     @Test
     fun showFileSelection_nonNullFiltersAreApplied() {
-        val fragment = activityRule.activity.supportFragmentManager.findFragmentByTag(ChatRoomActivity.TAG_CHAT_ROOM_FRAGMENT) as ChatRoomFragment
+        val fragment =
+            activityRule.activity.supportFragmentManager.findFragmentByTag("ChatRoomFragment") as ChatRoomFragment
 
         val filters = arrayOf("image/*")
         fragment.showFileSelection(filters)
 
-        intended(allOf(
+        intended(
+            allOf(
                 hasAction(Intent.ACTION_GET_CONTENT),
                 hasType("*/*"),
                 hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
-                hasExtra(Intent.EXTRA_MIME_TYPES, filters)))
+                hasExtra(Intent.EXTRA_MIME_TYPES, filters)
+            )
+        )
     }
 
     @Test
     fun showFileSelection_nullFiltersAreNotApplied() {
-        val fragment = activityRule.activity.supportFragmentManager.findFragmentByTag(ChatRoomActivity.TAG_CHAT_ROOM_FRAGMENT) as ChatRoomFragment
+        val fragment =
+            activityRule.activity.supportFragmentManager.findFragmentByTag("ChatRoomFragment") as ChatRoomFragment
 
         fragment.showFileSelection(null)
 
-        intended(allOf(
+        intended(
+            allOf(
                 hasAction(Intent.ACTION_GET_CONTENT),
                 hasType("*/*"),
                 hasCategories(setOf(Intent.CATEGORY_OPENABLE)),
-                not(hasExtraWithKey(Intent.EXTRA_MIME_TYPES))))
+                not(hasExtraWithKey(Intent.EXTRA_MIME_TYPES))
+            )
+        )
     }
 }
\ No newline at end of file

app/src/foss/java/chat/rocket/android/analytics/AnswersAnalytics.kt

+package chat.rocket.android.analytics
+
+import chat.rocket.android.analytics.event.AuthenticationEvent
+import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.analytics.event.SubscriptionTypeEvent
+
+class AnswersAnalytics : Analytics {
+
+    override fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {
+        // Do absolutely nothing
+    }
+
+    override fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {
+        // Do absolutely nothing
+    }
+
+    override fun logScreenView(event: ScreenViewEvent) {
+        // Do absolutely nothing
+    }
+
+    override fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) {
+        // Do absolutely nothing
+    }
+
+    override fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {
+        // Do absolutely nothing
+    }
+
+    override fun logReaction(event: SubscriptionTypeEvent) {
+        // Do absolutely nothing
+    }
+
+    override fun logServerSwitch(serverUrl: String, serverCount: Int) {
+        // Do absolutely nothing
+    }
+}

app/src/foss/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt

+package chat.rocket.android.analytics
+
+import android.content.Context
+import chat.rocket.android.analytics.event.AuthenticationEvent
+import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.analytics.event.SubscriptionTypeEvent
+import javax.inject.Inject
+
+class GoogleAnalyticsForFirebase @Inject constructor(val  context: Context) :
+    Analytics {
+
+    override fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {
+        // Do absolutely nothing
+    }
+
+    override fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {
+        // Do absolutely nothing
+    }
+
+    override fun logScreenView(event: ScreenViewEvent) {
+        // Do absolutely nothing
+    }
+
+    override fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) {
+        // Do absolutely nothing
+    }
+
+    override fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {
+        // Do absolutely nothing
+    }
+
+    override fun logReaction(event: SubscriptionTypeEvent) {
+        // Do absolutely nothing
+    }
+
+    override fun logServerSwitch(serverUrl: String, serverCount: Int) {
+        // Do absolutely nothing
+    }
+}

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

+package chat.rocket.android.dagger.module
+
+import chat.rocket.android.chatroom.di.MessageServiceProvider
+import chat.rocket.android.chatroom.service.MessageService
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module abstract class ServiceBuilder {
+    @ContributesAndroidInjector(modules = [MessageServiceProvider::class])
+    abstract fun bindMessageService(): MessageService
+}

app/src/foss/java/chat/rocket/android/helper/ActivityKt.kt

+package chat.rocket.android.helper
+
+import android.app.Activity
+import android.content.Intent
+import androidx.fragment.app.FragmentActivity
+
+fun FragmentActivity.saveCredentials(id: String, password: String) {
+}
+
+fun Activity.requestStoredCredentials(): Pair<String, String>? = null
+
+fun getCredentials(data: Intent): Pair<String, String>? = null
+
+fun hasCredentialsSupport() = false
\ No newline at end of file

app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt

+package chat.rocket.android.helper
+
+import timber.log.Timber
+import android.util.Log
+
+class CrashlyticsTree : Timber.Tree() {
+
+    override fun log(priority: Int, tag: String?, message: String, throwable: Throwable?) {
+        Log.println(priority, tag, message)
+
+        if (throwable != null) {
+            Log.e(tag,throwable.toString())
+        }
+    }
+}

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

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

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

+package chat.rocket.android.util
+
+import android.content.Context
+
+fun setupFabric(context: Context) {
+    //Do absolutely nothing
+}

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

+package chat.rocket.android.util
+
+fun invalidateFirebaseToken(token: String) {
+    //Do absolutely nothing
+}
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -95,23 +95,6 @@
             </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"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT" />
-            </intent-filter>
-        </service>
-
         <service
             android:name=".chatroom.service.MessageService"
             android:exported="true"
@@ -122,4 +105,4 @@
             android:value="12ac6e94f850aaffcdff52001af77ca415d06a43" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

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

@@ -7,43 +7,56 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import chat.rocket.android.BuildConfig
 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
+
+internal const val TAG_ABOUT_FRAGMENT = "AboutFragment"
 
 class AboutFragment : Fragment() {
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
 
-    companion object {
-        fun newInstance() = AboutFragment()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
     }
 
-    override fun onCreateView(inflater: LayoutInflater,
-                              container: ViewGroup?,
-                              savedInstanceState: Bundle?
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View? = inflater.inflate(R.layout.fragment_about, container, false)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
         setupViews()
+
+        analyticsManager.logScreenView(ScreenViewEvent.About)
     }
 
     private fun setupViews() {
-        text_version_name.text = getString(R.string.msg_version, BuildConfig.VERSION_NAME)
-        text_build_number.text = getString(R.string.msg_build, BuildConfig.VERSION_CODE)
+        text_version_name.text = BuildConfig.VERSION_NAME
+        text_build_number.text = getString(
+            R.string.msg_build, BuildConfig.VERSION_CODE,
+            BuildConfig.GIT_SHA, BuildConfig.FLAVOR
+        )
     }
 
     private fun setupToolbar() {
-        val toolbar = (activity as MainActivity).toolbar
-        toolbar.title = getString(R.string.title_about)
-        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        toolbar.setNavigationOnClickListener {
-            this.activity?.onBackPressed()
+        with((activity as MainActivity).toolbar) {
+            title = getString(R.string.title_about)
+            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+            setNavigationOnClickListener { activity?.onBackPressed() }
         }
     }
 
-    override fun onStop() {
-        super.onStop()
-        (activity as MainActivity).toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
+    companion object {
+        fun newInstance() = AboutFragment()
     }
 }

app/src/main/java/chat/rocket/android/analytics/Analytics.kt

+package chat.rocket.android.analytics
+
+import chat.rocket.android.analytics.event.AuthenticationEvent
+import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.analytics.event.SubscriptionTypeEvent
+
+interface Analytics {
+
+    /**
+     * Logs the login event.
+     *
+     * @param event The [AuthenticationEvent] used to log in.
+     * @param loginSucceeded True if successful logged in, false otherwise.
+     */
+    fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean)
+
+    /**
+     * Logs the sign up event.
+     *
+     * @param event The [AuthenticationEvent] used to sign up.
+     * @param signUpSucceeded True if successful signed up, false otherwise.
+     */
+    fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean)
+
+    /**
+     * Logs the screen view event.
+     *
+     * @param event The [ScreenViewEvent] to log.
+     */
+    fun logScreenView(event: ScreenViewEvent)
+
+    /**
+     * Logs the message sent event.
+     *
+     * @param event The [SubscriptionTypeEvent] to log.
+     * @param serverUrl The server URL to log.
+     */
+    fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String)
+
+    /**
+     * Logs the media upload event.
+     *
+     * @param event The [SubscriptionTypeEvent] to log.
+     * @param mimeType The mime type of the media uploaded to log.
+     */
+    fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String)
+
+    /**
+     * Logs the reaction event.
+     *
+     * @param event The [SubscriptionTypeEvent] to log.
+     */
+    fun logReaction(event: SubscriptionTypeEvent)
+
+    /**
+     * Logs the server switch event.
+     *
+     * @param serverUrl The server URL to log.
+     * @param serverCount The number of server(s) the use own.
+     */
+    fun logServerSwitch(serverUrl: String, serverCount: Int)
+}

app/src/main/java/chat/rocket/android/analytics/AnalyticsManager.kt

+package chat.rocket.android.analytics
+
+import chat.rocket.android.analytics.event.AuthenticationEvent
+import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.analytics.event.SubscriptionTypeEvent
+import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
+import chat.rocket.android.server.domain.GetAccountsInteractor
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import javax.inject.Inject
+
+class AnalyticsManager @Inject constructor(
+    private val analyticsTrackingInteractor: AnalyticsTrackingInteractor,
+    getCurrentServerInteractor: GetCurrentServerInteractor,
+    getAccountsInteractor: GetAccountsInteractor,
+    private val analytics: List<Analytics>
+) {
+    val serverUrl = getCurrentServerInteractor.get()
+    val accounts = getAccountsInteractor.get()
+
+    fun logLogin(
+        event: AuthenticationEvent,
+        loginSucceeded: Boolean
+    ) {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logLogin(event, loginSucceeded) }
+        }
+    }
+
+    fun logSignUp(
+        event: AuthenticationEvent,
+        signUpSucceeded: Boolean
+    ) {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logSignUp(event, signUpSucceeded) }
+        }
+    }
+
+    fun logScreenView(event: ScreenViewEvent) {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logScreenView(event) }
+        }
+    }
+
+    fun logMessageSent(event: SubscriptionTypeEvent) {
+        if (analyticsTrackingInteractor.get() && serverUrl != null) {
+            analytics.forEach { it.logMessageSent(event, serverUrl) }
+        }
+    }
+
+    fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMediaUploaded(event, mimeType) }
+        }
+    }
+
+    fun logReaction(event: SubscriptionTypeEvent) {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logReaction(event) }
+        }
+    }
+
+    fun logServerSwitch() {
+        if (analyticsTrackingInteractor.get() && serverUrl != null) {
+            analytics.forEach { it.logServerSwitch(serverUrl, accounts.size) }
+        }
+    }
+}

app/src/main/java/chat/rocket/android/analytics/event/AuthenticationEvent.kt

+package chat.rocket.android.analytics.event
+
+sealed class AuthenticationEvent(val methodName: String) {
+
+    object AuthenticationWithUserAndPassword : AuthenticationEvent("User and password")
+    object AuthenticationWithCas : AuthenticationEvent("CAS")
+    object AuthenticationWithSaml : AuthenticationEvent("SAML")
+    object AuthenticationWithOauth : AuthenticationEvent("Oauth")
+    object AuthenticationWithDeeplink : AuthenticationEvent("Deep link")
+}
+

app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt

+package chat.rocket.android.analytics.event
+
+sealed class ScreenViewEvent(val screenName: String) {
+
+    object About : ScreenViewEvent("AboutFragment")
+    object ChatRoom : ScreenViewEvent("ChatRoomFragment")
+    object ChatRooms : ScreenViewEvent("ChatRoomsFragment")
+    object CreateChannel : ScreenViewEvent("CreateChannelFragment")
+    object FavoriteMessages : ScreenViewEvent("FavoriteMessagesFragment")
+    object Files : ScreenViewEvent("FilesFragment")
+    object Login : ScreenViewEvent("LoginFragment")
+    object MemberBottomSheet : ScreenViewEvent("MemberBottomSheetFragment")
+    object Members : ScreenViewEvent("MembersFragment")
+    object Mentions : ScreenViewEvent("MentionsFragment")
+    object MessageInfo : ScreenViewEvent("MessageInfoFragment")
+    object Password : ScreenViewEvent("PasswordFragment")
+    object PinnedMessages : ScreenViewEvent("PinnedMessagesFragment")
+    object Preferences : ScreenViewEvent("PreferencesFragment")
+    object Profile : ScreenViewEvent("ProfileFragment")
+    object RegisterUsername : ScreenViewEvent("RegisterUsernameFragment")
+    object ResetPassword : ScreenViewEvent("ResetPasswordFragment")
+    object Server : ScreenViewEvent("ServerFragment")
+    object Settings : ScreenViewEvent("SettingsFragment")
+    object SignUp : ScreenViewEvent("SignupFragment")
+    object TwoFa : ScreenViewEvent("TwoFAFragment")
+}

app/src/main/java/chat/rocket/android/analytics/event/SubscriptionTypeEvent.kt

+package chat.rocket.android.analytics.event
+
+sealed class SubscriptionTypeEvent(val subscriptionTypeName: String) {
+
+    object DirectMessage : SubscriptionTypeEvent("Direct Message")
+    object Channel : SubscriptionTypeEvent("Channel")
+    object Group : SubscriptionTypeEvent("Group")
+}

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

@@ -22,6 +22,9 @@ class AppLifecycleObserver @Inject constructor(
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun onEnterForeground() {
         changeTemporaryStatus(UserStatus.Online())
+        serverInteractor.get()?.let { currentServer ->
+            factory.create(currentServer).resetReconnectionTimer()
+        }
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)

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

@@ -80,7 +80,7 @@ private fun formatLocalDateTime(localDateTime: LocalDateTime): String {
 }
 
 private fun formatLocalDate(localDate: LocalDate): String {
-    val formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
+    val formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
     return localDate.format(formatter).toString()
 }
 

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

@@ -8,36 +8,42 @@ 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.infrastructure.installCrashlyticsWrapper
 import chat.rocket.android.server.domain.AccountsRepository
 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.emoji.EmojiRepository
-import com.crashlytics.android.Crashlytics
-import com.crashlytics.android.core.CrashlyticsCore
+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 io.fabric.sdk.android.Fabric
+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
@@ -51,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
@@ -67,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
@@ -87,9 +98,8 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         context = WeakReference(applicationContext)
 
         AndroidThreeTen.init(this)
-        EmojiRepository.load(this)
 
-        setupCrashlytics()
+        setupFabric(this)
         setupFresco()
         setupTimber()
 
@@ -103,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() {
@@ -125,15 +138,6 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         }
     }
 
-    private fun setupCrashlytics() {
-        val core = CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()
-        Fabric.with(this, Crashlytics.Builder().core(core).build())
-
-        installCrashlyticsWrapper(this@RocketChatApplication,
-                getCurrentServerInteractor, settingsInteractor,
-                accountRepository, localRepository)
-    }
-
     private fun setupFresco() {
         Fresco.initialize(this, imagePipelineConfig, draweeConfig)
     }
@@ -146,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
@@ -164,9 +164,47 @@ 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)
 private fun LocalRepository.setOldMessagesCleanedUp() = save(CLEANUP_OLD_MESSAGES_NEEDED, false)
 
-private const val CLEANUP_OLD_MESSAGES_NEEDED = "CLEANUP_OLD_MESSAGES_NEEDED"
\ No newline at end of file
+private const val CLEANUP_OLD_MESSAGES_NEEDED = "CLEANUP_OLD_MESSAGES_NEEDED"

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

 package chat.rocket.android.authentication.login.presentation
 
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.AuthenticationEvent
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 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.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
@@ -23,12 +24,12 @@ 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.isWordpressAuthenticationEnabled
 import chat.rocket.android.server.domain.isPasswordResetEnabled
 import chat.rocket.android.server.domain.isRegistrationEnabledForNewUsers
-import chat.rocket.android.server.domain.wordpressUrl
+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
@@ -37,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
@@ -80,8 +80,8 @@ 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,
     private val saveCurrentServer: SaveCurrentServerInteractor,
     private val saveAccountInteractor: SaveAccountInteractor,
@@ -97,6 +97,7 @@ class LoginPresenter @Inject constructor(
     private lateinit var credentialSecret: String
     private lateinit var deepLinkUserId: String
     private lateinit var deepLinkToken: String
+    private lateinit var loginMethod: AuthenticationEvent
 
     fun setupView() {
         setupConnectionInfo(currentServer)
@@ -118,6 +119,7 @@ class LoginPresenter @Inject constructor(
             else -> {
                 this.usernameOrEmail = usernameOrEmail
                 this.password = password
+                loginMethod = AuthenticationEvent.AuthenticationWithUserAndPassword
                 doAuthentication(TYPE_LOGIN_USER_EMAIL)
             }
         }
@@ -125,17 +127,20 @@ class LoginPresenter @Inject constructor(
 
     fun authenticateWithCas(casToken: String) {
         credentialToken = casToken
+        loginMethod = AuthenticationEvent.AuthenticationWithCas
         doAuthentication(TYPE_LOGIN_CAS)
     }
 
     fun authenticateWithSaml(samlToken: String) {
         credentialToken = samlToken
+        loginMethod = AuthenticationEvent.AuthenticationWithSaml
         doAuthentication(TYPE_LOGIN_SAML)
     }
 
     fun authenticateWithOauth(oauthToken: String, oauthSecret: String) {
         credentialToken = oauthToken
         credentialSecret = oauthSecret
+        loginMethod = AuthenticationEvent.AuthenticationWithOauth
         doAuthentication(TYPE_LOGIN_OAUTH)
     }
 
@@ -146,6 +151,7 @@ class LoginPresenter @Inject constructor(
             deepLinkUserId = deepLinkInfo.userId
             deepLinkToken = deepLinkInfo.token
             tokenRepository.save(serverUrl, Token(deepLinkUserId, deepLinkToken))
+            loginMethod = AuthenticationEvent.AuthenticationWithDeeplink
             doAuthentication(TYPE_LOGIN_DEEP_LINK)
         } else {
             // If we don't have the login credentials, just go through normal setup and user input.
@@ -446,7 +452,7 @@ class LoginPresenter @Inject constructor(
                             if (myself.id == deepLinkUserId) {
                                 Token(deepLinkUserId, deepLinkToken)
                             } else {
-                                throw RocketChatAuthException("Invalid Authentication Deep Link Credentials...")
+                                throw RocketChatAuthException("Invalid AuthenticationEvent Deep Link Credentials...")
                             }
                         }
                         else -> {
@@ -465,11 +471,12 @@ class LoginPresenter @Inject constructor(
                         username = myself.username,
                         utcOffset = myself.utcOffset
                     )
-                    localRepository.saveCurrentUser(url = currentServer, user = user)
+                    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)
                     }
@@ -483,6 +490,7 @@ class LoginPresenter @Inject constructor(
                         navigator.toTwoFA(usernameOrEmail, password)
                     }
                     else -> {
+                        analyticsManager.logLogin(loginMethod, false)
                         exception.message?.let {
                             view.showMessage(it)
                         }.ifNull {
@@ -621,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/login/presentation/LoginView.kt

@@ -2,7 +2,6 @@ package chat.rocket.android.authentication.login.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
-import com.google.android.gms.auth.api.credentials.Credential
 
 interface LoginView : LoadingView, MessageView {
 

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

@@ -6,7 +6,6 @@ import android.content.Intent
 import android.graphics.PorterDuff
 import android.os.Build
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.text.style.ClickableSpan
 import android.view.LayoutInflater
 import android.view.View
@@ -18,23 +17,39 @@ import android.widget.LinearLayout
 import android.widget.ScrollView
 import androidx.core.view.isVisible
 import androidx.core.view.postDelayed
+import androidx.fragment.app.Fragment
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.login.presentation.LoginPresenter
 import chat.rocket.android.authentication.login.presentation.LoginView
-import chat.rocket.android.helper.*
-import chat.rocket.android.util.extensions.*
-import chat.rocket.android.webview.sso.ui.INTENT_SSO_TOKEN
-import chat.rocket.android.webview.sso.ui.ssoWebViewIntent
+import chat.rocket.android.helper.KeyboardHelper
+import chat.rocket.android.helper.TextHelper
+import chat.rocket.android.helper.getCredentials
+import chat.rocket.android.helper.hasCredentialsSupport
+import chat.rocket.android.helper.requestStoredCredentials
+import chat.rocket.android.helper.saveCredentials
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.shake
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.textContent
+import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.extensions.vibrateSmartPhone
 import chat.rocket.android.webview.oauth.ui.INTENT_OAUTH_CREDENTIAL_SECRET
 import chat.rocket.android.webview.oauth.ui.INTENT_OAUTH_CREDENTIAL_TOKEN
 import chat.rocket.android.webview.oauth.ui.oauthWebViewIntent
+import chat.rocket.android.webview.sso.ui.INTENT_SSO_TOKEN
+import chat.rocket.android.webview.sso.ui.ssoWebViewIntent
 import chat.rocket.common.util.ifNull
-import com.google.android.gms.auth.api.credentials.*
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_log_in.*
 import javax.inject.Inject
 
+internal const val TAG_LOGIN_FRAGMENT = "LoginFragment"
+internal const val REQUEST_CODE_FOR_SIGN_IN_REQUIRED = 1
+internal const val REQUEST_CODE_FOR_MULTIPLE_ACCOUNTS_RESOLUTION = 2
+internal const val REQUEST_CODE_FOR_SAVE_RESOLUTION = 3
 internal const val REQUEST_CODE_FOR_CAS = 4
 internal const val REQUEST_CODE_FOR_SAML = 5
 internal const val REQUEST_CODE_FOR_OAUTH = 6
@@ -42,13 +57,14 @@ internal const val REQUEST_CODE_FOR_OAUTH = 6
 class LoginFragment : Fragment(), LoginView {
     @Inject
     lateinit var presenter: LoginPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private var isOauthViewEnable = false
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         areLoginOptionsNeeded()
     }
     private var isGlobalLayoutListenerSetUp = false
     private var deepLinkInfo: LoginDeepLinkInfo? = null
-    private val credentialsClient by lazy { Credentials.getClient(requireActivity()) }
 
     companion object {
         private const val DEEP_LINK_INFO = "DeepLinkInfo"
@@ -85,6 +101,12 @@ class LoginFragment : Fragment(), LoginView {
         }.ifNull {
             presenter.setupView()
         }
+
+        if (!hasCredentialsSupport()) {
+            image_key.isVisible = false
+        }
+
+        analyticsManager.logScreenView(ScreenViewEvent.Login)
     }
 
     override fun onDestroyView() {
@@ -100,13 +122,15 @@ class LoginFragment : Fragment(), LoginView {
             if (data != null) {
                 when (requestCode) {
                     REQUEST_CODE_FOR_MULTIPLE_ACCOUNTS_RESOLUTION -> {
-                        onCredentialRetrieved(data.getParcelableExtra(Credential.EXTRA_KEY))
+                        getCredentials(data)?.let {
+                            onCredentialRetrieved(it.first, it.second)
+                        }
                     }
                     REQUEST_CODE_FOR_SIGN_IN_REQUIRED -> {
-                        //use the hints to autofill sign in forms to reduce the info to be filled.
-                        val credential: Credential = data.getParcelableExtra(Credential.EXTRA_KEY)
-                        text_username_or_email.setText(credential.id)
-                        text_password.setText(credential.password)
+                        getCredentials(data)?.let { credential ->
+                            text_username_or_email.setText(credential.first)
+                            text_password.setText(credential.second)
+                        }
                     }
                     REQUEST_CODE_FOR_SAVE_RESOLUTION -> {
                         showMessage(getString(R.string.message_credentials_saved_successfully))
@@ -154,19 +178,19 @@ class LoginFragment : Fragment(), LoginView {
 
     private fun requestStoredCredentials() {
         activity?.let {
-            SmartLockHelper.requestStoredCredentials(credentialsClient, it)?.let {
-                onCredentialRetrieved(it)
+            it.requestStoredCredentials()?.let { credentials ->
+                onCredentialRetrieved(credentials.first, credentials.second)
             }
         }
     }
 
-    private fun onCredentialRetrieved(credential: Credential) {
-        presenter.authenticateWithUserAndPassword(credential.id, credential.password.toString())
+    private fun onCredentialRetrieved(id: String, password: String) {
+        presenter.authenticateWithUserAndPassword(id, password)
     }
 
     override fun saveSmartLockCredentials(id: String, password: String) {
         activity?.let {
-            SmartLockHelper.save(credentialsClient, it, id, password)
+            it.saveCredentials(id, password)
         }
     }
 

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

@@ -4,9 +4,14 @@ import android.content.Intent
 import chat.rocket.android.R
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.login.ui.LoginFragment
+import chat.rocket.android.authentication.login.ui.TAG_LOGIN_FRAGMENT
 import chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
+import chat.rocket.android.authentication.registerusername.ui.TAG_REGISTER_USERNAME_FRAGMENT
 import chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
+import chat.rocket.android.authentication.resetpassword.ui.TAG_RESET_PASSWORD_FRAGMENT
 import chat.rocket.android.authentication.signup.ui.SignupFragment
+import chat.rocket.android.authentication.signup.ui.TAG_SIGNUP_FRAGMENT
+import chat.rocket.android.authentication.twofactor.ui.TAG_TWO_FA_FRAGMENT
 import chat.rocket.android.authentication.twofactor.ui.TwoFAFragment
 import chat.rocket.android.authentication.ui.AuthenticationActivity
 import chat.rocket.android.authentication.ui.newServerIntent
@@ -19,13 +24,13 @@ import chat.rocket.android.webview.ui.webViewIntent
 class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
 
     fun toLogin() {
-        activity.addFragmentBackStack("LoginFragment", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_LOGIN_FRAGMENT, R.id.fragment_container) {
             LoginFragment.newInstance()
         }
     }
 
     fun toLogin(deepLinkInfo: LoginDeepLinkInfo) {
-        activity.addFragmentBackStack("LoginFragment", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_LOGIN_FRAGMENT, R.id.fragment_container) {
             LoginFragment.newInstance(deepLinkInfo)
         }
     }
@@ -35,19 +40,19 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
     }
 
     fun toTwoFA(username: String, password: String) {
-        activity.addFragmentBackStack("TwoFAFragment", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_TWO_FA_FRAGMENT, R.id.fragment_container) {
             TwoFAFragment.newInstance(username, password)
         }
     }
 
     fun toSignUp() {
-        activity.addFragmentBackStack("SignupFragment", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_SIGNUP_FRAGMENT, R.id.fragment_container) {
             SignupFragment.newInstance()
         }
     }
 
     fun toForgotPassword() {
-        activity.addFragmentBackStack("ResetPasswordFragment", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_RESET_PASSWORD_FRAGMENT, R.id.fragment_container) {
             ResetPasswordFragment.newInstance()
         }
     }
@@ -58,7 +63,7 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
     }
 
     fun toRegisterUsername(userId: String, authToken: String) {
-        activity.addFragmentBackStack("RegisterUsernameFragment", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_REGISTER_USERNAME_FRAGMENT, R.id.fragment_container) {
             RegisterUsernameFragment.newInstance(userId, authToken)
         }
     }

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

 package chat.rocket.android.authentication.registerusername.presentation
 
+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.*
+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.favicon
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.wideTile
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.extensions.registerPushToken
+import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
@@ -23,10 +30,9 @@ 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,
     settingsInteractor: GetSettingsInteractor
@@ -50,10 +56,14 @@ class RegisterUsernamePresenter @Inject constructor(
                         saveAccount(registeredUsername)
                         saveCurrentServer.save(currentServer)
                         tokenRepository.save(currentServer, Token(userId, authToken))
-                        registerPushToken()
+                        analyticsManager.logSignUp(
+                            AuthenticationEvent.AuthenticationWithOauth,
+                            true
+                        )
                         navigator.toChatList()
                     }
                 } catch (exception: RocketChatException) {
+                    analyticsManager.logSignUp(AuthenticationEvent.AuthenticationWithOauth, false)
                     exception.message?.let {
                         view.showMessage(it)
                     }.ifNull {
@@ -66,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/registerusername/ui/RegisterUsernameFragment.kt

@@ -3,21 +3,34 @@ package chat.rocket.android.authentication.registerusername.ui
 import DrawableHelper
 import android.os.Build
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.registerusername.presentation.RegisterUsernamePresenter
 import chat.rocket.android.authentication.registerusername.presentation.RegisterUsernameView
-import chat.rocket.android.util.extensions.*
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.setVisible
+import chat.rocket.android.util.extensions.shake
+import chat.rocket.android.util.extensions.showKeyboard
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.textContent
+import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.extensions.vibrateSmartPhone
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_register_username.*
 import javax.inject.Inject
 
+internal const val TAG_REGISTER_USERNAME_FRAGMENT = "RegisterUsernameFragment"
+
 class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
     @Inject
     lateinit var presenter: RegisterUsernamePresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private lateinit var userId: String
     private lateinit var authToken: String
 
@@ -61,6 +74,8 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
         }
 
         setupOnClickListener()
+
+        analyticsManager.logScreenView(ScreenViewEvent.RegisterUsername)
     }
 
     override fun alertBlankUsername() {

app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt

@@ -3,26 +3,35 @@ package chat.rocket.android.authentication.resetpassword.ui
 import DrawableHelper
 import android.os.Build
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.fragment.app.Fragment
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordPresenter
 import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordView
-import chat.rocket.android.util.extensions.*
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.setVisible
+import chat.rocket.android.util.extensions.shake
+import chat.rocket.android.util.extensions.showKeyboard
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.textContent
+import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.extensions.vibrateSmartPhone
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_reset_password.*
 import javax.inject.Inject
 
+internal const val TAG_RESET_PASSWORD_FRAGMENT = "ResetPasswordFragment"
+
 class ResetPasswordFragment : Fragment(), ResetPasswordView {
     @Inject
     lateinit var presenter: ResetPasswordPresenter
-
-    companion object {
-        fun newInstance() = ResetPasswordFragment()
-    }
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -48,6 +57,8 @@ class ResetPasswordFragment : Fragment(), ResetPasswordView {
         }
 
         setupOnClickListener()
+
+        analyticsManager.logScreenView(ScreenViewEvent.ResetPassword)
     }
 
     override fun alertBlankEmail() {
@@ -131,4 +142,8 @@ class ResetPasswordFragment : Fragment(), ResetPasswordView {
             presenter.resetPassword(text_email.textContent)
         }
     }
+
+    companion object {
+        fun newInstance() = ResetPasswordFragment()
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt

@@ -3,44 +3,46 @@ package chat.rocket.android.authentication.server.ui
 import android.app.AlertDialog
 import android.net.Uri
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import androidx.fragment.app.Fragment
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.server.presentation.ServerPresenter
 import chat.rocket.android.authentication.server.presentation.ServerView
 import chat.rocket.android.helper.KeyboardHelper
-import chat.rocket.android.util.extensions.*
+import chat.rocket.android.util.extensions.hintContent
+import chat.rocket.android.util.extensions.ifEmpty
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.sanitize
+import chat.rocket.android.util.extensions.setVisible
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.textContent
+import chat.rocket.android.util.extensions.ui
 import chat.rocket.common.util.ifNull
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_server.*
 import okhttp3.HttpUrl
 import javax.inject.Inject
 
+internal const val TAG_SERVER_FRAGMENT = "ServerFragment"
+
 class ServerFragment : Fragment(), ServerView {
     @Inject
     lateinit var presenter: ServerPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private var deepLinkInfo: LoginDeepLinkInfo? = null
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         text_server_url.isCursorVisible = KeyboardHelper.isSoftKeyboardShown(relative_layout.rootView)
     }
-
-    companion object {
-        private const val DEEP_LINK_INFO = "DeepLinkInfo"
-
-        fun newInstance(deepLinkInfo: LoginDeepLinkInfo?) = ServerFragment().apply {
-            arguments = Bundle().apply {
-                putParcelable(DEEP_LINK_INFO, deepLinkInfo)
-            }
-        }
-    }
-
     private var protocol = "https://"
     private var ignoreChange = false
 
@@ -100,6 +102,8 @@ class ServerFragment : Fragment(), ServerView {
             override fun onNothingSelected(parent: AdapterView<*>?) {
             }
         }
+
+        analyticsManager.logScreenView(ScreenViewEvent.Server)
     }
 
     override fun onDestroyView() {
@@ -217,4 +221,14 @@ class ServerFragment : Fragment(), ServerView {
             }
         }
     }
+
+    companion object {
+        private const val DEEP_LINK_INFO = "DeepLinkInfo"
+
+        fun newInstance(deepLinkInfo: LoginDeepLinkInfo?) = ServerFragment().apply {
+            arguments = Bundle().apply {
+                putParcelable(DEEP_LINK_INFO, deepLinkInfo)
+            }
+        }
+    }
 }
\ No newline at end of file

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

 package chat.rocket.android.authentication.signup.presentation
 
+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.*
+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.favicon
 import chat.rocket.android.server.domain.model.Account
+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.*
+import chat.rocket.android.util.extensions.avatarUrl
+import chat.rocket.android.util.extensions.privacyPolicyUrl
+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
@@ -25,13 +35,12 @@ class SignupPresenter @Inject constructor(
     private val localRepository: LocalRepository,
     private val serverInteractor: GetConnectingServerInteractor,
     private val saveCurrentServerInteractor: SaveCurrentServerInteractor,
+    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) {
@@ -65,10 +74,17 @@ class SignupPresenter @Inject constructor(
                         saveCurrentServerInteractor.save(currentServer)
                         localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, me.username)
                         saveAccount(me)
-                        registerPushToken()
+                        analyticsManager.logSignUp(
+                            AuthenticationEvent.AuthenticationWithUserAndPassword,
+                            true
+                        )
                         view.saveSmartLockCredentials(username, password)
                         navigator.toChatList()
                     } catch (exception: RocketChatException) {
+                        analyticsManager.logSignUp(
+                            AuthenticationEvent.AuthenticationWithUserAndPassword,
+                            false
+                        )
                         exception.message?.let {
                             view.showMessage(it)
                         }.ifNull {
@@ -95,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/signup/presentation/SignupView.kt

@@ -2,7 +2,6 @@ package chat.rocket.android.authentication.signup.presentation
 
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
-import com.google.android.gms.auth.api.credentials.Credential
 
 interface SignupView : LoadingView, MessageView {
 

app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt

@@ -5,30 +5,39 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.text.style.ClickableSpan
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
+import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.R.string.message_credentials_saved_successfully
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.signup.presentation.SignupPresenter
 import chat.rocket.android.authentication.signup.presentation.SignupView
 import chat.rocket.android.helper.KeyboardHelper
-import chat.rocket.android.helper.SmartLockHelper
 import chat.rocket.android.helper.TextHelper
-import chat.rocket.android.util.extensions.*
-import com.google.android.gms.auth.api.credentials.Credentials
+import chat.rocket.android.helper.saveCredentials
+import chat.rocket.android.util.extensions.setVisible
+import chat.rocket.android.util.extensions.shake
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.textContent
+import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.extensions.vibrateSmartPhone
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_sign_up.*
 import javax.inject.Inject
 
+internal const val TAG_SIGNUP_FRAGMENT = "SignupFragment"
 internal const val SAVE_CREDENTIALS = 1
 
 class SignupFragment : Fragment(), SignupView {
     @Inject
     lateinit var presenter: SignupPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         if (KeyboardHelper.isSoftKeyboardShown(relative_layout.rootView)) {
             bottom_container.setVisible(false)
@@ -41,10 +50,6 @@ class SignupFragment : Fragment(), SignupView {
         }
     }
 
-    companion object {
-        fun newInstance() = SignupFragment()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
@@ -75,6 +80,8 @@ class SignupFragment : Fragment(), SignupView {
                 text_email.textContent
             )
         }
+
+        analyticsManager.logScreenView(ScreenViewEvent.SignUp)
     }
 
     override fun onDestroyView() {
@@ -155,9 +162,7 @@ class SignupFragment : Fragment(), SignupView {
     }
 
     override fun saveSmartLockCredentials(id: String, password: String) {
-        activity?.let {
-            SmartLockHelper.save(Credentials.getClient(it), it, id, password)
-        }
+        activity?.saveCredentials(id, password)
     }
 
     private fun tintEditTextDrawableStart() {
@@ -216,4 +221,8 @@ class SignupFragment : Fragment(), SignupView {
         text_password.isEnabled = value
         text_email.isEnabled = value
     }
+
+    companion object {
+        fun newInstance() = SignupFragment()
+    }
 }

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

 package chat.rocket.android.authentication.twofactor.presentation
 
+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.*
+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.favicon
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.wideTile
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.extensions.registerPushToken
+import chat.rocket.android.util.extensions.avatarUrl
 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
 import javax.inject.Inject
 
-class TwoFAPresenter @Inject constructor(private val view: TwoFAView,
-                                         private val strategy: CancelStrategy,
-                                         private val navigator: AuthenticationNavigator,
-                                         private val tokenRepository: TokenRepository,
-                                         private val localRepository: LocalRepository,
-                                         private val serverInteractor: GetConnectingServerInteractor,
-                                         private val saveCurrentServerInteractor: SaveCurrentServerInteractor,
-                                         private val factory: RocketChatClientFactory,
-                                         private val saveAccountInteractor: SaveAccountInteractor,
-                                         private val getAccountsInteractor: GetAccountsInteractor,
-                                         settingsInteractor: GetSettingsInteractor) {
+class TwoFAPresenter @Inject constructor(
+    private val view: TwoFAView,
+    private val strategy: CancelStrategy,
+    private val navigator: AuthenticationNavigator,
+    private val tokenRepository: TokenRepository,
+    private val localRepository: LocalRepository,
+    private val serverInteractor: GetConnectingServerInteractor,
+    private val saveCurrentServerInteractor: SaveCurrentServerInteractor,
+    private val analyticsManager: AnalyticsManager,
+    private val factory: RocketChatClientFactory,
+    private val saveAccountInteractor: SaveAccountInteractor,
+    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)
-    fun authenticate(usernameOrEmail: String, password: String, twoFactorAuthenticationCode: String) {
+    fun authenticate(
+        usernameOrEmail: String,
+        password: String,
+        twoFactorAuthenticationCode: String
+    ) {
         val server = serverInteractor.get()
         when {
             server == null -> {
@@ -58,12 +70,20 @@ class TwoFAPresenter @Inject constructor(private val view: TwoFAView,
                         saveAccount(me)
                         saveCurrentServerInteractor.save(currentServer)
                         tokenRepository.save(server, token)
-                        registerPushToken()
+                        localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, me.username)
+                        analyticsManager.logLogin(
+                            AuthenticationEvent.AuthenticationWithUserAndPassword,
+                            true
+                        )
                         navigator.toChatList()
                     } catch (exception: RocketChatException) {
                         if (exception is RocketChatAuthException) {
                             view.alertInvalidTwoFactorAuthenticationCode()
                         } else {
+                            analyticsManager.logLogin(
+                                AuthenticationEvent.AuthenticationWithUserAndPassword,
+                                false
+                            )
                             exception.message?.let {
                                 view.showMessage(it)
                             }.ifNull {
@@ -80,14 +100,6 @@ class TwoFAPresenter @Inject constructor(private val view: TwoFAView,
 
     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/authentication/twofactor/ui/TwoFAFragment.kt

@@ -4,37 +4,37 @@ import DrawableHelper
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
+import androidx.fragment.app.Fragment
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.twofactor.presentation.TwoFAPresenter
 import chat.rocket.android.authentication.twofactor.presentation.TwoFAView
-import chat.rocket.android.util.extensions.*
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.setVisible
+import chat.rocket.android.util.extensions.shake
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.textContent
+import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.extensions.vibrateSmartPhone
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_two_fa.*
 import javax.inject.Inject
 
+internal const val TAG_TWO_FA_FRAGMENT = "TwoFAFragment"
+
 class TwoFAFragment : Fragment(), TwoFAView {
-    @Inject lateinit var presenter: TwoFAPresenter
+    @Inject
+    lateinit var presenter: TwoFAPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     lateinit var username: String
     lateinit var password: String
 
-    // TODO - we could create an in memory repository to save username and password.
-    companion object {
-        private const val USERNAME = "username"
-        private const val PASSWORD = "password"
-
-        fun newInstance(username: String, password: String) = TwoFAFragment().apply {
-            arguments = Bundle(2).apply {
-                putString(USERNAME, username)
-                putString(PASSWORD, password)
-            }
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
@@ -44,7 +44,11 @@ class TwoFAFragment : Fragment(), TwoFAView {
         password = arguments?.getString(PASSWORD) ?: ""
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = container?.inflate(R.layout.fragment_authentication_two_fa)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_authentication_two_fa)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -60,6 +64,8 @@ class TwoFAFragment : Fragment(), TwoFAView {
         }
 
         setupOnClickListener()
+
+        analyticsManager.logScreenView(ScreenViewEvent.TwoFa)
     }
 
     override fun alertBlankTwoFactorAuthenticationCode() {
@@ -103,7 +109,8 @@ class TwoFAFragment : Fragment(), TwoFAView {
 
     private fun tintEditTextDrawableStart() {
         ui {
-            val lockDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_vpn_key_black_24dp, it)
+            val lockDrawable =
+                DrawableHelper.getDrawableFromId(R.drawable.ic_vpn_key_black_24dp, it)
             DrawableHelper.wrapDrawable(lockDrawable)
             DrawableHelper.tintDrawable(lockDrawable, it, R.color.colorDrawableTintGrey)
             DrawableHelper.compoundDrawable(text_two_factor_auth, lockDrawable)
@@ -120,4 +127,17 @@ class TwoFAFragment : Fragment(), TwoFAView {
             presenter.authenticate(username, password, text_two_factor_auth.textContent)
         }
     }
+
+    // TODO - we could create an in memory repository to save username and password.
+    companion object {
+        private const val USERNAME = "username"
+        private const val PASSWORD = "password"
+
+        fun newInstance(username: String, password: String) = TwoFAFragment().apply {
+            arguments = Bundle(2).apply {
+                putString(USERNAME, username)
+                putString(PASSWORD, password)
+            }
+        }
+    }
 }

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

@@ -10,6 +10,7 @@ import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.domain.model.getLoginDeepLinkInfo
 import chat.rocket.android.authentication.presentation.AuthenticationPresenter
 import chat.rocket.android.authentication.server.ui.ServerFragment
+import chat.rocket.android.authentication.server.ui.TAG_SERVER_FRAGMENT
 import chat.rocket.android.util.extensions.addFragment
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
@@ -64,7 +65,7 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
     }
 
     fun showServerInput(deepLinkInfo: LoginDeepLinkInfo?) {
-        addFragment("ServerFragment", R.id.fragment_container, allowStateLoss = true) {
+        addFragment(TAG_SERVER_FRAGMENT, R.id.fragment_container, allowStateLoss = true) {
             ServerFragment.newInstance(deepLinkInfo)
         }
     }

app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoActivity.kt

@@ -6,7 +6,6 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
-import chat.rocket.android.chatinformation.ui.MessageInfoFragment.Companion.TAG_MESSAGE_INFO_FRAGMENT
 import chat.rocket.android.util.extensions.addFragment
 import chat.rocket.android.util.extensions.textContent
 import dagger.android.AndroidInjection

app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt

@@ -9,14 +9,14 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.chatinformation.adapter.ReadReceiptAdapter
 import chat.rocket.android.chatinformation.presentation.MessageInfoPresenter
 import chat.rocket.android.chatinformation.presentation.MessageInfoView
 import chat.rocket.android.chatinformation.viewmodel.ReadReceiptViewModel
-import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.showToast
-import chat.rocket.core.model.ReadReceipt
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_message_info.*
 import javax.inject.Inject
@@ -29,13 +29,14 @@ fun newInstance(messageId: String): Fragment {
     }
 }
 
+internal const val TAG_MESSAGE_INFO_FRAGMENT = "MessageInfoFragment"
 private const val BUNDLE_MESSAGE_ID = "message_id"
 
 class MessageInfoFragment : Fragment(), MessageInfoView {
-
     @Inject
     lateinit var presenter: MessageInfoPresenter
-
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private lateinit var adapter: ReadReceiptAdapter
     private lateinit var messageId: String
 
@@ -64,6 +65,8 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
         presenter.loadReadReceipts(messageId = messageId)
+
+        analyticsManager.logScreenView(ScreenViewEvent.MessageInfo)
     }
 
     private fun setupRecyclerView() {
@@ -93,8 +96,4 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
     override fun showReadReceipts(messageReceipts: List<ReadReceiptViewModel>) {
         adapter.addAll(messageReceipts)
     }
-
-    companion object {
-        const val TAG_MESSAGE_INFO_FRAGMENT = "MessageInfoFragment"
-    }
 }

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

+package chat.rocket.android.chatroom.adapter
+
+import android.view.View
+import chat.rocket.android.chatroom.uimodel.ActionsAttachmentUiModel
+import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.core.model.attachment.actions.Action
+import chat.rocket.core.model.attachment.actions.ButtonAction
+import kotlinx.android.synthetic.main.item_actions_attachment.view.*
+import androidx.recyclerview.widget.LinearLayoutManager
+import timber.log.Timber
+
+class ActionsAttachmentViewHolder(
+        itemView: View,
+        listener: ActionsListener,
+        reactionListener: EmojiReactionListener? = null,
+        var actionAttachmentOnClickListener: ActionAttachmentOnClickListener
+) : BaseViewHolder<ActionsAttachmentUiModel>(itemView, listener, reactionListener) {
+
+    init {
+        with(itemView) {
+            setupActionMenu(actions_attachment_container)
+        }
+    }
+
+    override fun bindViews(data: ActionsAttachmentUiModel) {
+        val actions = data.actions
+        val alignment = data.buttonAlignment
+        Timber.d("no of actions : ${actions.size} : $actions")
+        with(itemView) {
+            title.text = data.title ?: ""
+            actions_list.layoutManager = LinearLayoutManager(itemView.context,
+                    when (alignment) {
+                        "horizontal" -> LinearLayoutManager.HORIZONTAL
+                        else -> LinearLayoutManager.VERTICAL //Default
+                    }, false)
+            actions_list.adapter = ActionsListAdapter(actions, actionAttachmentOnClickListener)
+        }
+    }
+}
+
+interface ActionAttachmentOnClickListener {
+    fun onActionClicked(view: View, action: Action)
+}
\ No newline at end of file

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

+package chat.rocket.android.chatroom.adapter
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.core.model.attachment.actions.Action
+import chat.rocket.core.model.attachment.actions.ButtonAction
+import com.facebook.drawee.backends.pipeline.Fresco
+import kotlinx.android.synthetic.main.item_action_button.view.*
+import timber.log.Timber
+
+class ActionsListAdapter(actions: List<Action>, var actionAttachmentOnClickListener: ActionAttachmentOnClickListener) : RecyclerView.Adapter<ActionsListAdapter.ViewHolder>() {
+
+    var actions: List<Action> = actions
+
+    inner class ViewHolder(var layout: View) : RecyclerView.ViewHolder(layout) {
+        lateinit var action: ButtonAction
+
+        private val onClickListener = View.OnClickListener {
+            actionAttachmentOnClickListener.onActionClicked(it, action)
+        }
+
+        init {
+            with(itemView) {
+                action_button.setOnClickListener(onClickListener)
+                action_image_button.setOnClickListener(onClickListener)
+            }
+        }
+
+        fun bindAction(action: Action) {
+            with(itemView) {
+                Timber.d("action : $action")
+                this@ViewHolder.action = action as ButtonAction
+
+                if (action.imageUrl != null) {
+                    action_button.isVisible = false
+                    action_image_button.isVisible = true
+
+                    //Image button
+                    val controller = Fresco.newDraweeControllerBuilder().apply {
+                        setUri(action.imageUrl)
+                        autoPlayAnimations = true
+                        oldController = action_image_button.controller
+                    }.build()
+                    action_image_button.controller = controller
+
+                } else if (action.text != null) {
+                    action_button.isVisible = true
+                    action_image_button.isVisible = false
+
+                    this.action_button.setText(action.text)
+                }
+            }
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = parent.inflate(R.layout.item_action_button)
+        return ViewHolder(view)
+    }
+
+    override fun getItemCount(): Int {
+        return actions.size
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val action = actions[position]
+        holder.bindAction(action)
+    }
+}
\ No newline at end of file

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

 package chat.rocket.android.chatroom.adapter
 
-import android.app.AlertDialog
-import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.MenuItem
+import android.view.View
 import android.view.ViewGroup
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.presentation.ChatRoomPresenter
 import chat.rocket.android.chatroom.uimodel.*
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.android.util.extensions.openTabbedUrl
+import chat.rocket.core.model.attachment.actions.Action
+import chat.rocket.core.model.attachment.actions.ButtonAction
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.isSystemMessage
 import timber.log.Timber
 import java.security.InvalidParameterException
 
 class ChatRoomAdapter(
+    private val roomId: String? = null,
     private val roomType: String? = null,
     private val roomName: String? = null,
     private val actionSelectListener: OnActionSelected? = null,
@@ -72,6 +74,10 @@ class ChatRoomAdapter(
                     actionSelectListener?.openDirectMessage(roomName, permalink)
                 }
             }
+            BaseUiModel.ViewType.ACTIONS_ATTACHMENT -> {
+                val view = parent.inflate(R.layout.item_actions_attachment)
+                ActionsAttachmentViewHolder(view, actionsListener, reactionListener, actionAttachmentOnClickListener)
+            }
             else -> {
                 throw InvalidParameterException("TODO - implement for ${viewType.toViewType()}")
             }
@@ -125,6 +131,8 @@ class ChatRoomAdapter(
                 holder.bind(dataSet[position] as GenericFileAttachmentUiModel)
             is MessageReplyViewHolder ->
                 holder.bind(dataSet[position] as MessageReplyUiModel)
+            is ActionsAttachmentViewHolder ->
+                holder.bind(dataSet[position] as ActionsAttachmentUiModel)
         }
     }
 
@@ -150,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<*>) {
@@ -203,6 +224,33 @@ class ChatRoomAdapter(
         }
     }
 
+    private val actionAttachmentOnClickListener = object : ActionAttachmentOnClickListener {
+        override fun onActionClicked(view: View, action: Action) {
+            val temp = action as ButtonAction
+            if (temp.url != null && temp.isWebView != null) {
+                if (temp.isWebView == true) {
+                    //TODO: Open in a configurable sizable webview
+                    Timber.d("Open in a configurable sizable webview")
+                } else {
+                    //Open in chrome custom tab
+                    temp.url?.let { view.openTabbedUrl(it) }
+                }
+            } else if (temp.message != null && temp.isMessageInChatWindow != null) {
+                if (temp.isMessageInChatWindow == true) {
+                    //Send to chat window
+                    temp.message?.let {
+                        if (roomId != null) {
+                            actionSelectListener?.sendMessage(roomId, it)
+                        }
+                    }
+                } else {
+                    //TODO: Send to bot but not in chat window
+                    Timber.d("Send to bot but not in chat window")
+                }
+            }
+        }
+    }
+
     private val actionsListener = object : BaseViewHolder.ActionsListener {
 
         override fun isActionsEnabled(): Boolean = enableActions
@@ -259,5 +307,6 @@ class ChatRoomAdapter(
         fun deleteMessage(roomId: String, id: String)
         fun showReactions(id: String)
         fun openDirectMessage(roomName: String, message: String)
+        fun sendMessage(chatRoomId: String, text: String)
     }
 }
\ No newline at end of file

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

 package chat.rocket.android.chatroom.adapter
 
 import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.text.Spannable
 import android.text.method.LinkMovementMethod
+import android.text.style.ImageSpan
 import android.view.View
 import androidx.core.view.isVisible
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.uimodel.MessageUiModel
 import chat.rocket.android.emoji.EmojiReactionListener
 import chat.rocket.core.model.isSystemMessage
+import com.bumptech.glide.load.resource.gif.GifDrawable
 import kotlinx.android.synthetic.main.avatar.view.*
 import kotlinx.android.synthetic.main.item_message.view.*
 
@@ -15,7 +19,7 @@ class MessageViewHolder(
     itemView: View,
     listener: ActionsListener,
     reactionListener: EmojiReactionListener? = null
-) : BaseViewHolder<MessageUiModel>(itemView, listener, reactionListener) {
+) : BaseViewHolder<MessageUiModel>(itemView, listener, reactionListener), Drawable.Callback {
 
     init {
         with(itemView) {
@@ -26,22 +30,26 @@ class MessageViewHolder(
 
     override fun bindViews(data: MessageUiModel) {
         with(itemView) {
-            day_marker_layout.visibility = if (data.showDayMarker) {
-                day.text = data.currentDayMarkerText
-                View.VISIBLE
-            } else {
-                View.GONE
-            }
+            day.text = data.currentDayMarkerText
+            day_marker_layout.isVisible = data.showDayMarker
 
-            if (data.isFirstUnread) {
-                new_messages_notif.visibility = View.VISIBLE
-            } else {
-                new_messages_notif.visibility = View.GONE
-            }
+            new_messages_notif.isVisible = data.isFirstUnread
 
             text_message_time.text = data.time
             text_sender.text = data.senderName
-            text_content.text = data.content
+
+            if (data.content is Spannable) {
+                val spans = data.content.getSpans(0, data.content.length, ImageSpan::class.java)
+                spans.forEach {
+                    if (it.drawable is GifDrawable) {
+                        it.drawable.callback = this@MessageViewHolder
+                        (it.drawable as GifDrawable).start()
+                    }
+                }
+            }
+
+            text_content.text_content.text = data.content
+
             image_avatar.setImageURI(data.avatar)
             text_content.setTextColor(if (data.isTemporary) Color.GRAY else Color.BLACK)
 
@@ -64,4 +72,22 @@ class MessageViewHolder(
             }
         }
     }
+
+    override fun unscheduleDrawable(who: Drawable?, what: Runnable?) {
+        with(itemView) {
+            text_content.removeCallbacks(what)
+        }
+    }
+
+    override fun invalidateDrawable(p0: Drawable?) {
+        with(itemView) {
+            text_content.invalidate()
+        }
+    }
+
+    override fun scheduleDrawable(who: Drawable?, what: Runnable?, w: Long) {
+        with(itemView) {
+            text_content.postDelayed(what, w)
+        }
+    }
 }

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

@@ -4,37 +4,42 @@ import chat.rocket.android.R
 import chat.rocket.android.chatinformation.ui.messageInformationIntent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.chatRoomIntent
+import chat.rocket.android.favoritemessages.ui.TAG_FAVORITE_MESSAGES_FRAGMENT
+import chat.rocket.android.files.ui.TAG_FILES_FRAGMENT
+import chat.rocket.android.members.ui.TAG_MEMBERS_FRAGMENT
+import chat.rocket.android.mentions.ui.TAG_MENTIONS_FRAGMENT
+import chat.rocket.android.pinnedmessages.ui.TAG_PINNED_MESSAGES_FRAGMENT
 import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.android.util.extensions.addFragmentBackStack
 
 class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
 
     fun toMembersList(chatRoomId: String) {
-        activity.addFragmentBackStack("MembersFragment", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_MEMBERS_FRAGMENT, R.id.fragment_container) {
             chat.rocket.android.members.ui.newInstance(chatRoomId)
         }
     }
 
     fun toMentions(chatRoomId: String) {
-        activity.addFragmentBackStack("MentionsFragment", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_MENTIONS_FRAGMENT, R.id.fragment_container) {
             chat.rocket.android.mentions.ui.newInstance(chatRoomId)
         }
     }
 
     fun toPinnedMessageList(chatRoomId: String) {
-        activity.addFragmentBackStack("PinnedMessages", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_PINNED_MESSAGES_FRAGMENT, R.id.fragment_container) {
             chat.rocket.android.pinnedmessages.ui.newInstance(chatRoomId)
         }
     }
 
     fun toFavoriteMessageList(chatRoomId: String) {
-        activity.addFragmentBackStack("FavoriteMessages", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_FAVORITE_MESSAGES_FRAGMENT, R.id.fragment_container) {
             chat.rocket.android.favoritemessages.ui.newInstance(chatRoomId)
         }
     }
 
     fun toFileList(chatRoomId: String) {
-        activity.addFragmentBackStack("Files", R.id.fragment_container) {
+        activity.addFragmentBackStack(TAG_FILES_FRAGMENT, R.id.fragment_container) {
             chat.rocket.android.files.ui.newInstance(chatRoomId)
         }
     }

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
+import chat.rocket.android.analytics.event.SubscriptionTypeEvent
 import chat.rocket.android.chatroom.adapter.AutoCompleteType
 import chat.rocket.android.chatroom.adapter.PEOPLE
 import chat.rocket.android.chatroom.adapter.ROOMS
@@ -30,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
@@ -78,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(
@@ -90,6 +95,7 @@ class ChatRoomPresenter @Inject constructor(
     private val usersRepository: UsersRepository,
     private val roomsRepository: RoomRepository,
     private val localRepository: LocalRepository,
+    private val analyticsManager: AnalyticsManager,
     private val userHelper: UserHelper,
     private val mapper: UiModelMapper,
     private val jobSchedulerInteractor: JobSchedulerInteractor,
@@ -107,7 +113,7 @@ class ChatRoomPresenter @Inject constructor(
     private val messagesChannel = Channel<Message>()
 
     private var chatRoomId: String? = null
-    private var chatRoomType: String? = null
+    private lateinit var chatRoomType: String
     private var chatIsBroadcast: Boolean = false
     private var chatRoles = emptyList<ChatRoomRole>()
     private val stateChannel = Channel<State>()
@@ -179,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 {
@@ -221,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,
@@ -261,7 +281,7 @@ class ChatRoomPresenter @Inject constructor(
             try {
                 // ignore message for now, will receive it on the stream
                 val id = UUID.randomUUID().toString()
-                val message = if (messageId == null) {
+                if (messageId == null) {
                     val username = userHelper.username()
                     val newMessage = Message(
                         id = id,
@@ -270,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,
@@ -291,11 +311,12 @@ class ChatRoomPresenter @Inject constructor(
                         messagesRepository.save(newMessage)
                         view.showNewMessage(
                             mapper.map(
-                                newMessage, 
+                                newMessage,
                                 RoomUiModel(roles = chatRoles, isBroadcast = chatIsBroadcast)
                             ), false
                         )
                         client.sendMessage(id, chatRoomId, text)
+                        logMessageSent()
                     } catch (ex: Exception) {
                         // Ok, not very beautiful, but the backend sends us a not valid response
                         // When someone sends a message on a read-only channel, so we just ignore it
@@ -327,34 +348,22 @@ 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 {
-                        fileName.isEmpty() -> {
-                            view.showInvalidFileMessage()
-                        }
-                        fileSize > maxFileSizeAllowed -> {
+                        fileName.isEmpty() -> view.showInvalidFileMessage()
+                        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,
@@ -363,9 +372,10 @@ class ChatRoomPresenter @Inject constructor(
                                     msg,
                                     description = fileName
                                 ) {
-                                    inputStream
+                                    byteArray?.inputStream() ?: uriInteractor.getInputStream(uri)
                                 }
                             }
+                            logMediaUploaded(mimeType)
                         }
                     }
                 }
@@ -392,9 +402,8 @@ class ChatRoomPresenter @Inject constructor(
                     val maxFileSizeAllowed = settings.uploadMaxFileSize()
 
                     when {
-                        fileSize > maxFileSizeAllowed -> {
+                        fileSize > maxFileSizeAllowed && maxFileSizeAllowed !in -1..0 ->
                             view.showInvalidFileSize(fileSize, maxFileSizeAllowed)
-                        }
                         else -> {
                             retryIO("uploadFile($roomId, $fileName, $mimeType") {
                                 client.uploadFile(
@@ -484,45 +493,49 @@ 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()
-                        try {
-                            val messages =
-                                retryIO(description = "history($chatRoomId, $roomType, $instant)") {
-                                    client.history(
-                                        chatRoomId!!, roomType, count = 50,
-                                        oldest = instant
-                                    )
-                                }
-                            Timber.d("History: $messages")
-
-                            if (messages.result.isNotEmpty()) {
-                                val models = mapper.map(messages.result, RoomUiModel(
-                                    roles = chatRoles,
-                                    isBroadcast = chatIsBroadcast,
-                                    // FIXME: Why are we fixing isRoom attribute to true here?
-                                    isRoom = true
-                                ))
-                                messagesRepository.saveAll(messages.result)
-
-                                launchUI(strategy) {
-                                    view.showNewMessage(models, true)
-                                }
+            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)") {
+                            client.history(
+                                chatRoomId!!, roomType, count = 50,
+                                oldest = instant
+                            )
+                        }
+                    Timber.d("History: $messages")
 
-                                if (messages.result.size == 50) {
-                                    // we loaded at least count messages, try one more to fetch more messages
-                                    loadMissingMessages()
-                                }
-                            }
-                        } catch (ex: Exception) {
-                            // TODO - we need to better treat connection problems here, but no let gaps
-                            // on the messages list
-                            Timber.d(ex, "Error fetching channel history")
+                    if (messages.result.isNotEmpty()) {
+                        val models = mapper.map(messages.result, RoomUiModel(
+                            roles = chatRoles,
+                            isBroadcast = chatIsBroadcast,
+                            // FIXME: Why are we fixing isRoom attribute to true here?
+                            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)
+                        }
+
+                        if (messages.result.size == 50) {
+                            // we loaded at least count messages, try one more to fetch more messages
+                            loadMissingMessages()
                         }
                     }
+                } catch (ex: Exception) {
+                    // TODO - we need to better treat connection problems here, but no let gaps
+                    // on the messages list
+                    Timber.d(ex, "Error fetching channel history")
+                }
             }
         }
     }
@@ -938,12 +951,43 @@ class ChatRoomPresenter @Inject constructor(
                 retryIO("toggleEmoji($messageId, $emoji)") {
                     client.toggleReaction(messageId, emoji.removeSurrounding(":"))
                 }
+                logReactionEvent()
             } catch (ex: RocketChatException) {
                 Timber.e(ex)
             }
         }
     }
 
+    private fun logReactionEvent() {
+        when {
+            roomTypeOf(chatRoomType) is RoomType.DirectMessage ->
+                analyticsManager.logReaction(SubscriptionTypeEvent.DirectMessage)
+            roomTypeOf(chatRoomType) is RoomType.Channel ->
+                analyticsManager.logReaction(SubscriptionTypeEvent.Channel)
+            else -> analyticsManager.logReaction(SubscriptionTypeEvent.Group)
+        }
+    }
+
+    private fun logMediaUploaded(mimeType: String) {
+        when {
+            roomTypeOf(chatRoomType) is RoomType.DirectMessage ->
+                analyticsManager.logMediaUploaded(SubscriptionTypeEvent.DirectMessage, mimeType)
+            roomTypeOf(chatRoomType) is RoomType.Channel ->
+                analyticsManager.logMediaUploaded(SubscriptionTypeEvent.Channel, mimeType)
+            else -> analyticsManager.logMediaUploaded(SubscriptionTypeEvent.Group, mimeType)
+        }
+    }
+
+    private fun logMessageSent() {
+        when {
+            roomTypeOf(chatRoomType) is RoomType.DirectMessage ->
+                analyticsManager.logMessageSent(SubscriptionTypeEvent.DirectMessage)
+            roomTypeOf(chatRoomType) is RoomType.Channel ->
+                analyticsManager.logMessageSent(SubscriptionTypeEvent.Channel)
+            else -> analyticsManager.logMessageSent(SubscriptionTypeEvent.Group)
+        }
+    }
+
     fun showReactions(messageId: String) {
         view.showReactionsPopup(messageId)
     }

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

@@ -148,9 +148,4 @@ interface ChatRoomView : LoadingView, MessageView {
      */
     fun onRoomUpdated(userCanPost: Boolean, channelIsBroadcast: Boolean, userCanMod: Boolean)
 
-    /**
-     * Open a DM with the user in the given [chatRoom] and pass the [permalink] for the message
-     * to reply.
-     */
-    fun openDirectMessage(chatRoom: ChatRoom, permalink: String)
 }

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/ChatRoomActivity.kt

@@ -6,8 +6,6 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.appcompat.app.AppCompatActivity
-import android.text.SpannableStringBuilder
-import androidx.core.view.isVisible
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
@@ -169,8 +167,4 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
         super.onBackPressed()
         overridePendingTransition(R.anim.close_enter, R.anim.close_exit)
     }
-
-    companion object {
-        const val TAG_CHAT_ROOM_FRAGMENT = "ChatRoomFragment"
-    }
 }
\ No newline at end of file

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

@@ -6,9 +6,13 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.Handler
+import android.os.SystemClock
+import android.text.Spannable
 import android.text.SpannableStringBuilder
+import android.text.style.ImageSpan
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.Menu
@@ -29,6 +33,8 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.adapter.CommandSuggestionsAdapter
 import chat.rocket.android.chatroom.adapter.PEOPLE
@@ -51,11 +57,13 @@ import chat.rocket.android.emoji.EmojiKeyboardPopup
 import chat.rocket.android.emoji.EmojiParser
 import chat.rocket.android.emoji.EmojiPickerPopup
 import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.android.emoji.internal.isCustom
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.helper.ImageHelper
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.util.extension.asObservable
+import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.circularRevealOrUnreveal
 import chat.rocket.android.util.extensions.fadeIn
 import chat.rocket.android.util.extensions.fadeOut
@@ -69,6 +77,7 @@ import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.core.internal.realtime.socket.model.State
 import chat.rocket.core.model.ChatRoom
+import com.bumptech.glide.load.resource.gif.GifDrawable
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
@@ -77,6 +86,8 @@ import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.launch
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
@@ -107,6 +118,8 @@ fun newInstance(
     }
 }
 
+internal const val TAG_CHAT_ROOM_FRAGMENT = "ChatRoomFragment"
+
 private const val BUNDLE_CHAT_ROOM_ID = "chat_room_id"
 private const val BUNDLE_CHAT_ROOM_NAME = "chat_room_name"
 private const val BUNDLE_CHAT_ROOM_TYPE = "chat_room_type"
@@ -127,11 +140,14 @@ internal const val MENU_ACTION_FAVORITE_MESSAGES = 5
 internal const val MENU_ACTION_FILES = 6
 
 class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiReactionListener,
-    ChatRoomAdapter.OnActionSelected {
+    ChatRoomAdapter.OnActionSelected, Drawable.Callback {
+
     @Inject
     lateinit var presenter: ChatRoomPresenter
     @Inject
     lateinit var parser: MessageParser
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private lateinit var adapter: ChatRoomAdapter
     internal lateinit var chatRoomId: String
     private lateinit var chatRoomName: String
@@ -202,8 +218,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
         }
 
-        adapter = ChatRoomAdapter(chatRoomType, chatRoomName, this,
-                reactionListener = this)
+        adapter = ChatRoomAdapter(chatRoomId, chatRoomType, chatRoomName, this, reactionListener = this)
     }
 
     override fun onCreateView(
@@ -228,6 +243,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             it.showToolbarTitle(chatRoomName)
             it.showToolbarChatRoomIcon(chatRoomType)
         }
+
+        analyticsManager.logScreenView(ScreenViewEvent.ChatRoom)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -385,10 +402,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-    override fun openDirectMessage(chatRoom: ChatRoom, permalink: String) {
-
-    }
-
     private val layoutChangeListener =
         View.OnLayoutChangeListener { _, _, _, _, bottom, _, _, _, oldBottom ->
             val y = oldBottom - bottom
@@ -463,23 +476,18 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun showTypingStatus(usernameList: List<String>) {
         ui {
             when (usernameList.size) {
-                1 -> {
-                    text_typing_status.text =
+                1 -> text_typing_status.text =
                         SpannableStringBuilder()
                             .bold { append(usernameList[0]) }
                             .append(getString(R.string.msg_is_typing))
-                }
-                2 -> {
-                    text_typing_status.text =
+                2 -> text_typing_status.text =
                         SpannableStringBuilder()
                             .bold { append(usernameList[0]) }
                             .append(getString(R.string.msg_and))
                             .bold { append(usernameList[1]) }
                             .append(getString(R.string.msg_are_typing))
-                }
-                else -> {
-                    text_typing_status.text = getString(R.string.msg_several_users_are_typing)
-                }
+
+                else -> text_typing_status.text = getString(R.string.msg_several_users_are_typing)
             }
             text_typing_status.isVisible = true
         }
@@ -631,8 +639,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun onEmojiAdded(emoji: Emoji) {
         val cursorPosition = text_message.selectionStart
         if (cursorPosition > -1) {
-            text_message.text?.insert(cursorPosition, EmojiParser.parse(emoji.shortname))
-            text_message.setSelection(cursorPosition + emoji.unicode.length)
+            context?.let {
+                val offset = if (!emoji.isCustom()) emoji.unicode.length else emoji.shortname.length
+                val parsed = if (emoji.isCustom()) emoji.shortname else EmojiParser.parse(it, emoji.shortname)
+                text_message.text?.insert(cursorPosition, parsed)
+                text_message.setSelection(cursorPosition + offset)
+            }
         }
     }
 
@@ -699,16 +711,16 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                     text_connection_status.text = getString(R.string.status_connected)
                     handler.postDelayed(dismissStatus, 2000)
                 }
-                is State.Disconnected -> text_connection_status.text =
-                    getString(R.string.status_disconnected)
-                is State.Connecting -> text_connection_status.text =
-                    getString(R.string.status_connecting)
-                is State.Authenticating -> text_connection_status.text =
-                    getString(R.string.status_authenticating)
-                is State.Disconnecting -> text_connection_status.text =
-                    getString(R.string.status_disconnecting)
-                is State.Waiting -> text_connection_status.text =
-                    getString(R.string.status_waiting, state.seconds)
+                is State.Disconnected ->
+                    text_connection_status.text = getString(R.string.status_disconnected)
+                is State.Connecting ->
+                    text_connection_status.text = getString(R.string.status_connecting)
+                is State.Authenticating ->
+                    text_connection_status.text = getString(R.string.status_authenticating)
+                is State.Disconnecting ->
+                    text_connection_status.text = getString(R.string.status_disconnecting)
+                is State.Waiting ->
+                    text_connection_status.text = getString(R.string.status_waiting, state.seconds)
             }
         }
     }
@@ -763,12 +775,18 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             button_send.isVisible = false
             button_show_attachment_options.alpha = 1f
             button_show_attachment_options.isVisible = true
+
             activity?.supportFragmentManager?.addOnBackStackChangedListener {
                 println("attach")
             }
+
             activity?.supportFragmentManager?.registerFragmentLifecycleCallbacks(
                 object : FragmentManager.FragmentLifecycleCallbacks() {
-                    override fun onFragmentAttached(fm: FragmentManager, f: Fragment, context: Context) {
+                    override fun onFragmentAttached(
+                        fm: FragmentManager,
+                        f: Fragment,
+                        context: Context
+                    ) {
                         if (f is MessageActionsBottomSheet) {
                             setReactionButtonIcon(R.drawable.ic_reaction_24dp)
                             emojiKeyboardPopup.dismiss()
@@ -777,13 +795,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 },
                 true
             )
+
             subscribeComposeTextMessage()
-            emojiKeyboardPopup =
-                EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))
+            emojiKeyboardPopup = EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))
             emojiKeyboardPopup.listener = this
             text_message.listener = object : ComposerEditText.ComposerEditTextListener {
-                override fun onKeyboardOpened() {
-                }
+                override fun onKeyboardOpened() {}
 
                 override fun onKeyboardClosed() {
                     activity?.let {
@@ -965,11 +982,28 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         (activity as ChatRoomActivity).showToolbarTitle(toolbarTitle)
     }
 
+    override fun unscheduleDrawable(who: Drawable?, what: Runnable?) {
+        text_message?.removeCallbacks(what)
+    }
+
+    override fun invalidateDrawable(who: Drawable?) {
+        text_message?.invalidate()
+    }
+
+    override fun scheduleDrawable(who: Drawable?, what: Runnable?, `when`: Long) {
+        text_message?.postDelayed(what, `when`)
+    }
+
     override fun showMessageInfo(id: String) {
         presenter.messageInfo(id)
     }
 
-    override fun citeMessage(roomName: String, roomType: String, messageId: String, mentionAuthor: Boolean) {
+    override fun citeMessage(
+        roomName: String,
+        roomType: String,
+        messageId: String,
+        mentionAuthor: Boolean
+    ) {
         presenter.citeMessage(roomName, roomType, messageId, mentionAuthor)
     }
 
@@ -1001,10 +1035,15 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         ui {
             val builder = AlertDialog.Builder(it)
             builder.setTitle(it.getString(R.string.msg_delete_message))
-                    .setMessage(it.getString(R.string.msg_delete_description))
-                    .setPositiveButton(it.getString(R.string.msg_ok)) { _, _ -> presenter.deleteMessage(roomId, id) }
-                    .setNegativeButton(it.getString(R.string.msg_cancel)) { _, _ ->  }
-                    .show()
+                .setMessage(it.getString(R.string.msg_delete_description))
+                .setPositiveButton(it.getString(R.string.msg_ok)) { _, _ ->
+                    presenter.deleteMessage(
+                        roomId,
+                        id
+                    )
+                }
+                .setNegativeButton(it.getString(R.string.msg_cancel)) { _, _ -> }
+                .show()
         }
     }
 
@@ -1015,4 +1054,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun openDirectMessage(roomName: String, message: String) {
         presenter.openDirectMessage(roomName, message)
     }
+
+    override fun sendMessage(chatRoomId: String, text: String) {
+        presenter.sendMessage(chatRoomId, text, null)
+    }
 }

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") -> {
-                    imagePreview.isVisible = true
-                    imagePreview.setImageURI(uri)
-                }
-                mimeType.startsWith("video") -> {
-                    audioVideoAttachment.isVisible = true
+                    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
+                            }
+                        })
                 }
+                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/chatroom/uimodel/ActionsAttachmentUiModel.kt

+package chat.rocket.android.chatroom.uimodel
+
+import chat.rocket.android.R
+import chat.rocket.core.model.Message
+import chat.rocket.core.model.attachment.actions.Action
+import chat.rocket.core.model.attachment.actions.ActionsAttachment
+
+data class ActionsAttachmentUiModel(
+	override val attachmentUrl: String,
+	val title: String?,
+	val actions: List<Action>,
+	val buttonAlignment: String,
+	override val message: Message,
+	override val rawData: ActionsAttachment,
+	override val messageId: String,
+	override var reactions: List<ReactionUiModel>,
+	override var nextDownStreamMessage: BaseUiModel<*>? = null,
+	override var preview: Message? = null,
+	override var isTemporary: Boolean = false,
+	override var unread: Boolean? = null,
+	override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+	override var currentDayMarkerText: String,
+	override var showDayMarker: Boolean
+) : BaseAttachmentUiModel<ActionsAttachment> {
+	override val viewType: Int
+		get() = BaseUiModel.ViewType.ACTIONS_ATTACHMENT.viewType
+	override val layoutId: Int
+		get() = R.layout.item_actions_attachment
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/BaseUiModel.kt

@@ -29,7 +29,8 @@ interface BaseUiModel<out T> {
         AUTHOR_ATTACHMENT(7),
         COLOR_ATTACHMENT(8),
         GENERIC_FILE_ATTACHMENT(9),
-        MESSAGE_REPLY(10)
+        MESSAGE_REPLY(10),
+        ACTIONS_ATTACHMENT(11)
     }
 }
 

app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt

@@ -46,6 +46,7 @@ import chat.rocket.core.model.attachment.GenericFileAttachment
 import chat.rocket.core.model.attachment.ImageAttachment
 import chat.rocket.core.model.attachment.MessageAttachment
 import chat.rocket.core.model.attachment.VideoAttachment
+import chat.rocket.core.model.attachment.actions.ActionsAttachment
 import chat.rocket.core.model.isSystemMessage
 import chat.rocket.core.model.url.Url
 import kotlinx.coroutines.experimental.CommonPool
@@ -305,10 +306,26 @@ class UiModelMapper @Inject constructor(
             is MessageAttachment -> mapMessageAttachment(message, attachment)
             is AuthorAttachment -> mapAuthorAttachment(message, attachment)
             is ColorAttachment -> mapColorAttachment(message, attachment)
+            is ActionsAttachment -> mapActionsAttachment(message, attachment)
             else -> null
         }
     }
 
+    private fun mapActionsAttachment(message: Message, attachment: ActionsAttachment): BaseUiModel<*>? {
+        return with(attachment) {
+            val content = stripMessageQuotes(message)
+
+            val localDateTime = DateTimeHelper.getLocalDateTime(message.timestamp)
+            val dayMarkerText = DateTimeHelper.getFormattedDateForMessages(localDateTime, context)
+
+            ActionsAttachmentUiModel(attachmentUrl = url, title = title,
+                    actions = actions, buttonAlignment = buttonAlignment, message = message, rawData = attachment,
+                    messageId = message.id, reactions = getReactions(message),
+                    preview = message.copy(message = content.message), unread = message.unread,
+                    showDayMarker = false, currentDayMarkerText = dayMarkerText)
+        }
+    }
+
     private fun mapColorAttachment(message: Message, attachment: ColorAttachment): BaseUiModel<*>? {
         return with(attachment) {
             val content = stripMessageQuotes(message)
@@ -493,7 +510,7 @@ class UiModelMapper @Inject constructor(
                 list.add(
                     ReactionUiModel(messageId = message.id,
                         shortname = shortname,
-                        unicode = EmojiParser.parse(shortname),
+                        unicode = EmojiParser.parse(context, shortname),
                         count = count,
                         usernames = usernames)
                 )

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt

@@ -21,6 +21,8 @@ import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.chatrooms.adapter.RoomsAdapter
 import chat.rocket.android.chatrooms.presentation.ChatRoomsPresenter
 import chat.rocket.android.chatrooms.presentation.ChatRoomsView
@@ -45,6 +47,8 @@ import kotlinx.android.synthetic.main.fragment_chat_rooms.*
 import timber.log.Timber
 import javax.inject.Inject
 
+internal const val TAG_CHAT_ROOMS_FRAGMENT = "ChatRoomsFragment"
+
 private const val BUNDLE_CHAT_ROOM_ID = "BUNDLE_CHAT_ROOM_ID"
 
 class ChatRoomsFragment : Fragment(), ChatRoomsView {
@@ -54,14 +58,12 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     lateinit var factory: ChatRoomsViewModelFactory
     @Inject
     lateinit var dbManager: DatabaseManager // TODO - remove when moving ChatRoom screen to DB
-
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     lateinit var viewModel: ChatRoomsViewModel
-
     private var searchView: SearchView? = null
     private var sortView: MenuItem? = null
-
     private val handler = Handler()
-
     private var chatRoomId: String? = null
     private var progressDialog: ProgressDialog? = null
 
@@ -108,6 +110,8 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         subscribeUi()
 
         setupToolbar()
+
+        analyticsManager.logScreenView(ScreenViewEvent.ChatRooms)
     }
 
     private fun subscribeUi() {
@@ -117,9 +121,13 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
             }
 
             recycler_view.layoutManager = LinearLayoutManager(it)
-            recycler_view.addItemDecoration(DividerItemDecoration(it,
+            recycler_view.addItemDecoration(
+                DividerItemDecoration(
+                    it,
                     resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
-                    resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)))
+                    resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
+                )
+            )
             recycler_view.itemAnimator = DefaultItemAnimator()
             recycler_view.adapter = adapter
 
@@ -134,7 +142,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
             })
 
             viewModel.loadingState.observe(viewLifecycleOwner, Observer { state ->
-                when(state) {
+                when (state) {
                     is LoadingState.Loading -> if (state.count == 0L) showLoading()
                     is LoadingState.Loaded -> {
                         hideLoading()
@@ -188,35 +196,47 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
             // TODO - simplify this
             R.id.action_sort -> {
                 val dialogLayout = layoutInflater.inflate(R.layout.chatroom_sort_dialog, null)
-                val sortType = SharedPreferenceHelper.getInt(Constants.CHATROOM_SORT_TYPE_KEY, ChatRoomsSortOrder.ACTIVITY)
-                val groupByType = SharedPreferenceHelper.getBoolean(Constants.CHATROOM_GROUP_BY_TYPE_KEY, false)
+                val sortType = SharedPreferenceHelper.getInt(
+                    Constants.CHATROOM_SORT_TYPE_KEY,
+                    ChatRoomsSortOrder.ACTIVITY
+                )
+                val groupByType =
+                    SharedPreferenceHelper.getBoolean(Constants.CHATROOM_GROUP_BY_TYPE_KEY, false)
 
                 val radioGroup = dialogLayout.findViewById<RadioGroup>(R.id.radio_group_sort)
-                val groupByTypeCheckBox = dialogLayout.findViewById<CheckBox>(R.id.checkbox_group_by_type)
+                val groupByTypeCheckBox =
+                    dialogLayout.findViewById<CheckBox>(R.id.checkbox_group_by_type)
 
-                radioGroup.check(when (sortType) {
-                    0 -> R.id.radio_sort_alphabetical
-                    else -> R.id.radio_sort_activity
-                })
+                radioGroup.check(
+                    when (sortType) {
+                        0 -> R.id.radio_sort_alphabetical
+                        else -> R.id.radio_sort_activity
+                    }
+                )
                 radioGroup.setOnCheckedChangeListener { _, checkedId ->
                     run {
-                        SharedPreferenceHelper.putInt(Constants.CHATROOM_SORT_TYPE_KEY, when (checkedId) {
-                            R.id.radio_sort_alphabetical -> 0
-                            R.id.radio_sort_activity -> 1
-                            else -> 1
-                        })
+                        SharedPreferenceHelper.putInt(
+                            Constants.CHATROOM_SORT_TYPE_KEY, when (checkedId) {
+                                R.id.radio_sort_alphabetical -> 0
+                                R.id.radio_sort_activity -> 1
+                                else -> 1
+                            }
+                        )
                     }
                 }
 
                 groupByTypeCheckBox.isChecked = groupByType
                 groupByTypeCheckBox.setOnCheckedChangeListener { _, isChecked ->
-                    SharedPreferenceHelper.putBoolean(Constants.CHATROOM_GROUP_BY_TYPE_KEY, isChecked)
+                    SharedPreferenceHelper.putBoolean(
+                        Constants.CHATROOM_GROUP_BY_TYPE_KEY,
+                        isChecked
+                    )
                 }
 
                 AlertDialog.Builder(context)
                     .setTitle(R.string.dialog_sort_title)
                     .setView(dialogLayout)
-                    .setPositiveButton("Done") { dialog, _ ->
+                    .setPositiveButton(R.string.dialog_button_done) { dialog, _ ->
                         invalidateQueryOnSearch()
                         updateSort()
                         dialog.dismiss()
@@ -227,10 +247,13 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     }
 
     private fun updateSort() {
-        val sortType = SharedPreferenceHelper.getInt(Constants.CHATROOM_SORT_TYPE_KEY, ChatRoomsSortOrder.ACTIVITY)
+        val sortType = SharedPreferenceHelper.getInt(
+            Constants.CHATROOM_SORT_TYPE_KEY,
+            ChatRoomsSortOrder.ACTIVITY
+        )
         val grouped = SharedPreferenceHelper.getBoolean(Constants.CHATROOM_GROUP_BY_TYPE_KEY, false)
 
-        val query = when(sortType) {
+        val query = when (sortType) {
             ChatRoomsSortOrder.ALPHABETICAL -> {
                 Query.ByName(grouped)
             }
@@ -297,11 +320,16 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
                     text_connection_status.text = getString(R.string.status_connected)
                     handler.postDelayed(dismissStatus, 2000)
                 }
-                is State.Disconnected -> text_connection_status.text = getString(R.string.status_disconnected)
-                is State.Connecting -> text_connection_status.text = getString(R.string.status_connecting)
-                is State.Authenticating -> text_connection_status.text = getString(R.string.status_authenticating)
-                is State.Disconnecting -> text_connection_status.text = getString(R.string.status_disconnecting)
-                is State.Waiting -> text_connection_status.text = getString(R.string.status_waiting, state.seconds)
+                is State.Disconnected -> text_connection_status.text =
+                        getString(R.string.status_disconnected)
+                is State.Connecting -> text_connection_status.text =
+                        getString(R.string.status_connecting)
+                is State.Authenticating -> text_connection_status.text =
+                        getString(R.string.status_authenticating)
+                is State.Disconnecting -> text_connection_status.text =
+                        getString(R.string.status_disconnecting)
+                is State.Waiting -> text_connection_status.text =
+                        getString(R.string.status_waiting, state.seconds)
             }
         }
     }

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/createchannel/ui/CreateChannelFragment.kt

@@ -15,6 +15,8 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.createchannel.presentation.CreateChannelPresenter
 import chat.rocket.android.createchannel.presentation.CreateChannelView
 import chat.rocket.android.main.ui.MainActivity
@@ -34,9 +36,13 @@ import kotlinx.android.synthetic.main.fragment_create_channel.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
+internal const val TAG_CREATE_CHANNEL_FRAGMENT = "CreateChannelFragment"
+
 class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback {
     @Inject
     lateinit var createChannelPresenter: CreateChannelPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private var actionMode: ActionMode? = null
     private val adapter: MembersAdapter = MembersAdapter {
         if (it.username != null) {
@@ -69,6 +75,8 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
         setupViewListeners()
         setupRecyclerView()
         subscribeEditTexts()
+
+        analyticsManager.logScreenView(ScreenViewEvent.CreateChannel)
     }
 
     override fun onDestroyView() {
@@ -161,7 +169,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
 
     override fun prepareToShowChatList() {
         with(activity as MainActivity) {
-            setCheckedNavDrawerItem(R.id.action_chat_rooms)
+            setCheckedNavDrawerItem(R.id.menu_action_chats)
             openDrawer()
             getDrawerLayout().postDelayed(1000) {
                 closeDrawer()

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
@@ -25,6 +26,7 @@ import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.members.di.MembersFragmentProvider
 import chat.rocket.android.mentions.di.MentionsFragmentProvider
 import chat.rocket.android.pinnedmessages.di.PinnedMessagesFragmentProvider
+import chat.rocket.android.preferences.di.PreferencesFragmentProvider
 import chat.rocket.android.profile.di.ProfileFragmentProvider
 import chat.rocket.android.server.di.ChangeServerModule
 import chat.rocket.android.server.ui.ChangeServerActivity
@@ -56,7 +58,9 @@ abstract class ActivityBuilder {
             ChatRoomsFragmentProvider::class,
             CreateChannelProvider::class,
             ProfileFragmentProvider::class,
-            SettingsFragmentProvider::class
+            SettingsFragmentProvider::class,
+            AboutFragmentProvider::class,
+            PreferencesFragmentProvider::class
         ]
     )
     abstract fun bindMainActivity(): MainActivity

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/module/AppModule.kt

@@ -9,6 +9,10 @@ import android.content.Context
 import android.content.SharedPreferences
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
+import chat.rocket.android.analytics.Analytics
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.AnswersAnalytics
+import chat.rocket.android.analytics.GoogleAnalyticsForFirebase
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
 import chat.rocket.android.chatroom.service.MessageService
@@ -23,9 +27,12 @@ import chat.rocket.android.push.GroupedPush
 import chat.rocket.android.push.PushManager
 import chat.rocket.android.server.domain.AccountsRepository
 import chat.rocket.android.server.domain.ActiveUsersRepository
+import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
+import chat.rocket.android.server.domain.AnalyticsTrackingRepository
 import chat.rocket.android.server.domain.ChatRoomsRepository
 import chat.rocket.android.server.domain.CurrentServerRepository
 import chat.rocket.android.server.domain.GetAccountInteractor
+import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.JobSchedulerInteractor
@@ -45,6 +52,7 @@ import chat.rocket.android.server.infraestructure.SharedPreferencesAccountsRepos
 import chat.rocket.android.server.infraestructure.SharedPreferencesMessagesRepository
 import chat.rocket.android.server.infraestructure.SharedPreferencesPermissionsRepository
 import chat.rocket.android.server.infraestructure.SharedPreferencesSettingsRepository
+import chat.rocket.android.server.infraestructure.SharedPrefsAnalyticsTrackingRepository
 import chat.rocket.android.server.infraestructure.SharedPrefsConnectingServerRepository
 import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
@@ -113,7 +121,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideImagePipelineConfig(context: Context, okHttpClient: OkHttpClient): ImagePipelineConfig {
+    fun provideImagePipelineConfig(
+        context: Context,
+        okHttpClient: OkHttpClient
+    ): ImagePipelineConfig {
         val listeners = setOf(RequestLoggingListener())
 
         return OkHttpImagePipelineConfigFactory.newBuilder(context, okHttpClient)
@@ -163,6 +174,12 @@ class AppModule {
         return SharedPrefsCurrentServerRepository(prefs)
     }
 
+    @Provides
+    @Singleton
+    fun provideAnalyticsTrackingRepository(prefs: SharedPreferences): AnalyticsTrackingRepository {
+        return SharedPrefsAnalyticsTrackingRepository(prefs)
+    }
+
     @Provides
     @ForAuthentication
     fun provideConnectingServerRepository(prefs: SharedPreferences): CurrentServerRepository {
@@ -177,7 +194,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun providePermissionsRepository(localRepository: LocalRepository, moshi: Moshi): PermissionsRepository {
+    fun providePermissionsRepository(
+        localRepository: LocalRepository,
+        moshi: Moshi
+    ): PermissionsRepository {
         return SharedPreferencesPermissionsRepository(localRepository, moshi)
     }
 
@@ -226,15 +246,20 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideMultiServerTokenRepository(repository: LocalRepository, moshi: Moshi): MultiServerTokenRepository {
+    fun provideMultiServerTokenRepository(
+        repository: LocalRepository,
+        moshi: Moshi
+    ): MultiServerTokenRepository {
         return SharedPreferencesMultiServerTokenRepository(repository, moshi)
     }
 
     @Provides
     @Singleton
-    fun provideMessageRepository(@ForMessages preferences: SharedPreferences,
-                                 moshi: Moshi,
-                                 currentServerInteractor: GetCurrentServerInteractor): MessagesRepository {
+    fun provideMessageRepository(
+        @ForMessages preferences: SharedPreferences,
+        moshi: Moshi,
+        currentServerInteractor: GetCurrentServerInteractor
+    ): MessagesRepository {
         return SharedPreferencesMessagesRepository(preferences, moshi, currentServerInteractor)
     }
 
@@ -249,10 +274,12 @@ class AppModule {
     fun provideConfiguration(context: Application): SpannableConfiguration {
         val res = context.resources
         return SpannableConfiguration.builder(context)
-            .theme(SpannableTheme.builder()
-                .blockMargin(0)
-                .linkColor(res.getColor(R.color.colorAccent))
-                .build())
+            .theme(
+                SpannableTheme.builder()
+                    .blockMargin(0)
+                    .linkColor(res.getColor(R.color.colorAccent))
+                    .build()
+            )
             .build()
     }
 
@@ -269,7 +296,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideAccountsRepository(preferences: SharedPreferences, moshi: Moshi): AccountsRepository =
+    fun provideAccountsRepository(
+        preferences: SharedPreferences,
+        moshi: Moshi
+    ): AccountsRepository =
         SharedPreferencesAccountsRepository(preferences, moshi)
 
     @Provides
@@ -288,8 +318,16 @@ class AppModule {
         manager: NotificationManager,
         moshi: Moshi,
         getAccountInteractor: GetAccountInteractor,
-        getSettingsInteractor: GetSettingsInteractor): PushManager {
-        return PushManager(groupedPushes, manager, moshi, getAccountInteractor, getSettingsInteractor, context)
+        getSettingsInteractor: GetSettingsInteractor
+    ): PushManager {
+        return PushManager(
+            groupedPushes,
+            manager,
+            moshi,
+            getAccountInteractor,
+            getSettingsInteractor,
+            context
+        )
     }
 
     @Provides
@@ -299,14 +337,19 @@ class AppModule {
 
     @Provides
     fun provideSendMessageJob(context: Application): JobInfo {
-        return JobInfo.Builder(MessageService.RETRY_SEND_MESSAGE_ID,
-            ComponentName(context, MessageService::class.java))
+        return JobInfo.Builder(
+            MessageService.RETRY_SEND_MESSAGE_ID,
+            ComponentName(context, MessageService::class.java)
+        )
             .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
             .build()
     }
 
     @Provides
-    fun provideJobSchedulerInteractor(jobScheduler: JobScheduler, jobInfo: JobInfo): JobSchedulerInteractor {
+    fun provideJobSchedulerInteractor(
+        jobScheduler: JobScheduler,
+        jobInfo: JobInfo
+    ): JobSchedulerInteractor {
         return JobSchedulerInteractorImpl(jobScheduler, jobInfo)
     }
 
@@ -323,4 +366,33 @@ class AppModule {
     ): DatabaseManager {
         return factory.create(currentServer)
     }
+
+    @Provides
+    @Singleton
+    fun provideAnswersAnalytics(): AnswersAnalytics {
+        return AnswersAnalytics()
+    }
+
+    @Provides
+    @Singleton
+    fun provideGoogleAnalyticsForFirebase(context: Application): GoogleAnalyticsForFirebase {
+        return GoogleAnalyticsForFirebase(context)
+    }
+
+    @Provides
+    @Singleton
+    fun provideAnalyticsManager(
+        analyticsTrackingInteractor: AnalyticsTrackingInteractor,
+        getCurrentServerInteractor: GetCurrentServerInteractor,
+        getAccountsInteractor: GetAccountsInteractor,
+        answersAnalytics: AnswersAnalytics,
+        googleAnalyticsForFirebase: GoogleAnalyticsForFirebase
+    ): AnalyticsManager {
+        return AnalyticsManager(
+            analyticsTrackingInteractor,
+            getCurrentServerInteractor,
+            getAccountsInteractor,
+            listOf(answersAnalytics, googleAnalyticsForFirebase)
+        )
+    }
 }

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/db/DatabaseManager.kt

@@ -330,7 +330,7 @@ class DatabaseManager(val context: Application,
             id = room.id,
             subscriptionId = subscription.id,
             type = room.type.toString(),
-            name = room.name ?: subscription.name ?: throw NullPointerException(),// this should be filtered on the SDK
+            name = room.name ?: subscription.name ?: throw NullPointerException(), // this should be filtered on the SDK
             fullname = subscription.fullName ?: room.fullName,
             userId = userId,
             ownerId = room.user?.id,

app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt

@@ -10,6 +10,8 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
@@ -31,13 +33,16 @@ fun newInstance(chatRoomId: String): Fragment {
     }
 }
 
+internal const val TAG_FAVORITE_MESSAGES_FRAGMENT = "FavoriteMessagesFragment"
 private const val INTENT_CHAT_ROOM_ID = "chat_room_id"
 
 class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
-    private lateinit var chatRoomId: String
-    private val adapter = ChatRoomAdapter(enableActions = false)
     @Inject
     lateinit var presenter: FavoriteMessagesPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
+    private lateinit var chatRoomId: String
+    private val adapter = ChatRoomAdapter(enableActions = false)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -61,6 +66,8 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
         presenter.loadFavoriteMessages(chatRoomId)
+
+        analyticsManager.logScreenView(ScreenViewEvent.FavoriteMessages)
     }
 
     override fun showFavoriteMessages(favoriteMessages: List<BaseUiModel<*>>) {

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

@@ -13,6 +13,8 @@ import androidx.recyclerview.widget.DividerItemDecoration.HORIZONTAL
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.files.adapter.FilesAdapter
 import chat.rocket.android.files.presentation.FilesPresenter
@@ -36,11 +38,14 @@ fun newInstance(chatRoomId: String): Fragment {
     }
 }
 
+internal const val TAG_FILES_FRAGMENT = "FilesFragment"
 private const val BUNDLE_CHAT_ROOM_ID = "chat_room_id"
 
 class FilesFragment : Fragment(), FilesView {
     @Inject
     lateinit var presenter: FilesPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private val adapter: FilesAdapter =
         FilesAdapter { fileUiModel -> presenter.openFile(fileUiModel) }
     private val linearLayoutManager = LinearLayoutManager(context)
@@ -68,28 +73,31 @@ class FilesFragment : Fragment(), FilesView {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
         presenter.loadFiles(chatRoomId)
+
+        analyticsManager.logScreenView(ScreenViewEvent.Files)
     }
 
     override fun showFiles(dataSet: List<FileUiModel>, total: Long) {
-        setupToolbar(total)
-        if (adapter.itemCount == 0) {
-            adapter.prependData(dataSet)
-            if (dataSet.size >= 30) {
-                recycler_view.addOnScrollListener(object :
-                    EndlessRecyclerViewScrollListener(linearLayoutManager) {
-                    override fun onLoadMore(
-                        page: Int,
-                        totalItemsCount: Int,
-                        recyclerView: RecyclerView
-                    ) {
-                        presenter.loadFiles(chatRoomId)
-                    }
-                })
+        ui {
+            setupToolbar(total)
+            if (adapter.itemCount == 0) {
+                adapter.prependData(dataSet)
+                if (dataSet.size >= 30) {
+                    recycler_view.addOnScrollListener(object :
+                        EndlessRecyclerViewScrollListener(linearLayoutManager) {
+                        override fun onLoadMore(
+                            page: Int,
+                            totalItemsCount: Int,
+                            recyclerView: RecyclerView
+                        ) {
+                            presenter.loadFiles(chatRoomId)
+                        }
+                    })
+                }
+                group_no_file.isVisible = dataSet.isEmpty()
+            } else {
+                adapter.appendData(dataSet)
             }
-            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

@@ -7,6 +7,7 @@ import android.graphics.Paint
 import android.graphics.RectF
 import android.text.Spanned
 import android.text.style.ClickableSpan
+import android.text.style.ImageSpan
 import android.text.style.ReplacementSpan
 import android.util.Patterns
 import android.view.View
@@ -25,7 +26,6 @@ import org.commonmark.node.Document
 import org.commonmark.node.ListItem
 import org.commonmark.node.Node
 import org.commonmark.node.OrderedList
-import org.commonmark.node.Paragraph
 import org.commonmark.node.Text
 import ru.noties.markwon.Markwon
 import ru.noties.markwon.SpannableBuilder
@@ -60,11 +60,11 @@ class MessageParser @Inject constructor(
             }
         }
         val builder = SpannableBuilder()
-        val content = EmojiRepository.shortnameToUnicode(text, true)
+        val content = EmojiRepository.shortnameToUnicode(text)
         val parentNode = parser.parse(toLenientMarkdown(content))
         parentNode.accept(MarkdownVisitor(configuration, builder))
         parentNode.accept(LinkVisitor(builder))
-        parentNode.accept(EmojiVisitor(configuration, builder))
+        parentNode.accept(EmojiVisitor(context, configuration, builder))
         message.mentions?.let {
             parentNode.accept(MentionVisitor(context, builder, mentions, selfUsername))
         }
@@ -126,16 +126,29 @@ class MessageParser @Inject constructor(
     }
 
     class EmojiVisitor(
+        private val context: Context,
         configuration: SpannableConfiguration,
         private val builder: SpannableBuilder
     ) : SpannableMarkdownVisitor(configuration, builder) {
 
+        private val emojiSize = context.resources.getDimensionPixelSize(R.dimen.custom_emoji_small)
+
         override fun visit(document: Document) {
-            val spannable = EmojiParser.parse(builder.text())
+            val spannable = EmojiParser.parse(context, builder.text())
             if (spannable is Spanned) {
-                val spans = spannable.getSpans(0, spannable.length, EmojiTypefaceSpan::class.java)
-                spans.forEach {
-                    builder.setSpan(it, spannable.getSpanStart(it), spannable.getSpanEnd(it), 0)
+                val emojiOneTypefaceSpans = spannable.getSpans(0, spannable.length,
+                    EmojiTypefaceSpan::class.java)
+                val emojiImageSpans = spannable.getSpans(0, spannable.length, ImageSpan::class.java)
+
+                emojiOneTypefaceSpans.forEach {
+                    builder.setSpan(it, spannable.getSpanStart(it), spannable.getSpanEnd(it),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                }
+
+                emojiImageSpans.forEach {
+                    it.drawable?.setBounds(0, 0, emojiSize, emojiSize)
+                    builder.setSpan(it, spannable.getSpanStart(it), spannable.getSpanEnd(it),
+                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                 }
             }
         }
@@ -230,4 +243,4 @@ class MessageParser @Inject constructor(
             canvas.drawText(text, start, end, x + padding, y.toFloat(), paint)
         }
     }
-}
\ No newline at end of file
+}

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

@@ -2,7 +2,6 @@ package chat.rocket.android.helper
 
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.common.model.SimpleUser
@@ -12,43 +11,13 @@ import javax.inject.Inject
 class UserHelper @Inject constructor(
     private val localRepository: LocalRepository,
     private val getCurrentServerInteractor: GetCurrentServerInteractor,
-    settingsRepository: SettingsRepository
+    private val settingsRepository: SettingsRepository
 ) {
 
-    private val settings: PublicSettings = settingsRepository.get(getCurrentServerInteractor.get()!!)
-
-    /**
-     * Return the display name for the given [user].
-     * If setting 'Use_Real_Name' is true then the real name will be given, or else
-     * the username without the '@' is yielded. The fallback for any case is the username, which
-     * could be null.
-     */
-    fun displayName(user: User): String? {
-        return if (settings.useRealName()) user.name ?: user.username else user.username
-    }
-
-    fun displayName(user: SimpleUser): String {
-        return if (settings.useRealName()) user.name ?: user.username ?: "" else user.username ?: ""
-    }
-
-    /**
-     * Return current logged user's display name.
-     *
-     * @see displayName
-     */
-    fun displayName(): String? {
-        user()?.let {
-            return displayName(it)
-        }
-        return null
-    }
-
     /**
      * Return current logged [User].
      */
-    fun user(): User? {
-        return localRepository.getCurrentUser(serverUrl())
-    }
+    fun user(): User? = getCurrentServerInteractor.get()?.let { localRepository.getCurrentUser(it) }
 
     /**
      * Return the username for the current logged [User].
@@ -56,13 +25,20 @@ class UserHelper @Inject constructor(
     fun username(): String? = localRepository.get(LocalRepository.CURRENT_USERNAME_KEY, null)
 
     /**
-     * Whether current [User] is admin on the current server.
+     * Return the display name for the given [user].
+     * If setting 'Use_Real_Name' is true then the real name will be given, otherwise the username
+     * without the '@' is yielded.
      */
-    fun isAdmin(): Boolean {
-        return user()?.roles?.find { it.equals("admin", ignoreCase = true) } != null
-    }
+    fun displayName(user: SimpleUser) = getCurrentServerInteractor.get()?.let {
+        if (settingsRepository.get(it).useRealName()) {
+            user.name
+        } else {
+            user.username
+        }
+    }.orEmpty()
 
-    private fun serverUrl(): String {
-        return getCurrentServerInteractor.get()!!
-    }
-}
\ No newline at end of file
+    /**
+     * Whether current [User] is admin on the current server.
+     */
+    fun isAdmin(): Boolean = user()?.roles?.find { it.equals("admin", true) } != null
+}

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

@@ -4,39 +4,50 @@ import chat.rocket.android.R
 import chat.rocket.android.authentication.ui.newServerIntent
 import chat.rocket.android.chatroom.ui.chatRoomIntent
 import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
+import chat.rocket.android.chatrooms.ui.TAG_CHAT_ROOMS_FRAGMENT
 import chat.rocket.android.createchannel.ui.CreateChannelFragment
+import chat.rocket.android.createchannel.ui.TAG_CREATE_CHANNEL_FRAGMENT
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.profile.ui.ProfileFragment
+import chat.rocket.android.profile.ui.TAG_PROFILE_FRAGMENT
 import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.android.settings.ui.SettingsFragment
+import chat.rocket.android.settings.ui.TAG_SETTINGS_FRAGMENT
 import chat.rocket.android.util.extensions.addFragment
+import chat.rocket.android.webview.adminpanel.ui.AdminPanelWebViewFragment
 
 class MainNavigator(internal val activity: MainActivity) {
 
     fun toChatList(chatRoomId: String? = null) {
-        activity.addFragment("ChatRoomsFragment", R.id.fragment_container) {
+        activity.addFragment(TAG_CHAT_ROOMS_FRAGMENT, R.id.fragment_container) {
             ChatRoomsFragment.newInstance(chatRoomId)
         }
     }
 
     fun toCreateChannel() {
-        activity.addFragment("CreateChannelFragment", R.id.fragment_container) {
+        activity.addFragment(TAG_CREATE_CHANNEL_FRAGMENT, R.id.fragment_container) {
             CreateChannelFragment.newInstance()
         }
     }
 
     fun toUserProfile() {
-        activity.addFragment("ProfileFragment", R.id.fragment_container) {
+        activity.addFragment(TAG_PROFILE_FRAGMENT, R.id.fragment_container) {
             ProfileFragment.newInstance()
         }
     }
 
     fun toSettings() {
-        activity.addFragment("SettingsFragment", R.id.fragment_container) {
+        activity.addFragment(TAG_SETTINGS_FRAGMENT, R.id.fragment_container) {
             SettingsFragment.newInstance()
         }
     }
 
+    fun toAdminPanel(webPageUrl: String, userToken: String) {
+        activity.addFragment("AdminPanelWebViewFragment", R.id.fragment_container) {
+            AdminPanelWebViewFragment.newInstance(webPageUrl, userToken)
+        }
+    }
+
     fun toChatRoom(
         chatRoomId: String,
         chatRoomName: String,
@@ -62,7 +73,17 @@ class MainNavigator(internal val activity: MainActivity) {
         activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
     }
 
-    fun toNewServer(serverUrl: String? = null) {
+    /**
+     * Switches to a server, given a [serverUrl] or adds a new server (navigating to the
+     * AuthenticationActivity) if the user server list only contains one server and the
+     * user logs out from this server.
+     * NOTE: If the user has more than one server and logs out from the current server, then it will
+     * switch to the first server in the server list.
+     *
+     * @param serverUrl The server URL to switch from, or null in case user logs out from the
+     * current server.
+     */
+    fun switchOrAddNewServer(serverUrl: String? = null) {
         activity.startActivity(activity.changeServerIntent(serverUrl = serverUrl))
         activity.finish()
     }

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

 package chat.rocket.android.main.presentation
 
+import android.content.Context
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManagerFactory
+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.infrastructure.LocalRepository
 import chat.rocket.android.main.uimodel.NavHeaderUiModel
 import chat.rocket.android.main.uimodel.NavHeaderUiModelMapper
@@ -11,6 +16,7 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
+import chat.rocket.android.server.domain.RefreshPermissionsInteractor
 import chat.rocket.android.server.domain.RemoveAccountInteractor
 import chat.rocket.android.server.domain.SaveAccountInteractor
 import chat.rocket.android.server.domain.TokenRepository
@@ -20,6 +26,7 @@ import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.extensions.adminPanelUrl
 import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO
@@ -28,14 +35,13 @@ import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.UserStatus
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.realtime.setDefaultStatus
+import chat.rocket.core.internal.rest.getCustomEmojis
 import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.unregisterPushToken
 import chat.rocket.core.model.Myself
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.channels.Channel
-import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 import javax.inject.Inject
@@ -47,12 +53,13 @@ class MainPresenter @Inject constructor(
     private val tokenRepository: TokenRepository,
     private val serverInteractor: GetCurrentServerInteractor,
     private val refreshSettingsInteractor: RefreshSettingsInteractor,
+    private val refreshPermissionsInteractor: RefreshPermissionsInteractor,
     private val localRepository: LocalRepository,
     private val navHeaderMapper: NavHeaderUiModelMapper,
     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,
@@ -63,7 +70,6 @@ class MainPresenter @Inject constructor(
     private val dbManager = dbManagerFactory.create(currentServer)
     private val client: RocketChatClient = factory.create(currentServer)
     private var settings: PublicSettings = getSettingsInteractor.get(serverInteractor.get()!!)
-
     private val userDataChannel = Channel<Myself>()
 
     fun toChatList(chatRoomId: String? = null) = navigator.toChatList(chatRoomId)
@@ -72,6 +78,10 @@ class MainPresenter @Inject constructor(
 
     fun toSettings() = navigator.toSettings()
 
+    fun toAdminPanel() = tokenRepository.get(currentServer)?.let {
+        navigator.toAdminPanel(currentServer.adminPanelUrl(), it.authToken)
+    }
+
     fun toCreateChannel() = navigator.toCreateChannel()
 
     fun loadServerAccounts() {
@@ -121,6 +131,38 @@ class MainPresenter @Inject constructor(
         }
     }
 
+    /**
+     * 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() {
+        launchUI(strategy) {
+            EmojiRepository.setCurrentServerUrl(currentServer)
+            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(view as Context, customEmojis = customEmojiList)
+            } catch (ex: RocketChatException) {
+                Timber.e(ex)
+                EmojiRepository.load(view as Context)
+            }
+        }
+    }
+
     /**
      * Logout from current server.
      */
@@ -145,7 +187,7 @@ class MainPresenter @Inject constructor(
                 tokenRepository.remove(currentServer)
 
                 withContext(CommonPool) { dbManager.logout() }
-                navigator.toNewServer()
+                navigator.switchOrAddNewServer()
             } catch (ex: Exception) {
                 Timber.d(ex, "Error cleaning up the session...")
             }
@@ -155,6 +197,7 @@ class MainPresenter @Inject constructor(
 
     fun connect() {
         refreshSettingsInteractor.refreshAsync(currentServer)
+        refreshPermissionsInteractor.refreshAsync(currentServer)
         manager.connect()
     }
 
@@ -165,7 +208,7 @@ class MainPresenter @Inject constructor(
 
     fun changeServer(serverUrl: String) {
         if (currentServer != serverUrl) {
-            navigator.toNewServer(serverUrl)
+            navigator.switchOrAddNewServer(serverUrl)
         } else {
             view.closeServerSelection()
         }
@@ -190,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

@@ -5,10 +5,9 @@ import android.app.Activity
 import android.app.AlertDialog
 import android.app.ProgressDialog
 import android.os.Bundle
-import android.view.Gravity
-import android.view.MenuItem
 import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -19,15 +18,16 @@ 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
 import chat.rocket.android.util.extensions.fadeIn
 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.common.model.UserStatus
-import com.google.firebase.iid.FirebaseInstanceId
-import com.google.firebase.messaging.FirebaseMessaging
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -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"
@@ -51,6 +48,8 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
     @Inject
     lateinit var presenter: MainPresenter
+    @Inject
+    lateinit var permissions: PermissionsInteractor
     private var isFragmentAdded: Boolean = false
     private var expanded = false
     private val headerLayout by lazy { view_navigation.getHeaderView(0) }
@@ -62,15 +61,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        launch(CommonPool) {
-            try {
-                val token = FirebaseInstanceId.getInstance().token
-                Timber.d("FCM token: $token")
-                presenter.refreshToken(token)
-            } catch (ex: Exception) {
-                Timber.d(ex, "Missing play services...")
-            }
-        }
+        refreshPushToken()
 
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
 
@@ -80,6 +71,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         presenter.connect()
         presenter.loadServerAccounts()
         presenter.loadCurrentInfo()
+        presenter.loadEmojis()
         setupToolbar()
         setupNavigationView()
     }
@@ -135,7 +127,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
                     text_user_name.text = userDisplayName
                 }
                 if (userAvatar != null) {
-                    image_avatar.setImageURI(userAvatar)
+                    setAvatar(userAvatar)
                 }
                 if (serverLogo != null) {
                     server_logo.setImageURI(serverLogo)
@@ -172,9 +164,9 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         }
 
         headerLayout.image_avatar.setOnClickListener {
-            view_navigation.menu.findItem(R.id.action_profile).isChecked = true
+            view_navigation.menu.findItem(R.id.menu_action_profile).isChecked = true
             presenter.toUserProfile()
-            drawer_layout.closeDrawer(Gravity.START)
+            drawer_layout.closeDrawer(GravityCompat.START)
         }
     }
 
@@ -211,7 +203,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     }
 
     override fun invalidateToken(token: String) =
-        FirebaseInstanceId.getInstance().deleteToken(token, FirebaseMessaging.INSTANCE_ID_SCOPE)
+        invalidateFirebaseToken(token)
 
     override fun showMessage(resId: Int) = showToast(resId)
 
@@ -224,44 +216,31 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     }
 
     fun setupNavigationView() {
-        view_navigation.setNavigationItemSelectedListener { menuItem ->
-            menuItem.isChecked = true
+        with (view_navigation.menu) {
+            clear()
+            setupMenu(this)
+        }
+
+        view_navigation.setNavigationItemSelectedListener {
+            it.isChecked = true
             closeDrawer()
-            onNavDrawerItemSelected(menuItem)
+            onNavDrawerItemSelected(it)
             true
         }
 
         toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
-        toolbar.setNavigationOnClickListener {
-            openDrawer()
-        }
+        toolbar.setNavigationOnClickListener { openDrawer() }
     }
 
-    private fun onNavDrawerItemSelected(menuItem: MenuItem) {
-        when (menuItem.itemId) {
-            R.id.action_chat_rooms -> {
-                presenter.toChatList()
-            }
-            R.id.action_profile -> {
-                presenter.toUserProfile()
-            }
-            R.id.action_channel -> {
-                presenter.toCreateChannel()
-            }
-            R.id.action_settings -> {
-                presenter.toSettings()
-            }
-            R.id.action_logout -> {
-                presenter.logout()
-            }
-        }
+    fun setAvatar(avatarUrl: String) {
+        headerLayout.image_avatar.setImageURI(avatarUrl)
     }
 
     fun getDrawerLayout(): DrawerLayout = drawer_layout
 
-    fun openDrawer() = drawer_layout.openDrawer(Gravity.START)
+    fun openDrawer() = drawer_layout.openDrawer(GravityCompat.START)
 
-    fun closeDrawer() = drawer_layout.closeDrawer(Gravity.START)
+    fun closeDrawer() = drawer_layout.closeDrawer(GravityCompat.START)
 
     fun setCheckedNavDrawerItem(@IdRes item: Int) = view_navigation.setCheckedItem(item)
 

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

+package chat.rocket.android.main.ui
+
+import android.view.Menu
+import android.view.MenuItem
+import chat.rocket.android.R
+
+internal fun MainActivity.setupMenu(menu: Menu) {
+    with(menu) {
+        add(
+            R.id.menu_section_one,
+            R.id.menu_action_chats,
+            Menu.NONE,
+            R.string.title_chats
+        ).setIcon(R.drawable.ic_chat_bubble_black_24dp)
+            .isChecked = true
+
+        add(
+            R.id.menu_section_one,
+            R.id.menu_action_create_channel,
+            Menu.NONE,
+            R.string.action_create_channel
+        ).setIcon(R.drawable.ic_create_black_24dp)
+
+        add(
+            R.id.menu_section_two,
+            R.id.menu_action_profile,
+            Menu.NONE,
+            R.string.title_profile
+        ).setIcon(R.drawable.ic_person_black_24dp)
+
+        add(
+            R.id.menu_section_two,
+            R.id.menu_action_settings,
+            Menu.NONE,
+            R.string.title_settings
+        ).setIcon(R.drawable.ic_settings_black_24dp)
+
+        if (permissions.canSeeTheAdminPanel()) {
+            add(
+                R.id.menu_section_two,
+                R.id.menu_action_admin_panel,
+                Menu.NONE,
+                R.string.title_admin_panel
+            ).setIcon(R.drawable.ic_settings_black_24dp)
+        }
+
+        add(
+            R.id.menu_section_three,
+            R.id.menu_action_logout,
+            Menu.NONE,
+            R.string.action_logout
+        ).setIcon(R.drawable.ic_logout_black_24dp)
+
+        setGroupCheckable(R.id.menu_section_one, true, true)
+        setGroupCheckable(R.id.menu_section_two, true, true)
+        setGroupCheckable(R.id.menu_section_three, true, true)
+    }
+}
+
+internal fun MainActivity.onNavDrawerItemSelected(menuItem: MenuItem) {
+    when (menuItem.itemId) {
+        R.id.menu_action_chats-> presenter.toChatList()
+        R.id.menu_action_create_channel -> presenter.toCreateChannel()
+        R.id.menu_action_profile -> presenter.toUserProfile()
+        R.id.menu_action_settings -> presenter.toSettings()
+        R.id.menu_action_admin_panel -> presenter.toAdminPanel()
+        R.id.menu_action_logout -> presenter.logout()
+    }
+}

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/presentation/MembersNavigator.kt

 package chat.rocket.android.members.presentation
 
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.members.ui.TAG_MEMBER_BOTTOM_SHEET_FRAGMENT
 import chat.rocket.android.members.ui.newInstance
 
 class MembersNavigator(internal val activity: ChatRoomActivity) {
@@ -8,7 +9,7 @@ class MembersNavigator(internal val activity: ChatRoomActivity) {
     fun toMemberDetails(avatarUri: String, realName: String, username: String, email: String, utcOffset: String) {
         activity.apply {
             newInstance(avatarUri, realName, username, email, utcOffset)
-                .show(supportFragmentManager, "MemberBottomSheetFragment")
+                .show(supportFragmentManager, TAG_MEMBER_BOTTOM_SHEET_FRAGMENT)
         }
     }
 }

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

 package chat.rocket.android.members.ui
 
 import android.os.Bundle
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+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
 
-fun newInstance(avatarUri: String,
-                realName: String,
-                username: String,
-                email: String,
-                utcOffset: String): BottomSheetDialogFragment {
+fun newInstance(
+    avatarUri: String,
+    realName: String,
+    username: String,
+    email: String,
+    utcOffset: String
+): BottomSheetDialogFragment {
     return MemberBottomSheetFragment().apply {
         arguments = Bundle(1).apply {
             putString(BUNDLE_AVATAR_URI, avatarUri)
@@ -27,13 +33,17 @@ fun newInstance(avatarUri: String,
     }
 }
 
+internal const val TAG_MEMBER_BOTTOM_SHEET_FRAGMENT = "MemberBottomSheetFragment"
+
 private const val BUNDLE_AVATAR_URI = "avatar_uri"
 private const val BUNDLE_REAL_NAME = "real_name"
 private const val BUNDLE_USERNAME = "username"
 private const val BUNDLE_EMAIL = "email"
 private const val BUNDLE_UTC_OFFSET = "utc_offset"
 
-class MemberBottomSheetFragment: BottomSheetDialogFragment() {
+class MemberBottomSheetFragment : BottomSheetDialogFragment() {
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private lateinit var avatarUri: String
     private lateinit var realName: String
     private lateinit var username: String
@@ -42,6 +52,7 @@ class MemberBottomSheetFragment: BottomSheetDialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
 
         val bundle = arguments
         if (bundle != null) {
@@ -54,12 +65,19 @@ class MemberBottomSheetFragment: BottomSheetDialogFragment() {
             requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
         }
     }
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? =
         inflater.inflate(R.layout.fragment_member_bottom_sheet, container, false)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         showMemberDetails()
+
+        analyticsManager.logScreenView(ScreenViewEvent.MemberBottomSheet)
     }
 
     private fun showMemberDetails() {
@@ -74,7 +92,7 @@ class MemberBottomSheetFragment: BottomSheetDialogFragment() {
             text_member_email_address.isVisible = false
         }
 
-        if (utcOffset.isNotEmpty()){
+        if (utcOffset.isNotEmpty()) {
             text_member_utc.content = utcOffset
         } else {
             text_utc.isVisible = false

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

 package chat.rocket.android.members.ui
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.members.adapter.MembersAdapter
@@ -31,11 +33,14 @@ fun newInstance(chatRoomId: String): Fragment {
     }
 }
 
+internal const val TAG_MEMBERS_FRAGMENT = "MembersFragment"
 private const val BUNDLE_CHAT_ROOM_ID = "chat_room_id"
 
 class MembersFragment : Fragment(), MembersView {
     @Inject
     lateinit var presenter: MembersPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private val adapter: MembersAdapter =
         MembersAdapter { memberUiModel -> presenter.toMemberDetails(memberUiModel) }
     private val linearLayoutManager = LinearLayoutManager(context)
@@ -63,6 +68,8 @@ class MembersFragment : Fragment(), MembersView {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
         presenter.loadChatRoomsMembers(chatRoomId)
+
+        analyticsManager.logScreenView(ScreenViewEvent.Members)
     }
 
     override fun showMembers(dataSet: List<MemberUiModel>, total: Long) {

app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt

@@ -10,6 +10,8 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
@@ -31,6 +33,7 @@ fun newInstance(chatRoomId: String): Fragment {
     }
 }
 
+internal const val TAG_MENTIONS_FRAGMENT = "MentionsFragment"
 private const val BUNDLE_CHAT_ROOM_ID = "chat_room_id"
 
 class MentionsFragment : Fragment(), MentionsView {
@@ -39,6 +42,8 @@ class MentionsFragment : Fragment(), MentionsView {
     private val adapter = ChatRoomAdapter(enableActions = false)
     @Inject
     lateinit var presenter: MentionsPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -63,6 +68,8 @@ class MentionsFragment : Fragment(), MentionsView {
 
         setupToolbar()
         presenter.loadMentions(chatRoomId)
+
+        analyticsManager.logScreenView(ScreenViewEvent.Mentions)
     }
 
     override fun showMentions(mentions: List<BaseUiModel<*>>) {

app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt

 package chat.rocket.android.pinnedmessages.ui
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesPresenter
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
+import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
@@ -31,14 +34,16 @@ fun newInstance(chatRoomId: String): Fragment {
     }
 }
 
+internal const val TAG_PINNED_MESSAGES_FRAGMENT = "PinnedMessagesFragment"
 private const val BUNDLE_CHAT_ROOM_ID = "chat_room_id"
 
 class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
-
-    private lateinit var chatRoomId: String
-    private val adapter = ChatRoomAdapter(enableActions = false)
     @Inject
     lateinit var presenter: PinnedMessagesPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
+    private lateinit var chatRoomId: String
+    private val adapter = ChatRoomAdapter(enableActions = false)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -63,6 +68,8 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
 
         setupToolbar()
         presenter.loadPinnedMessages(chatRoomId)
+
+        analyticsManager.logScreenView(ScreenViewEvent.PinnedMessages)
     }
 
     override fun showPinnedMessages(pinnedMessages: List<BaseUiModel<*>>) {

app/src/main/java/chat/rocket/android/preferences/di/PreferencesFragmentModule.kt

+package chat.rocket.android.preferences.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.preferences.presentation.PreferencesView
+import chat.rocket.android.preferences.ui.PreferencesFragment
+import dagger.Module
+import dagger.Provides
+
+@Module
+class PreferencesFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun preferencesView(frag: PreferencesFragment): PreferencesView {
+        return frag
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/preferences/di/PreferencesFragmentProvider.kt

+package chat.rocket.android.preferences.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.preferences.ui.PreferencesFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class PreferencesFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [PreferencesFragmentModule::class])
+    @PerFragment
+    abstract fun providePreferencesFragment(): PreferencesFragment
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesPresenter.kt

+package chat.rocket.android.preferences.presentation
+
+import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
+import javax.inject.Inject
+
+class PreferencesPresenter @Inject constructor(
+    private val view: PreferencesView,
+    private val analyticsTrackingInteractor: AnalyticsTrackingInteractor
+) {
+
+    fun loadAnalyticsTrackingInformation() {
+        view.setupAnalyticsTrackingView(analyticsTrackingInteractor.get())
+    }
+
+    fun enableAnalyticsTracking() {
+        analyticsTrackingInteractor.save(true)
+    }
+
+    fun disableAnalyticsTracking() {
+        analyticsTrackingInteractor.save(false)
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesView.kt

+package chat.rocket.android.preferences.presentation
+
+interface PreferencesView {
+
+    /**
+     * Setups the analytics tracking view.
+     *
+     * @param isAnalyticsTrackingEnabled Whether the analytics tracking is enabled
+     */
+    fun setupAnalyticsTrackingView(isAnalyticsTrackingEnabled: Boolean)
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt

+package chat.rocket.android.preferences.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import chat.rocket.android.BuildConfig
+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 chat.rocket.android.preferences.presentation.PreferencesPresenter
+import chat.rocket.android.preferences.presentation.PreferencesView
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.app_bar.*
+import kotlinx.android.synthetic.main.fragment_preferences.*
+import javax.inject.Inject
+
+internal const val TAG_PREFERENCES_FRAGMENT = "PreferencesFragment"
+
+class PreferencesFragment : Fragment(), PreferencesView {
+    @Inject
+    lateinit var presenter: PreferencesPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = inflater.inflate(R.layout.fragment_preferences, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar()
+        setupListeners()
+        presenter.loadAnalyticsTrackingInformation()
+
+        analyticsManager.logScreenView(ScreenViewEvent.Preferences)
+    }
+
+    override fun setupAnalyticsTrackingView(isAnalyticsTrackingEnabled: Boolean) {
+        if (BuildConfig.FLAVOR == "foss") {
+            switch_analytics_tracking.isChecked = false
+            switch_analytics_tracking.isEnabled = false
+            text_analytics_tracking_description.text =
+                    getString(R.string.msg_not_applicable_since_it_is_a_foss_version)
+            return
+        }
+
+        if (isAnalyticsTrackingEnabled) {
+            text_analytics_tracking_description.text =
+                    getString(R.string.msg_send_analytics_tracking)
+        } else {
+            text_analytics_tracking_description.text =
+                    getString(R.string.msg_do_not_send_analytics_tracking)
+        }
+        switch_analytics_tracking.isChecked = isAnalyticsTrackingEnabled
+    }
+
+    private fun setupToolbar() {
+        with((activity as MainActivity).toolbar) {
+            title = getString(R.string.title_preferences)
+            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+            setNavigationOnClickListener { activity?.onBackPressed() }
+        }
+    }
+
+    private fun setupListeners() {
+        switch_analytics_tracking.setOnCheckedChangeListener { _, isChecked ->
+            if (isChecked) {
+                text_analytics_tracking_description.text =
+                        getString(R.string.msg_send_analytics_tracking)
+                presenter.enableAnalyticsTracking()
+            } else {
+                text_analytics_tracking_description.text =
+                        getString(R.string.msg_do_not_send_analytics_tracking)
+                presenter.disableAnalyticsTracking()
+            }
+        }
+    }
+
+    companion object {
+        fun newInstance() = PreferencesFragment()
+    }
+}

app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt

 package chat.rocket.android.profile.presentation
 
+import android.graphics.Bitmap
+import android.net.Uri
+import chat.rocket.android.chatroom.domain.UriInteractor
 import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.extension.compressImageAndGetByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 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.me
+import chat.rocket.core.internal.rest.resetAvatar
 import chat.rocket.core.internal.rest.setAvatar
 import chat.rocket.core.internal.rest.updateProfile
+import java.util.*
 import javax.inject.Inject
 
 class ProfilePresenter @Inject constructor(
     private val view: ProfileView,
     private val strategy: CancelStrategy,
+    private val uriInteractor: UriInteractor,
+    val userHelper: UserHelper,
     serverInteractor: GetCurrentServerInteractor,
     factory: RocketChatClientFactory
 ) {
     private val serverUrl = serverInteractor.get()!!
     private val client: RocketChatClient = factory.create(serverUrl)
-    private lateinit var myselfId: String
+    private val myselfId = userHelper.user()?.id ?: ""
+    private var myselfName = userHelper.user()?.name ?: ""
+    private var myselfUsername = userHelper.username() ?: ""
+    private var myselfEmailAddress = userHelper.user()?.emails?.getOrNull(0)?.address ?: ""
 
     fun loadUserProfile() {
         launchUI(strategy) {
             view.showLoading()
             try {
-                val myself = retryIO("me") { client.me() }
-                val id = myself.id
-                val username = myself.username
-                if (id == null || username == null) {
+                view.showProfile(
+                    serverUrl.avatarUrl(myselfUsername),
+                    myselfName,
+                    myselfUsername,
+                    myselfEmailAddress
+                )
+            } catch (exception: RocketChatException) {
+                view.showMessage(exception)
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    fun updateUserProfile(email: String, name: String, username: String) {
+        launchUI(strategy) {
+            view.showLoading()
+            try {
+                retryIO { client.updateProfile(myselfId, email, name, username) }
+
+                myselfEmailAddress = email
+                myselfName = name
+                myselfUsername = username
+
+                view.showProfileUpdateSuccessfullyMessage()
+                loadUserProfile()
+            } catch (exception: RocketChatException) {
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
                     view.showGenericErrorMessage()
-                } else {
-                    myselfId = id
-                    val avatarUrl = serverUrl.avatarUrl(username)
-                    val email = myself.emails?.getOrNull(0)?.address
-                    view.showProfile(
-                        avatarUrl,
-                        myself.name ?: "",
-                        myself.username ?: "",
-                        email
-                    )
                 }
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    fun updateAvatar(uri: Uri) {
+        launchUI(strategy) {
+            view.showLoading()
+            try {
+                retryIO {
+                    client.setAvatar(
+                        uriInteractor.getFileName(uri) ?: uri.toString(),
+                        uriInteractor.getMimeType(uri)
+                    ) {
+                        uriInteractor.getInputStream(uri)
+                    }
+                }
+                view.reloadUserAvatar(serverUrl.avatarUrl(myselfUsername))
             } catch (exception: RocketChatException) {
-                view.showMessage(exception)
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
             } finally {
                 view.hideLoading()
             }
         }
     }
 
-    fun updateUserProfile(email: String, name: String, username: String, avatarUrl: String = "") {
+    fun preparePhotoAndUpdateAvatar(bitmap: Bitmap) {
         launchUI(strategy) {
             view.showLoading()
             try {
-                if (avatarUrl != "") {
-                    retryIO { client.setAvatar(avatarUrl) }
+                val byteArray = bitmap.compressImageAndGetByteArray("image/png")
+
+                retryIO {
+                    client.setAvatar(
+                        UUID.randomUUID().toString() + ".png",
+                        "image/png"
+                    ) {
+                        byteArray?.inputStream()
+                    }
                 }
-                val user = retryIO {
-                    client.updateProfile(
-                        userId = myselfId, email = email, name = name, username = username
-                    )
+                view.reloadUserAvatar(serverUrl.avatarUrl(myselfUsername))
+            } catch (exception: RocketChatException) {
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
                 }
-                view.showProfileUpdateSuccessfullyMessage()
-                loadUserProfile()
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    fun resetAvatar() {
+        launchUI(strategy) {
+            view.showLoading()
+            try {
+                retryIO { client.resetAvatar(myselfId) }
+                view.reloadUserAvatar(serverUrl.avatarUrl(myselfUsername))
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)

app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt

@@ -15,6 +15,13 @@ interface ProfileView : LoadingView, MessageView {
      */
     fun showProfile(avatarUrl: String, name: String, username: String, email: String?)
 
+    /**
+     * Reloads the user avatar (after successfully updating it).
+     *
+     * @param avatarUrl The user avatar URL.
+     */
+    fun reloadUserAvatar(avatarUrl: String)
+
     /**
      * Shows a profile update successfully message
      */

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

 package chat.rocket.android.profile.ui
 
 import DrawableHelper
+import android.app.Activity
+import android.content.Intent
+import android.graphics.Bitmap
 import android.os.Build
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.appcompat.view.ActionMode
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.view.ActionMode
+import androidx.core.net.toUri
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 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 chat.rocket.android.profile.presentation.ProfilePresenter
 import chat.rocket.android.profile.presentation.ProfileView
 import chat.rocket.android.util.extension.asObservable
-import chat.rocket.android.util.extensions.*
+import chat.rocket.android.util.extension.dispatchImageSelection
+import chat.rocket.android.util.extension.dispatchTakePicture
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.textContent
+import chat.rocket.android.util.extensions.ui
+import com.facebook.drawee.backends.pipeline.Fresco
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.disposables.CompositeDisposable
-import io.reactivex.disposables.Disposable
 import io.reactivex.rxkotlin.Observables
 import kotlinx.android.synthetic.main.avatar_profile.*
 import kotlinx.android.synthetic.main.fragment_profile.*
+import kotlinx.android.synthetic.main.update_avatar_options.*
 import javax.inject.Inject
 
+internal const val TAG_PROFILE_FRAGMENT = "ProfileFragment"
+
+private const val REQUEST_CODE_FOR_PERFORM_SAF = 1
+private const val REQUEST_CODE_FOR_PERFORM_CAMERA = 2
+
 class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     @Inject
     lateinit var presenter: ProfilePresenter
-    private lateinit var currentName: String
-    private lateinit var currentUsername: String
-    private lateinit var currentEmail: String
-    private lateinit var currentAvatar: String
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
+    private var currentName = ""
+    private var currentUsername = ""
+    private var currentEmail = ""
     private var actionMode: ActionMode? = null
     private val editTextsDisposable = CompositeDisposable()
 
@@ -50,11 +73,14 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         super.onViewCreated(view, savedInstanceState)
 
         setupToolbar()
+        setupListeners()
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
             tintEditTextDrawableStart()
         }
-
         presenter.loadUserProfile()
+        subscribeEditTexts()
+
+        analyticsManager.logScreenView(ScreenViewEvent.Profile)
     }
 
     override fun onDestroyView() {
@@ -62,56 +88,61 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         unsubscribeEditTexts()
     }
 
+    override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
+        if (resultData != null && resultCode == Activity.RESULT_OK) {
+            if (requestCode == REQUEST_CODE_FOR_PERFORM_SAF) {
+                presenter.updateAvatar(resultData.data)
+            } else if (requestCode == REQUEST_CODE_FOR_PERFORM_CAMERA) {
+                presenter.preparePhotoAndUpdateAvatar(resultData.extras["data"] as Bitmap)
+            }
+        }
+    }
+
     override fun showProfile(avatarUrl: String, name: String, username: String, email: String?) {
         ui {
             image_avatar.setImageURI(avatarUrl)
-
             text_name.textContent = name
             text_username.textContent = username
             text_email.textContent = email ?: ""
-            text_avatar_url.textContent = ""
 
             currentName = name
             currentUsername = username
             currentEmail = email ?: ""
-            currentAvatar = avatarUrl
-
-            profile_container.setVisible(true)
 
-            subscribeEditTexts()
+            profile_container.isVisible = true
         }
     }
 
+    override fun reloadUserAvatar(avatarUrl: String) {
+        Fresco.getImagePipeline().evictFromCache(avatarUrl.toUri())
+        image_avatar.setImageURI(avatarUrl)
+        (activity as MainActivity).setAvatar(avatarUrl)
+    }
+
     override fun showProfileUpdateSuccessfullyMessage() {
         showMessage(getString(R.string.msg_profile_update_successfully))
     }
 
     override fun showLoading() {
         enableUserInput(false)
-        ui {
-            view_loading.setVisible(true)
-        }
+        ui { view_loading.isVisible = true }
     }
 
     override fun hideLoading() {
         ui {
             if (view_loading != null) {
-                view_loading.setVisible(false)
+                view_loading.isVisible = false
             }
         }
         enableUserInput(true)
     }
 
     override fun showMessage(resId: Int) {
-        ui {
-            showToast(resId)
-        }
+        ui { showToast(resId) }
     }
 
     override fun showMessage(message: String) {
-        ui {
-            showToast(message)
-        }
+        ui { showToast(message) }
     }
 
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
@@ -130,8 +161,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
                 presenter.updateUserProfile(
                     text_email.textContent,
                     text_name.textContent,
-                    text_username.textContent,
-                    text_avatar_url.textContent
+                    text_username.textContent
                 )
                 mode.finish()
                 true
@@ -151,6 +181,37 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
                 getString(R.string.title_profile)
     }
 
+    private fun setupListeners() {
+        image_avatar.setOnClickListener { showUpdateAvatarOptions() }
+
+        view_dim.setOnClickListener { hideUpdateAvatarOptions() }
+
+        button_open_gallery.setOnClickListener {
+            dispatchImageSelection(REQUEST_CODE_FOR_PERFORM_SAF)
+            hideUpdateAvatarOptions()
+        }
+
+        button_take_photo.setOnClickListener {
+            dispatchTakePicture(REQUEST_CODE_FOR_PERFORM_CAMERA)
+            hideUpdateAvatarOptions()
+        }
+
+        button_reset_avatar.setOnClickListener {
+            hideUpdateAvatarOptions()
+            presenter.resetAvatar()
+        }
+    }
+
+    private fun showUpdateAvatarOptions() {
+        view_dim.isVisible = true
+        layout_update_avatar_options.isVisible = true
+    }
+
+    private fun hideUpdateAvatarOptions() {
+        layout_update_avatar_options.isVisible = false
+        view_dim.isVisible = false
+    }
+
     private fun tintEditTextDrawableStart() {
         (activity as MainActivity).apply {
             val personDrawable =
@@ -158,14 +219,12 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
             val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_24dp, this)
             val emailDrawable =
                 DrawableHelper.getDrawableFromId(R.drawable.ic_email_black_24dp, this)
-            val linkDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_link_black_24dp, this)
 
-            val drawables = arrayOf(personDrawable, atDrawable, emailDrawable, linkDrawable)
+            val drawables = arrayOf(personDrawable, atDrawable, emailDrawable)
             DrawableHelper.wrapDrawables(drawables)
             DrawableHelper.tintDrawables(drawables, this, R.color.colorDrawableTintGrey)
             DrawableHelper.compoundDrawables(
-                arrayOf(text_name, text_username, text_email, text_avatar_url),
-                drawables
+                arrayOf(text_name, text_username, text_email), drawables
             )
         }
     }
@@ -174,13 +233,11 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         editTextsDisposable.add(Observables.combineLatest(
             text_name.asObservable(),
             text_username.asObservable(),
-            text_email.asObservable(),
-            text_avatar_url.asObservable()
-        ) { text_name, text_username, text_email, text_avatar_url ->
+            text_email.asObservable()
+        ) { text_name, text_username, text_email ->
             return@combineLatest (text_name.toString() != currentName ||
                     text_username.toString() != currentUsername ||
-                    text_email.toString() != currentEmail ||
-                    (text_avatar_url.toString() != "" && text_avatar_url.toString() != currentAvatar))
+                    text_email.toString() != currentEmail)
         }.subscribe { isValid ->
             if (isValid) {
                 startActionMode()
@@ -190,9 +247,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         })
     }
 
-    private fun unsubscribeEditTexts() {
-        editTextsDisposable.clear()
-    }
+    private fun unsubscribeEditTexts() = editTextsDisposable.clear()
 
     private fun startActionMode() {
         if (actionMode == null) {
@@ -207,7 +262,6 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
             text_username.isEnabled = value
             text_username.isEnabled = value
             text_email.isEnabled = value
-            text_avatar_url.isEnabled = value
         }
     }
 }

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/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/main/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/main/java/chat/rocket/android/server/domain/AccountsRepository.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.server.domain
 import chat.rocket.android.server.domain.model.Account
 
 interface AccountsRepository {
-    suspend fun save(account: Account)
-    suspend fun load(): List<Account>
-    suspend fun remove(serverUrl: String)
+    fun save(account: Account)
+    fun load(): List<Account>
+    fun remove(serverUrl: String)
 }
\ No newline at end of file

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

+package chat.rocket.android.server.domain
+
+import javax.inject.Inject
+
+class AnalyticsTrackingInteractor @Inject constructor(val repository: AnalyticsTrackingRepository) {
+    fun save(isAnalyticsTrackingEnable: Boolean) = repository.save(isAnalyticsTrackingEnable)
+    fun get(): Boolean = repository.get()
+}
\ No newline at end of file

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

+package chat.rocket.android.server.domain
+
+interface AnalyticsTrackingRepository {
+    fun save(isAnalyticsTrackingEnable: Boolean)
+    fun get(): Boolean
+}
\ No newline at end of file

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

@@ -3,5 +3,5 @@ package chat.rocket.android.server.domain
 import javax.inject.Inject
 
 class GetAccountsInteractor @Inject constructor(val repository: AccountsRepository) {
-    suspend fun get() = repository.load()
+    fun get() = repository.load()
 }
\ No newline at end of file

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/domain/PermissionsInteractor.kt

 package chat.rocket.android.server.domain
 
 import chat.rocket.android.helper.UserHelper
-import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.core.model.Permission
 import javax.inject.Inject
 
 // Creating rooms
-const val CREATE_PUBLIC_CHANNELS = "create-c"
-const val CREATE_DIRECT_MESSAGES = "create-d"
-const val CREATE_PRIVATE_CHANNELS = "create-p"
+private const val CREATE_PUBLIC_CHANNELS = "create-c"
+private const val CREATE_DIRECT_MESSAGES = "create-d"
+private const val CREATE_PRIVATE_CHANNELS = "create-p"
 
 // Messages
-const val DELETE_MESSAGE = "delete-message"
-const val FORCE_DELETE_MESSAGE = "force-delete-message"
-const val EDIT_MESSAGE = "edit-message"
-const val PIN_MESSAGE = "pin-message"
-const val POST_READONLY = "post-readonly"
+private const val DELETE_MESSAGE = "delete-message"
+private const val FORCE_DELETE_MESSAGE = "force-delete-message"
+private const val EDIT_MESSAGE = "edit-message"
+private const val PIN_MESSAGE = "pin-message"
+private const val POST_READONLY = "post-readonly"
+
+private const val VIEW_STATISTICS = "view-statistics"
+private const val VIEW_ROOM_ADMINISTRATION = "view-room-administration"
+private const val VIEW_USER_ADMINISTRATION = "view-user-administration"
+private const val VIEW_PRIVILEGED_SETTING = "view-privileged-setting"
 
 class PermissionsInteractor @Inject constructor(
     private val settingsRepository: SettingsRepository,
@@ -23,14 +26,8 @@ class PermissionsInteractor @Inject constructor(
     private val getCurrentServerInteractor: GetCurrentServerInteractor,
     private val userHelper: UserHelper
 ) {
-
     private fun publicSettings(): PublicSettings? = settingsRepository.get(currentServerUrl()!!)
 
-    fun saveAll(permissions: List<Permission>) {
-        val url = currentServerUrl()!!
-        permissions.forEach { permissionsRepository.save(url, it) }
-    }
-
     /**
      * Check whether the user is allowed to delete a message.
      */
@@ -71,6 +68,28 @@ class PermissionsInteractor @Inject constructor(
         } == true || userHelper.isAdmin()
     }
 
+
+    fun canSeeTheAdminPanel(): Boolean {
+        currentServerUrl()?.let { serverUrl ->
+            val viewStatistics =
+                permissionsRepository.get(serverUrl, VIEW_STATISTICS)
+            val viewRoomAdministration =
+                permissionsRepository.get(serverUrl, VIEW_ROOM_ADMINISTRATION)
+            val viewUserAdministration =
+                permissionsRepository.get(serverUrl, VIEW_USER_ADMINISTRATION)
+            val viewPrivilegedSetting =
+                permissionsRepository.get(serverUrl, VIEW_PRIVILEGED_SETTING)
+
+            userHelper.user()?.roles?.let { userRolesList ->
+                return viewStatistics?.roles?.any { userRolesList.contains(it) } == true ||
+                        viewRoomAdministration?.roles?.any { userRolesList.contains(it) } == true ||
+                        viewUserAdministration?.roles?.any { userRolesList.contains(it) } == true ||
+                        viewPrivilegedSetting?.roles?.any { userRolesList.contains(it) } == true
+            }
+        }
+        return false
+    }
+
     private fun currentServerUrl(): String? {
         return getCurrentServerInteractor.get()
     }

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

@@ -5,20 +5,20 @@ import chat.rocket.core.model.Permission
 interface PermissionsRepository {
 
     /**
-     * Store [permission] locally.
+     * Stores a list of [Permission] locally.
      *
-     * @param url The server url from where we're interest to store the permission.
-     * @param permission The permission to store.
+     * @param url The server url to store the permission.
+     * @param permissionList The permission list to store.
      */
-    fun save(url: String, permission: Permission)
+    fun save(url: String, permissionList: List<Permission>)
 
     /**
-     * Get permission given by the [permissionId] and for the server [url].
+     * Gets permission given by the [permissionId] and for the server [url].
      *
-     * @param url The server url from where we're interested on getting the permissions.
-     * @param permissionId the id of the permission to get.
+     * @param url The server url to get the permissions from.
+     * @param permissionId the ID of the permission to get.
      *
-     * @return The interested [Permission] or null if not found.
+     * @return The [Permission] or null if not found.
      */
     fun get(url: String, permissionId: String): Permission?
 }
\ No newline at end of file

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

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.retryIO
+import chat.rocket.core.internal.rest.permissions
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+/**
+ * This class reloads the current logged server permission whenever its used.
+ */
+class RefreshPermissionsInteractor @Inject constructor(
+    private val factory: RocketChatClientFactory,
+    private val repository: PermissionsRepository
+) {
+
+    fun refreshAsync(server: String) {
+        launch(CommonPool) {
+            try {
+                factory.create(server).let { client ->
+                    val permissions = retryIO(
+                        description = "permissions",
+                        times = 5,
+                        maxDelay = 5000,
+                        initialDelay = 300
+                    ) {
+                        client.permissions()
+                    }
+                    repository.save(server, permissions)
+                }
+            } catch (ex: Exception) {
+                Timber.e(ex, "Error refreshing permissions for: $server")
+            }
+        }
+    }
+}
\ No newline at end of file

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

@@ -9,6 +9,9 @@ import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
+/**
+ * This class reloads the current logged server settings whenever needed.
+ */
 class RefreshSettingsInteractor @Inject constructor(
     private val factory: RocketChatClientFactory,
     private val repository: SettingsRepository

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

-package chat.rocket.android.server.domain
-
-import chat.rocket.core.model.Value
-import javax.inject.Inject
-
-class SaveSettingsInteractor @Inject constructor(private val repository: SettingsRepository) {
-
-    fun save(url: String, settings: Map<String, Value<Any>>) = repository.save(url, settings)
-}
\ No newline at end of file

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

@@ -193,6 +193,14 @@ class ConnectionManager(
         client.setTemporaryStatus(userStatus)
     }
 
+    fun resetReconnectionTimer() {
+        // if we are waiting to reconnect, immediately try to reconnect
+        // and reset the reconnection counter
+        if (client.state is State.Waiting) {
+            client.connect(resetCounter = true)
+        }
+    }
+
     private fun resubscribeRooms() {
         roomMessagesChannels.toList().map { (roomId, channel) ->
             client.subscribeRoomMessages(roomId) { _, id ->

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/SharedPreferencesAccountsRepository.kt

@@ -6,41 +6,37 @@ import chat.rocket.android.server.domain.AccountsRepository
 import chat.rocket.android.server.domain.model.Account
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.withContext
+
+private const val ACCOUNTS_KEY = "ACCOUNTS_KEY"
 
 class SharedPreferencesAccountsRepository(
     private val preferences: SharedPreferences,
     private val moshi: Moshi
 ) : AccountsRepository {
 
-    override suspend fun save(newAccount: Account) {
-        withContext(CommonPool) {
-            val accounts = load()
+    override fun save(newAccount: Account) {
+        val accounts = load()
 
-            val newList = accounts.filter { account -> newAccount.serverUrl != account.serverUrl }
-                    .toMutableList()
-            newList.add(0, newAccount)
-            save(newList)
-        }
+        val newList = accounts.filter { account -> newAccount.serverUrl != account.serverUrl }
+            .toMutableList()
+        newList.add(0, newAccount)
+        save(newList)
     }
 
-    override suspend fun load(): List<Account> = withContext(CommonPool) {
+    override fun load(): List<Account> {
         val json = preferences.getString(ACCOUNTS_KEY, "[]")
         val type = Types.newParameterizedType(List::class.java, Account::class.java)
         val adapter = moshi.adapter<List<Account>>(type)
 
-        adapter.fromJson(json) ?: emptyList()
+        return adapter.fromJson(json) ?: emptyList()
     }
 
-    override suspend fun remove(serverUrl: String) {
-        withContext(CommonPool) {
-            val accounts = load()
+    override fun remove(serverUrl: String) {
+        val accounts = load()
 
-            val newList = accounts.filter { account -> serverUrl != account.serverUrl }
-                    .toMutableList()
-            save(newList)
-        }
+        val newList = accounts.filter { account -> serverUrl != account.serverUrl }
+            .toMutableList()
+        save(newList)
     }
 
     private fun save(accounts: List<Account>) {
@@ -50,6 +46,4 @@ class SharedPreferencesAccountsRepository(
             putString(ACCOUNTS_KEY, adapter.toJson(accounts))
         }
     }
-}
-
-private const val ACCOUNTS_KEY = "ACCOUNTS_KEY"
\ No newline at end of file
+}
\ No newline at end of file

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/server/infraestructure/SharedPreferencesPermissionsRepository.kt

@@ -9,11 +9,12 @@ class SharedPreferencesPermissionsRepository(
     private val localRepository: LocalRepository,
     moshi: Moshi
 ) : PermissionsRepository {
-
     private val adapter = moshi.adapter(Permission::class.java)
 
-    override fun save(url: String, permission: Permission) {
-        localRepository.save(getPermissionKey(url, permission.id), adapter.toJson(permission))
+    override fun save(url: String, permissionList: List<Permission>) {
+        for (permission in permissionList) {
+            localRepository.save(getPermissionKey(url, permission.id), adapter.toJson(permission))
+        }
     }
 
     override fun get(url: String, permissionId: String): Permission? {

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

+package chat.rocket.android.server.infraestructure
+
+import android.content.SharedPreferences
+import chat.rocket.android.server.domain.AnalyticsTrackingRepository
+
+private const val ANALYTICS_TRACKING_KEY = "ANALYTICS_TRACKING_KEY"
+
+class SharedPrefsAnalyticsTrackingRepository(private val preferences: SharedPreferences) :
+    AnalyticsTrackingRepository {
+
+    override fun save(isAnalyticsTrackingEnable: Boolean) =
+        preferences.edit().putBoolean(ANALYTICS_TRACKING_KEY, isAnalyticsTrackingEnable).apply()
+
+    override fun get() = preferences.getBoolean(ANALYTICS_TRACKING_KEY, true)
+}
\ No newline at end of file

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

@@ -7,6 +7,7 @@ import chat.rocket.android.server.ui.ChangeServerActivity
 import chat.rocket.android.server.ui.INTENT_CHAT_ROOM_ID
 
 class ChangeServerNavigator (internal val activity: ChangeServerActivity) {
+
     fun toServerScreen() {
         activity.startActivity(activity.newServerIntent())
         activity.finish()

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

 package chat.rocket.android.server.presentation
 
+import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.*
+import chat.rocket.android.server.domain.GetAccountInteractor
+import chat.rocket.android.server.domain.GetAccountsInteractor
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.domain.SaveCurrentServerInteractor
+import chat.rocket.android.server.domain.SettingsRepository
+import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.util.ifNull
@@ -16,17 +22,20 @@ class ChangeServerPresenter @Inject constructor(
     private val getCurrentServerInteractor: GetCurrentServerInteractor,
     private val getAccountInteractor: GetAccountInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
+    private val analyticsManager: AnalyticsManager,
     private val settingsRepository: SettingsRepository,
     private val tokenRepository: TokenRepository,
     private val localRepository: LocalRepository,
     private val connectionManager: ConnectionManagerFactory
 ) {
+
     fun loadServer(newUrl: String?, chatRoomId: String? = null) {
         launchUI(strategy) {
             view.showProgress()
             var url = newUrl
-            if (url == null) { // Try to load next server on the list...
-                val accounts = getAccountsInteractor.get()
+            val accounts = getAccountsInteractor.get()
+            if (url == null) {
+                // Try to load next server on the list...
                 url = accounts.firstOrNull()?.serverUrl
             }
 
@@ -56,6 +65,7 @@ class ChangeServerPresenter @Inject constructor(
 
                 saveCurrentServerInteractor.save(serverUrl)
                 view.hideProgress()
+                analyticsManager.logServerSwitch()
                 navigator.toChatRooms(chatRoomId)
             }.ifNull {
                 view.hideProgress()

app/src/main/java/chat/rocket/android/server/ui/ChangeServerActivity.kt

@@ -11,6 +11,18 @@ import chat.rocket.android.util.extensions.showToast
 import dagger.android.AndroidInjection
 import javax.inject.Inject
 
+private const val INTENT_SERVER_URL = "INTENT_SERVER_URL"
+const val INTENT_CHAT_ROOM_ID = "INTENT_CHAT_ROOM_ID"
+
+fun Context.changeServerIntent(serverUrl: String? = null, chatRoomId: String? = ""): Intent {
+    return Intent(this, ChangeServerActivity::class.java).apply {
+        serverUrl?.let { url ->
+            putExtra(INTENT_SERVER_URL, url)
+            putExtra(INTENT_CHAT_ROOM_ID, chatRoomId)
+        }
+        flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK
+    }
+}
 class ChangeServerActivity : AppCompatActivity(), ChangeServerView {
     @Inject lateinit var presenter: ChangeServerPresenter
 
@@ -37,18 +49,3 @@ class ChangeServerActivity : AppCompatActivity(), ChangeServerView {
         progress?.dismiss()
     }
 }
-
-private const val INTENT_SERVER_URL = "INTENT_SERVER_URL"
-private const val INTENT_CHAT_ROOM_NAME = "INTENT_CHAT_ROOM_NAME"
-private const val INTENT_CHAT_ROOM_TYPE = "INTENT_CHAT_ROOM_TYPE"
-const val INTENT_CHAT_ROOM_ID = "INTENT_CHAT_ROOM_ID"
-
-fun Context.changeServerIntent(serverUrl: String? = null, chatRoomId: String? = ""): Intent {
-    return Intent(this, ChangeServerActivity::class.java).apply {
-        serverUrl?.let { url ->
-            putExtra(INTENT_SERVER_URL, url)
-            putExtra(INTENT_CHAT_ROOM_ID, chatRoomId)
-        }
-        flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK
-    }
-}
\ No newline at end of file

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/settings/password/ui/PasswordActivity.kt

@@ -4,7 +4,6 @@ import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.appcompat.app.AppCompatActivity
 import chat.rocket.android.R
-import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
 import chat.rocket.android.util.extensions.addFragment
 import chat.rocket.android.util.extensions.textContent
 import dagger.android.AndroidInjection
@@ -23,7 +22,7 @@ class PasswordActivity : AppCompatActivity(), HasSupportFragmentInjector {
         setContentView(R.layout.activity_password)
 
         setupToolbar()
-        addFragment("PasswordFragment")
+        addFragment(TAG_PASSWORD_FRAGMENT)
     }
 
     override fun onBackPressed() {
@@ -47,6 +46,6 @@ class PasswordActivity : AppCompatActivity(), HasSupportFragmentInjector {
 
     private fun setupToolbar() {
         setSupportActionBar(toolbar)
-        text_change_password.textContent = resources.getString(R.string.title_password)
+        text_change_password.textContent = resources.getString(R.string.title_change_password)
     }
 }

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

 package chat.rocket.android.settings.password.ui
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import android.widget.Toast
+import androidx.appcompat.view.ActionMode
+import androidx.fragment.app.Fragment
 import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.settings.password.presentation.PasswordPresenter
 import chat.rocket.android.settings.password.presentation.PasswordView
-import chat.rocket.android.util.extensions.inflate
-import androidx.appcompat.view.ActionMode
 import chat.rocket.android.util.extension.asObservable
+import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.android.util.extensions.ui
 import dagger.android.support.AndroidSupportInjection
@@ -19,8 +25,13 @@ import io.reactivex.rxkotlin.Observables
 import kotlinx.android.synthetic.main.fragment_password.*
 import javax.inject.Inject
 
-class PasswordFragment: Fragment(), PasswordView, ActionMode.Callback {
-    @Inject lateinit var presenter: PasswordPresenter
+internal const val TAG_PASSWORD_FRAGMENT = "PasswordFragment"
+
+class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
+    @Inject
+    lateinit var presenter: PasswordPresenter
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
     private var actionMode: ActionMode? = null
     private val disposables = CompositeDisposable()
 
@@ -33,12 +44,18 @@ class PasswordFragment: Fragment(), PasswordView, ActionMode.Callback {
         super.onCreate(savedInstanceState)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = container?.inflate(R.layout.fragment_password)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_password)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         disposables.add(listenToChanges())
+
+        analyticsManager.logScreenView(ScreenViewEvent.Password)
     }
 
     override fun onDestroyView() {
@@ -98,12 +115,17 @@ class PasswordFragment: Fragment(), PasswordView, ActionMode.Callback {
     private fun finishActionMode() = actionMode?.finish()
 
     private fun listenToChanges(): Disposable {
-        return Observables.combineLatest(text_new_password.asObservable(),
-                text_confirm_password.asObservable()).subscribe {
+        return Observables.combineLatest(
+            text_new_password.asObservable(),
+            text_confirm_password.asObservable()
+        ).subscribe {
             val textPassword = text_new_password.textContent
             val textConfirmPassword = text_confirm_password.textContent
 
-            if (textPassword.length > 5 && textConfirmPassword.length > 5 && textPassword.equals(textConfirmPassword))
+            if (textPassword.length > 5 && textConfirmPassword.length > 5 && textPassword.equals(
+                    textConfirmPassword
+                )
+            )
                 startActionMode()
             else
                 finishActionMode()

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

@@ -2,25 +2,38 @@ package chat.rocket.android.settings.ui
 
 import android.content.Intent
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.appcompat.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.about.ui.AboutFragment
+import chat.rocket.android.about.ui.TAG_ABOUT_FRAGMENT
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.main.ui.MainActivity
+import chat.rocket.android.preferences.ui.PreferencesFragment
+import chat.rocket.android.preferences.ui.TAG_PREFERENCES_FRAGMENT
 import chat.rocket.android.settings.password.ui.PasswordActivity
 import chat.rocket.android.settings.presentation.SettingsView
 import chat.rocket.android.util.extensions.addFragmentBackStack
 import chat.rocket.android.util.extensions.inflate
+import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_settings.*
+import javax.inject.Inject
 import kotlin.reflect.KClass
 
+internal const val TAG_SETTINGS_FRAGMENT = "SettingsFragment"
+
 class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListener {
-    companion object {
-        fun newInstance() = SettingsFragment()
+    @Inject
+    lateinit var analyticsManager: AnalyticsManager
+
+   override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
     }
 
     override fun onCreateView(
@@ -33,23 +46,32 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
         setupListView()
+        analyticsManager.logScreenView(ScreenViewEvent.Settings)
     }
 
     override fun onResume() {
         // FIXME - gambiarra ahead. will fix when moving to new androidx Navigation
-        (activity as? MainActivity)?.let {
-            it.setupNavigationView()
-        }
+        (activity as? MainActivity)?.setupNavigationView()
         super.onResume()
     }
 
     override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
         when (parent?.getItemAtPosition(position).toString()) {
-            resources.getString(R.string.title_password) -> {
-                startNewActivity(PasswordActivity::class)
+            resources.getString(R.string.title_preferences) -> {
+                (activity as AppCompatActivity).addFragmentBackStack(
+                    TAG_PREFERENCES_FRAGMENT,
+                    R.id.fragment_container
+                ) {
+                    PreferencesFragment.newInstance()
+                }
             }
+            resources.getString(R.string.title_change_password) ->
+                startNewActivity(PasswordActivity::class)
             resources.getString(R.string.title_about) -> {
-                (activity as AppCompatActivity).addFragmentBackStack("AboutFragmnet", R.id.fragment_container){
+                (activity as AppCompatActivity).addFragmentBackStack(
+                    TAG_ABOUT_FRAGMENT,
+                    R.id.fragment_container
+                ) {
                     AboutFragment.newInstance()
                 }
             }
@@ -69,4 +91,8 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
         startActivity(Intent(activity, classType.java))
         activity?.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
     }
+
+    companion object {
+        fun newInstance() = SettingsFragment()
+    }
 }

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/String.kt

@@ -51,6 +51,8 @@ fun String.termsOfServiceUrl() = "${removeTrailingSlash()}/terms-of-service"
 
 fun String.privacyPolicyUrl() = "${removeTrailingSlash()}/privacy-policy"
 
+fun String.adminPanelUrl() = "${removeTrailingSlash()}/admin/info?layout=embedded"
+
 fun String.isValidUrl(): Boolean = Patterns.WEB_URL.matcher(this).matches()
 
 fun String.parseColor(): Int {

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

@@ -66,12 +66,13 @@ var TextView.content: CharSequence?
         Markwon.unscheduleDrawables(this)
         Markwon.unscheduleTableRows(this)
         if (value is Spanned) {
-            val result = EmojiParser.parse(value.toString()) as Spannable
+            val context = this.context
+            val result = EmojiParser.parse(context, value.toString()) as Spannable
             val end = if (value.length > result.length) result.length else value.length
             TextUtils.copySpansFrom(value, 0, end, Any::class.java, result, 0)
             text = result
         } else {
-            val result = EmojiParser.parse(value.toString()) as Spannable
+            val result = EmojiParser.parse(context, value.toString()) as Spannable
             text = result
         }
         Markwon.scheduleDrawables(this)

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
 }
@@ -104,4 +111,4 @@ fun Uri.getInputStream(context: Context): InputStream? {
 
 fun Uri.getBitmpap(context: Context): Bitmap? {
     return MediaStore.Images.Media.getBitmap(context.contentResolver, this)
-}
+}
\ No newline at end of file

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

+package chat.rocket.android.webview.adminpanel.ui
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.webkit.WebView
+import android.webkit.WebViewClient
+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"
+private const val BUNDLE_USER_TOKEN = "user_token"
+
+class AdminPanelWebViewFragment : Fragment() {
+    private lateinit var webPageUrl: String
+    private lateinit var userToken: String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val bundle = arguments
+        if (bundle != null) {
+            webPageUrl = bundle.getString(BUNDLE_WEB_PAGE_URL)
+            userToken = bundle.getString(BUNDLE_USER_TOKEN)
+        } else {
+            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_admin_panel_web_view)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar()
+        setupWebView()
+    }
+
+    private fun setupToolbar() {
+        (activity as AppCompatActivity?)?.supportActionBar?.title =
+                getString(R.string.title_admin_panel)
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    private fun setupWebView() {
+        with(web_view.settings) {
+            javaScriptEnabled = true
+            domStorageEnabled = true
+        }
+
+        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)
+    }
+
+    companion object {
+        fun newInstance(webPageUrl: String, userToken: String) = AdminPanelWebViewFragment().apply {
+            arguments = Bundle(2).apply {
+                putString(BUNDLE_WEB_PAGE_URL, webPageUrl)
+                putString(BUNDLE_USER_TOKEN, userToken)
+            }
+        }
+    }
+}
\ No newline at end of file

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
+</vector>

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>
+</vector>
\ No newline at end of file

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

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
-</vector>

app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml → app/src/main/res/drawable/ic_logout_black_24dp.xml

 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
 
     <path
         android:fillColor="#FF000000"
         android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
 
-</vector>
\ No newline at end of file
+</vector>

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
+</vector>

app/src/main/res/layout/activity_main.xml

@@ -33,8 +33,7 @@
             android:id="@+id/view_navigation"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            app:headerLayout="@layout/nav_header"
-            app:menu="@menu/navigation" />
+            app:headerLayout="@layout/nav_header" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/accounts_list"

app/src/main/res/layout/app_bar_password.xml

@@ -28,7 +28,7 @@
                 android:textColor="@color/colorWhite"
                 android:textSize="18sp"
                 android:textStyle="bold"
-                tools:text="@string/title_password" />
+                tools:text="@string/title_change_password" />
         </RelativeLayout>
     </androidx.appcompat.widget.Toolbar>
 

app/src/main/res/layout/fragment_about.xml

@@ -35,7 +35,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/image_app_name"
         android:layout_marginTop="16dp"
-        android:textColor="@color/colorSecondaryText" />
+        android:textColor="@color/colorSecondaryText"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
 
     <TextView
         android:id="@+id/text_build_number"

app/src/main/res/layout/fragment_admin_panel_web_view.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".webview.adminpanel.ui.AdminPanelWebViewFragment">
+
+    <WebView
+        android:id="@+id/web_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:id="@+id/view_loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:indicatorColor="@color/colorBlack"
+        app:indicatorName="BallPulseIndicator"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_authentication_log_in.xml

@@ -40,6 +40,7 @@
             android:src="@drawable/ic_vpn_key_black_24dp"
             android:tint="@color/colorDrawableTintGrey"
             android:visibility="gone"
+            tools:visibility="visible"
             app:layout_constraintBottom_toBottomOf="@+id/text_username_or_email"
             app:layout_constraintEnd_toEndOf="@+id/text_username_or_email"
             app:layout_constraintTop_toTopOf="@+id/text_username_or_email" />

app/src/main/res/layout/fragment_member_bottom_sheet.xml

@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="16dp"
-    app:layout_behavior="	com.google.android.material.bottomsheet.BottomSheetBehavior">
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
+    tools:context=".members.ui.MemberBottomSheetFragment">
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/image_bottom_sheet_avatar"

app/src/main/res/layout/fragment_message_info.xml

@@ -5,7 +5,7 @@
     android:id="@+id/root_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".chatinformation.ui.MessageInfoActivity">
+    tools:context=".chatinformation.ui.MessageInfoFragment">
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"

app/src/main/res/layout/fragment_password.xml

@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context=".settings.password.ui.PasswordFragment">
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/layout_new_password"

app/src/main/res/layout/fragment_preferences.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_margin="16dp"
+    tools:context="preferences.ui.PreferencesFragment">
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:id="@+id/view_loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:indicatorColor="@color/colorBlack"
+        app:indicatorName="BallPulseIndicator"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/text_analytics_tracking"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/msg_analytics_tracking"
+        android:textColor="@color/colorPrimaryText"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/text_analytics_tracking_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/msg_send_analytics_tracking"
+        android:textColor="@color/colorSecondaryText"
+        android:textSize="12sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_analytics_tracking" />
+
+    <Switch
+        android:id="@+id/switch_analytics_tracking"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:checked="true"
+        app:layout_constraintBottom_toBottomOf="@+id/text_analytics_tracking_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/text_analytics_tracking" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_profile.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/relative_layout"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/relative_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusableInTouchMode="true"
@@ -48,20 +48,11 @@
                 android:id="@+id/text_email"
                 style="@style/Profile.EditText"
                 android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
                 android:drawableStart="@drawable/ic_email_black_24dp"
                 android:hint="@string/msg_email"
                 android:inputType="textEmailAddress" />
-
-            <EditText
-                android:id="@+id/text_avatar_url"
-                style="@style/Profile.EditText"
-                android:layout_marginTop="16dp"
-                android:drawableStart="@drawable/ic_link_black_24dp"
-                android:hint="@string/msg_avatar_url"
-                android:inputType="text"
-                android:layout_marginBottom="16dp"/>
         </LinearLayout>
-
     </ScrollView>
 
     <com.wang.avi.AVLoadingIndicatorView
@@ -72,4 +63,19 @@
         app:indicatorColor="@color/colorBlack"
         app:indicatorName="BallPulseIndicator" />
 
+    <View
+        android:id="@+id/view_dim"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorDim"
+        android:visibility="gone" />
+
+    <include
+        android:id="@+id/layout_update_avatar_options"
+        layout="@layout/update_avatar_options"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone" />
+
 </RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_settings.xml

 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".settings.ui.SettingsFragment">
+
     <ListView
         android:id="@+id/settings_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:entries="@array/settings_actions"/>
-</RelativeLayout>
\ No newline at end of file
+        android:entries="@array/settings_actions" />
+</RelativeLayout>

app/src/main/res/layout/item_action_button.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/action_button"
+        style="@style/Widget.MaterialComponents.Button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="2dp"
+        android:layout_marginStart="2dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+        android:textSize="12sp" />
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/action_image_button"
+        android:layout_width="match_parent"
+        android:layout_height="75dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginEnd="2dp"
+        android:layout_marginStart="2dp"
+        android:visibility="gone"
+        fresco:actualImageScaleType="fitStart"
+        fresco:placeholderImage="@drawable/image_dummy" />
+
+</RelativeLayout>
\ No newline at end of file

app/src/main/res/layout/item_actions_attachment.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/actions_attachment_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:paddingBottom="@dimen/message_item_top_and_bottom_padding"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
+    android:paddingStart="@dimen/screen_edge_left_and_right_padding">
+
+    <TextView
+        android:id="@+id/title"
+        style="@style/Message.TextView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginStart="56dp"
+        android:layout_marginTop="2dp"
+        android:textDirection="locale"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
+
+    <View
+        android:id="@+id/quote_bar"
+        android:layout_width="4dp"
+        android:layout_height="0dp"
+        android:background="@drawable/quote_vertical_gray_bar"
+        app:layout_constraintBottom_toTopOf="@id/recycler_view_reactions"
+        app:layout_constraintStart_toStartOf="@id/title"
+        app:layout_constraintTop_toBottomOf="@id/title" />
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/actions_list"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+        android:textColor="@color/colorAccent"
+        android:textDirection="locale"
+        app:layout_constraintEnd_toEndOf="@id/title"
+        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@id/title" />
+
+    <include
+        layout="@layout/layout_reactions"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@id/actions_list" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/item_message.xml

@@ -88,15 +88,6 @@
             android:background="@color/colorRed" />
     </LinearLayout>
 
-    <include
-        android:id="@+id/layout_avatar"
-        layout="@layout/avatar"
-        android:layout_width="38dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="5dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/new_messages_notif" />
-
     <TextView
         android:id="@+id/text_sender"
         style="@style/Sender.Name.TextView"

app/src/main/res/layout/update_avatar_options.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/style_attachment_options"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/button_open_gallery"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_image_black_24dp"
+        android:drawablePadding="20dp"
+        android:gravity="start|center"
+        android:text="@string/action_select_photo_from_gallery" />
+
+    <Button
+        android:id="@+id/button_take_photo"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_photo_camera_black_24dp"
+        android:drawablePadding="20dp"
+        android:gravity="start|center"
+        android:text="@string/action_take_photo" />
+
+    <Button
+        android:id="@+id/button_reset_avatar"
+        style="?android:attr/borderlessButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_close_black_24dp"
+        android:drawablePadding="20dp"
+        android:gravity="start|center"
+        android:text="@string/action_reset_avatar" />
+
+</LinearLayout>
\ No newline at end of file

app/src/main/res/menu/navigation.xml

-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <group
-        android:id="@+id/menu_section_1"
-        android:checkableBehavior="single">
-
-        <item
-            android:id="@+id/action_chat_rooms"
-            android:checked="true"
-            android:icon="@drawable/ic_chat_bubble_black_24dp"
-            android:title="@string/title_chats" />
-
-        <item
-            android:id="@+id/action_channel"
-            android:icon="@drawable/ic_create_black_24dp"
-            android:title="@string/action_create_channel" />
-    </group>
-
-    <group
-        android:id="@+id/menu_section_2"
-        android:checkableBehavior="single">
-
-        <item
-            android:id="@+id/action_profile"
-            android:icon="@drawable/ic_person_black_24dp"
-            android:title="@string/title_profile" />
-
-        <item
-            android:id="@+id/action_settings"
-            android:icon="@drawable/ic_settings_black_24dp"
-            android:title="@string/title_settings" />
-    </group>
-
-    <group
-        android:id="@+id/menu_section_3"
-        android:checkableBehavior="single">
-
-        <item
-            android:id="@+id/action_logout"
-            android:icon="@drawable/ic_exit_to_app_black_24dp"
-            android:title="@string/action_logout" />
-    </group>
-</menu>
\ 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>
+    <string name="title_register_username">Registriere Benutzernamen</string>
+    <string name="title_reset_password">Passwort zurücksetzen</string>
+    <string name="title_sign_up">registrieren</string>
+    <string name="title_authentication">Login Daten prüfen</string>
+    <string name="title_legal_terms">Legal Terms</string>
+    <string name="title_chats">Chats</string>
+    <string name="title_profile">Profil</string>
+    <string name="title_members">Benutzer (%d)</string>
+    <string name="title_settings">Einstellungen</string>
+    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_change_password">Ändere Passwort</string>
+    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
+    <string name="title_password">Ändere Passwort</string>
+    <string name="title_update_profile">Update Profil</string>
+    <string name="title_about">Über</string>
+    <string name="title_create_channel">Erstelle Raum</string>
+
+    <!-- Actions -->
+    <string name="action_connect">Verbinde</string>
+    <string name="action_use_this_username">Benutze den Benutzernamen</string>
+    <string name="action_login_or_sign_up">Klick diesen Knopf um sich anzumelden oder einen Account zu erstellen</string>
+    <string name="action_terms_of_service">Nutzungsbedingungen</string>
+    <string name="action_privacy_policy">Datenschutz</string>
+    <string name="action_search">Suche</string>
+    <string name="action_update">Updaten</string>
+    <string name="action_settings">Einstellungen</string>
+    <string name="action_create_channel">Erstelle Raum</string>
+    <string name="action_create">Erstelle</string>
+    <string name="action_logout">Abmelden</string>
+    <string name="action_files">Dateien</string>
+    <string name="action_confirm_password">Bestätige Passwort Änderung</string>
+    <string name="action_join_chat">Trete Chat bei</string>
+    <string name="action_add_account">Erstelle Account</string>
+    <string name="action_online">Online</string>
+    <string name="action_away">Abwesend</string>
+    <string name="action_busy">Beschäftigt</string>
+    <string name="action_invisible">Unsichtbar</string>
+    <string name="action_drawing">Zeichnung</string>
+    <string name="action_save_to_gallery">Sichern in Gallerie</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 -->
+
+    <!-- Settings List -->
+    <string-array name="settings_actions">
+        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
+        <item name="item_password">Ändere Passwort</item>
+        <item name="item_password">Über</item>
+    </string-array>
+
+    <!-- Regular information messages -->
+    <string name="msg_generic_error">Entschuldigung, ein Fehler ist aufgetreten, bitte versuchen Sie es noch einmal.</string>
+    <string name="msg_no_data_to_display">Keine Anzeigedaten vorhanden</string>
+    <string name="msg_profile_update_successfully">Profil update erfolgreich</string>
+    <string name="msg_username">Benutzername</string>
+    <string name="msg_username_or_email">Benutzername oder E-Mail</string>
+    <string name="msg_password">Passwort</string>
+    <string name="msg_name">Name</string>
+    <string name="msg_email">E-Mail</string>
+    <string name="msg_avatar_url">Avatar URL</string>
+    <string name="msg_or_continue_using_social_accounts">Oder weiter mit einem Social Account</string>
+    <string name="msg_new_user">Neuer Benutzer? %1$s</string>
+    <string name="msg_forgot_password">Passwort vergessen? %1$s</string>
+    <string name="msg_reset">Zurücksetzen</string>
+    <string name="msg_check_your_email_to_reset_your_password">E-Mail gesendet! Prüfe dein E-Mail Posteingang um dein Passwort zurückzusetzen.</string>
+    <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_yesterday">Gestern</string>
+    <string name="msg_today">Heute</string>
+    <string name="msg_message">Nachricht</string>
+    <string name="msg_this_room_is_read_only">Dieser Raum ist nur lesen</string>
+    <string name="msg_invalid_2fa_code">Falscher 2FA Code</string>
+    <string name="msg_invalid_file">Falsche Datei</string>
+    <string name="msg_invalid_server_url">Falsche Server URL</string>
+    <string name="msg_content_description_log_in_using_facebook">Login mit Facebook</string>
+    <string name="msg_content_description_log_in_using_github">Login mit Github</string>
+    <string name="msg_content_description_log_in_using_google">Login mit Google</string>
+    <string name="msg_content_description_log_in_using_linkedin">Login mit Linkedin</string>
+    <string name="msg_content_description_log_in_using_meteor">Login mit Meteor</string>
+    <string name="msg_content_description_log_in_using_twitter">Login mit Twitter</string>
+    <string name="msg_content_description_log_in_using_gitlab">Login mit Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordpress">Login mit WordPress</string>
+    <string name="msg_content_description_send_message">Sende Nachricht</string>
+    <string name="msg_content_description_show_attachment_options">Zeige Anhang Optionen</string>
+    <string name="msg_you">Du</string>
+    <string name="msg_unknown">Unbekannt</string>
+    <string name="msg_email_address">E-Mail Addresse</string>
+    <string name="msg_utc_offset">UTC Offset</string>
+    <string name="msg_new_password">Neues Passwort eingeben</string>
+    <string name="msg_confirm_password">Bestätige neues Passwort</string>
+    <string name="msg_channel_name">Raum Name</string>
+    <string name="msg_search">Suche</string>
+    <string name="msg_unread_messages">Ungelesene Nachrichten</string>
+    <string name="msg_preview_video">Video</string>
+    <string name="msg_preview_audio">Audio</string>
+    <string name="msg_preview_photo">Bild</string>
+    <string name="msg_preview_file">Datei</string>
+    <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_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>
+    <string name="msg_cancel">ABBRUCH</string>
+    <string name="msg_warning">WARNUNG</string>
+    <string name="msg_http_insecure">Bei HTTP verbinden Sie sich usicher zu einem Server. Wir empfehlen HTTPS zu benutzen.</string>
+    <string name="msg_error_checking_server_version">Ein Fehler ist aufgetreten beim prüfen der Server Version, bitte versuchen Sie es noch einmal</string>
+    <string name="msg_invalid_server_protocol">Das ausgewählte Protokoll wird vom Server nicht akzeptiert, versuchen Sie HTTPS</string>
+    <string name="msg_image_saved_successfully">Bild wurde in der Gallerie gespeichert</string>
+    <string name="msg_image_saved_failed">Bild speichern fehlgeschlagen</string>
+    <string name="msg_edited">(bearbeitet)</string>
+    <string name="msg_and">\u0020und\u0020</string>
+    <string name="msg_is_typing">\u0020 schreibt…</string>
+    <string name="msg_are_typing">\u0020 schreiben…</string>
+    <string name="msg_several_users_are_typing">Mehrere Benutzer schreiben…</string>
+    <string name="msg_no_search_found">Kein Ergebnis gefunden</string>
+    <string name="msg_log_out">Ausloggen…</string>
+    <string name="msg_upload_file">Lade Datei hoch</string>
+    <string name="msg_file_description">Datei Beschreibung</string>
+    <string name="msg_send">Sende</string>
+    <string name="msg_sent_attachment">Sende Anhang</string>
+
+    <!-- Create channel messages -->
+    <string name="msg_private_channel">Privat</string>
+    <string name="msg_public_channel">Öffentlich</string>
+    <string name="msg_private_channel_description">Nur Sie und eingeladene Benutzer haben Zugriff auf den Raum</string>
+    <string name="msg_public_channel_description">Jeder hat Zugriff auf diesen Raum</string>
+    <string name="msg_ready_only_channel">Nur lesen Raum</string>
+    <string name="msg_ready_only_channel_description">Nur der Admin kann neue Nachrichten schreiben</string>
+    <string name="msg_invite_members">Lade Benutzer in diesen Raum ein</string>
+    <string name="msg_member_already_added">Sie haben diesen Benutzer bereits selektiert</string>
+    <string name="msg_member_not_found">Benutzer nicht gefunden</string>
+    <string name="msg_channel_created_successfully">Raum erfolgreich erstellt</string>
+    <string name="msg_message_copied">Nachricht kopiert</string>
+    <string name="msg_delete_message">Lösche Nachricht</string>
+    <string name="msg_delete_description">Sind Sie sicher, dass Sie diese Nachricht löschen wollen?</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">Raum Namen geändert zu: %1$s von %2$s</string>
+    <string name="message_user_added_by">Benutzer %1$s hinzugefügt von %2$s</string>
+    <string name="message_user_removed_by">Benutzer %1$s entfernt von %2$s</string>
+    <string name="message_user_left">Hat den Raum verlassen.</string>
+    <string name="message_user_joined_channel">Hat den Raum betreten.</string>
+    <string name="message_welcome">Willkommen %s</string>
+    <string name="message_removed">Nachricht entfernt</string>
+    <string name="message_pinned">Nachricht angeheftet:</string>
+    <string name="message_muted">Benutzer %1$s stumm geschaltet von %2$s</string>
+    <string name="message_unmuted">Benutzer %1$s nicht mehr stumm geschaltet von %2$s</string>
+    <string name="message_role_add">%1$s wurde gesetzt %2$s von %3$s</string>
+    <string name="message_role_removed">%1$s ist nicht länger %2$s von %3$s</string>
+    <string name="message_credentials_saved_successfully">Login-Daten erfolgreich gespeichert</string>
+
+    <!-- Message actions -->
+    <string name="action_msg_reply">Antworten</string>
+    <string name="action_msg_info">Nachrichten Info</string>
+    <string name="action_msg_edit">Bearbeiten</string>
+    <string name="action_msg_copy">Kopieren</string>
+    <string name="action_msg_quote">Zitieren</string>
+    <string name="action_msg_delete">Löschen</string>
+    <string name="action_msg_pin">Nachricht anheften</string>
+    <string name="action_msg_unpin">Nachricht nicht mehr anheften</string>
+    <string name="action_msg_star">Nachricht favorisieren</string>
+    <string name="action_msg_unstar">Nachricht nicht mehr favorisieren</string>
+    <string name="action_msg_share">Teilen</string>
+    <string name="action_title_editing">Nachricht bearbeiten</string>
+    <string name="action_msg_add_reaction">Reaktion hinzufügen</string>
+
+    <!-- Permission messages -->
+    <string name="permission_editing_not_allowed">Bearbeiten nicht erlaubt</string>
+    <string name="permission_deleting_not_allowed">Löschen nicht erlaubt</string>
+    <string name="permission_pinning_not_allowed">Anheften nicht erlaubt</string>
+    <string name="permission_starring_not_allowed">Favorisieren nicht erlaubt</string>
+
+    <!-- Search message -->
+    <string name="title_search_message">Suche Nachricht</string>
+
+    <!-- Favorite/Unfavorite chat room -->
+    <string name="title_favorite_chat">Chat favorisieren</string>
+    <string name="title_unfavorite_chat">Chat nicht favorisieren</string>
+
+    <!-- Members List -->
+    <string name="title_members_list">Benutzer</string>
+
+    <!-- Mentions -->
+    <string name="msg_mentions">Erwähnungen</string>
+    <string name="msg_no_mention">Keine Erwähnung</string>
+    <string name="msg_all_the_mentions_appear_here">Alle Erwähnungen\nerscheinen hier</string>
+
+    <!-- Pinned Messages -->
+    <string name="title_pinned_messages">Angeheftete Nachrichten</string>
+    <string name="no_pinned_messages">Keine angehefteten Nachrichten vorhanden</string>
+    <string name="no_pinned_description">Alle angehefteten Nachrichten\nerscheinen hier</string>
+
+    <!-- Favorite Messages -->
+    <string name="title_favorite_messages">Favorisierte Nachrichten</string>
+    <string name="no_favorite_messages">Keine favorisierten Nachrichten vorhanden</string>
+    <string name="no_favorite_description">Alle favorisierten Nachrichten\nerscheinen hier</string>
+
+    <!-- Files -->
+    <string name="title_files">Dateien</string>
+    <string name="title_files_total">Dateien (%d)</string>
+    <string name="msg_no_files">Keine Dateien vorhanden</string>
+    <string name="msg_all_files_appear_here">Alle Dateien erscheinen hier</string>
+
+    <!-- Upload Messages -->
+    <string name="max_file_size_exceeded">Dateigröße von %1$d Bytes überschreitet maximale Hochladegröße von %2$d Bytes</string>
+
+    <!-- Socket status -->
+    <string name="status_connected">Verbunden</string>
+    <string name="status_disconnected">Getrennt</string>
+    <string name="status_connecting">Verbinde</string>
+    <string name="status_authenticating">Authentifiziere</string>
+    <string name="status_disconnecting">Trenne</string>
+    <string name="status_waiting">Verbinde in %d Sekunden</string>
+
+    <!--Suggestions-->
+    <string name="suggest_all_description">Benachrichtige alle in diesem Raum</string>
+    <string name="suggest_here_description">Benachrichtige aktive Benutzer in diesem Raum</string>
+
+    <!-- Slash Commands -->
+    <string name="Slash_Gimme_Description">Zeige ༼ つ ◕_◕ ༽つ vor deiner Nachricht</string>
+    <string name="Slash_LennyFace_Description">Zeige ( ͡° ͜ʖ ͡°) nach deiner Nachricht</string>
+    <string name="Slash_Shrug_Description">Zeige ¯\_(ツ)_/¯ nach deiner Nachricht</string>
+    <string name="Slash_Tableflip_Description">Zeige (╯°□°）╯︵ ┻━┻</string>
+    <string name="Slash_TableUnflip_Description">Zeige ┬─┬ ノ( ゜-゜ノ)</string>
+    <string name="Create_A_New_Channel">Erstelle einen neuen Raum</string>
+    <string name="Show_the_keyboard_shortcut_list">Zeige Tasterturkürzel</string>
+    <string name="Invite_user_to_join_channel_all_from">Lade alle Benutzer von [#channel] in diesen Raum ein</string>
+    <string name="Invite_user_to_join_channel_all_to">Lade alle Benutzer von diesem Raum in [#channel] ein</string>
+    <string name="Archive">Archivieren</string>
+    <string name="Remove_someone_from_room">Entferne jemanden vom Raum</string>
+    <string name="Leave_the_current_channel">Verlasse diesen Raum</string>
+    <string name="Displays_action_text">Zeige Aktions Text</string>
+    <string name="Direct_message_someone">Schicke eine Direktnachricht an jemanden</string>
+    <string name="Mute_someone_in_room">Schalte jemanden im Raum auf Stumm</string>
+    <string name="Unmute_someone_in_room">Schalte jemanden im Raum nicht mehr auf Stumm</string>
+    <string name="Invite_user_to_join_channel">Lade jemanden in diesen Raum ein</string>
+    <string name="Unarchive">Dearchivieren</string>
+    <string name="Join_the_given_channel">Trete diesem Raum bei</string>
+    <string name="Guggy_Command_Description">Erstelle ein Gif, basierend auf den eingegebenen Text</string>
+    <string name="Slash_Topic_Description">Setze Topic</string>
+
+    <!-- Emoji message-->
+    <string name="msg_no_recent_emoji">Keine letzten Emojis</string>
+    <string name="alert_title_default_skin_tone">Standart Hautton</string>
+
+    <!-- Sorting and grouping-->
+    <string name="menu_chatroom_sort">Sortiere</string>
+    <string name="dialog_sort_title">Sortieren nach</string>
+    <string name="dialog_sort_by_alphabet">Alphabetisch</string>
+    <string name="dialog_sort_by_activity">Aktivität</string>
+    <string name="dialog_group_by_type">Räume nach Typ</string>
+    <string name="dialog_group_favourites">Räume nach Favoriten</string>
+    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
+    <string name="chatroom_header">Kopf</string>
+
+    <!--ChatRooms Headers-->
+    <string name="header_channel">Räume</string>
+    <string name="header_private_groups">Private Räume</string>
+    <string name="header_direct_messages">Direkt Nachrichten</string>
+    <string name="header_live_chats">Live Chats</string>
+    <string name="header_unknown">Unbekannt</string>
+
+    <!--Notifications-->
+    <string name="share_label">Bearbeite geteilte Nachricht</string>
+    <string name="notif_action_reply_hint">Antworten</string>
+    <string name="notif_error_sending">Antworten fehlgeschlagen. Bitte versuchen Sie es noch einmal.</string>
+    <string name="notif_success_sending">Nachricht gesendet nach %1$s!</string>
+    <string name="read_by">Gelesen von</string>
+    <string name="message_information_title">Nachricht Information</string>
+</resources>
\ No newline at end of file

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

@@ -11,6 +11,9 @@
     <string name="title_profile">Perfil</string>
     <string name="title_members">Miembros (%d)</string>
     <string name="title_settings">Configuraciones</string>
+    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_change_password">Cambia la contraseña</string>
+    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">Cambia la contraseña</string>
     <string name="title_update_profile">Actualización del perfil</string>
     <string name="title_about">Acerca de</string>
@@ -36,11 +39,15 @@
     <string name="action_away">Ausente</string>
     <string name="action_busy">Ocupado</string>
     <string name="action_invisible">Invisible</string>
-    <string name="action_drawing">dibujo</string>
+    <string name="action_drawing">Dibujo</string>
     <string name="action_save_to_gallery">Guardar en la galería</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 -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
+        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Cambia la contraseña</item>
         <item name="item_password">Acerca de</item>
     </string-array>
@@ -77,7 +84,7 @@
     <string name="msg_content_description_log_in_using_meteor">Inicia sesión usando Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Inicia sesión usando Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Inicia sesión usando Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">Enviar mensaje</string>
     <string name="msg_content_description_show_attachment_options">Mostrar opciones de archivo adjunto</string>
     <string name="msg_you">Tú</string>
@@ -92,8 +99,6 @@
     <string name="msg_preview_photo">Foto</string>
     <string name="msg_preview_file">Fichero</string>
     <string name="msg_no_messages_yet">Aún no hay mensajes</string>
-    <string name="msg_version">Versión %1$s</string>
-    <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Versión del servidor actualizada. Póngase en contacto con el administrador del servidor para actualizar la versión del servidor y continuar.</string>
     <string name="msg_ver_not_recommended">
@@ -116,12 +121,12 @@
     <string name="msg_is_typing">\u0020esta escribiendo…</string>
     <string name="msg_are_typing">\u0020están escribiendo…</string>
     <string name="msg_several_users_are_typing">Varios usuarios están escribiendo…</string>
-    <string name="msg_no_search_found">No se han encontrado resultados</string>
     <string name="msg_channel_name">Nombre del Canal</string>
     <string name="msg_search">Buscar</string>
     <string name="msg_message_copied">Mensaje copiado</string>
     <string name="msg_delete_message">Borrar mensaje</string>
     <string name="msg_delete_description">Seguro que quieres borrar este mensaje</string>
+    <string name="msg_no_search_found">No se han encontrado resultados</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>
@@ -135,6 +140,11 @@
     <string name="msg_member_not_found">Miembro no encontrado</string>
     <string name="msg_channel_created_successfully">Canal creado con éxito</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">Nombre de la sala cambiado para: %1$s por %2$s</string>
@@ -170,11 +180,11 @@
     <string name="permission_editing_not_allowed">La edición no és permitida</string>
     <string name="permission_deleting_not_allowed">Eliminar no és permitido</string>
     <string name="permission_pinning_not_allowed">Fijar no és permitido</string>
-    // TODO: Add proper translation.
+    <!-- TODO Add translation -->
     <string name="permission_starring_not_allowed">Starring is not allowed</string>
 
     <!-- Search message -->
-    <string name="title_search_message">Mensaje de búsqueda</string>
+    <string name="title_search_message">Búsqueda de mensajes</string>
 
     <!-- Favorite/Unfavorite chat room -->
     <string name="title_favorite_chat">Chat favorito</string>
@@ -253,6 +263,7 @@
     <string name="dialog_sort_by_activity">Actividad</string>
     <string name="dialog_group_by_type">Agrupar por tipo</string>
     <string name="dialog_group_favourites">Agrupar favoritos</string>
+    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
     <string name="chatroom_header">Cabezazo</string>
 
     <!--ChatRooms Headers-->
@@ -263,11 +274,10 @@
     <string name="header_unknown">Desconocido</string>
 
     <!--Notifications-->
+    <string name="share_label">Edita mensaje compartido</string>
     <string name="notif_action_reply_hint">RESPUESTA</string>
     <string name="notif_error_sending">La respuesta ha fallado. Inténtalo de nuevo.</string>
     <string name="notif_success_sending">Mensaje enviado a %1$s!</string>
-
-    <string name="share_label">Editar mensaje compartido</string>
     <string name="read_by">Leído por</string>
     <string name="message_information_title">Información del mensaje</string>
     <string name="msg_log_out">Saliendo de tu cuenta…</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>
     <string name="title_register_username">Enregistrer le nom d\'utilisateur</string>
-    // TODO: Add proper translation.
-    <string name="title_reset_password">Reset password</string>
+    <string name="title_reset_password">Reset password</string> <!-- TODO Add translation -->
     <string name="title_sign_up">S\'inscrire</string>
     <string name="title_authentication">Authentification</string>
     <string name="title_legal_terms">Termes légaux</string>
@@ -12,11 +12,13 @@
     <string name="title_profile">Profil</string>
     <string name="title_members">Membres (%d)</string>
     <string name="title_settings">Paramètres</string>
+    <string name="title_preferences">Preferences</string> <!-- TODO Add translation -->
+    <string name="title_change_password">Changer le mot de passe</string>
+    <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">Changer le mot de passe</string>
     <string name="title_update_profile">Update profile</string>
     <string name="title_about">Sur</string>
-    // TODO: Add proper translation.
-    <string name="title_create_channel">Create Channel</string>
+    <string name="title_create_channel">Create Channel</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Se connecter</string>
@@ -27,8 +29,7 @@
     <string name="action_search">Chercher</string>
     <string name="action_update">Mettre à jour</string>
     <string name="action_settings">Paramètres</string>
-    // TODO: Add proper translation.
-    <string name="action_create_channel">Create channel</string>
+    <string name="action_create_channel">Create channel</string> <!-- TODO Add translation -->
     <string name="action_create">Create</string>
     <string name="action_logout">Se déconnecter</string>
     <string name="action_files">Fichiers</string>
@@ -40,11 +41,14 @@
     <string name="action_busy">Occupé</string>
     <string name="action_invisible">Invisible</string>
     <string name="action_drawing">Dessin</string>
-    // TODO: Add proper translation.
-    <string name="action_save_to_gallery">Save to gallery</string>
+    <string name="action_save_to_gallery">Save to gallery</string> <!-- TODO Add translation -->
+    <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 -->
 
     <!-- Settings List -->
     <string-array name="settings_actions">
+        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
         <item name="item_password">Changer le mot de passe</item>
         <item name="item_password">Sur</item>
     </string-array>
@@ -61,13 +65,9 @@
     <string name="msg_avatar_url">URL de l\'avatar</string>
     <string name="msg_or_continue_using_social_accounts">Ou continuer en utilisant les comptes sociaux</string>
     <string name="msg_new_user">Nouvel utilisateur? %1$s</string>
-    // TODO: Add proper translation.
-    <string name="msg_forgot_password">Forgot password? %1$s</string>
-    // TODO: Add proper translation.
-    <string name="msg_reset">Reset</string>
-    // TODO: Add proper translation.
-    <string name="msg_check_your_email_to_reset_your_password">Email sent! Check your inbox to reset your password.</string>
-    // TODO: Add proper translation.
+    <string name="msg_forgot_password">Forgot password? %1$s</string> <!-- TODO Add translation -->
+    <string name="msg_reset">Reset</string> <!-- TODO Add translation -->
+    <string name="msg_check_your_email_to_reset_your_password">Email sent! Check your inbox to reset your password.</string> <!-- TODO Add translation -->
     <string name="msg_invalid_email">Please type a valid e-mail</string>
     <string name="msg_new_user_agreement">En procédant, vous acceptez notre\n%1$s et %2$s</string>
     <string name="msg_2fa_code">Code 2FA</string>
@@ -85,7 +85,7 @@
     <string name="msg_content_description_log_in_using_meteor">Connectez-vous en utilisant Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Connectez-vous en utilisant Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Connectez-vous en utilisant Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">Envoyer message</string>
     <string name="msg_content_description_show_attachment_options">Afficher les options de fichiers</string>
     <string name="msg_you">Toi</string>
@@ -100,16 +100,10 @@
     <string name="msg_preview_photo">Photo</string>
     <string name="msg_preview_file">File</string>
     <string name="msg_no_messages_yet">Aucun message pour le moment</string>
-    <string name="msg_version">Version %1$s</string>
-    <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
-    // TODO: Add proper translation.
-    <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
-    <string name="msg_ver_not_recommended">
-        On dirait que la version de votre serveur est en dessous de la version recommandée %1$s.\nVous pouvez toujours vous connecter mais vous pouvez rencontrer des comportements inattendus.</string>
-    <string name="msg_ver_not_minimum">
-        On dirait que la version de votre serveur est inférieure à la version minimale requise %1$s.\nVeuillez mettre à jour votre serveur pour vous connecter!
-    </string>
+    <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string> <!-- TODO Add translation -->
+    <string name="msg_ver_not_recommended">On dirait que la version de votre serveur est en dessous de la version recommandée %1$s.\nVous pouvez toujours vous connecter mais vous pouvez rencontrer des comportements inattendus.</string>
+    <string name="msg_ver_not_minimum">On dirait que la version de votre serveur est inférieure à la version minimale requise %1$s.\nVeuillez mettre à jour votre serveur pour vous connecter!</string>
     <string name="msg_proceed">PROCÉDER</string>
     <string name="msg_cancel">ANNULER</string>
     <string name="msg_warning">ATTENTION</string>
@@ -121,30 +115,22 @@
     <string name="msg_no_chat_title">Aucun message de discussion</string>
     <string name="msg_no_chat_description">Commencez à converser pour voir\nvos messages ici.</string>
     <string name="msg_edited">(édité)</string>
-    // TODO: Add proper translation.
-    <string name="msg_and">\u0020and\u0020</string>
-    // TODO: Add proper translation.
-    <string name="msg_is_typing">\u0020is typing…</string>
-    // TODO: Add proper translation.
-    <string name="msg_are_typing">\u0020are typing…</string>
-    // TODO: Add proper translation.
-    <string name="msg_several_users_are_typing">Several users are typing…</string>
+    <string name="msg_and">\u0020and\u0020</string> <!-- TODO Add translation -->
+    <string name="msg_is_typing">\u0020is typing…</string> <!-- TODO Add translation -->
+    <string name="msg_are_typing">\u0020are typing…</string> <!-- TODO Add translation -->
+    <string name="msg_several_users_are_typing">Several users are typing…</string> <!-- TODO Add translation -->
     <string name="msg_no_search_found">Aucun résultat trouvé</string>
-    // TODO: Add proper translation.
-    <string name="msg_channel_name">Channel name</string>
-    // TODO: Add proper translation.
-    <string name="msg_search">Search</string>
+    <string name="msg_channel_name">Channel name</string> <!-- TODO Add translation -->
+    <string name="msg_search">Search</string> <!-- TODO Add translation -->
     <string name="msg_message_copied">Message copié</string>
     <string name="msg_upload_file">Téléverser un fichier</string>
     <string name="msg_file_description">Description du fichier</string>
     <string name="msg_send">envoyer</string>
-    // TODO: Add proper translation.
-    <string name="msg_delete_message">Delete Message</string>
+    <string name="msg_delete_message">Delete Message</string> <!-- TODO Add translation -->
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
 
     <!-- Create channel messages -->
-    // TODO: Add proper translation.
-    <string name="msg_private_channel">Private</string>
+    <string name="msg_private_channel">Private</string> <!-- TODO Add translation -->
     <string name="msg_public_channel">Public</string>
     <string name="msg_private_channel_description">Only you and invited members can access this channel</string>
     <string name="msg_public_channel_description">Everyone can access this channel</string>
@@ -155,6 +141,12 @@
     <string name="msg_member_not_found">Member not found</string>
     <string name="msg_channel_created_successfully">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 -->
+
     <!-- System messages -->
     <string name="message_room_name_changed">Le nom de le salle a changé à: %1$s par %2$s</string>
     <string name="message_user_added_by">Utilisateur %1$s ajouté par %2$s</string>
@@ -169,8 +161,7 @@
     <string name="message_role_add">%1$s a été défini %2$s par %3$s</string>
     <string name="message_role_removed">%1$s is no longer %2$s par %3$s</string>
 
-    // TODO:Add proper translation.
-    <string name="message_credentials_saved_successfully">Credentials saved successfully</string>
+    <string name="message_credentials_saved_successfully">Credentials saved successfully</string> <!-- TODO Add translation -->
 
     <!-- Message actions -->
     <string name="action_msg_reply">Répondre</string>
@@ -186,32 +177,27 @@
     <string name="action_msg_share">Partager</string>
     <string name="action_title_editing">Modification du message</string>
     <string name="action_msg_add_reaction">Ajouter une réaction</string>
-    <string name="action_share">Partager</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">L\'édition n\'est pas autorisée</string>
     <string name="permission_deleting_not_allowed">La suppression n\'est pas autorisée</string>
     <string name="permission_pinning_not_allowed">L\'épinglage n\'est pas autorisé</string>
-    // TODO: Add proper translation.
-    <string name="permission_starring_not_allowed">Starring is not allowed</string>
+    <string name="permission_starring_not_allowed">Starring is not allowed</string> <!-- TODO Add translation -->
 
     <!-- Search message -->
-    <!-- TODO Add proper translation-->
-    <string name="title_search_message">Search message</string>
+    <string name="title_search_message">Search message</string> <!-- TODO Add translation -->
 
     <!-- Favorite/Unfavorite chat room -->
-    <!-- TODO Add proper translation-->
-    <string name="title_favorite_chat">Favorite chat</string>
-    <string name="title_unfavorite_chat">Unfavorite chat</string>
+    <string name="title_favorite_chat">Favorite chat</string> <!-- TODO Add translation -->
+    <string name="title_unfavorite_chat">Unfavorite chat</string> <!-- TODO Add translation -->
 
     <!-- Members List -->
     <string name="title_members_list">Membres</string>
 
     <!-- Mentions -->
-    <!-- TODO Add proper translation-->
-    <string name="msg_mentions">Mentions</string>
-    <string name="msg_no_mention">No mention</string>
-    <string name="msg_all_the_mentions_appear_here">All the mentions\nappear here</string>
+    <string name="msg_mentions">Mentions</string> <!-- TODO Add translation -->
+    <string name="msg_no_mention">No mention</string> <!-- TODO Add translation -->
+    <string name="msg_all_the_mentions_appear_here">All the mentions\nappear here</string> <!-- TODO Add translation -->
 
     <!-- Pinned Messages -->
     <string name="title_pinned_messages">Messages épinglés</string>
@@ -219,17 +205,15 @@
     <string name="no_pinned_description">Tous les messages épinglés\napparaissent ici</string>
 
     <!-- Favorite Messages -->
-    <!-- TODO Add proper translation-->
-    <string name="title_favorite_messages">Favorite Messages</string>
-    <string name="no_favorite_messages">No favorite messages</string>
-    <string name="no_favorite_description">All the favorite messages\nappear here</string>
+    <string name="title_favorite_messages">Favorite Messages</string> <!-- TODO Add translation -->
+    <string name="no_favorite_messages">No favorite messages</string> <!-- TODO Add translation -->
+    <string name="no_favorite_description">All the favorite messages\nappear here</string> <!-- TODO Add translation -->
 
     <!-- Files -->
-    <!-- TODO Add proper translation-->
-    <string name="title_files">Files</string>
-    <string name="title_files_total">Files (%d)</string>
-    <string name="msg_no_files">No files</string>
-    <string name="msg_all_files_appear_here">All the files appear here</string>
+    <string name="title_files">Files</string> <!-- TODO Add translation -->
+    <string name="title_files_total">Files (%d)</string> <!-- TODO Add translation -->
+    <string name="msg_no_files">No files</string> <!-- TODO Add translation -->
+    <string name="msg_all_files_appear_here">All the files appear here</string> <!-- TODO Add translation -->
 
     <!-- Upload Messages -->
     <string name="max_file_size_exceeded">Taille du fichier (%1$d bytes) dépassé la taille de téléchargement maximale de %2$d bytes</string>
@@ -242,7 +226,7 @@
     <string name="status_disconnecting">Déconnexion</string>
     <string name="status_waiting">Connexion en %d secondes</string>
 
-    <!--Suggestions-->
+    <!--Suggestions -->
     <string name="suggest_all_description">Notifier tout dans cette salle</string>
     <string name="suggest_here_description">Notifier les utilisateurs actifs dans cette salle</string>
 
@@ -280,6 +264,7 @@
     <string name="dialog_sort_by_activity">Activité</string>
     <string name="dialog_group_by_type">Grouper par type</string>
     <string name="dialog_group_favourites">Grouper favoris</string>
+    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
     <string name="chatroom_header">Entête</string>
 
     <!--ChatRooms Headers-->
@@ -298,4 +283,4 @@
     <string name="message_information_title">Informations sur le message</string>
     <string name="msg_log_out">Déconnecter…</string>
     <string name="msg_sent_attachment">Envoyé un fichier</string>
-</resources>
+</resources>
\ No newline at end of file

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

@@ -12,6 +12,9 @@
     <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>
@@ -39,10 +42,13 @@
     <string name="action_invisible">अदृश्य</string>
     <string name="action_save_to_gallery">गैलरी में सहेजें</string>
     <string name="action_drawing">चित्रकारी</string>
-    <string name="action_share">शेयर</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">प्राथमिकताएँ</item>
         <item name="item_password">पासवर्ड बदलें</item>
         <item name="item_password">परिचय</item>
     </string-array>
@@ -79,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_wordprees">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>
@@ -94,8 +100,6 @@
     <string name="msg_preview_file">फ़ाइल</string>
     <string name="msg_unread_messages">अपठित संदेश</string>
     <string name="msg_no_messages_yet">अभी तक कोई पोस्ट नहीं</string>
-    <string name="msg_version">वर्शन %1$s</string>
-    <string name="msg_build">बिल्ड %1$d</string>
     <string name="msg_update_app_version_in_order_to_continue">पुराना सर्वर वर्शन। जारी रखने के लिए सर्वर वर्शन को अद्यतन करने के लिए कृपया सर्वर व्यवस्थापक से संपर्क करें।</string>
     <string name="msg_ok">ठीक है</string>
     <string name="msg_ver_not_recommended">
@@ -142,6 +146,12 @@
     <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">उपयोगकर्ता %1$s द्वारा %2$s को जोड़ा गया</string>
@@ -180,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>
@@ -260,6 +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">पूर्ण</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-pt-rBR/strings.xml

@@ -12,6 +12,9 @@
     <string name="title_profile">Perfil</string>
     <string name="title_members">Membros (%d)</string>
     <string name="title_settings">Configurações</string>
+    <string name="title_preferences">Preferencias</string>
+    <string name="title_change_password">Alterar senha</string>
+    <string name="title_admin_panel">Painel administrativo</string>
     <string name="title_password">Alterar senha</string>
     <string name="title_update_profile">Editar perfil</string>
     <string name="title_about">Sobre</string>
@@ -39,9 +42,13 @@
     <string name="action_invisible">Invisível</string>
     <string name="action_drawing">Desenhando</string>
     <string name="action_save_to_gallery">Salvar na galeria</string>
+    <string name="action_select_photo_from_gallery">Escolher foto da galeria</string>
+    <string name="action_take_photo">Tirar foto</string>
+    <string name="action_reset_avatar">Resetar avatar</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
+        <item name="item_preferences">Preferencias</item>
         <item name="item_password">Alterar senha</item>
         <item name="item_password">Sobre</item>
     </string-array>
@@ -78,7 +85,7 @@
     <string name="msg_content_description_log_in_using_meteor">Fazer login através do Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Fazer login através do Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Fazer login através do Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordprees">Fazer login através do WordPress</string>
+    <string name="msg_content_description_log_in_using_wordpress">Fazer login através do WordPress</string>
     <string name="msg_content_description_send_message">Enviar mensagem</string>
     <string name="msg_content_description_show_attachment_options">Mostrar opções de anexo</string>
     <string name="msg_you">Você</string>
@@ -93,8 +100,6 @@
     <string name="msg_preview_photo">Foto</string>
     <string name="msg_preview_file">Arquivo</string>
     <string name="msg_no_messages_yet">Nenhuma mensagem ainda</string>
-    <string name="msg_version">Versão %1$s</string>
-    <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Versão do servidor desatualizada. Por favor, entre em contato com o administrador do sistema para continuar.</string>
     <string name="msg_ver_not_recommended">
@@ -141,6 +146,12 @@
     <string name="msg_member_not_found">Membro não encontrado</string>
     <string name="msg_channel_created_successfully">Chat criado com sucesso</string>
 
+    <!-- Preferences messages -->
+    <string name="msg_analytics_tracking">Rastreamento de análises</string>
+    <string name="msg_send_analytics_tracking">Envie estatísticas anônimas para ajudar a melhorar este app</string>
+    <string name="msg_do_not_send_analytics_tracking">Não envie estatísticas anônimas para ajudar a melhorar este app</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Not aplicável devido a versão do aplicativo ser FOSS</string> <!-- TODO Add translation -->
+
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>
     <string name="message_user_added_by">Usuário %1$s adicionado por %2$s</string>
@@ -258,6 +269,7 @@
     <string name="dialog_sort_by_activity">Atividade</string>
     <string name="dialog_group_by_type">Agrupar por tipo</string>
     <string name="dialog_group_favourites">Grupos favoritos</string>
+    <string name="dialog_button_done">Done</string><!-- TODO Add translation -->
     <string name="chatroom_header">Cabeçalho</string>
 
     <!--ChatRooms Headers-->
@@ -272,7 +284,6 @@
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">Falha ao enviar a mensagem.</string>
     <string name="notif_success_sending">Mensagem enviada para %1$s!</string>
-    <string name="action_share">Compartilhar</string>
     <string name="read_by">Lida por</string>
     <string name="message_information_title">Informações da mensagem</string>
     <string name="msg_log_out">Deslogando…</string>

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

 <resources>
 
     <!-- Titles -->
-    <string name="title_sign_in_your_server">Войдите на ваш сервер</string>
+    <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>
@@ -12,13 +12,16 @@
     <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_connect">Подключиться</string>
     <string name="action_use_this_username">Использовать это имя</string>
     <string name="action_login_or_sign_up">Нажмите эту кнопку, чтобы войти в систему или создать учетную запись</string>
     <string name="action_terms_of_service">Условия использования</string>
@@ -37,11 +40,15 @@
     <string name="action_away">Отошел</string>
     <string name="action_busy">Занят</string>
     <string name="action_invisible">Невидимый</string>
-    <string name="action_drawing">малюнок</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">Персональные</item>
         <item name="item_password">Изменить пароль</item>
         <item name="item_password">О программе</item>
     </string-array>
@@ -62,23 +69,23 @@
     <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">Продолжая, вы соглашаетесь с нашими\n%1$s и %2$s</string>
+    <string name="msg_new_user_agreement">Продолжая, вы принимаете\n%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_today">Сегодня</string>
     <string name="msg_message">Сообщение</string>
-    <string name="msg_this_room_is_read_only">Этот канал только для чтения</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_wordprees">Login using WordPress</string> <!-- TODO Translate-->
+    <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>
@@ -93,17 +100,13 @@
     <string name="msg_preview_photo">Фото</string>
     <string name="msg_preview_file">Файл</string>
     <string name="msg_no_messages_yet">Нет сообщений</string>
-    <string name="msg_version">Версия %1$s</string>
-    <string name="msg_build">Сборка %1$d</string>
+    <string name="msg_build">Сборка %1$d - %2$s - %3$s</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">Начните разговор, чтобы увидеть ваши\nсообщения здесь.</string>
+    <string name="msg_update_app_version_in_order_to_continue">Версия сервера устарела. Пожалуйста, свяжитесь с администратором, чтобы обновить сервер.</string>
+    <string name="msg_ver_not_recommended">Похоже, версия сервера меньше рекомендуемой %1$s.\nМожно войти, но могут возникнуть те или иные проблемы при работе.\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">Начните общаться, чтобы увидеть\nтут сообщения.</string>
     <string name="msg_proceed">ПРОДОЛЖИТЬ</string>
     <string name="msg_cancel">ОТМЕНА</string>
     <string name="msg_warning">ПРЕДУПРЕЖДЕНИЕ</string>
@@ -121,8 +124,8 @@
     <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_sent_attachment">Надіслано вкладення</string>
+    <string name="msg_send">Отправить</string>
+    <string name="msg_sent_attachment">Вложение отправлено</string>
     <string name="msg_delete_message">Удалить сообщение</string>
     <string name="msg_delete_description">Вы уверены, что хотите удалить это сообщение?</string>
     <string name="msg_channel_name">Название канала</string>
@@ -135,54 +138,59 @@
     <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_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">Отслеживание 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">Название канала изменено на: %1$s by %2$s</string>
+    <string name="message_room_name_changed">%2$s изменил название канала на %1$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_welcome">Привет, %s</string>
     <string name="message_removed">Сообщение удалено</string>
     <string name="message_pinned">Прикрепленное сообщение:</string>
-    <string name="message_muted">Пользователь %1$s заглушен пользователем %2$s</string>
-    <string name="message_unmuted">Пользователь %1$s перестал быть заглушенным по решению %2$s</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_info">Информация о прочтении</string>
     <string name="action_msg_edit">Редактировать</string>
     <string name="action_msg_copy">Копировать</string>
-    <string name="action_msg_quote">Цитата</string>
+    <string name="action_msg_quote">Цитировать</string>
     <string name="action_msg_delete">Удалить</string>
-    <string name="action_msg_pin">Прикрепить сообщение</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_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>
-    <string name="action_share">Поділитися</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>
+    <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>
+    <string name="title_favorite_chat">Добавить в избранное</string>
+    <string name="title_unfavorite_chat">Удалить из избранного</string>
 
     <!-- Members List -->
     <string name="title_members_list">Пользователи</string>
@@ -190,17 +198,17 @@
     <!-- Mentions -->
     <string name="msg_mentions">Упоминания</string>
     <string name="msg_no_mention">Нет упоминаний</string>
-    <string name="msg_all_the_mentions_appear_here">Все упоминания\nотображаются здесь</string>
+    <string name="msg_all_the_mentions_appear_here">Упоминания\nотображаются здесь</string>
 
     <!-- Pinned Messages -->
     <string name="title_pinned_messages">Прикрепленные сообщения</string>
     <string name="no_pinned_messages">Нет прикрепленных сообщений</string>
-    <string name="no_pinned_description">Все прикрепленные сообщения\nотображаются здесь</string>
+    <string name="no_pinned_description">Прикрепленные сообщения\nотображаются здесь</string>
 
     <!-- Favorite Messages -->
     <string name="title_favorite_messages">Избранные сообщения</string>
     <string name="no_favorite_messages">Нет избранных сообщений</string>
-    <string name="no_favorite_description">Все избранные сообщения\nотображаются здесь</string>
+    <string name="no_favorite_description">Избранные сообщения\nотображаются здесь</string>
 
     <!-- Files -->
     <string name="title_files">Файлы</string>
@@ -209,14 +217,14 @@
     <string name="msg_all_files_appear_here">Все файлы отображаются здесь</string>
 
     <!-- Upload Messages -->
-    <string name="max_file_size_exceeded">Размер файла %1$d превысил максимально допустимый %2$d bytes</string>
+    <string name="max_file_size_exceeded">Размер файла %1$d превысил максимально допустимый %2$d байт</string>
 
     <!-- Socket status -->
-    <string name="status_connected">Соединено</string>
+    <string name="status_connected">Подключено</string>
     <string name="status_disconnected">Отключено</string>
-    <string name="status_connecting">Соединение</string>
+    <string name="status_connecting">Подключаемся…</string>
     <string name="status_authenticating">Аутентификация</string>
-    <string name="status_disconnecting">Отключение</string>
+    <string name="status_disconnecting">Отключаемся…</string>
     <string name="status_waiting">Соединение через %d секунд</string>
 
     <!--Suggestions-->
@@ -244,11 +252,11 @@
     <string name="Unarchive">Разархивировать</string>
     <string name="Join_the_given_channel">Присоединиться к этому каналу</string>
     <string name="Guggy_Command_Description">Создает gif на основе предоставленного текста</string>
-    <string name="Slash_Topic_Description">Установить тему</string>
+    <string name="Slash_Topic_Description">Задать тему</string>
 
     <!-- Emoji message-->
-    <string name="msg_no_recent_emoji">Нет недавно используемых emoji</string>
-    <string name="alert_title_default_skin_tone">По умолчанию тон кожи</string>
+    <string name="msg_no_recent_emoji">Пусто</string>
+    <string name="alert_title_default_skin_tone">Тон кожи по умолчанию</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Сортировать</string>
@@ -257,21 +265,22 @@
     <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_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="share_label">Редактировать сообщение</string>
     <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
-    <string name="notif_error_sending">Ошибка ответа. Пожалуйста, попробуйте еще раз.</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="message_information_title">Информация о прочтении</string>
+    <string name="msg_log_out">Выходим…</string>
 </resources>

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/dimens.xml

@@ -31,6 +31,7 @@
     <dimen name="supposed_keyboard_height">252dp</dimen>
     <dimen name="picker_popup_height">250dp</dimen>
     <dimen name="picker_popup_width">300dp</dimen>
+    <dimen name="emoji_size">22dp</dimen>
 
     <!--Toolbar-->
     <dimen name="toolbar_height">56dp</dimen>

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

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="menu_section_one" type="id"/>
+    <item name="menu_section_two" type="id"/>
+    <item name="menu_section_three" type="id"/>
+
+    <item name="menu_action_chats" type="id"/>
+    <item name="menu_action_create_channel" type="id"/>
+    <item name="menu_action_profile" type="id"/>
+    <item name="menu_action_settings" type="id"/>
+    <item name="menu_action_admin_panel" type="id"/>
+    <item name="menu_action_logout" type="id"/>
+
+</resources>
\ No newline at end of file

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

-<resources>
+<!--
+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>
 
     <!-- Titles -->
@@ -13,6 +24,9 @@
     <string name="title_profile">Profile</string>
     <string name="title_members">Members (%d)</string>
     <string name="title_settings">Settings</string>
+    <string name="title_preferences">Preferences</string>
+    <string name="title_change_password">Change Password</string>
+    <string name="title_admin_panel">Admin panel</string>
     <string name="title_password">Change Password</string>
     <string name="title_update_profile">Update profile</string>
     <string name="title_about">About</string>
@@ -40,9 +54,13 @@
     <string name="action_invisible">Invisible</string>
     <string name="action_drawing">Drawing</string>
     <string name="action_save_to_gallery">Save to gallery</string>
+    <string name="action_select_photo_from_gallery">Select photo from gallery</string>
+    <string name="action_take_photo">Take photo</string>
+    <string name="action_reset_avatar">Reset avatar</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
+        <item name="item_preferences">Preferences</item>
         <item name="item_password">Change Password</item>
         <item name="item_password">About</item>
     </string-array>
@@ -80,7 +98,7 @@
     <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_wordprees">Login using WordPress</string>
+    <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string>
     <string name="msg_content_description_send_message">Send message</string>
     <string name="msg_content_description_show_attachment_options">Show attachment options</string>
     <string name="msg_you">You</string>
@@ -97,8 +115,7 @@
     <string name="msg_preview_photo">Photo</string>
     <string name="msg_preview_file">File</string>
     <string name="msg_no_messages_yet">No messages yet</string>
-    <string name="msg_version">Version %1$s</string>
-    <string name="msg_build">Build %1$d</string>
+    <string name="msg_build" tools:ignore="MissingTranslation">Build %1$d - %2$s - %3$s</string>
     <string name="msg_ok">OK</string>
     <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
     <string name="msg_ver_not_recommended">
@@ -122,7 +139,7 @@
     <string name="msg_are_typing">\u0020are typing…</string>
     <string name="msg_several_users_are_typing">Several users are typing…</string>
     <string name="msg_no_search_found">No result found</string>
-    <string name="msg_log_out">Logging out...</string>
+    <string name="msg_log_out">Logging out…</string>
     <string name="msg_upload_file">Upload file</string>
     <string name="msg_file_description">File description</string>
     <string name="msg_send">Send</string>
@@ -142,6 +159,12 @@
     <string name="msg_message_copied">Message copied</string>
     <string name="msg_delete_message">Delete Message</string>
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
+    
+    <!-- Preferences messages -->
+    <string name="msg_analytics_tracking">Analytics tracking</string>
+    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string>
+    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>
@@ -172,7 +195,6 @@
     <string name="action_msg_share">Share</string>
     <string name="action_title_editing">Editing Message</string>
     <string name="action_msg_add_reaction">Add reaction</string>
-    <string name="action_share">Share</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Editing is not allowed</string>
@@ -260,6 +282,7 @@
     <string name="dialog_sort_by_activity">Activity</string>
     <string name="dialog_group_by_type">Group by type</string>
     <string name="dialog_group_favourites">Group favourites</string>
+    <string name="dialog_button_done">Done</string>
     <string name="chatroom_header">Header</string>
 
     <!--ChatRooms Headers-->
@@ -276,4 +299,6 @@
     <string name="notif_success_sending">Message sent to %1$s!</string>
     <string name="read_by">Read by</string>
     <string name="message_information_title">Message information</string>
+
+    <string name="foss" tools:ignore="MissingTranslation">(FOSS)</string>
 </resources>
\ No newline at end of file

app/src/play/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="chat.rocket.android">
+
+    <application
+        android:name=".app.RocketChatApplication"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_config"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true">
+
+        <service
+            android:name=".push.FirebaseMessagingService"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>

app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt

+package chat.rocket.android.analytics
+
+import chat.rocket.android.analytics.event.AuthenticationEvent
+import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.analytics.event.SubscriptionTypeEvent
+import com.crashlytics.android.answers.Answers
+import com.crashlytics.android.answers.CustomEvent
+import com.crashlytics.android.answers.LoginEvent
+import com.crashlytics.android.answers.SignUpEvent
+
+class AnswersAnalytics : Analytics {
+
+    override fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) =
+        Answers.getInstance()
+            .logLogin(
+                LoginEvent()
+                    .putMethod(event.methodName)
+                    .putSuccess(loginSucceeded)
+            )
+
+    override fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) =
+        Answers.getInstance()
+            .logSignUp(
+                SignUpEvent()
+                    .putMethod(event.methodName)
+                    .putSuccess(signUpSucceeded)
+            )
+
+
+    override fun logScreenView(event: ScreenViewEvent) =
+        Answers.getInstance()
+            .logCustom(CustomEvent("screen_view").putCustomAttribute("screen", event.screenName))
+
+
+    override fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) =
+        Answers.getInstance()
+            .logCustom(
+                CustomEvent("message_sent")
+                    .putCustomAttribute("subscription_type", event.subscriptionTypeName)
+                    .putCustomAttribute("server", serverUrl)
+            )
+
+
+    override fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) =
+        Answers.getInstance()
+            .logCustom(
+                CustomEvent("media_upload")
+                    .putCustomAttribute("subscription_type", event.subscriptionTypeName)
+                    .putCustomAttribute("media_type", mimeType)
+            )
+
+
+    override fun logReaction(event: SubscriptionTypeEvent) =
+        Answers.getInstance()
+            .logCustom(
+                CustomEvent("reaction")
+                    .putCustomAttribute("subscription_type", event.subscriptionTypeName)
+            )
+
+
+    override fun logServerSwitch(serverUrl: String, serverCount: Int) =
+        Answers.getInstance()
+            .logCustom(
+                CustomEvent("server_switch")
+                    .putCustomAttribute("server_url", serverUrl)
+                    .putCustomAttribute("server_count", serverCount)
+            )
+}

app/src/play/java/chat/rocket/android/analytics/GoogleAnalyticsForFirebase.kt

+package chat.rocket.android.analytics
+
+import android.content.Context
+import android.os.Bundle
+import chat.rocket.android.analytics.event.AuthenticationEvent
+import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.analytics.event.SubscriptionTypeEvent
+import com.google.firebase.analytics.FirebaseAnalytics
+import javax.inject.Inject
+
+class GoogleAnalyticsForFirebase @Inject constructor(val context: Context) :
+    Analytics {
+    private val firebaseAnalytics = FirebaseAnalytics.getInstance(context)
+
+    override fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {
+        firebaseAnalytics.logEvent(FirebaseAnalytics.Event.LOGIN, Bundle(1).apply {
+            putString(FirebaseAnalytics.Param.METHOD, event.methodName)
+            putLong(FirebaseAnalytics.Param.SUCCESS, if (loginSucceeded) 1 else 0)
+        })
+    }
+
+    override fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {
+        firebaseAnalytics.logEvent(FirebaseAnalytics.Event.SIGN_UP, Bundle(1).apply {
+            putString(FirebaseAnalytics.Param.METHOD, event.methodName)
+            putLong(FirebaseAnalytics.Param.SUCCESS, if (signUpSucceeded) 1 else 0)
+        })
+    }
+
+    override fun logScreenView(event: ScreenViewEvent) {
+        firebaseAnalytics.logEvent("screen_view", Bundle(1).apply {
+            putString("screen", event.screenName)
+        })
+    }
+
+    override fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) {
+        firebaseAnalytics.logEvent("message_sent", Bundle(1).apply {
+            putString("subscription_type", event.subscriptionTypeName)
+            putString("server", serverUrl)
+        })
+    }
+
+    override fun logMediaUploaded(event: SubscriptionTypeEvent, mimeType: String) {
+        firebaseAnalytics.logEvent("media_upload", Bundle(1).apply {
+            putString("subscription_type", event.subscriptionTypeName)
+            putString("media_type", mimeType)
+        })
+    }
+
+    override fun logReaction(event: SubscriptionTypeEvent) {
+        firebaseAnalytics.logEvent("reaction", Bundle(1).apply {
+            putString("subscription_type", event.subscriptionTypeName)
+        })
+    }
+
+    override fun logServerSwitch(serverUrl: String, serverCount: Int) {
+        firebaseAnalytics.logEvent("server_switch", Bundle(1).apply {
+            putString("server_url", serverUrl)
+            putInt("server_count", serverCount)
+        })
+    }
+}

app/src/main/java/chat/rocket/android/dagger/module/ServiceBuilder.kt → 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/helper/ActivityKt.kt

+package chat.rocket.android.helper
+
+import android.app.Activity
+import android.content.Intent
+import androidx.fragment.app.FragmentActivity
+import com.google.android.gms.auth.api.credentials.Credential
+import com.google.android.gms.auth.api.credentials.Credentials
+
+fun FragmentActivity.saveCredentials(id: String, password: String) {
+    val credentialsClient = Credentials.getClient(this)
+    SmartLockHelper.save(credentialsClient, this, id, password)
+}
+
+fun Activity.requestStoredCredentials(): Pair<String, String>? {
+    val credentialsClient = Credentials.getClient(this)
+    return SmartLockHelper.requestStoredCredentials(credentialsClient, this)?.let {
+        null
+    }
+}
+
+fun getCredentials(data: Intent): Pair<String, String>? {
+    val credentials: Credential = data.getParcelableExtra(Credential.EXTRA_KEY)
+    return credentials.password?.let {
+        Pair(credentials.id, it)
+    }
+}
+
+fun hasCredentialsSupport() = true
\ No newline at end of file

app/src/main/java/chat/rocket/android/push/FirebaseMessagingService.kt → 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/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/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/FabricManager.kt

+package chat.rocket.android.util
+
+import chat.rocket.android.BuildConfig
+import io.fabric.sdk.android.Fabric
+import com.crashlytics.android.Crashlytics
+import com.crashlytics.android.core.CrashlyticsCore
+import android.content.Context
+import chat.rocket.android.app.RocketChatApplication
+import chat.rocket.android.infrastructure.installCrashlyticsWrapper
+import com.crashlytics.android.answers.Answers
+
+fun setupFabric(context: Context) {
+    val core = CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build()
+    Fabric.with(
+        context,
+        Crashlytics.Builder()
+            .core(core) // For Crashlytics
+            .answers(Answers()) // For Answers
+            .build()
+    )
+
+    installCrashlyticsWrapper(
+        context as RocketChatApplication,
+        context.getCurrentServerInteractor,
+        context.settingsInteractor,
+        context.accountRepository,
+        context.localRepository
+    )
+}

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

+package chat.rocket.android.util
+
+import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
+
+fun invalidateFirebaseToken(token: String) {
+    FirebaseInstanceId.getInstance().deleteToken(token, FirebaseMessaging.INSTANCE_ID_SCOPE)
+}

build.gradle

@@ -10,12 +10,14 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha03'
+        classpath 'com.android.tools.build:gradle:3.2.0-rc02'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
-        classpath 'com.google.gms:google-services:3.2.0'
+        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
     }
@@ -34,4 +36,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}

dependencies.gradle

@@ -5,58 +5,63 @@ ext {
             compileSdk            : 28,
             targetSdk             : 28,
             minSdk                : 21,
-            buildTools            : '28.0.0-rc2',
+            buildTools            : '28.0.2',
             dokka                 : '0.9.16',
 
             // For app
-            kotlin                : '1.2.51',
-            coroutine             : '0.23.1',
+            kotlin                : '1.2.61',
+            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',
-            firebase              : '15.0.0',
-            playServices          : '15.0.0',
-            exoPlayer             : '2.6.0',
-            flexbox               : '0.3.2',
+            firebaseCloudMessage  : '17.3.0',
+            firebaseAnalytics     : '16.0.3',
+            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.10.0',
+            okhttp                : '3.11.0',
 
-            timber                : '4.7.0',
-            threeTenABP           : '1.0.5',
-            rxBinding             : '2.0.0',
+            timber                : '4.7.1',
+            threeTenABP           : '1.1.0',
+            rxBinding             : '2.1.1',
 
-            fresco                : '1.9.0',
+            fresco                : '1.10.0',
 
-            kotshi                : '1.0.2',
+            kotshi                : '1.0.4',
 
             frescoImageViewer     : '0.5.1',
-            markwon               : '1.0.6',
+            markwon               : '1.1.1',
             aVLoadingIndicatorView: '2.1.3',
+            glide                 : '4.8.0',
 
             // For wearable
             wear                  : '2.3.0',
             playServicesWearable  : '15.0.1',
-            supportWearable       : '26.1.0',
+            supportWearable       : '27.1.1',
 
             // For testing
             junit                 : '4.12',
-            truth                 : '0.36',
-            espresso              : '3.1.0-alpha2',
-            mockito               : '2.10.0'
+            truth                 : '0.42',
+            espresso              : '3.1.0-alpha4',
+            mockito               : '2.21.0'
     ]
     libraries = [
             kotlin                : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}",
@@ -69,13 +74,14 @@ 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}",
             daggerProcessor       : "com.google.dagger:dagger-compiler:${versions.dagger}",
             daggerAndroidApt      : "com.google.dagger:dagger-android-processor:${versions.dagger}",
-            fcm                   : "com.google.firebase:firebase-messaging:${versions.firebase}",
-            playServicesAuth      : "com.google.android.gms:play-services-auth:${versions.playServices}",
             exoPlayer             : "com.google.android.exoplayer:exoplayer:${versions.exoPlayer}",
             flexbox               : "com.google.android:flexbox:${versions.flexbox}",
             material              : "com.google.android.material:material:${versions.material}",
@@ -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}",
@@ -107,11 +116,18 @@ ext {
             kotshiCompiler        : "se.ansman.kotshi:compiler:${versions.kotshi}",
 
             frescoImageViewer     : "com.github.luciofm:FrescoImageViewer:${versions.frescoImageViewer}",
+            glide                 : "com.github.bumptech.glide:glide:${versions.glide}",
+            glideProcessor        : "com.github.bumptech.glide:compiler:${versions.glide}",
 
             markwon               : "ru.noties:markwon:${versions.markwon}",
 
             aVLoadingIndicatorView: "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
 
+            // Proprietary libraries
+            fcm                   : "com.google.firebase:firebase-messaging:${versions.firebaseCloudMessage}",
+            firebaseAnalytics     : "com.google.firebase:firebase-core:${versions.firebaseAnalytics}",
+            playServicesAuth      : "com.google.android.gms:play-services-auth:${versions.playServices}",
+
             // For wearable
             wearable              : "com.google.android.support:wearable:${versions.wear}",
             playServicesWearable  : "com.google.android.gms:play-services-wearable:${versions.playServicesWearable}",
@@ -121,10 +137,10 @@ ext {
             wearSupport           : "com.android.support:wear:${versions.supportWearable}",
 
             // For testing
-            junit                 : "junit:junit:$versions.junit",
+            junit                 : "junit:junit:${versions.junit}",
             espressoCore          : "androidx.test.espresso:espresso-core:${versions.espresso}",
             espressoIntents       : "androidx.test.espresso:espresso-intents:${versions.espresso}",
             roomTest              : "android.arch.persistence.room:testing:${versions.room}",
-            truth                 : "com.google.truth:truth:$versions.truth"
+            truth                 : "com.google.truth:truth:${versions.truth}"
     ]
-}
\ No newline at end of file
+}

draw/build.gradle

@@ -19,14 +19,36 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    // Since we are using the util module here, we need to declare the same flavorDimensions and
+    // productFlavors from there.
+
+    flavorDimensions "type"
+
+    productFlavors {
+        // includes proprietary libs
+        play {
+            dimension "type"
+        }
+
+        // only foss
+        foss {
+            dimension "type"
+        }
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation project(':util')
     implementation project(':core')
+    implementation project(':util')
 
     implementation libraries.kotlin
     implementation libraries.coroutines

draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt

@@ -111,6 +111,12 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
     }
 
     private fun colorSelector() {
+        image_color_black.setOnClickListener {
+            custom_draw_view.setColor(
+                    ResourcesCompat.getColor(resources, R.color.color_black, null)
+            )
+            scaleColorView(image_color_black)
+        }
         image_color_red.setOnClickListener {
             custom_draw_view.setColor(
                 ResourcesCompat.getColor(resources, R.color.color_red, null)

emoji/build.gradle

 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion versions.compileSdk
@@ -14,6 +15,11 @@ android {
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
     }
 
     buildTypes {
@@ -34,6 +40,10 @@ dependencies {
     implementation libraries.constraintlayout
     implementation libraries.recyclerview
     implementation libraries.material
+    implementation libraries.glide
+    kapt libraries.glideProcessor
+    implementation libraries.room
+    kapt libraries.roomProcessor
 }
 
 kotlin {

emoji/proguard-rules.pro

@@ -19,3 +19,12 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+
+# for DexGuard only
+-keepresourcexmlelements manifest/application/meta-data@value=GlideModule

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/ComposerEditText.kt

 package chat.rocket.android.emoji
 
 import android.content.Context
-import androidx.appcompat.widget.AppCompatEditText
+import android.text.Spanned
+import android.text.style.ImageSpan
 import android.util.AttributeSet
 import android.view.KeyEvent
+import androidx.appcompat.widget.AppCompatEditText
+import androidx.core.text.getSpans
 
 class ComposerEditText : AppCompatEditText {
+
     var listener: ComposerEditTextListener? = null
 
     constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) :
-            super(context, attrs, defStyleAttr) {
+        super(context, attrs, defStyleAttr) {
         isFocusable = true
         isFocusableInTouchMode = true
         isClickable = true
@@ -20,6 +24,21 @@ class ComposerEditText : AppCompatEditText {
 
     constructor(context: Context) : this(context, null)
 
+    override fun onSelectionChanged(selStart: Int, selEnd: Int) {
+        super.onSelectionChanged(selStart, selEnd)
+        text?.getSpans<ImageSpan>()?.forEach {
+            val s = text?.getSpanStart(it) ?: -1
+            val e = text?.getSpanEnd(it) ?: -1
+            val flags = if (selStart in s..e) {
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE or Spanned.SPAN_COMPOSING
+            } else {
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            }
+
+            text?.setSpan(it, s, e, flags)
+        }
+    }
+
     override fun dispatchKeyEventPreIme(event: KeyEvent): Boolean {
         if (event.keyCode == KeyEvent.KEYCODE_BACK) {
             val state = keyDispatcherState
@@ -43,4 +62,4 @@ class ComposerEditText : AppCompatEditText {
         fun onKeyboardClosed()
         fun onKeyboardOpened()
     }
-}
\ No newline at end of file
+}

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

 package chat.rocket.android.emoji
 
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.PrimaryKey
+
+@Entity
 data class Emoji(
-    val shortname: String,
-    val shortnameAlternates: List<String>,
-    val unicode: String,
-    val keywords: List<String>,
-    val category: String,
-    val count: Int = 0,
-    val siblings: MutableCollection<Emoji> = mutableListOf(),
-    val fitzpatrick: Fitzpatrick = Fitzpatrick.Default
-)
\ No newline at end of file
+    @PrimaryKey
+    var shortname: String = "",
+    var shortnameAlternates: List<String> = listOf(),
+    var unicode: String = "",
+    @Ignore val keywords: List<String> = listOf(),
+    var category: String = "",
+    var count: Int = 0,
+    var siblings: MutableList<String> = mutableListOf(), // Siblings are the same emoji with different skin tones.
+    var fitzpatrick: String = Fitzpatrick.Default.type,
+    var url: String? = null, // Filled for custom emojis
+    var isDefault: Boolean = true // Tell if this is the default emoji if it has siblings (usually a yellow-toned one).
+)

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

+package chat.rocket.android.emoji
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy.IGNORE
+import androidx.room.Query
+import androidx.room.Update
+
+@Dao
+interface EmojiDao {
+
+    @Query("SELECT * FROM emoji")
+    fun loadAllEmojis(): List<Emoji>
+
+    @Query("SELECT * FROM emoji WHERE url IS NULL")
+    fun loadSimpleEmojis(): List<Emoji>
+
+    @Query("SELECT * FROM emoji WHERE url IS NOT NULL")
+    fun loadAllCustomEmojis(): List<Emoji>
+
+    @Query("SELECT * FROM emoji WHERE shortname=:shortname")
+    fun loadEmojiByShortname(shortname: String): List<Emoji>
+
+    @Query("SELECT * FROM emoji WHERE UPPER(category)=UPPER(:category)")
+    fun loadEmojisByCategory(category: String): List<Emoji>
+
+    @Query("SELECT * FROM emoji WHERE UPPER(category)=UPPER(:category) AND url LIKE :url")
+    fun loadEmojisByCategoryAndUrl(category: String, url: String): List<Emoji>
+
+    @Insert(onConflict = IGNORE)
+    fun insertEmoji(emoji: Emoji)
+
+    @Insert(onConflict = IGNORE)
+    fun insertAllEmojis(vararg emojis: Emoji)
+
+    @Update
+    fun updateEmoji(emoji: Emoji)
+
+    @Delete
+    fun deleteEmoji(emoji: Emoji)
+
+    @Query("DELETE FROM emoji")
+    fun deleteAll()
+}

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

@@ -22,6 +22,8 @@ import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.emoji.internal.EmojiPagerAdapter
 import chat.rocket.android.emoji.internal.PREF_EMOJI_SKIN_TONE
 import com.google.android.material.tabs.TabLayout
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.launch
 
 
 class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow(context, view) {
@@ -49,8 +51,10 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
     }
 
     override fun onViewCreated(view: View) {
-        setupViewPager()
-        setupBottomBar()
+        launch(UI) {
+            setupViewPager()
+            setupBottomBar()
+        }
     }
 
     private fun setupBottomBar() {
@@ -81,42 +85,42 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
             .create()
 
         view.findViewById<TextView>(R.id.default_tone_text).also {
-            it.text = EmojiParser.parse(it.text)
+            it.text = EmojiParser.parse(context, it.text)
         }.setOnClickListener {
             dialog.dismiss()
             changeSkinTone(Fitzpatrick.Default)
         }
 
         view.findViewById<TextView>(R.id.light_tone_text).also {
-            it.text = EmojiParser.parse(it.text)
+            it.text = EmojiParser.parse(context, it.text)
         }.setOnClickListener {
             dialog.dismiss()
             changeSkinTone(Fitzpatrick.LightTone)
         }
 
         view.findViewById<TextView>(R.id.medium_light_text).also {
-            it.text = EmojiParser.parse(it.text)
+            it.text = EmojiParser.parse(context, it.text)
         }.setOnClickListener {
             dialog.dismiss()
             changeSkinTone(Fitzpatrick.MediumLightTone)
         }
 
         view.findViewById<TextView>(R.id.medium_tone_text).also {
-            it.text = EmojiParser.parse(it.text)
+            it.text = EmojiParser.parse(context, it.text)
         }.setOnClickListener {
             dialog.dismiss()
             changeSkinTone(Fitzpatrick.MediumTone)
         }
 
         view.findViewById<TextView>(R.id.medium_dark_tone_text).also {
-            it.text = EmojiParser.parse(it.text)
+            it.text = EmojiParser.parse(context, it.text)
         }.setOnClickListener {
             dialog.dismiss()
             changeSkinTone(Fitzpatrick.MediumDarkTone)
         }
 
         view.findViewById<TextView>(R.id.dark_tone_text).also {
-            it.text = EmojiParser.parse(it.text)
+            it.text = EmojiParser.parse(context, it.text)
         }.setOnClickListener {
             dialog.dismiss()
             changeSkinTone(Fitzpatrick.DarkTone)
@@ -135,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)
@@ -148,7 +154,7 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
         }
     }
 
-    private fun setupViewPager() {
+    private suspend fun setupViewPager() {
         context.let {
             val callback = when (it) {
                 is EmojiKeyboardListener -> it
@@ -167,6 +173,7 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
                     callback.onEmojiAdded(emoji)
                 }
             })
+
             viewPager.offscreenPageLimit = EmojiCategory.values().size
             viewPager.adapter = adapter
 
@@ -183,11 +190,13 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
             } else {
                 EmojiCategory.RECENTS.ordinal
             }
+
             viewPager.currentItem = currentTab
         }
     }
 
     class EmojiTextWatcher(private val editor: EditText) : TextWatcher {
+
         @Volatile
         private var emojiToRemove = mutableListOf<EmojiTypefaceSpan>()
 
@@ -231,4 +240,4 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
         override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
         }
     }
-}
\ No newline at end of file
+}

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

 package chat.rocket.android.emoji
 
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Typeface
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.Spanned
+import android.text.style.ImageSpan
+import android.util.Log
+import chat.rocket.android.emoji.internal.GlideApp
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.load.resource.gif.GifDrawable
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.Deferred
+import kotlinx.coroutines.experimental.async
 
 class EmojiParser {
 
     companion object {
+
+        private val regex = ":[\\w]+:".toRegex()
+
         /**
          * Parses a text string containing unicode characters and/or shortnames to a rendered
          * Spannable.
@@ -15,10 +29,18 @@ class EmojiParser {
          * @param factory Optional. A [Spannable.Factory] instance to reuse when creating [Spannable].
          * @return A rendered Spannable containing any supported emoji.
          */
-        fun parse(text: CharSequence, factory: Spannable.Factory? = null): CharSequence {
-            val unicodedText = EmojiRepository.shortnameToUnicode(text, true)
-            val spannable = factory?.newSpannable(unicodedText) ?: SpannableString.valueOf(unicodedText)
-            val typeface = EmojiRepository.cachedTypeface
+        fun parse(context: Context, text: CharSequence, factory: Spannable.Factory? = null): CharSequence {
+            val unicodedText = EmojiRepository.shortnameToUnicode(text)
+            val spannable = factory?.newSpannable(unicodedText)
+                ?: SpannableString.valueOf(unicodedText)
+
+            val typeface = try {
+                EmojiRepository.cachedTypeface
+            } catch (ex: UninitializedPropertyAccessException) {
+                // swallow this exception and create typeface now
+                Typeface.createFromAsset(context.assets, "fonts/emojione-android.ttf")
+            }
+
             // Look for groups of emojis, set a EmojiTypefaceSpan with the emojione font.
             val length = spannable.length
             var inEmoji = false
@@ -32,6 +54,7 @@ class EmojiParser {
                     offset += count
                     continue
                 }
+
                 if (codepoint >= 0x200) {
                     if (!inEmoji) {
                         emojiStart = offset
@@ -40,17 +63,64 @@ class EmojiParser {
                 } else {
                     if (inEmoji) {
                         spannable.setSpan(EmojiTypefaceSpan("sans-serif", typeface),
-                                emojiStart, offset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                            emojiStart, offset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                     }
                     inEmoji = false
                 }
+
                 offset += count
                 if (offset >= length && inEmoji) {
                     spannable.setSpan(EmojiTypefaceSpan("sans-serif", typeface),
-                            emojiStart, offset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                        emojiStart, offset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                 }
             }
-            return spannable
+
+            val customEmojis = EmojiRepository.getCustomEmojis()
+
+            val px = context.resources.getDimensionPixelSize(R.dimen.custom_emoji_small)
+
+            return spannable.also { sp ->
+                regex.findAll(spannable).iterator().forEach { match ->
+                    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()
+                                } else {
+                                    GlideApp.with(context).asBitmap()
+                                }
+
+                                val futureTarget = glideRequest
+                                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                                    .load(url)
+                                    .submit(px, px)
+
+                                val range = match.range
+                                futureTarget.get()?.let { image ->
+                                    if (image is Bitmap) {
+                                        spannable.setSpan(ImageSpan(context, image), range.start,
+                                            range.endInclusive + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                                    } else if (image is GifDrawable) {
+                                        image.setBounds(0, 0, image.intrinsicWidth, image.intrinsicHeight)
+                                        spannable.setSpan(ImageSpan(image), range.start,
+                                            range.endInclusive + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                                    }
+                                }
+                            } catch (ex: Throwable) {
+                                Log.e("EmojiParser", "", ex)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        fun parseAsync(
+            context: Context,
+            text: CharSequence,
+            factory: Spannable.Factory? = null
+        ): Deferred<CharSequence> {
+            return async(CommonPool) { parse(context, text, factory) }
         }
     }
-}
\ No newline at end of file
+}

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

@@ -14,6 +14,8 @@ import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.emoji.internal.EmojiPagerAdapter
 import chat.rocket.android.emoji.internal.PREF_EMOJI_SKIN_TONE
 import kotlinx.android.synthetic.main.emoji_picker.*
+import kotlinx.coroutines.experimental.android.UI
+import kotlinx.coroutines.experimental.launch
 
 
 class EmojiPickerPopup(context: Context) : Dialog(context) {
@@ -27,19 +29,23 @@ class EmojiPickerPopup(context: Context) : Dialog(context) {
         setContentView(R.layout.emoji_picker)
 
         tabs.setupWithViewPager(pager_categories)
-        setupViewPager()
-        setSize()
+        launch(UI) {
+            setupViewPager()
+            setSize()
+        }
     }
 
     private fun setSize() {
         val lp = WindowManager.LayoutParams()
-        lp.copyFrom(window.attributes)
-        val dialogWidth = lp.width
-        val dialogHeight = context.resources.getDimensionPixelSize(R.dimen.picker_popup_height)
-        window.setLayout(dialogWidth, dialogHeight)
+        window?.let {
+            lp.copyFrom(it.attributes)
+            val dialogWidth = lp.width
+            val dialogHeight = context.resources.getDimensionPixelSize(R.dimen.picker_popup_height)
+            it.setLayout(dialogWidth, dialogHeight)
+        }
     }
 
-    private fun setupViewPager() {
+    private suspend fun setupViewPager() {
         adapter = EmojiPagerAdapter(object : EmojiKeyboardListener {
             override fun onEmojiAdded(emoji: Emoji) {
                 EmojiRepository.addToRecents(emoji)

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

@@ -3,12 +3,16 @@ package chat.rocket.android.emoji
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.Typeface
-import android.os.SystemClock
+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
-import kotlinx.coroutines.experimental.yield
 import org.json.JSONArray
 import org.json.JSONObject
 import java.io.BufferedReader
@@ -16,61 +20,123 @@ import java.io.InputStream
 import java.io.InputStreamReader
 import java.util.*
 import java.util.regex.Pattern
+import kotlin.collections.ArrayList
 import kotlin.coroutines.experimental.buildSequence
 
+
 object EmojiRepository {
 
     private val FITZPATRICK_REGEX = "(.*)_(tone[0-9]):".toRegex(RegexOption.IGNORE_CASE)
     private val shortNameToUnicode = HashMap<String, String>()
     private val SHORTNAME_PATTERN = Pattern.compile(":([-+\\w]+):")
-    private val ALL_EMOJIS = mutableListOf<Emoji>()
+    private var customEmojis = listOf<Emoji>()
     private lateinit var preferences: SharedPreferences
     internal lateinit var cachedTypeface: Typeface
+    private lateinit var db: EmojiDatabase
+    private lateinit var currentServerUrl: String
 
-    fun load(context: Context, path: String = "emoji.json") {
-        preferences = context.getSharedPreferences("emoji", Context.MODE_PRIVATE)
-        ALL_EMOJIS.clear()
-        cachedTypeface = Typeface.createFromAsset(context.assets, "fonts/emojione-android.ttf")
-        val stream = context.assets.open(path)
-        val emojis = loadEmojis(stream)
-        emojis.forEach { emoji ->
-            val unicodeIntList = mutableListOf<Int>()
-            emoji.unicode.split("-").forEach {
-                val value = it.toInt(16)
-                if (value >= 0x10000) {
-                    val surrogatePair = calculateSurrogatePairs(value)
-                    unicodeIntList.add(surrogatePair.first)
-                    unicodeIntList.add(surrogatePair.second)
-                } else {
-                    unicodeIntList.add(value)
-                }
+    fun setCurrentServerUrl(url: String) {
+        currentServerUrl = url
+    }
+
+    fun getCurrentServerUrl(): String? {
+        return if (::currentServerUrl.isInitialized) currentServerUrl else null
+    }
+
+    fun load(context: Context, customEmojis: List<Emoji> = emptyList(), path: String = "emoji.json") {
+        launch(CommonPool) {
+            this@EmojiRepository.customEmojis = customEmojis
+            val allEmojis = mutableListOf<Emoji>()
+            db = EmojiDatabase.getInstance(context)
+
+            if (!::cachedTypeface.isInitialized) {
+                cachedTypeface = Typeface.createFromAsset(context.assets, "fonts/emojione-android.ttf")
             }
-            val unicodeIntArray = unicodeIntList.toIntArray()
-            val unicode = String(unicodeIntArray, 0, unicodeIntArray.size)
-            val emojiWithUnicode = emoji.copy(unicode = unicode)
-            if (hasFitzpatrick(emoji.shortname)) {
-                val matchResult = FITZPATRICK_REGEX.find(emoji.shortname)
-                val prefix = matchResult!!.groupValues[1] + ":"
-                val fitzpatrick = Fitzpatrick.valueOf(matchResult.groupValues[2])
-                val defaultEmoji = ALL_EMOJIS.firstOrNull { it.shortname == prefix }
-                val emojiWithFitzpatrick = emojiWithUnicode.copy(fitzpatrick = fitzpatrick)
-                if (defaultEmoji != null) {
-                    defaultEmoji.siblings.add(emojiWithFitzpatrick)
-                } else {
-                    // This emoji doesn't have a default tone, ie. :man_in_business_suit_levitating_tone1:
-                    // In this case, the default emoji becomes the first toned one.
-                    ALL_EMOJIS.add(emojiWithFitzpatrick)
+
+            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.
+            val emojis = loadEmojis(stream).also {
+                it.addAll(customEmojis)
+            }.toList()
+
+            for (emoji in emojis) {
+                val unicodeIntList = mutableListOf<Int>()
+
+                emoji.category = emoji.category
+
+                if (emoji.isCustom()) {
+                    allEmojis.add(emoji)
+                    continue
+                }
+
+                emoji.unicode.split("-").forEach {
+                    val value = it.toInt(16)
+                    if (value >= 0x10000) {
+                        val surrogatePair = calculateSurrogatePairs(value)
+                        unicodeIntList.add(surrogatePair.first)
+                        unicodeIntList.add(surrogatePair.second)
+                    } else {
+                        unicodeIntList.add(value)
+                    }
+                }
+
+                val unicodeIntArray = unicodeIntList.toIntArray()
+                val unicode = String(unicodeIntArray, 0, unicodeIntArray.size)
+                emoji.unicode = unicode
+
+                if (hasFitzpatrick(emoji.shortname)) {
+                    val matchResult = FITZPATRICK_REGEX.find(emoji.shortname)
+                    val prefix = matchResult!!.groupValues[1] + ":"
+                    val fitzpatrick = Fitzpatrick.valueOf(matchResult.groupValues[2])
+                    val defaultEmoji = allEmojis.firstOrNull { it.shortname == prefix }
+                    emoji.fitzpatrick = fitzpatrick.type
+
+                    emoji.isDefault = if (defaultEmoji != null) {
+                        defaultEmoji.siblings.add(emoji.shortname)
+                        false
+                    } else {
+                        true
+                    }
+
+                    emoji.isDefault = false
+                }
+
+                allEmojis.add(emoji)
+
+                shortNameToUnicode.apply {
+                    put(emoji.shortname, unicode)
+                    emoji.shortnameAlternates.forEach { alternate -> put(alternate, unicode) }
                 }
-            } else {
-                ALL_EMOJIS.add(emojiWithUnicode)
             }
-            shortNameToUnicode.apply {
-                put(emoji.shortname, unicode)
-                emoji.shortnameAlternates.forEach { alternate -> put(alternate, unicode) }
+
+            saveEmojisToDatabase(allEmojis.toList())
+
+            // Prefetch all custom emojis to make cache.
+            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")
+                    }
+                }
             }
         }
     }
 
+    private suspend fun saveEmojisToDatabase(emojis: List<Emoji>) {
+        withContext(CommonPool) {
+            db.emojiDao().insertAllEmojis(*emojis.toTypedArray())
+        }
+    }
+
     private fun hasFitzpatrick(shortname: String): Boolean {
         return FITZPATRICK_REGEX matches shortname
     }
@@ -80,22 +146,28 @@ object EmojiRepository {
      *
      * @return All emojis for all categories.
      */
-    internal fun getAll() = ALL_EMOJIS
+    internal suspend fun getAll(): List<Emoji> = withContext(CommonPool) {
+        return@withContext db.emojiDao().loadAllEmojis()
+    }
 
-    /**
-     * Get all emojis for a given category.
-     *
-     * @param category Emoji category such as: PEOPLE, NATURE, ETC
-     *
-     * @return All emoji from specified category
-     */
-    internal fun getEmojisByCategory(category: EmojiCategory): List<Emoji> {
-        return ALL_EMOJIS.filter { it.category.toLowerCase() == category.name.toLowerCase() }
+    internal suspend fun getEmojiSequenceByCategory(category: EmojiCategory): Sequence<Emoji> {
+        val list = withContext(CommonPool) {
+            db.emojiDao().loadEmojisByCategory(category.name)
+        }
+
+        return buildSequence {
+            list.forEach {
+                yield(it)
+            }
+        }
     }
 
-    internal fun getEmojiSequenceByCategory(category: EmojiCategory): Sequence<Emoji> {
-        val list = ALL_EMOJIS.filter { it.category.toLowerCase() == category.name.toLowerCase() }
-        return buildSequence{
+    internal suspend fun getEmojiSequenceByCategoryAndUrl(category: EmojiCategory, url: String): Sequence<Emoji> {
+        val list = withContext(CommonPool) {
+            db.emojiDao().loadEmojisByCategoryAndUrl(category.name, "$url%")
+        }
+
+        return buildSequence {
             list.forEach {
                 yield(it)
             }
@@ -109,7 +181,9 @@ object EmojiRepository {
      *
      * @return Emoji given by shortname or null
      */
-    internal fun getEmojiByShortname(shortname: String) = ALL_EMOJIS.firstOrNull { it.shortname == shortname }
+    private suspend fun getEmojiByShortname(shortname: String): Emoji? = withContext(CommonPool) {
+        return@withContext db.emojiDao().loadAllCustomEmojis().firstOrNull()
+    }
 
     /**
      * Add an emoji to the Recents category.
@@ -117,40 +191,68 @@ object EmojiRepository {
     internal fun addToRecents(emoji: Emoji) {
         val emojiShortname = emoji.shortname
         val recentsJson = JSONObject(preferences.getString(PREF_EMOJI_RECENTS, "{}"))
+
         if (recentsJson.has(emojiShortname)) {
             val useCount = recentsJson.getInt(emojiShortname)
             recentsJson.put(emojiShortname, useCount + 1)
         } else {
             recentsJson.put(emojiShortname, 1)
         }
+
         preferences.edit().putString(PREF_EMOJI_RECENTS, recentsJson.toString()).apply()
     }
 
+    internal suspend fun getCustomEmojisAsync(): List<Emoji> {
+        return withContext(CommonPool) {
+            db.emojiDao().loadAllCustomEmojis().also {
+                this.customEmojis = it
+            }
+        }
+    }
+
+    internal fun getCustomEmojis(): List<Emoji> = customEmojis
+
     /**
      * Get all recently used emojis ordered by usage count.
      *
      * @return All recent emojis ordered by usage.
      */
-    internal fun getRecents(): List<Emoji> {
+    internal suspend fun getRecents(): List<Emoji> = withContext(CommonPool) {
         val list = mutableListOf<Emoji>()
         val recentsJson = JSONObject(preferences.getString(PREF_EMOJI_RECENTS, "{}"))
-        for (shortname in recentsJson.keys()) {
-            val emoji = getEmojiByShortname(shortname)
-            emoji?.let {
+
+        val allEmojis = db.emojiDao().loadAllEmojis()
+        val len = recentsJson.length()
+        val recentShortnames = recentsJson.keys()
+        for (i in 0 until len) {
+            val shortname = recentShortnames.next()
+            allEmojis.firstOrNull {
+                if (it.shortname == shortname) {
+                    if (it.isCustom()) {
+                        return@firstOrNull getCurrentServerUrl()?.let { url ->
+                            it.url?.startsWith(url)
+                        } ?: false
+                    }
+                    return@firstOrNull true
+                }
+                false
+            }?.let {
                 val useCount = recentsJson.getInt(it.shortname)
                 list.add(it.copy(count = useCount))
             }
         }
+
         list.sortWith(Comparator { o1, o2 ->
             o2.count - o1.count
         })
-        return list
+
+        return@withContext list
     }
 
     /**
      * Replace shortnames to unicode characters.
      */
-    fun shortnameToUnicode(input: CharSequence, removeIfUnsupported: Boolean): String {
+    fun shortnameToUnicode(input: CharSequence): String {
         val matcher = SHORTNAME_PATTERN.matcher(input)
         var result: String = input.toString()
 
@@ -163,7 +265,7 @@ object EmojiRepository {
         return result
     }
 
-    private fun loadEmojis(stream: InputStream): List<Emoji> {
+    private fun loadEmojis(stream: InputStream): MutableList<Emoji> {
         val emojisJSON = JSONArray(inputStreamToString(stream))
         val emojis = ArrayList<Emoji>(emojisJSON.length());
         for (i in 0 until emojisJSON.length()) {
@@ -211,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/EmojiCategory.kt

@@ -7,12 +7,17 @@ import chat.rocket.android.emoji.EmojiRepository
 import chat.rocket.android.emoji.EmojiTypefaceSpan
 import chat.rocket.android.emoji.R
 
-internal enum class EmojiCategory {
+enum class EmojiCategory {
     RECENTS {
         override fun resourceIcon() = R.drawable.ic_emoji_recents
 
         override fun textIcon() = getTextIconFor("\uD83D\uDD58")
     },
+    CUSTOM {
+        override fun resourceIcon() = R.drawable.ic_emoji_custom
+
+        override fun textIcon() = getTextIconFor("\uD83D\uDD58")
+    },
     PEOPLE() {
         override fun resourceIcon() = R.drawable.ic_emoji_people
 
@@ -65,4 +70,4 @@ internal enum class EmojiCategory {
             setSpan(span, 0, text.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE)
         }
     }
-}
\ No newline at end of file
+}

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

+package chat.rocket.android.emoji.internal
+
+import android.content.Context
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.load.engine.cache.ExternalPreferredCacheDiskCacheFactory
+import com.bumptech.glide.module.AppGlideModule
+
+@GlideModule
+class EmojiGlideModule : AppGlideModule() {
+
+    override fun applyOptions(context: Context, builder: GlideBuilder) {
+        builder.setDiskCache(ExternalPreferredCacheDiskCacheFactory(context))
+    }
+}

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

@@ -14,7 +14,9 @@ import chat.rocket.android.emoji.EmojiParser
 import chat.rocket.android.emoji.EmojiRepository
 import chat.rocket.android.emoji.Fitzpatrick
 import chat.rocket.android.emoji.R
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import kotlinx.android.synthetic.main.emoji_category_layout.view.*
+import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
 import kotlinx.android.synthetic.main.emoji_row_item.view.*
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.android.UI
@@ -43,22 +45,33 @@ internal class EmojiPagerAdapter(private val listener: EmojiKeyboardListener) :
 
             container.addView(view)
             launch(UI) {
+                val currentServerUrl = EmojiRepository.getCurrentServerUrl()
                 val emojis = if (category != EmojiCategory.RECENTS) {
-                    EmojiRepository.getEmojiSequenceByCategory(category)
+                    if (category == EmojiCategory.CUSTOM) {
+                        currentServerUrl?.let { url ->
+                            EmojiRepository.getEmojiSequenceByCategoryAndUrl(category, url)
+                        } ?: emptySequence()
+                    } else {
+                        EmojiRepository.getEmojiSequenceByCategory(category)
+                    }
                 } else {
                     sequenceOf(*EmojiRepository.getRecents().toTypedArray())
                 }
+
                 val recentEmojiSize = EmojiRepository.getRecents().size
                 text_no_recent_emoji.isVisible = category == EmojiCategory.RECENTS && recentEmojiSize == 0
+
                 if (adapters[category] == null) {
                     val adapter = EmojiAdapter(listener = listener)
                     emoji_recycler_view.adapter = adapter
                     adapters[category] = adapter
                     adapter.addEmojisFromSequence(emojis)
                 }
+
                 adapters[category]!!.setFitzpatrick(fitzpatrick)
             }
         }
+
         return view
     }
 
@@ -88,20 +101,24 @@ internal class EmojiPagerAdapter(private val listener: EmojiKeyboardListener) :
         private val listener: EmojiKeyboardListener
     ) : RecyclerView.Adapter<EmojiRowViewHolder>() {
 
+        private val CUSTOM = 1
+        private val NORMAL = 2
+        private val allEmojis = mutableListOf<Emoji>()
         private val emojis = mutableListOf<Emoji>()
 
-        fun addEmojis(emojis: List<Emoji>) {
-            this.emojis.clear()
-            this.emojis.addAll(emojis)
-            notifyDataSetChanged()
+        override fun getItemViewType(position: Int): Int {
+            return if (emojis[position].isCustom()) CUSTOM else NORMAL
         }
 
         suspend fun addEmojisFromSequence(emojiSequence: Sequence<Emoji>) {
             withContext(CommonPool) {
                 emojiSequence.forEachIndexed { index, emoji ->
                     withContext(UI) {
-                        emojis.add(emoji)
-                        notifyItemInserted(index)
+                        allEmojis.add(emoji)
+                        if (emoji.isDefault) {
+                            emojis.add(emoji)
+                            notifyItemInserted(emojis.size - 1)
+                        }
                     }
                 }
             }
@@ -115,12 +132,27 @@ internal class EmojiPagerAdapter(private val listener: EmojiKeyboardListener) :
         override fun onBindViewHolder(holder: EmojiRowViewHolder, position: Int) {
             val emoji = emojis[position]
             holder.bind(
-                emoji.siblings.find { it.fitzpatrick == fitzpatrick } ?: emoji
+                if (fitzpatrick != Fitzpatrick.Default) {
+                    emoji.siblings.find {
+                        it.endsWith("${fitzpatrick.type}:")
+                    }?.let { shortname ->
+                        allEmojis.firstOrNull {
+                            it.shortname == shortname
+                        }
+                    } ?: emoji
+                } else {
+                    emoji
+                }
             )
         }
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EmojiRowViewHolder {
-            val view = LayoutInflater.from(parent.context).inflate(R.layout.emoji_row_item, parent, false)
+            val inflater = LayoutInflater.from(parent.context)
+            val view = if (viewType == CUSTOM) {
+                inflater.inflate(R.layout.emoji_image_row_item, parent, false)
+            } else {
+                inflater.inflate(R.layout.emoji_row_item, parent, false)
+            }
             return EmojiRowViewHolder(view, listener)
         }
 
@@ -134,16 +166,26 @@ internal class EmojiPagerAdapter(private val listener: EmojiKeyboardListener) :
 
         fun bind(emoji: Emoji) {
             with(itemView) {
-                val parsedUnicode = unicodeCache[emoji.unicode]
-                emoji_view.setSpannableFactory(spannableFactory)
-                emoji_view.text = if (parsedUnicode == null) {
-                    EmojiParser.parse(emoji.unicode, spannableFactory).let {
-                        unicodeCache[emoji.unicode] = it
-                        it
+                if (emoji.unicode.isNotEmpty()) {
+                    // Handle simple emoji.
+                    val parsedUnicode = unicodeCache[emoji.unicode]
+                    emoji_view.setSpannableFactory(spannableFactory)
+                    emoji_view.text = if (parsedUnicode == null) {
+                        EmojiParser.parse(itemView.context, emoji.unicode, spannableFactory).let {
+                            unicodeCache[emoji.unicode] = it
+                            it
+                        }
+                    } else {
+                        parsedUnicode
                     }
                 } else {
-                    parsedUnicode
+                    // Handle custom emoji.
+                    GlideApp.with(context)
+                        .load(emoji.url)
+                        .diskCacheStrategy(DiskCacheStrategy.ALL)
+                        .into(emoji_image_view)
                 }
+
                 itemView.setOnClickListener {
                     listener.onEmojiAdded(emoji)
                 }
@@ -155,4 +197,4 @@ internal class EmojiPagerAdapter(private val listener: EmojiKeyboardListener) :
             private val unicodeCache = mutableMapOf<CharSequence, CharSequence>()
         }
     }
-}
\ No newline at end of file
+}

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

+package chat.rocket.android.emoji.internal
+
+import chat.rocket.android.emoji.Emoji
+
+fun Emoji.isCustom(): Boolean = this.url != null

emoji/src/main/java/chat/rocket/android/emoji/internal/db/EmojiDatabase.kt

+package chat.rocket.android.emoji.internal.db
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import chat.rocket.android.emoji.Emoji
+import chat.rocket.android.emoji.EmojiDao
+
+@Database(entities = [Emoji::class], version = 1)
+@TypeConverters(StringListConverter::class)
+abstract class EmojiDatabase : RoomDatabase() {
+
+    abstract fun emojiDao(): EmojiDao
+
+    companion object : SingletonHolder<EmojiDatabase, Context>({
+        Room.databaseBuilder(it.applicationContext,
+            EmojiDatabase::class.java, "emoji.db")
+            .fallbackToDestructiveMigration()
+            .build()
+    })
+}
+
+open class SingletonHolder<out T, in A>(creator: (A) -> T) {
+    private var creator: ((A) -> T)? = creator
+    @kotlin.jvm.Volatile
+    private var instance: T? = null
+
+    fun getInstance(arg: A): T {
+        val i = instance
+        if (i != null) {
+            return i
+        }
+
+        return synchronized(this) {
+            val i2 = instance
+            if (i2 != null) {
+                i2
+            } else {
+                val created = creator!!(arg)
+                instance = created
+                creator = null
+                created
+            }
+        }
+    }
+}

emoji/src/main/java/chat/rocket/android/emoji/internal/db/StringListConverter.kt

+package chat.rocket.android.emoji.internal.db
+
+import androidx.room.TypeConverter
+
+class StringListConverter {
+
+    @TypeConverter
+    fun fromStringList(list: List<String>?): String {
+        return list?.joinToString(separator = ",") ?: ""
+    }
+
+    @TypeConverter
+    fun fromString(value: String?): List<String> {
+        return value?.split(",") ?: emptyList()
+    }
+}

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>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_gravity="center">
+
+    <ImageView
+        android:id="@+id/emoji_image_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_gravity="center"
+        tools:src="@tools:sample/avatars" />
+</FrameLayout>

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>
\ No newline at end of file
+</LinearLayout>

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

@@ -2,10 +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="😀" />

emoji/src/main/res/values/dimens.xml

@@ -5,5 +5,6 @@
     <dimen name="supposed_keyboard_height">252dp</dimen>
     <dimen name="picker_popup_height">250dp</dimen>
     <dimen name="picker_popup_width">300dp</dimen>
-
-</resources>
\ No newline at end of file
+    <dimen name="custom_emoji_large">32dp</dimen>
+    <dimen name="custom_emoji_small">22dp</dimen>
+</resources>

gradle/wrapper/gradle-wrapper.properties

-#Fri May 18 17:08:16 IST 2018
+#Mon Aug 06 11:30:07 BRT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-rc-2-all.zip
-distributionSha256Sum=9bc16f929e5920a9a27fef22c65a8ab8140d705e418de0159ca6eb7f08a74200
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+distributionSha256Sum=39e2d5803bbd5eaf6c8efe07067b0e5a00235e8c71318642b2ed262920b27721

util/build.gradle

@@ -17,6 +17,11 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 }
 

util/src/main/java/chat/rocket/android/util/extension/Image.kt

 package chat.rocket.android.util.extension
 
+import android.content.Intent
 import android.graphics.Bitmap
+import android.provider.MediaStore
+import androidx.fragment.app.Fragment
 import kotlinx.coroutines.experimental.DefaultDispatcher
 import kotlinx.coroutines.experimental.withContext
 import java.io.ByteArrayInputStream
@@ -61,4 +64,18 @@ fun String.getCompressFormat(): Bitmap.CompressFormat {
         this.contains("webp") -> Bitmap.CompressFormat.WEBP
         else -> Bitmap.CompressFormat.PNG
     }
+}
+
+fun Fragment.dispatchImageSelection(requestCode: Int) {
+    val intent = Intent(Intent.ACTION_GET_CONTENT)
+    intent.type = "image/*"
+    intent.addCategory(Intent.CATEGORY_OPENABLE)
+    startActivityForResult(intent, requestCode)
+}
+
+fun Fragment.dispatchTakePicture(requestCode: Int) {
+    val takePictureIntent = Intent(MediaStore.ACTION_IMAGE_CAPTURE)
+    if (takePictureIntent.resolveActivity(context?.packageManager) != null) {
+        startActivityForResult(takePictureIntent, requestCode)
+    }
 }
\ No newline at end of file

wear/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion versions.buildTools
 
     defaultConfig {