Merge branch 'develop' into doug/888_add_url_previews

2026-04-27 19:56:57 +02:00 · 2021-08-18 16:47:22 +01:00
parent 174238f0cb 29d322173d
commit 6c8dccd84f
11 changed files with 188 additions and 60 deletions
@@ -2383,11 +2383,16 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
        }
        else if (bubbleData.attachment.type == MXKAttachmentTypeVoiceMessage)
        {
-            if (bubbleData.isPaginationFirstBubble) {
+            if (bubbleData.isPaginationFirstBubble)
+            {
                cellViewClass = VoiceMessageWithPaginationTitleBubbleCell.class;
-            } else if (bubbleData.shouldHideSenderInformation) {
+            }
+            else if (bubbleData.shouldHideSenderInformation)
+            {
                cellViewClass = VoiceMessageWithoutSenderInfoBubbleCell.class;
-            } else {
+            }
+            else
+            {
                cellViewClass = VoiceMessageBubbleCell.class;
            }
        }
@@ -164,8 +164,6 @@ class VoiceMessagePlaybackController: VoiceMessageAudioPlayerDelegate, VoiceMess
        }
        
        self.state = .stopped
-        self.loading = true
-        self.samples = []
        updateUI()
        
        let requiredNumberOfSamples = playbackView.getRequiredNumberOfSamples()