gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-08 23:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

run ./gradlew ktlintFormat

Browse Source 
Signed-off-by: Giacomo Pacini <giacomopacini98@gmail.com>
This commit is contained in:
Giacomo Pacini 2024-12-19 15:26:11 +01:00
parent 67162d578d
commit c3aef0286a
No known key found for this signature in database
GPG Key ID: 2FBC97406B43D889
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
View File

@ -294,8 +294,10 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
private fun colorizeMessageBubble(message: ChatMessage) { private fun colorizeMessageBubble(message: ChatMessage) {
viewThemeUtils.talk.themeIncomingMessageBubble( viewThemeUtils.talk.themeIncomingMessageBubble(
bubble, message.isGrouped, bubble,
message.isDeleted, message.wasPlayedVoiceMessage message.isGrouped,
message.isDeleted,
message.wasPlayedVoiceMessage
) )
} }

6
app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
View File

@ -358,8 +358,10 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
private fun colorizeMessageBubble(message: ChatMessage) { private fun colorizeMessageBubble(message: ChatMessage) {
viewThemeUtils.talk.themeOutgoingMessageBubble( viewThemeUtils.talk.themeOutgoingMessageBubble(
bubble, message.isGrouped, bubble,
message.isDeleted, message.wasPlayedVoiceMessage message.isGrouped,
message.isDeleted,
message.wasPlayedVoiceMessage
) )
} }

37
app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
View File

@ -1205,10 +1205,7 @@ class ChatActivity :
} }
} }
private fun setUpWaveform( private fun setUpWaveform(message: ChatMessage, thenPlay: Boolean = true, backgroundPlayAllowed: Boolean = false) {
message: ChatMessage, thenPlay: Boolean = true,
backgroundPlayAllowed: Boolean = false
) {
val filename = message.selectedIndividualHashMap!!["name"] val filename = message.selectedIndividualHashMap!!["name"]
val file = File(context.cacheDir, filename!!) val file = File(context.cacheDir, filename!!)
if (file.exists() && message.voiceMessageFloatArray == null) { if (file.exists() && message.voiceMessageFloatArray == null) {
@ -1617,10 +1614,8 @@ class ChatActivity :
} }
} }
private fun startPlayback( @Suppress("Detekt.TooGenericExceptionCaught")
message: ChatMessage, doPlay: Boolean = true, private fun startPlayback(message: ChatMessage, doPlay: Boolean = true, backgroundPlayAllowed: Boolean = false) {
backgroundPlayAllowed: Boolean = false
) {
if (!active && !backgroundPlayAllowed) { if (!active && !backgroundPlayAllowed) {
// don't begin to play voice message if screen is not visible anymore. // don't begin to play voice message if screen is not visible anymore.
// this situation might happen if file is downloading but user already left the chatview. // this situation might happen if file is downloading but user already left the chatview.
@ -1665,10 +1660,12 @@ class ChatActivity :
retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION) retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
retriever.release() // Always release the retriever to free resources retriever.release() // Always release the retriever to free resources
(durationStr?.toIntOrNull() ?: 0) / 1000 // Convert to int (seconds) (durationStr?.toIntOrNull() ?: 0) / 1000 // Convert to int (seconds)
} catch (e: Exception) { } catch (e: RuntimeException) {
Log.e( Log.e(
TAG, "An exception occurred while computing " + TAG,
"voice message duration for " + filename, e "An exception occurred while computing " +
"voice message duration for " + filename,
e
) )
0 0
} }
@ -1683,10 +1680,12 @@ class ChatActivity :
retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION) retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION)
retriever.release() // Always release the retriever to free resources retriever.release() // Always release the retriever to free resources
(durationStr?.toIntOrNull() ?: 0) / 1000 // Convert to int (seconds) (durationStr?.toIntOrNull() ?: 0) / 1000 // Convert to int (seconds)
} catch (e: Exception) { } catch (e: RuntimeException) {
Log.e( Log.e(
TAG, "An exception occurred while computing " + TAG,
"voice message duration for " + filename, e "An exception occurred while computing " +
"voice message duration for " + filename,
e
) )
0 0
} }
@ -1699,7 +1698,6 @@ class ChatActivity :
val hasConsecutiveVoiceMessage = if (nextMessage != null) nextMessage.isVoiceMessage else false val hasConsecutiveVoiceMessage = if (nextMessage != null) nextMessage.isVoiceMessage else false
mediaPlayer?.let { mediaPlayer?.let {
if (!it.isPlaying && doPlay) { if (!it.isPlaying && doPlay) {
chatViewModel.audioRequest(true) { chatViewModel.audioRequest(true) {
@ -1734,7 +1732,8 @@ class ChatActivity :
stopMediaPlayer(message) stopMediaPlayer(message)
if (hasConsecutiveVoiceMessage) { if (hasConsecutiveVoiceMessage) {
val defaultMediaPlayer = MediaPlayer.create( val defaultMediaPlayer = MediaPlayer.create(
context, R.raw context,
R.raw
.next_voice_message_doodle .next_voice_message_doodle
) )
defaultMediaPlayer.setOnCompletionListener { defaultMediaPlayer.setOnCompletionListener {
@ -3200,7 +3199,7 @@ class ChatActivity :
private fun isInfoMessageAboutDeletion(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean = private fun isInfoMessageAboutDeletion(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
currentMessage.value.parentMessageId != null && currentMessage.value.parentMessageId != null &&
currentMessage.value.systemMessageType == ChatMessage currentMessage.value.systemMessageType == ChatMessage
.SystemMessageType.MESSAGE_DELETED .SystemMessageType.MESSAGE_DELETED
private fun isReactionsMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean = private fun isReactionsMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION || currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION ||
@ -3210,7 +3209,7 @@ class ChatActivity :
private fun isEditMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean = private fun isEditMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
currentMessage.value.parentMessageId != null && currentMessage.value.parentMessageId != null &&
currentMessage.value.systemMessageType == ChatMessage currentMessage.value.systemMessageType == ChatMessage
.SystemMessageType.MESSAGE_EDITED .SystemMessageType.MESSAGE_EDITED
private fun isPollVotedMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean = private fun isPollVotedMessage(currentMessage: MutableMap.MutableEntry<String, ChatMessage>): Boolean =
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.POLL_VOTED currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.POLL_VOTED
@ -3505,7 +3504,7 @@ class ChatActivity :
val lon = data["longitude"]!! val lon = data["longitude"]!!
metaData = metaData =
"{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," + "{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," +
"\"longitude\":\"$lon\",\"name\":\"$name\"}" "\"longitude\":\"$lon\",\"name\":\"$name\"}"
} }
shareToNotes(shareUri, roomToken, message, objectId, metaData) shareToNotes(shareUri, roomToken, message, objectId, metaData)