Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into avatar_realtime_api

README.md

@@ -43,8 +43,8 @@ cd Rocket.Chat.Android/app
 
 ## Bug report & Feature request
 
-Are you having a technical issue trying to compile the app, or setting up Push Notifications? Please use our Community Support channel for that: https://forums.rocket.chat/c/community-support. The issues are only suppose to be used for bugs, improvements and features in the native Android application.
+Are you having a technical issue trying to compile the app, or setting up Push Notifications? Please use our Community Support channel for that: https://forums.rocket.chat/c/community-support. The issues are only supposed to be used for bugs, improvements, and features in the native Android application.
 
 ## Coding Style
 
-Please follow the official [Kotlin coding convections](https://kotlinlang.org/docs/reference/coding-conventions.html) when contributing.
+Please follow the official [Kotlin coding conventions](https://kotlinlang.org/docs/reference/coding-conventions.html) when contributing.

app/build.gradle

@@ -2,7 +2,9 @@ def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
 def isPlay = !(taskRequests.contains("Foss") || taskRequests.contains("foss"))
 
 apply plugin: 'com.android.application'
-if (isPlay) { apply plugin: 'io.fabric' }
+if (isPlay) {
+    apply plugin: 'io.fabric'
+}
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
@@ -16,13 +18,12 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2057
-        versionName "3.2.0"
+        versionCode 2065
+        versionName "3.4.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 {
@@ -30,6 +31,17 @@ android {
                 arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
             }
         }
+
+        // For Jitsi
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+        }
+
+        // For Jitsi
+        ndk {
+            abiFilters "armeabi-v7a", "x86"
+        }
     }
 
     signingConfigs {
@@ -73,7 +85,7 @@ android {
             dimension "type"
         }
 
-        // only foss
+        // only FOSS
         foss {
             dimension "type"
         }
@@ -83,6 +95,10 @@ android {
         exclude 'META-INF/core.kotlin_module'
         exclude 'META-INF/main.kotlin_module'
     }
+
+    lintOptions {
+        lintConfig file("src/main/res/xml/lint.xml")
+    }
 }
 
 dependencies {
@@ -96,7 +112,7 @@ dependencies {
     implementation project(':suggestions')
 
     implementation libraries.kotlin
-    implementation libraries.coroutines
+    implementation libraries.coroutinesCore
     implementation libraries.coroutinesAndroid
 
     implementation libraries.appCompat
@@ -123,6 +139,8 @@ dependencies {
     implementation libraries.viewmodelKtx
     implementation libraries.workmanager
 
+    implementation libraries.livedataKtx
+
     implementation libraries.rxKotlin
     implementation libraries.rxAndroid
 
@@ -133,25 +151,25 @@ dependencies {
     implementation libraries.timber
     implementation libraries.threeTenABP
 
+    kapt libraries.kotshiCompiler
+    implementation libraries.kotshiApi
+
     implementation libraries.fresco
     api libraries.frescoOkHttp
     implementation libraries.frescoAnimatedGif
     implementation libraries.frescoWebP
     implementation libraries.frescoAnimatedWebP
 
-    implementation libraries.glide
-    implementation libraries.glideTransformations
-
-    kapt libraries.kotshiCompiler
-    implementation libraries.kotshiApi
-
     implementation libraries.frescoImageViewer
 
     implementation libraries.markwon
 
     implementation libraries.aVLoadingIndicatorView
 
-    implementation libraries.livedataKtx
+    implementation libraries.glide
+    implementation libraries.glideTransformations
+
+    implementation(libraries.jitsi) { transitive = true }
 
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
@@ -159,8 +177,8 @@ dependencies {
     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 }
+    playImplementation('com.crashlytics.sdk.android:crashlytics:2.9.8@aar') { transitive = true }
+    playImplementation('com.crashlytics.sdk.android:answers:1.4.6@aar') { transitive = true }
 
     testImplementation libraries.junit
     testImplementation libraries.truth
@@ -168,12 +186,6 @@ dependencies {
     androidTestImplementation libraries.espressoIntents
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 androidExtensions {
     experimental = true
 }
@@ -181,8 +193,8 @@ 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) {
+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', sdk_location
     } else {
@@ -192,4 +204,4 @@ task compileSdk(type:Exec) {
 preBuild.dependsOn compileSdk
 if (isPlay) {
     apply plugin: 'com.google.gms.google-services'
-}
+}
\ No newline at end of file

app/schemas/chat.rocket.android.db.RCDatabase/11.json → app/schemas/chat.rocket.android.db.RCDatabase/13.json

 {
   "formatVersion": 1,
   "database": {
-    "version": 11,
-    "identityHash": "fb9f1c815809b0217d326452aeb34e92",
+    "version": 13,
+    "identityHash": "3bef73b44ae4edf2a74b48fd68f2c599",
     "entities": [
       {
         "tableName": "users",
@@ -59,7 +59,7 @@
       },
       {
         "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `parentId` TEXT, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
         "fields": [
           {
             "fieldPath": "id",
@@ -73,6 +73,12 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "type",
             "columnName": "type",
@@ -1013,7 +1019,7 @@
       },
       {
         "tableName": "reactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, `names` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "reaction",
@@ -1038,6 +1044,12 @@
             "columnName": "usernames",
             "affinity": "TEXT",
             "notNull": true
+          },
+          {
+            "fieldPath": "names",
+            "columnName": "names",
+            "affinity": "TEXT",
+            "notNull": true
           }
         ],
         "primaryKey": {
@@ -1099,7 +1111,7 @@
     ],
     "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, \"fb9f1c815809b0217d326452aeb34e92\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"3bef73b44ae4edf2a74b48fd68f2c599\")"
     ]
   }
 }
\ No newline at end of file

app/schemas/chat.rocket.android.db.RCDatabase/3.json

-{
-  "formatVersion": 1,
-  "database": {
-    "version": 3,
-    "identityHash": "06359a8c2943365dd094bc5dff210203",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      }
-    ],
-    "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, \"06359a8c2943365dd094bc5dff210203\")"
-    ]
-  }
-}
\ No newline at end of file

app/schemas/chat.rocket.android.db.RCDatabase/4.json

-{
-  "formatVersion": 1,
-  "database": {
-    "version": 4,
-    "identityHash": "e389d26bfb975f00c75dc6fc5d06d012",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      }
-    ],
-    "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, \"e389d26bfb975f00c75dc6fc5d06d012\")"
-    ]
-  }
-}
\ No newline at end of file

