From c0c671bccf9c2be88eb029a5a3900bb44e4ac87e Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 21 Mar 2024 14:20:17 +0100 Subject: [PATCH] fix to use correct cloudId. Without this fix, the avatars for "normal" messages were not able to show avatars. Only the messages that contained messageParameters with actor were able to show avatars(for example "userX invited userY") Signed-off-by: Marcel Hibbe --- .../messages/IncomingLinkPreviewMessageViewHolder.kt | 2 +- .../adapters/messages/IncomingLocationMessageViewHolder.kt | 2 +- .../talk/adapters/messages/IncomingPollMessageViewHolder.kt | 2 +- .../talk/adapters/messages/IncomingTextMessageViewHolder.kt | 2 +- .../talk/adapters/messages/IncomingVoiceMessageViewHolder.kt | 2 +- .../talk/adapters/messages/PreviewMessageViewHolder.kt | 2 +- .../com/nextcloud/talk/extensions/ImageViewExtensions.kt | 5 +---- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt index 713361aff..de0221835 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt @@ -173,7 +173,7 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : binding.messageUserAvatar.loadChangelogBotAvatar() } else if (message.actorType == "bots") { binding.messageUserAvatar.loadBotsAvatar() - } else if (message.actorType == "federated_users" && message.messageParameters?.get("actor") != null) { + } else if (message.actorType == "federated_users") { binding.messageUserAvatar.loadFederatedUserAvatar(message) } } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt index 6185aa8e9..4bcc90976 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt @@ -149,7 +149,7 @@ class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) : binding.messageUserAvatar.loadChangelogBotAvatar() } else if (message.actorType == "bots") { binding.messageUserAvatar.loadBotsAvatar() - } else if (message.actorType == "federated_users" && message.messageParameters?.get("actor") != null) { + } else if (message.actorType == "federated_users") { binding.messageUserAvatar.loadFederatedUserAvatar(message) } } else { diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt index becb6858b..fe00b0863 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt @@ -180,7 +180,7 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : binding.messageUserAvatar.loadChangelogBotAvatar() } else if (message.actorType == "bots") { binding.messageUserAvatar.loadBotsAvatar() - } else if (message.actorType == "federated_users" && message.messageParameters?.get("actor") != null) { + } else if (message.actorType == "federated_users") { binding.messageUserAvatar.loadFederatedUserAvatar(message) } } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt index bb0b3d018..6b7806eb4 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt @@ -183,7 +183,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) : binding.messageUserAvatar.loadChangelogBotAvatar() } else if (message.actorType == "bots") { binding.messageUserAvatar.loadBotsAvatar() - } else if (message.actorType == "federated_users" && message.messageParameters?.get("actor") != null) { + } else if (message.actorType == "federated_users") { binding.messageUserAvatar.loadFederatedUserAvatar(message) } } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt index 929f54407..67b282232 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt @@ -286,7 +286,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : ) binding.messageUserAvatar.visibility = View.VISIBLE binding.messageUserAvatar.setImageDrawable(drawable) - } else if (message.actorType == "federated_users" && message.messageParameters?.get("actor") != null) { + } else if (message.actorType == "federated_users") { binding.messageUserAvatar.loadFederatedUserAvatar(message) } } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt index ee21d703e..6121a30ad 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt @@ -195,7 +195,7 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) : } if (ACTOR_TYPE_BOTS == message.actorType && ACTOR_ID_CHANGELOG == message.actorId) { userAvatar.loadChangelogBotAvatar() - } else if (message.actorType == "federated_users" && message.messageParameters?.get("actor") != null) { + } else if (message.actorType == "federated_users") { userAvatar.loadFederatedUserAvatar(message) } } diff --git a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt index ce52114aa..3d336b736 100644 --- a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt @@ -128,10 +128,7 @@ fun ImageView.loadUserAvatar( } fun ImageView.loadFederatedUserAvatar(message: ChatMessage): io.reactivex.disposables.Disposable { - val map = message.messageParameters?.get("actor") - val url = map?.get("server")!! - val id = map["id"] - val cloudId = "$id@$url" + val cloudId = message.actorId!! val darkTheme = if (DisplayUtils.isDarkModeOn(context)) 1 else 0 val ignoreCache = false val requestBigSize = true