gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve codacy score

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-06-21 23:20:13 +02:00
parent 2cf5952fae
commit 4ebc64de1c
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,8 +112,12 @@ class IncomingVoiceMessageViewHolder(incomingView: View) : MessageHolders
activity = itemView.context as Activity activity = itemView.context as Activity
binding.seekbar.setOnSeekBarChangeListener(object : OnSeekBarChangeListener { binding.seekbar.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
override fun onStopTrackingTouch(seekBar: SeekBar) {} override fun onStopTrackingTouch(seekBar: SeekBar) {
override fun onStartTrackingTouch(seekBar: SeekBar) {} // unused atm
}
override fun onStartTrackingTouch(seekBar: SeekBar) {
// unused atm
}
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
if (mediaPlayer != null && fromUser) { if (mediaPlayer != null && fromUser) {
mediaPlayer!!.seekTo(progress * SEEKBAR_BASE) mediaPlayer!!.seekTo(progress * SEEKBAR_BASE)

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

@ -105,8 +105,12 @@ class OutcomingVoiceMessageViewHolder(incomingView: View) : MessageHolders
activity = itemView.context as Activity activity = itemView.context as Activity
binding.seekbar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener { binding.seekbar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
override fun onStopTrackingTouch(seekBar: SeekBar) {} override fun onStopTrackingTouch(seekBar: SeekBar) {
override fun onStartTrackingTouch(seekBar: SeekBar) {} // unused atm
}
override fun onStartTrackingTouch(seekBar: SeekBar) {
// unused atm
}
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
if (mediaPlayer != null && fromUser) { if (mediaPlayer != null && fromUser) {
mediaPlayer!!.seekTo(progress * SEEKBAR_BASE) mediaPlayer!!.seekTo(progress * SEEKBAR_BASE)

31
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -37,6 +37,7 @@ import android.graphics.drawable.ColorDrawable
import android.media.MediaRecorder import android.media.MediaRecorder
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Build.VERSION_CODES.O
import android.os.Bundle import android.os.Bundle
import android.os.Handler import android.os.Handler
import android.os.SystemClock import android.os.SystemClock
@ -663,7 +664,7 @@ class ChatController(args: Bundle) :
showRecordAudioUi(false) showRecordAudioUi(false)
voiceRecordEndTime = System.currentTimeMillis() voiceRecordEndTime = System.currentTimeMillis()
var voiceRecordDuration = voiceRecordEndTime - voiceRecordStartTime val voiceRecordDuration = voiceRecordEndTime - voiceRecordStartTime
if (voiceRecordDuration < MINIMUM_VOICE_RECORD_DURATION) { if (voiceRecordDuration < MINIMUM_VOICE_RECORD_DURATION) {
Log.d(TAG, "voiceRecordDuration: " + voiceRecordDuration) Log.d(TAG, "voiceRecordDuration: " + voiceRecordDuration)
Toast.makeText( Toast.makeText(
@ -694,7 +695,7 @@ class ChatController(args: Bundle) :
sliderInitX = binding.messageInputView.slideToCancelDescription.x sliderInitX = binding.messageInputView.slideToCancelDescription.x
} }
var movedX: Float = event.x val movedX: Float = event.x
deltaX = movedX - downX deltaX = movedX - downX
// only allow slide to left // only allow slide to left
@ -844,6 +845,7 @@ class ChatController(args: Bundle) :
cachedFile.delete() cachedFile.delete()
} }
@Suppress("Detekt.TooGenericExceptionCaught")
private fun stopAudioRecording() { private fun stopAudioRecording() {
binding.messageInputView.audioRecordDuration.stop() binding.messageInputView.audioRecordDuration.stop()
binding.messageInputView.microphoneEnabledInfo.clearAnimation() binding.messageInputView.microphoneEnabledInfo.clearAnimation()
@ -869,10 +871,10 @@ class ChatController(args: Bundle) :
fun vibrate() { fun vibrate() {
val vibrator = context?.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator val vibrator = context?.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator
if (Build.VERSION.SDK_INT >= 26) { if (Build.VERSION.SDK_INT >= O) {
vibrator.vibrate(VibrationEffect.createOneShot(20, VibrationEffect.DEFAULT_AMPLITUDE)) vibrator.vibrate(VibrationEffect.createOneShot(SHORT_VIBRATE, VibrationEffect.DEFAULT_AMPLITUDE))
} else { } else {
vibrator.vibrate(20) vibrator.vibrate(SHORT_VIBRATE)
} }
} }
@ -893,16 +895,16 @@ class ChatController(args: Bundle) :
Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY
) { ) {
conversationVoiceCallMenuItem?.icon?.alpha = 99 conversationVoiceCallMenuItem?.icon?.alpha = SEMI_TRANSPARENT_INT
conversationVideoMenuItem?.icon?.alpha = 99 conversationVideoMenuItem?.icon?.alpha = SEMI_TRANSPARENT_INT
binding.messageInputView.visibility = View.GONE binding.messageInputView.visibility = View.GONE
} else { } else {
if (conversationVoiceCallMenuItem != null) { if (conversationVoiceCallMenuItem != null) {
conversationVoiceCallMenuItem?.icon?.alpha = 255 conversationVoiceCallMenuItem?.icon?.alpha = FULLY_OPAQUE_INT
} }
if (conversationVideoMenuItem != null) { if (conversationVideoMenuItem != null) {
conversationVideoMenuItem?.icon?.alpha = 255 conversationVideoMenuItem?.icon?.alpha = FULLY_OPAQUE_INT
} }
if (currentConversation != null && currentConversation!!.shouldShowLobby(conversationUser) if (currentConversation != null && currentConversation!!.shouldShowLobby(conversationUser)
@ -1869,14 +1871,14 @@ class ChatController(args: Bundle) :
return true return true
} }
R.id.conversation_video_call -> { R.id.conversation_video_call -> {
if (conversationVideoMenuItem?.icon?.alpha == 255) { if (conversationVideoMenuItem?.icon?.alpha == FULLY_OPAQUE_INT) {
startACall(false) startACall(false)
return true return true
} }
return false return false
} }
R.id.conversation_voice_call -> { R.id.conversation_voice_call -> {
if (conversationVoiceCallMenuItem?.icon?.alpha == 255) { if (conversationVoiceCallMenuItem?.icon?.alpha == FULLY_OPAQUE_INT) {
startACall(true) startACall(true)
return true return true
} }
@ -2218,8 +2220,8 @@ class ChatController(args: Bundle) :
override fun hasContentFor(message: ChatMessage, type: Byte): Boolean { override fun hasContentFor(message: ChatMessage, type: Byte): Boolean {
return when (type) { return when (type) {
CONTENT_TYPE_LOCATION -> return message.hasGeoLocation() CONTENT_TYPE_LOCATION -> message.hasGeoLocation()
CONTENT_TYPE_VOICE_MESSAGE -> return message.isVoiceMessage() CONTENT_TYPE_VOICE_MESSAGE -> message.isVoiceMessage()
CONTENT_TYPE_SYSTEM_MESSAGE -> !TextUtils.isEmpty(message.systemMessage) CONTENT_TYPE_SYSTEM_MESSAGE -> !TextUtils.isEmpty(message.systemMessage)
CONTENT_TYPE_UNREAD_NOTICE_MESSAGE -> message.id == "-1" CONTENT_TYPE_UNREAD_NOTICE_MESSAGE -> message.id == "-1"
else -> false else -> false
@ -2340,5 +2342,8 @@ class ChatController(args: Bundle) :
private const val VOICE_RECORD_CANCEL_SLIDER_X: Int = -50 private const val VOICE_RECORD_CANCEL_SLIDER_X: Int = -50
private const val VOICE_MESSAGE_META_DATA = "{\"messageType\":\"voice-message\"}" private const val VOICE_MESSAGE_META_DATA = "{\"messageType\":\"voice-message\"}"
private const val VOICE_MESSAGE_FILE_SUFFIX = ".mp3" private const val VOICE_MESSAGE_FILE_SUFFIX = ".mp3"
private const val SHORT_VIBRATE: Long = 20
private const val FULLY_OPAQUE_INT: Int = 255
private const val SEMI_TRANSPARENT_INT: Int = 99
} }
} }