auto play next audio

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -847,8 +847,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     override fun playNextAudioIfPossible(current: Int) {
-        if (current < conversationRecyclerView.childCount) {
-            val nextVisibleMessageView = conversationRecyclerView[current + 1] as? VisibleMessageView
+        if (current > 0) {
+            val nextVisibleMessageView = conversationRecyclerView[current - 1] as? VisibleMessageView
             nextVisibleMessageView?.let { visibleMessageView ->
                 visibleMessageView.messageContentView.mainContainer.children.forEach { child ->
                     val nextVoiceMessageView = child as? VoiceMessageView

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt

@@ -72,6 +72,7 @@ class ConversationAdapter(context: Context, cursor: Cursor, private val onItemPr
                 view.snIsSelected = isSelected
                 view.messageTimestampTextView.isVisible = isSelected
                 val position = viewHolder.adapterPosition
+                view.viewHolderIndex = position
                 view.bind(message, getMessageBefore(position, cursor), getMessageAfter(position, cursor), glide, searchQuery)
                 view.onPress = { event -> onItemPress(message, viewHolder.adapterPosition, view, event) }
                 view.onSwipeToReply = { onItemSwipeToReply(message, viewHolder.adapterPosition) }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt

@@ -32,6 +32,7 @@ import org.session.libsession.utilities.ViewUtil
 import org.session.libsession.utilities.recipients.Recipient
 import org.thoughtcrime.securesms.conversation.v2.components.AlbumThumbnailView
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView
+import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.conversation.v2.dialogs.OpenURLDialog
 import org.thoughtcrime.securesms.conversation.v2.utilities.ModalURLSpan
 import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities.getIntersectedModalSpans
@@ -48,6 +49,7 @@ class VisibleMessageContentView : LinearLayout {
     var onContentClick: ((event: MotionEvent) -> Unit)? = null
     var onContentDoubleTap: (() -> Unit)? = null
     var delegate: VisibleMessageContentViewDelegate? = null
+    var viewHolderIndex: Int = -1
 
     // region Lifecycle
     constructor(context: Context) : super(context) { initialize() }
@@ -107,9 +109,10 @@ class VisibleMessageContentView : LinearLayout {
             }
         } else if (message is MmsMessageRecord && message.slideDeck.audioSlide != null) {
             val voiceMessageView = VoiceMessageView(context)
+            voiceMessageView.index = viewHolderIndex
+            voiceMessageView.delegate = context as? ConversationActivityV2
             voiceMessageView.bind(message, isStartOfMessageCluster, isEndOfMessageCluster)
             mainContainer.addView(voiceMessageView)
-            voiceMessageView.delegate = delegate
             // 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.
             onContentClick = { voiceMessageView.togglePlayback() }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -47,6 +47,7 @@ class VisibleMessageView : LinearLayout {
     private var longPressCallback: Runnable? = null
     private var onDownTimestamp = 0L
     private var onDoubleTap: (() -> Unit)? = null
+    var viewHolderIndex: Int = -1
     var snIsSelected = false
         set(value) { field = value; handleIsSelectedChanged()}
     var onPress: ((event: MotionEvent) -> Unit)? = null
@@ -151,6 +152,7 @@ class VisibleMessageView : LinearLayout {
         var maxWidth = screenWidth - startPadding - endPadding
         if (profilePictureContainer.visibility != View.GONE) { maxWidth -= profilePictureContainer.width }
         // Populate content view
+        messageContentView.viewHolderIndex = viewHolderIndex
         messageContentView.bind(message, isStartOfMessageCluster, isEndOfMessageCluster, glide, maxWidth, thread, searchQuery)
         messageContentView.delegate = contentViewDelegate
         onDoubleTap = { messageContentView.onContentDoubleTap?.invoke() }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VoiceMessageView.kt

@@ -32,8 +32,8 @@ class VoiceMessageView : LinearLayout, AudioSlidePlayer.Listener {
     private var duration = 0L
     private var player: AudioSlidePlayer? = null
     private var isPreparing = false
-    var delegate: VisibleMessageContentViewDelegate? = null
-    var index = 0
+    var delegate: VoiceMessageViewDelegate? = null
+    var index = -1
 
     // region Lifecycle
     constructor(context: Context) : super(context) { initialize() }