mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-29 09:39:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix app closing on pressing back (#565)

Browse source
This commit is contained in:
Quickdesh 2022-05-03 05:28:55 +09:00 committed by GitHub
parent 856847f06e
commit b10a4c7fcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerActivity.kt
View file

@ -809,9 +809,6 @@ class PlayerActivity :
player.destroy() player.destroy()
} }
abandonAudioFocus() abandonAudioFocus()
if (packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
finishAndRemoveTask()
}
super.onDestroy() super.onDestroy()
} }
@ -1129,11 +1126,13 @@ class PlayerActivity :
private fun eventPropertyUi(property: String, value: Boolean) { private fun eventPropertyUi(property: String, value: Boolean) {
when (property) { when (property) {
"pause" -> { "pause" -> {
if (!isFinishing) {
setAudioFocus(value) setAudioFocus(value)
updatePlaybackStatus(value) updatePlaybackStatus(value)
} }
} }
} }
}
override fun eventProperty(property: String) {} override fun eventProperty(property: String) {}

4
app/src/main/java/eu/kanade/tachiyomi/ui/player/PlayerControlsView.kt
View file

@ -67,8 +67,8 @@ class PlayerControlsView @JvmOverloads constructor(context: Context, attrs: Attr
PackageManager.FEATURE_PICTURE_IN_PICTURE, PackageManager.FEATURE_PICTURE_IN_PICTURE,
) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
} }
binding.backArrowBtnLandscape.setOnClickListener { activity.finishAndRemoveTask() } binding.backArrowBtnLandscape.setOnClickListener { activity.onBackPressed() }
binding.backArrowBtnPortrait.setOnClickListener { activity.finishAndRemoveTask() } binding.backArrowBtnPortrait.setOnClickListener { activity.onBackPressed() }
// Lock and Unlock controls // Lock and Unlock controls
binding.lockBtn.setOnClickListener { lockControls(true) } binding.lockBtn.setOnClickListener { lockControls(true) }