app/schemas/chat.rocket.android.db.RCDatabase/5.json

-{
-  "formatVersion": 1,
-  "database": {
-    "version": 5,
-    "identityHash": "47a0c30e2696ae09bc86df16cc37279d",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          },
-          {
-            "name": "index_chatrooms_lastMessageUserId",
-            "unique": false,
-            "columnNames": [
-              "lastMessageUserId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      }
-    ],
-    "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, \"47a0c30e2696ae09bc86df16cc37279d\")"
-    ]
-  }
-}
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -6,6 +6,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application
         android:name=".app.RocketChatApplication"
@@ -73,6 +75,11 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
+        <activity
+            android:name=".videoconference.ui.VideoConferenceActivity"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+
         <activity
             android:name=".chatroom.ui.ChatRoomActivity"
             android:theme="@style/AppTheme"
@@ -83,7 +90,7 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
-        <!-- TODO: Change to fragment-->
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />

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

-package chat.rocket.android.about.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 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
-
-    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_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 = BuildConfig.VERSION_NAME
-        text_build_number.text = getString(
-            R.string.msg_build, BuildConfig.VERSION_CODE,
-            BuildConfig.GIT_SHA, BuildConfig.FLAVOR
-        )
-    }
-
-    private fun setupToolbar() {
-        with((activity as MainActivity).toolbar) {
-            title = getString(R.string.title_about)
-            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-            setNavigationOnClickListener { activity?.onBackPressed() }
-        }
-    }
-
-    companion object {
-        fun newInstance() = AboutFragment()
-    }
-}

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

