From c55539c50ebc7dc777a52583348f960bf4ad4b0f Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Thu, 6 Jul 2023 09:45:11 +0200
Subject: [PATCH] solve lint warnings

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/models/json/chat/ChatMessage.kt      | 43 +------------------
 app/src/main/res/values/strings.xml           |  2 -
 2 files changed, 1 insertion(+), 44 deletions(-)

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:
     <string name="nc_conversation_menu_video_call">Video call</string>
     <string name="nc_conversation_menu_conversation_info">Conversation info</string>
     <string name="nc_new_messages">Unread messages</string>
-    <string name="nc_sent_a_link" formatted="true">%1$s sent a link.</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s sent a GIF.</string>
     <string name="nc_sent_an_attachment" formatted="true">%1$s sent an attachment.</string>
     <string name="nc_sent_an_audio" formatted="true">%1$s sent an audio.</string>
@@ -352,7 +351,6 @@ How to translate with transifex:
     <string name="nc_sent_poll" formatted="true">%1$s sent a poll.</string>
     <string name="nc_sent_location" formatted="true">%1$s sent a location.</string>
     <string name="nc_sent_voice" formatted="true">%1$s sent a voice message.</string>
-    <string name="nc_sent_a_link_you">You sent a link.</string>
     <string name="nc_sent_a_gif_you">You sent a GIF.</string>
     <string name="nc_sent_an_attachment_you">You sent an attachment.</string>
     <string name="nc_sent_an_audio_you">You sent an audio.</string>