filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup after Onuray's review and improve wording when removing display name

Browse Source
This commit is contained in:
Benoit Marty 2020-06-23 11:21:00 +02:00
parent 9754e26e5f
commit 35fed2676a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/res/values/strings.xml
View File

@ -33,8 +33,8 @@
<string name="notice_display_name_set_by_you">You set your display name to %1$s</string> <string name="notice_display_name_set_by_you">You set your display name to %1$s</string>
<string name="notice_display_name_changed_from">%1$s changed their display name from %2$s to %3$s</string> <string name="notice_display_name_changed_from">%1$s changed their display name from %2$s to %3$s</string>
<string name="notice_display_name_changed_from_by_you">You changed your display name from %1$s to %2$s</string> <string name="notice_display_name_changed_from_by_you">You changed your display name from %1$s to %2$s</string>
<string name="notice_display_name_removed">%1$s removed their display name (%2$s)</string> <string name="notice_display_name_removed">%1$s removed their display name (it was %2$s)</string>
<string name="notice_display_name_removed_by_you">You removed your display name (%1$s)</string> <string name="notice_display_name_removed_by_you">You removed your display name (it was %1$s)</string>
<string name="notice_room_topic_changed">%1$s changed the topic to: %2$s</string> <string name="notice_room_topic_changed">%1$s changed the topic to: %2$s</string>
<string name="notice_room_topic_changed_by_you">You changed the topic to: %1$s</string> <string name="notice_room_topic_changed_by_you">You changed the topic to: %1$s</string>
<string name="notice_room_name_changed">%1$s changed the room name to: %2$s</string> <string name="notice_room_name_changed">%1$s changed the room name to: %2$s</string>

9
vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt
View File

@ -122,7 +122,9 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
it.summary = session.getUser(session.myUserId)?.displayName ?: "" it.summary = session.getUser(session.myUserId)?.displayName ?: ""
it.text = it.summary.toString() it.text = it.summary.toString()
it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
onDisplayNameClick(newValue?.let { (it as String).trim() }) newValue
?.let { value -> (value as? String)?.trim() }
?.let { value -> onDisplayNameChanged(value) }
false false
} }
} }
@ -857,20 +859,21 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() {
/** /**
* Update the displayname. * Update the displayname.
*/ */
private fun onDisplayNameClick(value: String?) { private fun onDisplayNameChanged(value: String) {
value ?: return
val currentDisplayName = session.getUser(session.myUserId)?.displayName ?: "" val currentDisplayName = session.getUser(session.myUserId)?.displayName ?: ""
if (currentDisplayName != value) { if (currentDisplayName != value) {
displayLoadingView() displayLoadingView()
session.setDisplayName(session.myUserId, value, object : MatrixCallback<Unit> { session.setDisplayName(session.myUserId, value, object : MatrixCallback<Unit> {
override fun onSuccess(data: Unit) { override fun onSuccess(data: Unit) {
if (!isAdded) return
// refresh the settings value // refresh the settings value
mDisplayNamePreference.summary = value mDisplayNamePreference.summary = value
onCommonDone(null) onCommonDone(null)
} }
override fun onFailure(failure: Throwable) { override fun onFailure(failure: Throwable) {
if (!isAdded) return
onCommonDone(failure.localizedMessage) onCommonDone(failure.localizedMessage)
} }
}) })