mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-25 14:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

solve lint warnings

Browse source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-07-06 09:45:11 +02:00
parent e1d4374ca5
commit 46386d503d
2 changed files with 1 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt
View file

@ -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 val lastMessageDisplayText: String
get() { get() {
if (getCalculateMessageType() == MessageType.REGULAR_TEXT_MESSAGE || if (getCalculateMessageType() == MessageType.REGULAR_TEXT_MESSAGE ||
@ -334,27 +314,6 @@ data class ChatMessage(
getNullsafeActorDisplayName() 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()) { } else if (MessageType.SINGLE_LINK_AUDIO_MESSAGE == getCalculateMessageType()) {
return if (actorId == activeUser!!.userId) { return if (actorId == activeUser!!.userId) {
sharedApplication!!.getString(R.string.nc_sent_an_audio_you) sharedApplication!!.getString(R.string.nc_sent_an_audio_you)
@ -387,7 +346,7 @@ data class ChatMessage(
sharedApplication!!.getString(R.string.nc_sent_poll_you) sharedApplication!!.getString(R.string.nc_sent_poll_you)
} else { } else {
String.format( String.format(
sharedApplication!!.resources.getString(R.string.nc_sent_an_image), sharedApplication!!.resources.getString(R.string.nc_sent_poll),
getNullsafeActorDisplayName() getNullsafeActorDisplayName()
) )
} }

2
app/src/main/res/values/strings.xml
View file

@ -343,7 +343,6 @@ How to translate with transifex:
<string name="nc_conversation_menu_video_call">Video call</string> <string name="nc_conversation_menu_video_call">Video call</string>
<string name="nc_conversation_menu_conversation_info">Conversation info</string> <string name="nc_conversation_menu_conversation_info">Conversation info</string>
<string name="nc_new_messages">Unread messages</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_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_attachment" formatted="true">%1$s sent an attachment.</string>
<string name="nc_sent_an_audio" formatted="true">%1$s sent an audio.</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_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_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_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_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_attachment_you">You sent an attachment.</string>
<string name="nc_sent_an_audio_you">You sent an audio.</string> <string name="nc_sent_an_audio_you">You sent an audio.</string>