From cc0815de0fdb2c5f77bd1486bc9a67bf1e650c18 Mon Sep 17 00:00:00 2001
From: rapterjet2004 <juliuslinus1@gmail.com>
Date: Thu, 24 Aug 2023 09:08:05 -0500
Subject: [PATCH 1/2] fixed media recorder bug

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
---
 .../com/nextcloud/talk/chat/ChatActivity.kt    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index aa4e7ee3b..626553568 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -348,6 +348,7 @@ class ChatActivity :
         AudioFormat.CHANNEL_IN_MONO,
         AudioFormat.ENCODING_PCM_16BIT
     )
+    private var voiceRecordDuration = 0L
 
     // messy workaround for a mediaPlayer bug, don't delete
     private var lastRecordMediaPosition: Int = 0
@@ -1163,7 +1164,7 @@ class ChatActivity :
                         showRecordAudioUi(false)
 
                         voiceRecordEndTime = System.currentTimeMillis()
-                        val voiceRecordDuration = voiceRecordEndTime - voiceRecordStartTime
+                        voiceRecordDuration = voiceRecordEndTime - voiceRecordStartTime
                         if (voiceRecordDuration < MINIMUM_VOICE_RECORD_DURATION) {
                             Log.d(TAG, "voiceRecordDuration: $voiceRecordDuration")
                             Snackbar.make(
@@ -2075,6 +2076,7 @@ class ChatActivity :
 
             try {
                 start()
+                Log.d(TAG, "recording started")
                 isVoiceRecordingInProgress = true
             } catch (e: IllegalStateException) {
                 Log.e(TAG, "start for audio recording failed")
@@ -2087,15 +2089,17 @@ class ChatActivity :
     private fun stopAndSendAudioRecording() {
         if (isVoiceRecordingInProgress) {
             stopAudioRecording()
+            Log.d(TAG, "stopped and sent audio recording")
+            val uri = Uri.fromFile(File(currentVoiceRecordFile))
+            uploadFile(uri.toString(), true)
         }
 
-        val uri = Uri.fromFile(File(currentVoiceRecordFile))
-        uploadFile(uri.toString(), true)
     }
 
     private fun stopAndDiscardAudioRecording() {
         if (isVoiceRecordingInProgress) {
             stopAudioRecording()
+            Log.d(TAG, "stopped and discarded audio recording")
         }
 
         val cachedFile = File(currentVoiceRecordFile)
@@ -2109,12 +2113,17 @@ class ChatActivity :
 
         recorder?.apply {
             try {
-                stop()
+                Log.d(TAG, "recording stopped with $voiceRecordDuration")
+                if (voiceRecordDuration > MINIMUM_VOICE_RECORD_TO_STOP) {
+                    stop()
+                }
                 release()
                 isVoiceRecordingInProgress = false
                 Log.d(TAG, "stopped recorder. isVoiceRecordingInProgress = false")
             } catch (e: java.lang.IllegalStateException) {
                 error("error while stopping recorder!" + e)
+            } catch (e: java.lang.RuntimeException) {
+                error("error while stopping recorder!" + e)
             }
 
             VibrationUtils.vibrateShort(context)
@@ -4241,6 +4250,7 @@ class ChatActivity :
         private const val REQUEST_CODE_SELECT_REMOTE_FILES = 888
         private const val OBJECT_MESSAGE: String = "{object}"
         private const val MINIMUM_VOICE_RECORD_DURATION: Int = 1000
+        private const val MINIMUM_VOICE_RECORD_TO_STOP: Int = 200
         private const val VOICE_RECORD_CANCEL_SLIDER_X: Int = -50
         private const val VOICE_RECORD_LOCK_BUTTON_Y: Int = -130
         private const val VOICE_MESSAGE_META_DATA = "{\"messageType\":\"voice-message\"}"

From e29ad8f7344271dca43649dac56e433ce64a434b Mon Sep 17 00:00:00 2001
From: Julius Linus <julius.linus@nextcloud.com>
Date: Thu, 24 Aug 2023 09:21:04 -0500
Subject: [PATCH 2/2] detekt

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
---
 app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 626553568..450f6a078 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -2093,7 +2093,6 @@ class ChatActivity :
             val uri = Uri.fromFile(File(currentVoiceRecordFile))
             uploadFile(uri.toString(), true)
         }
-
     }
 
     private fun stopAndDiscardAudioRecording() {