Merge pull request #1905 from RocketChat/feat-user-details-screen

[FIX] Some usability adjustments

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

@@ -75,6 +75,7 @@ class MessageViewHolder(
 
             val senderId = data.message.sender?.id
             val subscriptionId = data.subscriptionId
+
             text_sender.setOnClickListener {
                 toUserDetails(context, senderId, subscriptionId)
             }

app/src/main/java/chat/rocket/android/db/UserDao.kt

@@ -29,7 +29,7 @@ abstract class UserDao : BaseDao<UserEntity> {
     abstract fun findUser(id: String): String?
 
     @Query("SELECT * FROM users WHERE ID = :id")
-    abstract fun getUser(id:String): UserEntity?
+    abstract fun getUser(id: String): UserEntity?
 
     @Transaction
     open fun upsert(user: BaseUserEntity) {

app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt

@@ -2,7 +2,6 @@ package chat.rocket.android.userdetails.presentation
 
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
@@ -10,8 +9,8 @@ import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
+import chat.rocket.common.model.userStatusOf
 import chat.rocket.core.internal.rest.createDirectMessage
-import chat.rocket.core.internal.rest.spotlight
 import chat.rocket.core.model.ChatRoom
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.withContext
@@ -23,13 +22,11 @@ class UserDetailsPresenter @Inject constructor(
     private val dbManager: DatabaseManager,
     private val strategy: CancelStrategy,
     serverInteractor: GetConnectingServerInteractor,
-    factory: ConnectionManagerFactory,
-    userHelper: UserHelper
+    factory: ConnectionManagerFactory
 ) {
     private var currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
-    private val currentUserId = userHelper.user()?.id
 
     fun loadUserDetails(userId: String) {
         launchUI(strategy) {
@@ -39,54 +36,41 @@ class UserDetailsPresenter @Inject constructor(
                 }
 
                 user?.let { u ->
-                    val localDMs = chatRoomByName(name = u.name)
+                    val openedChatRooms = chatRoomByName(name = u.name)
                     val avatarUrl = u.username?.let { currentServer.avatarUrl(avatar = it) }
 
-                    val chatRoom: ChatRoom? = if (localDMs.isEmpty()) {
-                        val query = u.username!!
-                        val spotlightResult = retryIO("spotlight($query)") {
-                            client.spotlight(query = query)
-                        }
+                    val chatRoom: ChatRoom? = if (openedChatRooms.isEmpty()) {
+                        ChatRoom(
+                            id = "",
+                            type = roomTypeOf(RoomType.DIRECT_MESSAGE),
+                            name = u.username ?: u.name.orEmpty(),
+                            fullName = u.name,
+                            favorite = false,
+                            open = false,
+                            alert = false,
+                            status = userStatusOf(u.status),
+                            client = client,
+                            broadcast = false,
+                            archived = false,
+                            default = false,
+                            description = null,
+                            groupMentions = null,
+                            userMentions = null,
+                            lastMessage = null,
+                            lastSeen = null,
+                            topic = null,
+                            announcement = null,
+                            roles = null,
+                            unread = 0,
+                            readonly = false,
+                            muted = null,
+                            subscriptionId = "",
+                            timestamp = null,
+                            updatedAt = null,
+                            user = null
+                        )
+                    } else openedChatRooms.firstOrNull()
 
-                        val matchFromSpotlight = spotlightResult.users.firstOrNull { it.username == query }
-
-                        if (matchFromSpotlight != null) {
-                            val result = retryIO("createDirectMessage(${matchFromSpotlight.id}") {
-                                client.createDirectMessage(username = matchFromSpotlight.id)
-                            }
-                            with(matchFromSpotlight) {
-                                ChatRoom(
-                                    id = result.id,
-                                    type = roomTypeOf(RoomType.DIRECT_MESSAGE),
-                                    name = u.username ?: u.name.orEmpty(),
-                                    fullName = u.name,
-                                    favorite = false,
-                                    open = false,
-                                    alert = false,
-                                    status = status,
-                                    client = client,
-                                    broadcast = false,
-                                    archived = false,
-                                    default = false,
-                                    description = null,
-                                    groupMentions = null,
-                                    userMentions = null,
-                                    lastMessage = null,
-                                    lastSeen = null,
-                                    topic = null,
-                                    announcement = null,
-                                    roles = null,
-                                    unread = 0,
-                                    readonly = false,
-                                    muted = null,
-                                    subscriptionId = "",
-                                    timestamp = null,
-                                    updatedAt = null,
-                                    user = null
-                                )
-                            }
-                        } else null
-                    } else localDMs.firstOrNull()
                     view.showUserDetails(
                         avatarUrl = avatarUrl,
                         username = u.username,
@@ -102,10 +86,54 @@ class UserDetailsPresenter @Inject constructor(
         }
     }
 
-    fun createDirectMessage(username: String) {
+    fun createDirectMessage(id: String) = launchUI(strategy) {
+        try {
+            val result = retryIO("createDirectMessage($id") {
+                client.createDirectMessage(username = id)
+            }
 
-    }
+            val userEntity = withContext(CommonPool) {
+                dbManager.userDao().getUser(id = id)
+            }
 
+            if (userEntity != null) {
+                view.toDirectMessage(
+                    chatRoom = ChatRoom(
+                        id = result.id,
+                        type = roomTypeOf(RoomType.DIRECT_MESSAGE),
+                        name = userEntity.username ?: userEntity.name.orEmpty(),
+                        fullName = userEntity.name,
+                        favorite = false,
+                        open = false,
+                        alert = false,
+                        status = userStatusOf(userEntity.status),
+                        client = client,
+                        broadcast = false,
+                        archived = false,
+                        default = false,
+                        description = null,
+                        groupMentions = null,
+                        userMentions = null,
+                        lastMessage = null,
+                        lastSeen = null,
+                        topic = null,
+                        announcement = null,
+                        roles = null,
+                        unread = 0,
+                        readonly = false,
+                        muted = null,
+                        subscriptionId = "",
+                        timestamp = null,
+                        updatedAt = result.updatedAt,
+                        user = null
+                    )
+                )
+            }
+        } catch (ex: Exception) {
+            Timber.e(ex)
+            view.onOpenDirectMessageError()
+        }
+    }
     private suspend fun chatRoomByName(name: String? = null): List<ChatRoom> = withContext(CommonPool) {
         return@withContext dbManager.chatRoomDao().getAllSync().filter {
             if (name == null) {
@@ -145,5 +173,4 @@ class UserDetailsPresenter @Inject constructor(
             }
         }
     }
-
 }

app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt

@@ -5,4 +5,8 @@ import chat.rocket.core.model.ChatRoom
 interface UserDetailsView {
 
     fun showUserDetails(avatarUrl: String?, username: String?, name: String?, utcOffset: Float?, status: String, chatRoom: ChatRoom?)
+
+    fun toDirectMessage(chatRoom: ChatRoom)
+
+    fun onOpenDirectMessageError()
 }

app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsActivity.kt

@@ -16,16 +16,20 @@ import chat.rocket.android.userdetails.presentation.UserDetailsView
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extension.orFalse
 import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.retryIO
 import chat.rocket.common.model.roomTypeOf
+import chat.rocket.core.internal.rest.createDirectMessage
 import chat.rocket.core.model.ChatRoom
 import chat.rocket.core.model.userId
 import com.bumptech.glide.Glide
 import com.bumptech.glide.Priority
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.CenterInside
 import com.bumptech.glide.load.resource.bitmap.FitCenter
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
+import com.google.android.material.snackbar.Snackbar
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -62,6 +66,7 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
     lateinit var presenter: UserDetailsPresenter
 
     private lateinit var subscriptionId: String
+    private lateinit var userId: String
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -69,7 +74,7 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         setContentView(R.layout.activity_user_details)
         setupToolbar()
 
-        val userId = intent.getStringExtra(EXTRA_USER_ID)
+        userId = intent.getStringExtra(EXTRA_USER_ID)
         subscriptionId = intent.getStringExtra(EXTRA_SUBSCRIPTION_ID)
         showLoadingView(true)
         presenter.loadUserDetails(userId = userId)
@@ -95,45 +100,67 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         text_view_username.text = username
         text_view_status.text = status.capitalize()
 
-        launch(UI) {
-            val image = withContext(CommonPool) {
-                val requestOptions = RequestOptions()
-                    .priority(Priority.IMMEDIATE)
-                    .transforms(CenterInside(), FitCenter())
-
-                return@withContext GlideApp.with(this@UserDetailsActivity)
-                    .asBitmap()
-                    .load(avatarUrl)
-                    .apply(requestOptions)
-                    .submit()
-                    .get().also { showLoadingView(false) }
+        try {
+            launch(UI) {
+                val image = withContext(CommonPool) {
+                    try {
+                        val requestOptions = RequestOptions()
+                            .priority(Priority.IMMEDIATE)
+                            .transforms(CenterInside(), FitCenter())
+
+                        return@withContext GlideApp.with(this@UserDetailsActivity)
+                            .asBitmap()
+                            .diskCacheStrategy(DiskCacheStrategy.ALL)
+                            .load(avatarUrl)
+                            .apply(requestOptions)
+                            .submit()
+                            .get()
+                    } catch (ex: Exception) {
+                        Timber.e(ex)
+                        return@withContext null
+                    } finally {
+                        showLoadingView(false)
+                    }
+                }
+
+                image?.let {
+                    val blurredBitmap = image.blurred(context = this@UserDetailsActivity,
+                        newWidth = toolbar.measuredWidth, newHeight = toolbar.measuredHeight)
+                    toolbar.background = BitmapDrawable(resources, blurredBitmap)
+                    GlideApp.with(this@UserDetailsActivity)
+                        .asBitmap()
+                        .transforms(RoundedCorners(25), CenterCrop())
+                        .load(image)
+                        .into(image_view_avatar)
+                }
             }
 
-            val blurredBitmap = image.blurred(context = this@UserDetailsActivity,
-                newWidth = toolbar.measuredWidth, newHeight =  toolbar.measuredHeight)
-            toolbar.background = BitmapDrawable(resources, blurredBitmap)
-            GlideApp.with(this@UserDetailsActivity)
-                .asBitmap()
-                .transforms(RoundedCorners(25), CenterCrop())
-                .load(avatarUrl)
-                .into(image_view_avatar)
-        }
-
-        utcOffset?.let {
-            val offsetLong = it.roundToLong()
-            val offset = if (it > 0) "+$offsetLong" else offsetLong.toString()
-            val formatter = DateTimeFormatter.ofPattern("'(GMT$offset)' hh:mm a")
-            val zoneId = ZoneId.systemDefault()
-            val timeNow = OffsetDateTime.now(ZoneOffset.UTC).plusHours(offsetLong).toLocalDateTime()
-            text_view_tz.text = formatter.format(ZonedDateTime.of(timeNow, zoneId))
-        }
+            utcOffset?.let {
+                val offsetLong = it.roundToLong()
+                val offset = if (it > 0) "+$offsetLong" else offsetLong.toString()
+                val formatter = DateTimeFormatter.ofPattern("'(GMT$offset)' hh:mm a")
+                val zoneId = ZoneId.systemDefault()
+                val timeNow = OffsetDateTime.now(ZoneOffset.UTC).plusHours(offsetLong).toLocalDateTime()
+                text_view_tz.text = formatter.format(ZonedDateTime.of(timeNow, zoneId))
+            }
 
-        text_view_message.setOnClickListener {
-            toDirectMessage(chatRoom = chatRoom)
-        }
+            text_view_message.setOnClickListener {
+                if (chatRoom == null) {
+                    presenter.createDirectMessage(id = userId)
+                } else {
+                    toDirectMessage(chatRoom)
+                }
+            }
 
-        image_view_message.setOnClickListener {
-            toDirectMessage(chatRoom = chatRoom)
+            image_view_message.setOnClickListener {
+                if (chatRoom == null) {
+                    presenter.createDirectMessage(id = userId)
+                } else {
+                    toDirectMessage(chatRoom)
+                }
+            }
+        } catch (ex: Exception) {
+            Timber.e(ex)
         }
     }
 
@@ -144,23 +171,28 @@ class UserDetailsActivity : AppCompatActivity(), UserDetailsView, HasSupportFrag
         }
     }
 
-    private fun toDirectMessage(chatRoom: ChatRoom?) {
-        chatRoom?.let { c ->
-            finish()
-            if (c.subscriptionId.isEmpty() || c.subscriptionId != subscriptionId) {
-                startActivity(
-                    chatRoomIntent(
-                        chatRoomId = c.id,
-                        chatRoomName = c.name,
-                        chatRoomType = c.type.toString(),
-                        isReadOnly = c.readonly.orFalse(),
-                        chatRoomLastSeen = c.lastSeen ?: 0,
-                        isSubscribed = c.open,
-                        isCreator = false,
-                        isFavorite = c.favorite
-                    )
+    override fun onOpenDirectMessageError() {
+        Snackbar.make(root_layout, R.string.error_opening_dm, Snackbar.LENGTH_INDEFINITE)
+            .setAction(R.string.retry) {
+                presenter.createDirectMessage(userId)
+            }.show()
+    }
+
+    override fun toDirectMessage(chatRoom: ChatRoom) {
+        finish()
+        if (chatRoom.subscriptionId.isEmpty() || chatRoom.subscriptionId != subscriptionId) {
+            startActivity(
+                chatRoomIntent(
+                    chatRoomId = chatRoom.id,
+                    chatRoomName = chatRoom.name,
+                    chatRoomType = chatRoom.type.toString(),
+                    isReadOnly = chatRoom.readonly.orFalse(),
+                    chatRoomLastSeen = chatRoom.lastSeen ?: 0,
+                    isSubscribed = chatRoom.open,
+                    isCreator = false,
+                    isFavorite = chatRoom.favorite
                 )
-            }
+            )
         }
     }
 }

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

@@ -2,6 +2,7 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout 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/root_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white"

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

@@ -336,6 +336,8 @@
     <!-- User Details -->
     <string name="message">Message</string> <!--TODO - Add proper translation-->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->

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

@@ -337,6 +337,9 @@
     <!-- User Details -->
     <string name="message">Message</string> <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
     <string name="required">*required</string> <!--TODO - Add proper translation-->

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

@@ -338,15 +338,13 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
+
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
 </resources>

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

@@ -337,16 +337,13 @@
     <string name="message_room_changed_privacy">%2$s ने रूम का प्रकार बदलकर %1$s किया </string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
     <string name="report_sent">Your report has been sent!</string>
 </resources>

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

@@ -332,16 +332,13 @@
     <string name="message_room_changed_privacy">Il tipo di stanza è cambiato in: %1$s da %2$s</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!-- TODO - Add proper translation -->
+    <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
 </resources>

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

@@ -339,16 +339,13 @@
     <string name="message_room_changed_privacy">ルームタイプを %2$s から %1$s に変更しました</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!--TODO - Add proper translation-->
+    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
+    <string name="required">*required</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
 </resources>

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

@@ -336,10 +336,10 @@
     <string name="message_room_changed_privacy">O tipo da sala mudou para: %1$s por %2$s</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
     <string name="message">Mensagem</string>
-    <!-- TODO - Add proper translation -->
     <string name="timezone">Fuso horário</string>
+    <string name="error_opening_dm">Algo deu errado quando tentamos abrir esta conversa…</string>
+    <string name="retry">Retentar</string>
 
     <!-- Report -->
     <string name="submit">Enviar</string>

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

@@ -334,16 +334,13 @@
     <string name="message_room_changed_privacy">Тип канала изменен на: %1$s пользователем %2$s</string>
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
-    <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
-    <string name="timezone">Timezone</string>
+    <string name="message">Message</string> <!--TODO - Add proper translation-->
+    <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!--TODO - Add proper translation-->
+    <string name="required">*required</string> <!--TODO - Add proper translation-->
+    <string name="report_sent">Your report has been sent!</string> <!--TODO - Add proper translation-->
 </resources>

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

@@ -339,6 +339,8 @@
     <!-- User Details -->
     <string name="message">Message</string> <!--TODO - Add proper translation-->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->

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

@@ -332,20 +332,16 @@
     <string name="message_information_title">Інформація про прочитання</string>
     <string name="msg_log_out">Виходимо…</string>
     <string name="msg_sent_attachment">Долучення відправлено</string>
-    <!--TODO - Add proper translation-->
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!-- TODO - Add proper translation -->
 
     <!-- User Details -->
-    <!-- TODO - Add proper translation -->
     <string name="message">Message</string>
-    <!-- TODO - Add proper translation -->
     <string name="timezone">Timezone</string>
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string> <!-- TODO - Add proper translation -->
+    <string name="retry">Retry</string> <!-- TODO - Add proper translation -->
 
     <!-- Report -->
-    <!--TODO - Add proper translation-->
-    <string name="submit">Submit</string>
-    <!--TODO - Add proper translation-->
-    <string name="required">*required</string>
-    <!--TODO - Add proper translation-->
-    <string name="report_sent">Your report has been sent!</string>
+    <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
+    <string name="required">*required</string> <!-- TODO - Add proper translation -->
+    <string name="report_sent">Your report has been sent!</string> <!-- TODO - Add proper translation -->
 </resources>

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

@@ -353,6 +353,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="message">Message</string>
     <string name="timezone">Timezone</string>
     <string name="status" translatable="false">Status</string>
+    <string name="error_opening_dm">Something went wrong while we were creating this conversation…</string>
+    <string name="retry">Retry</string>
 
     <!-- Report -->
     <string name="submit">Submit</string>