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

Merge pull request #2771 from nextcloud/bugfix/noid/fixNpeVoiceMessagePlayback

Browse Source 
avoid NPE for voice message playback
This commit is contained in:
Marcel Hibbe 2023-02-16 15:20:10 +01:00 committed by GitHub
commit 989e3fe211
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -975,25 +975,27 @@ class ChatController(args: Bundle) :
initMediaPlayer(message) initMediaPlayer(message)
if (!mediaPlayer!!.isPlaying) { mediaPlayer?.let {
mediaPlayer!!.start() if (!it.isPlaying) {
} it.start()
mediaPlayerHandler = Handler()
activity?.runOnUiThread(object : Runnable {
override fun run() {
if (mediaPlayer != null) {
val currentPosition: Int = mediaPlayer!!.currentPosition / VOICE_MESSAGE_SEEKBAR_BASE
message.voiceMessagePlayedSeconds = currentPosition
adapter?.update(message)
}
mediaPlayerHandler.postDelayed(this, SECOND)
} }
})
message.isDownloadingVoiceMessage = false mediaPlayerHandler = Handler()
message.isPlayingVoiceMessage = true activity?.runOnUiThread(object : Runnable {
adapter?.update(message) override fun run() {
if (mediaPlayer != null) {
val currentPosition: Int = mediaPlayer!!.currentPosition / VOICE_MESSAGE_SEEKBAR_BASE
message.voiceMessagePlayedSeconds = currentPosition
adapter?.update(message)
}
mediaPlayerHandler.postDelayed(this, SECOND)
}
})
message.isDownloadingVoiceMessage = false
message.isPlayingVoiceMessage = true
adapter?.update(message)
}
} }
private fun pausePlayback(message: ChatMessage) { private fun pausePlayback(message: ChatMessage) {
@ -1031,8 +1033,6 @@ class ChatController(args: Bundle) :
Log.e(TAG, "failed to initialize mediaPlayer", e) Log.e(TAG, "failed to initialize mediaPlayer", e)
Toast.makeText(context, R.string.nc_common_error_sorry, Toast.LENGTH_LONG).show() Toast.makeText(context, R.string.nc_common_error_sorry, Toast.LENGTH_LONG).show()
} }
} else {
Log.e(TAG, "mediaPlayer was not null. This should not happen!")
} }
} }