Merge pull request #3453 from nextcloud/issue-3302-bug-fix

Bug Fix - IllegalStateException in stopAudioRecording + Polishes
nextcloud · Nov 29, 2023 · 5f53005 · 5f53005
2 parents d88ab82 + 2adad16
commit 5f53005
Show file tree

Hide file tree

Showing 10 changed files with 232 additions and 126 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java
@@ -60,7 +60,6 @@ public void onBind(@NonNull ChatMessage message) {
         ) {
             Spanned processedMessageText = null;
             binding.incomingPreviewMessageBubble.setBackgroundResource(R.drawable.shape_grouped_incoming_message);
-            binding.incomingPreviewMessageBubble.setOnClickListener(null);
             if (viewThemeUtils != null ) {
                 processedMessageText = messageUtils.enrichChatMessageText(
                     binding.messageCaption.getContext(),
@@ -76,8 +75,9 @@ public void onBind(@NonNull ChatMessage message) {
                     viewThemeUtils,
                     processedMessageText,
                     message,
-                    itemView);
+                    binding.incomingPreviewMessageBubble);
             }
+            binding.incomingPreviewMessageBubble.setOnClickListener(null);
 
             float textSize = 0;
             if (context != null) {

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
@@ -89,6 +89,15 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
         this.message = message
         sharedApplication!!.componentApplication.inject(this)
 
+        val filename = message.selectedIndividualHashMap!!["name"]
+        val retrieved = appPreferences!!.getWaveFormFromFile(filename)
+        if (retrieved.isNotEmpty() &&
+            message.voiceMessageFloatArray == null ||
+            message.voiceMessageFloatArray?.isEmpty() == true
+        ) {
+            message.voiceMessageFloatArray = retrieved.toFloatArray()
+            binding.seekbar.setWaveData(message.voiceMessageFloatArray!!)
+        }
         binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)
 
         setAvatarAndAuthorOnMessageItem(message)

diff --git a/...src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java b/...src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java
@@ -23,7 +23,6 @@
 package com.nextcloud.talk.adapters.messages;
 
 import android.text.Spanned;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
@@ -60,7 +59,6 @@ public void onBind(@NonNull ChatMessage message) {
         ) {
             Spanned processedMessageText = null;
             binding.outgoingPreviewMessageBubble.setBackgroundResource(R.drawable.shape_grouped_outcoming_message);
-            binding.outgoingPreviewMessageBubble.setOnClickListener(null);
             if (viewThemeUtils != null) {
                 processedMessageText = messageUtils.enrichChatMessageText(
                     binding.messageCaption.getContext(),
@@ -76,8 +74,9 @@ public void onBind(@NonNull ChatMessage message) {
                     viewThemeUtils,
                     processedMessageText,
                     message,
-                    itemView);
+                    binding.outgoingPreviewMessageBubble);
             }
+            binding.outgoingPreviewMessageBubble.setOnClickListener(null);
 
             float textSize = 0;
             if (context != null) {

diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
@@ -86,6 +86,17 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
         this.message = message
         sharedApplication!!.componentApplication.inject(this)
         viewThemeUtils.platform.colorTextView(binding.messageTime, ColorRole.ON_SURFACE_VARIANT)
+
+        val filename = message.selectedIndividualHashMap!!["name"]
+        val retrieved = appPreferences!!.getWaveFormFromFile(filename)
+        if (retrieved.isNotEmpty() &&
+            message.voiceMessageFloatArray == null ||
+            message.voiceMessageFloatArray?.isEmpty() == true
+        ) {
+            message.voiceMessageFloatArray = retrieved.toFloatArray()
+            binding.seekbar.setWaveData(message.voiceMessageFloatArray!!)
+        }
+
         binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp)
 
         colorizeMessageBubble(message)