From 2a96b2c68e9a142587a237f2d721c08bd993a352 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Mon, 28 Sep 2020 11:35:02 +0300
Subject: [PATCH] Differentiate wordings for the room profile screen.

---
 .../features/roomprofile/RoomProfileController.kt    | 12 +++++++++---
 vector/src/main/res/values/strings.xml               |  3 +++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
index 815478b46b..13efaf0d10 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
@@ -57,7 +57,7 @@ class RoomProfileController @Inject constructor(
         // Security
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_security))
         val learnMoreSubtitle = if (roomSummary.isEncrypted) {
-            R.string.room_profile_encrypted_subtitle
+            if (roomSummary.isDirect) R.string.direct_room_profile_encrypted_subtitle else R.string.room_profile_encrypted_subtitle
         } else {
             R.string.room_profile_not_encrypted_subtitle
         }
@@ -71,7 +71,10 @@ class RoomProfileController @Inject constructor(
         buildProfileSection(stringProvider.getString(R.string.room_profile_section_more))
         buildProfileAction(
                 id = "settings",
-                title = stringProvider.getString(R.string.room_profile_section_more_settings),
+                title = if (roomSummary.isDirect)
+                    stringProvider.getString(R.string.direct_room_profile_section_more_settings)
+                else
+                    stringProvider.getString(R.string.room_profile_section_more_settings),
                 dividerColor = dividerColor,
                 icon = R.drawable.ic_room_profile_settings,
                 action = { callback?.onSettingsClicked() }
@@ -112,7 +115,10 @@ class RoomProfileController @Inject constructor(
         )
         buildProfileAction(
                 id = "leave",
-                title = stringProvider.getString(R.string.room_profile_section_more_leave),
+                title = if (roomSummary.isDirect)
+                    stringProvider.getString(R.string.direct_room_profile_section_more_leave)
+                else
+                    stringProvider.getString(R.string.room_profile_section_more_leave),
                 dividerColor = dividerColor,
                 divider = false,
                 destructive = true,
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 887e78d102..d71195bf13 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -2118,11 +2118,13 @@
     <string name="verification_request_alert_description">For extra security, verify %s by checking a one-time code on both your devices.\n\nFor maximum security, do this in person.</string>
     <string name="room_profile_not_encrypted_subtitle">Messages in this room are not end-to-end encrypted.</string>
     <string name="room_profile_encrypted_subtitle">Messages in this room are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
+    <string name="direct_room_profile_encrypted_subtitle">Messages here are end-to-end encrypted.\n\nYour messages are secured with locks and only you and the recipient have the unique keys to unlock them.</string>
     <string name="room_profile_section_security">Security</string>
     <string name="room_profile_section_security_learn_more">Learn more</string>
     <string name="room_profile_section_more">More</string>
     <string name="room_profile_section_admin">Admin Actions</string>
     <string name="room_profile_section_more_settings">Room settings</string>
+    <string name="direct_room_profile_section_more_settings">Settings</string>
     <string name="room_profile_section_more_notifications">Notifications</string>
     <plurals name="room_profile_section_more_member_list">
         <item quantity="one">"One person"</item>
@@ -2130,6 +2132,7 @@
     </plurals>
     <string name="room_profile_section_more_uploads">Uploads</string>
     <string name="room_profile_section_more_leave">Leave Room</string>
+    <string name="direct_room_profile_section_more_leave">Leave</string>
     <string name="room_profile_leaving_room">"Leaving the room…"</string>
 
     <string name="room_member_power_level_admins">Admins</string>