Fixed crash when leaving video file viewer
This commit is contained in:
parent
dbdc06bbff
commit
5411648e2e
2 changed files with 12 additions and 6 deletions
|
@ -75,11 +75,20 @@ class VideoViewerFragment : SecureFragment<VideoViewerFragmentBinding>() {
|
||||||
if (mediaController.isShowing) {
|
if (mediaController.isShowing) {
|
||||||
mediaController.hide()
|
mediaController.hide()
|
||||||
}
|
}
|
||||||
binding.videoView.pause()
|
|
||||||
|
if (binding.videoView.isPlaying) {
|
||||||
|
binding.videoView.pause()
|
||||||
|
}
|
||||||
|
|
||||||
super.onPause()
|
super.onPause()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onDestroyView() {
|
||||||
|
binding.videoView.stopPlayback()
|
||||||
|
|
||||||
|
super.onDestroyView()
|
||||||
|
}
|
||||||
|
|
||||||
private fun initMediaController() {
|
private fun initMediaController() {
|
||||||
val videoView = binding.videoView
|
val videoView = binding.videoView
|
||||||
|
|
||||||
|
@ -95,10 +104,6 @@ class VideoViewerFragment : SecureFragment<VideoViewerFragmentBinding>() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
videoView.setOnCompletionListener { mediaPlayer ->
|
|
||||||
mediaPlayer.release()
|
|
||||||
}
|
|
||||||
|
|
||||||
videoView.setOnErrorListener { _, what, extra ->
|
videoView.setOnErrorListener { _, what, extra ->
|
||||||
Log.e("[Video Viewer] Error: $what ($extra)")
|
Log.e("[Video Viewer] Error: $what ($extra)")
|
||||||
false
|
false
|
||||||
|
|
|
@ -107,7 +107,8 @@ class CorePreferences constructor(private val context: Context) {
|
||||||
|
|
||||||
/* Chat */
|
/* Chat */
|
||||||
|
|
||||||
// iOS app currently can't display more than 1 file per message
|
// iOS and Android 4.4.x releases currently can't display more than 1 file per message
|
||||||
|
// TODO: Remove for the release, this won't be necessary anymore
|
||||||
var preventMoreThanOneFilePerMessage: Boolean
|
var preventMoreThanOneFilePerMessage: Boolean
|
||||||
get() = config.getBool("app", "prevent_more_than_one_file_per_message", true)
|
get() = config.getBool("app", "prevent_more_than_one_file_per_message", true)
|
||||||
set(value) {
|
set(value) {
|
||||||
|
|
Loading…
Reference in a new issue