diff --git a/library/ui-strings/src/main/res/values/strings_sc.xml b/library/ui-strings/src/main/res/values/strings_sc.xml
index 48b4f385f7..8a138fe683 100644
--- a/library/ui-strings/src/main/res/values/strings_sc.xml
+++ b/library/ui-strings/src/main/res/values/strings_sc.xml
@@ -207,4 +207,7 @@
Loading replied-to messageā¦
Failed to load replied-to message
+ Clickable names
+ Click on a username to mention them
+
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index 62c8e55ba9..8f95598d9e 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -1881,7 +1881,9 @@ class TimelineFragment :
}
override fun onMemberNameClicked(informationData: MessageInformationData) {
- messageComposerViewModel.handle(MessageComposerAction.InsertUserDisplayName(informationData.senderId))
+ if (vectorPreferences.enableMemberNameClick()) {
+ messageComposerViewModel.handle(MessageComposerAction.InsertUserDisplayName(informationData.senderId))
+ }
}
override fun onClickOnReactionPill(informationData: MessageInformationData, reaction: String, on: Boolean) {
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index eaaf0108b5..e204f4526e 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -259,6 +259,7 @@ class VectorPreferences @Inject constructor(
const val SETTINGS_FORCE_ALLOW_BACKGROUND_SYNC = "SETTINGS_FORCE_ALLOW_BACKGROUND_SYNC"
const val SETTINGS_ROOM_SORT_ORDER_NULL = "SETTINGS_ROOM_SORT_ORDER_NULL"
const val SETTINGS_ROOM_SORT_ORDER_NON_NULL = "SETTINGS_ROOM_SORT_ORDER_NON_NULL"
+ private const val SETTINGS_ENABLE_MEMBER_NAME_CLICK = "SETTINGS_ENABLE_MEMBER_NAME_CLICK"
private const val DID_ASK_TO_ENABLE_SESSION_PUSH = "DID_ASK_TO_ENABLE_SESSION_PUSH"
@@ -1216,14 +1217,22 @@ class VectorPreferences @Inject constructor(
return defaultPrefs.getBoolean(SETTINGS_SHOW_OPEN_ANONYMOUS, false)
}
+ // SC addition
fun floatingDate(): Boolean {
return defaultPrefs.getBoolean(SETTINGS_FLOATING_DATE, true)
}
+ // SC addition
fun spaceBackNavigation(): Boolean {
return defaultPrefs.getBoolean(SETTINGS_SPACE_BACK_NAVIGATION, false)
}
+ // SC addition
+ fun enableMemberNameClick(): Boolean {
+ return defaultPrefs.getBoolean(SETTINGS_ENABLE_MEMBER_NAME_CLICK, true)
+ }
+
+
/**
* I likely do more fresh installs of the app than anyone else, so a shortcut to change some of the default settings to
* my preferred values can safe me some time
@@ -1250,6 +1259,7 @@ class VectorPreferences @Inject constructor(
.putBoolean(SETTINGS_SHOW_OPEN_ANONYMOUS, true)
.putBoolean(SETTINGS_FLOATING_DATE, true)
.putBoolean(SETTINGS_FOLLOW_SYSTEM_LOCALE, true)
+ .putBoolean(SETTINGS_ENABLE_MEMBER_NAME_CLICK, false)
.apply()
}
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 45d38fdca8..1209e82b01 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -272,6 +272,12 @@
android:title="@string/settings_vibrate_on_mention"
app:isPreferenceVisible="@bool/false_not_implemented" />
+
+