diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt
index 73c3e66c1..5e8646981 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt
@@ -267,26 +267,6 @@ data class ChatMessage(
""
}
}
-
- /*} else if (getCalculateMessageType().equals(MessageType.SINGLE_LINK_MESSAGE)) {
- if (actorId.equals(activeUser.getUserId())) {
- return (
- NextcloudTalkApplication
- .Companion.getSharedApplication()
- .getString(R.string.nc_sent_a_link_you)
- );
- } else {
- return (String.format(NextcloudTalkApplication.
- Companion.
- getSharedApplication().
- getResources().
- getString(R.string.nc_sent_a_link),
- !TextUtils.isEmpty(actorDisplayName) ? actorDisplayName : NextcloudTalkApplication.
- Companion.
- getSharedApplication().
- getString(R.string.nc_guest))
- );
- }*/
val lastMessageDisplayText: String
get() {
if (getCalculateMessageType() == MessageType.REGULAR_TEXT_MESSAGE ||
@@ -334,27 +314,6 @@ data class ChatMessage(
getNullsafeActorDisplayName()
)
}
- /*} else if (getCalculateMessageType().equals(MessageType.SINGLE_LINK_MESSAGE)) {
- if (actorId.equals(activeUser.getUserId())) {
- return (
- NextcloudTalkApplication
- .Companion
- .getSharedApplication()
- .getString(R.string.nc_sent_a_link_you)
- );
- } else {
- return (String.format(
- NextcloudTalkApplication
- .Companion
- .getSharedApplication()
- .getResources()
- .getString(R.string.nc_sent_a_link),
- !TextUtils.isEmpty(actorDisplayName) ? actorDisplayName : NextcloudTalkApplication.
- Companion.
- getSharedApplication().
- getString(R.string.nc_guest))
- );
- }*/
} else if (MessageType.SINGLE_LINK_AUDIO_MESSAGE == getCalculateMessageType()) {
return if (actorId == activeUser!!.userId) {
sharedApplication!!.getString(R.string.nc_sent_an_audio_you)
@@ -387,7 +346,7 @@ data class ChatMessage(
sharedApplication!!.getString(R.string.nc_sent_poll_you)
} else {
String.format(
- sharedApplication!!.resources.getString(R.string.nc_sent_an_image),
+ sharedApplication!!.resources.getString(R.string.nc_sent_poll),
getNullsafeActorDisplayName()
)
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2335b3039..168299764 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -343,7 +343,6 @@ How to translate with transifex:
Video call
Conversation info
Unread messages
- %1$s sent a link.
%1$s sent a GIF.
%1$s sent an attachment.
%1$s sent an audio.
@@ -352,7 +351,6 @@ How to translate with transifex:
%1$s sent a poll.
%1$s sent a location.
%1$s sent a voice message.
- You sent a link.
You sent a GIF.
You sent an attachment.
You sent an audio.