@@ -10,7 +10,7 @@ interface Analytics {
      * Logs the login event.
      *
      * @param event The [AuthenticationEvent] used to log in.
-     * @param loginSucceeded True if successful logged in, false otherwise.
+     * @param loginSucceeded True if logged in successfully, false otherwise.
      */
     fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {}
 
@@ -18,7 +18,7 @@ interface Analytics {
      * Logs the sign up event.
      *
      * @param event The [AuthenticationEvent] used to sign up.
-     * @param signUpSucceeded True if successful signed up, false otherwise.
+     * @param signUpSucceeded True if signed up successfully, false otherwise.
      */
     fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {}
 
@@ -71,4 +71,67 @@ interface Analytics {
      * @param resetPasswordSucceeded True if successful reset password, false otherwise.
      */
     fun logResetPassword(resetPasswordSucceeded: Boolean) {}
+
+    /**
+     * Logs the video conference event.
+     *
+     * @param event The [SubscriptionTypeEvent] to log.
+     * @param serverUrl The server URL to log.
+     */
+    fun logVideoConference(event: SubscriptionTypeEvent, serverUrl: String) {}
+
+    /**
+     * Logs the add reaction message action.
+     */
+    fun logMessageActionAddReaction() {}
+
+    /**
+     * Logs the replay message action.
+     */
+    fun logMessageActionReply() {}
+
+    /**
+     * Logs the quote message action.
+     */
+    fun logMessageActionQuote() {}
+
+    /**
+     * Logs the permalink message action.
+     */
+    fun logMessageActionPermalink() {}
+
+    /**
+     * Logs the copy message action.
+     */
+    fun logMessageActionCopy() {}
+
+    /**
+     * Logs the edit message action.
+     */
+    fun logMessageActionEdit() {}
+
+    /**
+     * Logs the info message action.
+     */
+    fun logMessageActionInfo() {}
+
+    /**
+     * Logs the star message action.
+     */
+    fun logMessageActionStar() {}
+
+    /**
+     * Logs the pin message action.
+     */
+    fun logMessageActionPin() {}
+
+    /**
+     * Logs the report message action.
+     */
+    fun logMessageActionReport() {}
+
+    /**
+     * Logs the delete message action.
+     */
+    fun logMessageActionDelete() {}
 }

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

@@ -76,4 +76,76 @@ class AnalyticsManager @Inject constructor(
             analytics.forEach { it.logResetPassword(resetPasswordSucceeded) }
         }
     }
+
+    fun logVideoConference(event: SubscriptionTypeEvent) {
+        if (analyticsTrackingInteractor.get() && serverUrl != null) {
+            analytics.forEach { it.logVideoConference(event, serverUrl) }
+        }
+    }
+
+    fun logMessageActionAddReaction() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionAddReaction() }
+        }
+    }
+
+    fun logMessageActionReply() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionReply() }
+        }
+    }
+
+    fun logMessageActionQuote() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionQuote() }
+        }
+    }
+
+    fun logMessageActionPermalink() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionPermalink() }
+        }
+    }
+
+    fun logMessageActionCopy() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionCopy() }
+        }
+    }
+
+    fun logMessageActionEdit() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionEdit() }
+        }
+    }
+
+    fun logMessageActionInfo() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionInfo() }
+        }
+    }
+
+    fun logMessageActionStar() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionStar() }
+        }
+    }
+
+    fun logMessageActionPin() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionPin() }
+        }
+    }
+
+    fun logMessageActionReport() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionReport() }
+        }
+    }
+
+    fun logMessageActionDelete() {
+        if (analyticsTrackingInteractor.get()) {
+            analytics.forEach { it.logMessageActionDelete() }
+        }
+    }
 }

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

@@ -27,4 +27,5 @@ sealed class ScreenViewEvent(val screenName: String) {
     object Preferences : ScreenViewEvent("PreferencesFragment")
     object Profile : ScreenViewEvent("ProfileFragment")
     object Settings : ScreenViewEvent("SettingsFragment")
+    object Directory : ScreenViewEvent("DirectoryFragment")
 }

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

@@ -3,15 +3,11 @@ package chat.rocket.android.app
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
-import chat.rocket.android.server.domain.GetAccountInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.common.RocketChatException
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.common.model.UserStatus
-import chat.rocket.core.internal.realtime.setTemporaryStatus
-import kotlinx.coroutines.experimental.launch
-import timber.log.Timber
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class AppLifecycleObserver @Inject constructor(
@@ -33,7 +29,7 @@ class AppLifecycleObserver @Inject constructor(
     }
 
     private fun changeTemporaryStatus(userStatus: UserStatus) {
-        launch {
+        GlobalScope.launch {
             serverInteractor.get()?.let { currentServer ->
                 factory.create(currentServer).setTemporaryStatus(userStatus)
             }

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

 import android.content.Context
 import chat.rocket.android.R
-import org.threeten.bp.*
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
+import org.threeten.bp.Period
+import org.threeten.bp.ZoneId
 import org.threeten.bp.format.DateTimeFormatter
 import org.threeten.bp.format.FormatStyle
 import org.threeten.bp.format.TextStyle
@@ -53,39 +58,39 @@ object DateTimeHelper {
         }
     }
 
-/**
- * Returns a time from a [LocalDateTime].
- *
- * @param localDateTime The [LocalDateTime].
- * @return The time from a [LocalDateTime].
- */
-fun getTime(localDateTime: LocalDateTime): String {
-    val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-    return localDateTime.toLocalTime().format(formatter).toString()
-}
+    /**
+     * Returns a time from a [LocalDateTime].
+     *
+     * @param localDateTime The [LocalDateTime].
+     * @return The time from a [LocalDateTime].
+     */
+    fun getTime(localDateTime: LocalDateTime): String {
+        val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+        return localDateTime.toLocalTime().format(formatter).toString()
+    }
 
-/**
- * Returns a date time from a [LocalDateTime].
- *
- * @param localDateTime The [LocalDateTime].
- * @return The time from a [LocalDateTime].
- */
-fun getDateTime(localDateTime: LocalDateTime): String {
-    return formatLocalDateTime(localDateTime)
-}
+    /**
+     * Returns a date time from a [LocalDateTime].
+     *
+     * @param localDateTime The [LocalDateTime].
+     * @return The time from a [LocalDateTime].
+     */
+    fun getDateTime(localDateTime: LocalDateTime): String {
+        return formatLocalDateTime(localDateTime)
+    }
 
-private fun formatLocalDateTime(localDateTime: LocalDateTime): String {
-    val formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
-    return localDateTime.format(formatter).toString()
-}
+    private fun formatLocalDateTime(localDateTime: LocalDateTime): String {
+        val formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
+        return localDateTime.format(formatter).toString()
+    }
 
-private fun formatLocalDate(localDate: LocalDate): String {
-    val formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
-    return localDate.format(formatter).toString()
-}
+    private fun formatLocalDate(localDate: LocalDate): String {
+        val formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
+        return localDate.format(formatter).toString()
+    }
 
-private fun formatLocalTime(localTime: LocalTime): String {
-    val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-    return localTime.format(formatter).toString()
-}
+    private fun formatLocalTime(localTime: LocalTime): String {
+        val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+        return localTime.format(formatter).toString()
+    }
 }
\ No newline at end of file

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

 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.view.View
+import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
-import android.widget.TextView
 import chat.rocket.android.R
 import chat.rocket.common.model.UserStatus
 
@@ -43,7 +44,7 @@ object DrawableHelper {
     /**
      * Tints an array of Drawable.
      *
-     * REMARK: you MUST always wrap the array of Drawable before tint it.
+     * REMARK: you MUST always wrap the array of Drawable before tinting it.
      *
      * @param drawables The array of Drawable to tint.
      * @param context The context.
@@ -60,7 +61,7 @@ object DrawableHelper {
     /**
      * Tints a Drawable.
      *
-     * REMARK: you MUST always wrap the Drawable before tint it.
+     * REMARK: you MUST always wrap the Drawable before tinting it.
      *
      * @param drawable The Drawable to tint.
      * @param context The context.
@@ -72,33 +73,74 @@ object DrawableHelper {
         DrawableCompat.setTint(drawable, ContextCompat.getColor(context, resId))
 
     /**
-     * Compounds an array of Drawable (to appear to the left of the text) into an array of TextView.
+     * Compounds an array of Drawable (to appear on the start side of a text) into an array of TextView.
      *
-     * REMARK: the number of elements in both array of Drawable and EditText MUST be equal.
+     * REMARK: the number of elements in both arrays of Drawable and TextView MUST be equal.
      *
      * @param textView The array of TextView.
      * @param drawables The array of Drawable.
-     * @see compoundDrawable
+     * @see compoundStartDrawable
      */
     fun compoundDrawables(textView: Array<TextView>, drawables: Array<Drawable>) {
         if (textView.size != drawables.size) {
             return
         } else {
             for (i in textView.indices) {
-                textView[i].setCompoundDrawablesWithIntrinsicBounds(drawables[i], null, null, null)
+                if (textView[i].resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+                    textView[i].setCompoundDrawablesWithIntrinsicBounds(null, null, drawables[i], null)
+                } else {
+                    textView[i].setCompoundDrawablesWithIntrinsicBounds(drawables[i], null, null, null)
+                }
             }
         }
     }
 
     /**
-     * Compounds a Drawable (to appear to the left of the text) into a TextView.
+     * Compounds a Drawable (to appear on the start side of a text) into a TextView.
      *
      * @param textView The TextView.
      * @param drawable The Drawable.
      * @see compoundDrawables
      */
-    fun compoundDrawable(textView: TextView, drawable: Drawable) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+    fun compoundStartDrawable(textView: TextView, drawable: Drawable) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        }
+
+    /**
+     * Compounds a Drawable (to appear on the end side of a text) into a TextView.
+     *
+     * @param textView The TextView.
+     * @param drawable The Drawable.
+     * @see compoundStartDrawable
+     */
+    fun compoundEndDrawable(textView: TextView, drawable: Drawable) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+        }
+
+    /**
+     * Compounds a Drawable (to appear on the start and end side of a text) into a TextView.
+     *
+     * @param textView The TextView.
+     * @param startDrawable The start Drawable.
+     * @param endDrawable The end Drawable.
+     * @see compoundStartDrawable
+     */
+    fun compoundStartAndEndDrawable(
+        textView: TextView,
+        startDrawable: Drawable,
+        endDrawable: Drawable
+    ) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(endDrawable, null, startDrawable, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(startDrawable, null, endDrawable, null)
+        }
 
     /**
      * Returns the user status drawable.
@@ -116,4 +158,4 @@ object DrawableHelper {
             else -> getDrawableFromId(R.drawable.ic_status_invisible_12dp, context)
         }
     }
-}
\ No newline at end of file
+}

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

@@ -24,7 +24,7 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.SITE_URL
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.android.util.setupFabric
 import chat.rocket.common.RocketChatException
@@ -37,7 +37,8 @@ import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
 import dagger.android.HasBroadcastReceiverInjector
 import dagger.android.HasServiceInjector
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -114,7 +115,7 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         // TODO - remove this
         checkCurrentServer()
 
-        // TODO - FIXME - we need to proper inject the EmojiRepository and initialize it properly
+        // TODO - FIXME - we need to properly inject and initialize the EmojiRepository
         loadEmojis()
     }
 
@@ -174,8 +175,8 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         EmojiRepository.init(this)
         val currentServer = getCurrentServerInteractor.get()
         currentServer?.let { server ->
-            launch {
-                val client = factory.create(server)
+            GlobalScope.launch {
+                val client = factory.get(server)
                 EmojiRepository.setCurrentServerUrl(server)
                 val customEmojiList = mutableListOf<Emoji>()
                 try {

app/src/main/java/chat/rocket/android/authentication/di/AuthenticationModule.kt

@@ -7,7 +7,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
+import kotlinx.coroutines.Job
 
 @Module
 class AuthenticationModule {

app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesMultiServerTokenRepository.kt → app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesMultiServerTokenRepository.kt

-package chat.rocket.android.authentication.infraestructure
+package chat.rocket.android.authentication.infrastructure
 
 import chat.rocket.android.authentication.domain.model.TokenModel
 import chat.rocket.android.dagger.scope.PerActivity
@@ -8,19 +8,16 @@ import chat.rocket.android.server.domain.MultiServerTokenRepository
 import com.squareup.moshi.Moshi
 
 @PerActivity
-class SharedPreferencesMultiServerTokenRepository(private val repository: LocalRepository,
-                                                  private val moshi: Moshi
+class SharedPreferencesMultiServerTokenRepository(
+    private val repository: LocalRepository,
+    private val moshi: Moshi
 ) : MultiServerTokenRepository {
 
     override fun get(server: String): TokenModel? {
         val token = repository.get("$TOKEN_KEY$server")
         val adapter = moshi.adapter<TokenModel>(TokenModel::class.java)
 
-        token?.let {
-            return adapter.fromJson(token)
-        }
-
-        return null
+        return token?.let { adapter.fromJson(it) }
     }
 
     override fun save(server: String, token: TokenModel) {

app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesTokenRepository.kt → app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesTokenRepository.kt

-package chat.rocket.android.authentication.infraestructure
+package chat.rocket.android.authentication.infrastructure
 
 import android.content.SharedPreferences
 import androidx.core.content.edit

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

@@ -15,8 +15,9 @@ import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.isLdapAuthenticationEnabled
 import chat.rocket.android.server.domain.isPasswordResetEnabled
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.siteName
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.isEmail
@@ -50,6 +51,7 @@ class LoginPresenter @Inject constructor(
 ) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
     private var currentServer = serverInteractor.get()!!
+    private val token = tokenRepository.get(currentServer)
     private lateinit var client: RocketChatClient
     private lateinit var settings: PublicSettings
 
@@ -60,7 +62,7 @@ class LoginPresenter @Inject constructor(
 
     private fun setupConnectionInfo(serverUrl: String) {
         currentServer = serverUrl
-        client = factory.create(currentServer)
+        client = factory.get(currentServer)
         settings = settingsInteractor.get(currentServer)
     }
 
@@ -85,20 +87,20 @@ class LoginPresenter @Inject constructor(
                     }
                 }
                 val myself = retryIO("me()") { client.me() }
-                if (myself.username != null) {
+                myself.username?.let { username ->
                     val user = User(
                         id = myself.id,
                         roles = myself.roles,
                         status = myself.status,
                         name = myself.name,
                         emails = myself.emails?.map { Email(it.address ?: "", it.verified) },
-                        username = myself.username,
+                        username = username,
                         utcOffset = myself.utcOffset
                     )
                     localRepository.saveCurrentUser(currentServer, user)
                     saveCurrentServer.save(currentServer)
-                    localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, myself.username)
-                    saveAccount(myself.username!!)
+                    localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, username)
+                    saveAccount(username)
                     saveToken(token)
                     analyticsManager.logLogin(
                         AuthenticationEvent.AuthenticationWithUserAndPassword,
@@ -133,15 +135,22 @@ class LoginPresenter @Inject constructor(
 
     fun forgotPassword() = navigator.toForgotPassword()
 
-    private suspend fun saveAccount(username: String) {
+    private fun saveAccount(username: String) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)
         }
         val logo = settings.wideTile()?.let {
             currentServer.serverLogoUrl(it)
         }
-        val thumb = currentServer.avatarUrl(username)
-        val account = Account(currentServer, icon, logo, username, thumb)
+        val thumb = currentServer.avatarUrl(username, token?.userId, token?.authToken)
+        val account = Account(
+            settings.siteName() ?: currentServer,
+            currentServer,
+            icon,
+            logo,
+            username,
+            thumb
+        )
         saveAccountInteractor.save(account)
     }
 

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

@@ -39,11 +39,9 @@ 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
 
-fun newInstance(serverName: String): Fragment {
-    return LoginFragment().apply {
-        arguments = Bundle(1).apply {
-            putString(SERVER_NAME, serverName)
-        }
+fun newInstance(serverName: String): Fragment = LoginFragment().apply {
+    arguments = Bundle(1).apply {
+        putString(SERVER_NAME, serverName)
     }
 }
 
@@ -59,9 +57,8 @@ class LoginFragment : Fragment(), LoginView {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
 
-        val bundle = arguments
-        if (bundle != null) {
-            serverName = bundle.getString(SERVER_NAME)
+        arguments?.run {
+            serverName = getString(SERVER_NAME)
         }
     }
 
@@ -93,7 +90,7 @@ class LoginFragment : Fragment(), LoginView {
                             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))
+                    REQUEST_CODE_FOR_SAVE_RESOLUTION -> showMessage(getString(R.string.msg_credentials_saved_successfully))
                 }
             }
         }
@@ -150,7 +147,7 @@ class LoginFragment : Fragment(), LoginView {
     override fun showGenericErrorMessage() = showMessage(R.string.msg_generic_error)
 
     private fun setupOnClickListener() =
-        ui { _ ->
+        ui {
             button_log_in.setOnClickListener {
                 presenter.authenticateWithUserAndPassword(
                     text_username_or_email.textContent,
@@ -160,7 +157,7 @@ class LoginFragment : Fragment(), LoginView {
         }
 
     override fun showForgotPasswordView() {
-        ui { _ ->
+        ui {
             button_forgot_your_password.isVisible = true
             button_forgot_your_password.setOnClickListener { presenter.forgotPassword() }
 

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

@@ -14,8 +14,9 @@ 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.siteName
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.serverLogoUrl
@@ -31,8 +32,7 @@ import chat.rocket.core.internal.rest.loginWithCas
 import chat.rocket.core.internal.rest.loginWithOauth
 import chat.rocket.core.internal.rest.loginWithSaml
 import chat.rocket.core.internal.rest.me
-import kotlinx.coroutines.experimental.delay
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.delay
 import javax.inject.Inject
 
 private const val TYPE_LOGIN_OAUTH = 1
@@ -55,6 +55,7 @@ class LoginOptionsPresenter @Inject constructor(
 ) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
     private var currentServer = serverInteractor.get()!!
+    private val token = tokenRepository.get(currentServer)
     private lateinit var client: RocketChatClient
     private lateinit var settings: PublicSettings
     private lateinit var credentialToken: String
@@ -109,11 +110,11 @@ class LoginOptionsPresenter @Inject constructor(
                     when (loginType) {
                         TYPE_LOGIN_OAUTH -> client.loginWithOauth(credentialToken, credentialSecret)
                         TYPE_LOGIN_CAS -> {
-                            delay(3, TimeUnit.SECONDS)
+                            delay(3000)
                             client.loginWithCas(credentialToken)
                         }
                         TYPE_LOGIN_SAML -> {
-                            delay(3, TimeUnit.SECONDS)
+                            delay(3000)
                             client.loginWithSaml(credentialToken)
                         }
                         TYPE_LOGIN_DEEP_LINK -> {
@@ -170,19 +171,26 @@ class LoginOptionsPresenter @Inject constructor(
 
     private fun setupConnectionInfo(serverUrl: String) {
         currentServer = serverUrl
-        client = factory.create(currentServer)
+        client = factory.get(currentServer)
         settings = settingsInteractor.get(currentServer)
     }
 
-    private suspend fun saveAccount(username: String) {
+    private fun saveAccount(username: String) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)
         }
         val logo = settings.wideTile()?.let {
             currentServer.serverLogoUrl(it)
         }
-        val thumb = currentServer.avatarUrl(username)
-        val account = Account(currentServer, icon, logo, username, thumb)
+        val thumb = currentServer.avatarUrl(username, token?.userId, token?.authToken)
+        val account = Account(
+            settings.siteName() ?: currentServer,
+            currentServer,
+            icon,
+            logo,
+            username,
+            thumb
+        )
         saveAccountInteractor.save(account)
     }
 

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

@@ -25,18 +25,18 @@ interface LoginOptionsView : LoadingView, MessageView {
     fun setupFacebookButtonListener(facebookOauthUrl: String, state: String)
 
     /**
-     * Shows the "login by Github" view if it is enabled by the server settings.
+     * Shows the "login by GitHub" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Github button listener before enabling it
+     * REMARK: We must set up the GitHub button listener before enabling it
      * [setupGithubButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByGithub()
 
     /**
-     * Setups the Github button.
+     * Setups the GitHub button.
      *
-     * @param githubUrl The Github OAuth URL to authenticate with.
+     * @param githubUrl The GitHub OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
@@ -61,36 +61,36 @@ interface LoginOptionsView : LoadingView, MessageView {
     fun setupGoogleButtonListener(googleUrl: String, state: String)
 
     /**
-     * Shows the "login by Linkedin" view if it is enabled by the server settings.
+     * Shows the "login by LinkedIn" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Linkedin button listener before enabling it
+     * REMARK: We must set up the LinkedIn button listener before enabling it
      * [setupLinkedinButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByLinkedin()
 
     /**
-     * Setups the Linkedin button.
+     * Setups the LinkedIn button.
      *
-     * @param linkedinUrl The Linkedin OAuth URL to authenticate with.
+     * @param linkedinUrl The LinkedIn OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
     fun setupLinkedinButtonListener(linkedinUrl: String, state: String)
 
     /**
-     * Shows the "login by Gitlab" view if it is enabled by the server settings.
+     * Shows the "login by GitLab" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Gitlab button listener before enabling it
+     * REMARK: We must set up the GitLab button listener before enabling it
      * [setupGitlabButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByGitlab()
 
     /**
-     * Setups the Gitlab button.
+     * Setups the GitLab button.
      *
-     * @param gitlabUrl The Gitlab OAuth URL to authenticate with.
+     * @param gitlabUrl The GitLab OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
@@ -99,7 +99,7 @@ interface LoginOptionsView : LoadingView, MessageView {
     /**
      * Shows the "login by WordPress" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Gitlab button listener before enabling it [setupWordpressButtonListener].
+     * REMARK: We must set up the GitLab button listener before enabling it [setupWordpressButtonListener].
      */
     fun enableLoginByWordpress()
 

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

@@ -7,11 +7,11 @@ import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
 import chat.rocket.android.server.domain.SaveConnectingServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.launchUI
-import kotlinx.coroutines.experimental.DefaultDispatcher
-import kotlinx.coroutines.experimental.withContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 class OnBoardingPresenter @Inject constructor(
@@ -19,7 +19,7 @@ class OnBoardingPresenter @Inject constructor(
     private val strategy: CancelStrategy,
     private val navigator: AuthenticationNavigator,
     private val serverInteractor: SaveConnectingServerInteractor,
-    private val refreshSettingsInteractor: RefreshSettingsInteractor,
+    refreshSettingsInteractor: RefreshSettingsInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
     val settingsInteractor: GetSettingsInteractor,
     val factory: RocketChatClientFactory
@@ -80,7 +80,7 @@ class OnBoardingPresenter @Inject constructor(
             }
             view.showLoading()
             try {
-                withContext(DefaultDispatcher) {
+                withContext(Dispatchers.Default) {
                     setupConnectionInfo(serverUrl)
 
                     // preparing next fragment before showing it

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

@@ -12,8 +12,9 @@ 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.siteName
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.serverLogoUrl
@@ -38,8 +39,9 @@ class RegisterUsernamePresenter @Inject constructor(
     val settingsInteractor: GetSettingsInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(currentServer)
-    private var settings: PublicSettings = settingsInteractor.get(serverInteractor.get()!!)
+    private val client: RocketChatClient = factory.get(currentServer)
+    private var settings: PublicSettings = settingsInteractor.get(currentServer)
+    private val token = tokenRepository.get(currentServer)
 
     fun registerUsername(username: String, userId: String, authToken: String) {
         launchUI(strategy) {
@@ -72,15 +74,22 @@ class RegisterUsernamePresenter @Inject constructor(
         }
     }
 
-    private suspend fun saveAccount(username: String) {
+    private fun saveAccount(username: String) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)
         }
         val logo = settings.wideTile()?.let {
             currentServer.serverLogoUrl(it)
         }
-        val thumb = currentServer.avatarUrl(username)
-        val account = Account(currentServer, icon, logo, username, thumb)
+        val thumb = currentServer.avatarUrl(username, token?.userId, token?.authToken)
+        val account = Account(
+            settings.siteName() ?: currentServer,
+            currentServer,
+            icon,
+            logo,
+            username,
+            thumb
+        )
         saveAccountInteractor.save(account)
     }
 }
\ No newline at end of file

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

@@ -31,12 +31,10 @@ import javax.inject.Inject
 private const val BUNDLE_USER_ID = "user_id"
 private const val BUNDLE_AUTH_TOKEN = "auth_token"
 
-fun newInstance(userId: String, authToken: String): Fragment {
-    return RegisterUsernameFragment().apply {
-        arguments = Bundle(2).apply {
-            putString(BUNDLE_USER_ID, userId)
-            putString(BUNDLE_AUTH_TOKEN, authToken)
-        }
+fun newInstance(userId: String, authToken: String): Fragment = RegisterUsernameFragment().apply {
+    arguments = Bundle(2).apply {
+        putString(BUNDLE_USER_ID, userId)
+        putString(BUNDLE_AUTH_TOKEN, authToken)
     }
 }
 
@@ -53,13 +51,10 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
 
-        val bundle = arguments
-        if (bundle != null) {
-            userId = bundle.getString(BUNDLE_USER_ID)
-            authToken = bundle.getString(BUNDLE_AUTH_TOKEN)
-        } else {
-            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
-        }
+        arguments?.run {
+            userId = getString(BUNDLE_USER_ID, "")
+            authToken = getString(BUNDLE_AUTH_TOKEN, "")
+        } ?: requireNotNull(arguments) { "no arguments supplied when the fragment was instantiated" }
     }
 
     override fun onCreateView(
@@ -145,7 +140,7 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
             val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_20dp, it)
             DrawableHelper.wrapDrawable(atDrawable)
             DrawableHelper.tintDrawable(atDrawable, it, R.color.colorDrawableTintGrey)
-            DrawableHelper.compoundDrawable(text_username, atDrawable)
+            DrawableHelper.compoundStartDrawable(text_username, atDrawable)
         }
     }
 

app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionViewHolder.kt

 package chat.rocket.android.chatdetails.adapter
 
-import android.content.Context
+import DrawableHelper
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView