Commit bfe320af authored by Lucio Maciel's avatar Lucio Maciel

Check only for name and text for last message

parent 357c9afe
...@@ -12,8 +12,8 @@ android { ...@@ -12,8 +12,8 @@ android {
applicationId "chat.rocket.android" applicationId "chat.rocket.android"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion versions.targetSdk targetSdkVersion versions.targetSdk
versionCode 2022 versionCode 2023
versionName "2.3.0" versionName "2.4.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
} }
......
...@@ -90,7 +90,7 @@ class RoomMapper(private val context: Application, ...@@ -90,7 +90,7 @@ class RoomMapper(private val context: Application,
private fun mapLastMessage(name: String?, fullName: String?, text: String?, unread: Boolean): CharSequence? { private fun mapLastMessage(name: String?, fullName: String?, text: String?, unread: Boolean): CharSequence? {
return if (!settings.showLastMessage()) { return if (!settings.showLastMessage()) {
null null
} else if (name != null && fullName != null && text != null) { } else if (name != null && text != null) {
val user = if (localRepository.checkIfMyself(name)) { val user = if (localRepository.checkIfMyself(name)) {
"${context.getString(R.string.msg_you)}: " "${context.getString(R.string.msg_you)}: "
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment