From 837f133f7cc9dd6202aa988501040e39bec568af Mon Sep 17 00:00:00 2001 From: jubb Date: Mon, 12 Jul 2021 10:51:01 +1000 Subject: [PATCH] fix: compilation errors --- .../conversation/v2/messages/UntrustedAttachmentView.kt | 2 +- .../conversation/v2/messages/VisibleMessageContentView.kt | 3 ++- .../securesms/conversation/v2/messages/VoiceMessageView.kt | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/UntrustedAttachmentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/UntrustedAttachmentView.kt index 7f286a88e7..967e080d92 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/UntrustedAttachmentView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/UntrustedAttachmentView.kt @@ -10,7 +10,7 @@ import kotlinx.android.synthetic.main.view_untrusted_attachment.view.* import network.loki.messenger.R import org.session.libsession.utilities.recipients.Recipient import org.thoughtcrime.securesms.conversation.v2.dialogs.DownloadDialog -import org.thoughtcrime.securesms.loki.utilities.ActivityDispatcher +import org.thoughtcrime.securesms.util.ActivityDispatcher import java.util.* class UntrustedAttachmentView: LinearLayout { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt index 783eb46cae..1d90f8475a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt @@ -112,7 +112,8 @@ class VisibleMessageContentView : LinearLayout { if (contactIsTrusted || message.isOutgoing) { val voiceMessageView = VoiceMessageView(context) voiceMessageView.index = viewHolderIndex - voiceMessageView.delegate = context as? ConversationActivityV2voiceMessageView.bind(message, isStartOfMessageCluster, isEndOfMessageCluster) + voiceMessageView.delegate = context as? ConversationActivityV2 + voiceMessageView.bind(message, isStartOfMessageCluster, isEndOfMessageCluster) mainContainer.addView(voiceMessageView) // We have to use onContentClick (rather than a click listener directly on the voice // message view) so as to not interfere with all the other gestures. diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt index 16992557e3..6498a1a472 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt @@ -31,7 +31,6 @@ class VoiceMessageView : LinearLayout, AudioSlidePlayer.Listener { private var progress = 0.0 private var duration = 0L private var player: AudioSlidePlayer? = null - private var isPreparing = false var delegate: VoiceMessageViewDelegate? = null var index = -1