From 26176328c460086dd3d1fb7179c20f209aa1e501 Mon Sep 17 00:00:00 2001 From: ericdecanini <eddecanini@gmail.com> Date: Fri, 18 Mar 2022 11:58:23 +0100 Subject: [PATCH] Fixes epoxy errors with renamed epoxy attributes --- .../detail/timeline/factory/MessageItemFactory.kt | 12 ++++++------ .../room/detail/timeline/item/MessageFileItem.kt | 2 ++ .../room/detail/timeline/item/MessageVoiceItem.kt | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt index 3189954e20..e70da45216 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt @@ -326,8 +326,8 @@ class MessageItemFactory @Inject constructor( } ?: "" return MessageFileItem_() .attributes(attributes) - .izLocalFile(localFilesHelper.isLocalFile(fileUrl)) - .izDownloaded(session.fileService().isFileInCache( + .isLocalFile(localFilesHelper.isLocalFile(fileUrl)) + .isDownloaded(session.fileService().isFileInCache( fileUrl, messageContent.getFileName(), messageContent.mimeType, @@ -368,8 +368,8 @@ class MessageItemFactory @Inject constructor( .waveform(messageContent.audioWaveformInfo?.waveform?.toFft().orEmpty()) .playbackControlButtonClickListener(playbackControlButtonClickListener) .voiceMessagePlaybackTracker(voiceMessagePlaybackTracker) - .izLocalFile(localFilesHelper.isLocalFile(fileUrl)) - .izDownloaded(session.fileService().isFileInCache( + .isLocalFile(localFilesHelper.isLocalFile(fileUrl)) + .isDownloaded(session.fileService().isFileInCache( fileUrl, messageContent.getFileName(), messageContent.mimeType, @@ -431,8 +431,8 @@ class MessageItemFactory @Inject constructor( return MessageFileItem_() .attributes(attributes) .leftGuideline(avatarSizeProvider.leftGuideline) - .izLocalFile(localFilesHelper.isLocalFile(messageContent.getFileUrl())) - .izDownloaded(session.fileService().isFileInCache(messageContent)) + .isLocalFile(localFilesHelper.isLocalFile(messageContent.getFileUrl())) + .isDownloaded(session.fileService().isFileInCache(messageContent)) .mxcUrl(mxcUrl) .contentUploadStateTrackerBinder(contentUploadStateTrackerBinder) .contentDownloadStateTrackerBinder(contentDownloadStateTrackerBinder) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt index 17d4a87ac6..dc39fbfdd7 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt @@ -51,9 +51,11 @@ abstract class MessageFileItem : AbsMessageItem<MessageFileItem.Holder>() { // var clickListener: ClickListener? = null @EpoxyAttribute + @JvmField var isLocalFile = false @EpoxyAttribute + @JvmField var isDownloaded = false @EpoxyAttribute diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt index c44ddcd843..6e176a8fa2 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt @@ -48,9 +48,11 @@ abstract class MessageVoiceItem : AbsMessageItem<MessageVoiceItem.Holder>() { var waveform: List<Int> = emptyList() @EpoxyAttribute + @JvmField var isLocalFile = false @EpoxyAttribute + @JvmField var isDownloaded = false @EpoxyAttribute