diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt index 452b290f..b6bbc04d 100644 --- a/app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt +++ b/app/src/main/java/com/futo/platformplayer/dialogs/AutoUpdateDialog.kt @@ -176,8 +176,7 @@ class AutoUpdateDialog(context: Context?) : AlertDialog(context) { withContext(Dispatchers.Main) { onReceiveResult("Failed to download update."); } - } - finally { + } finally { withContext(Dispatchers.Main) { window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/ImportDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/ImportDialog.kt index 62305de1..f12b1305 100644 --- a/app/src/main/java/com/futo/platformplayer/dialogs/ImportDialog.kt +++ b/app/src/main/java/com/futo/platformplayer/dialogs/ImportDialog.kt @@ -200,6 +200,8 @@ class ImportDialog : AlertDialog { _uiResultBot.visibility = View.VISIBLE; } catch (e: Throwable) { Logger.e(TAG, "Failed to update import UI.", e) + } finally { + window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } } } catch (e: Throwable) { diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/MigrateDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/MigrateDialog.kt index e933a425..dd91a7eb 100644 --- a/app/src/main/java/com/futo/platformplayer/dialogs/MigrateDialog.kt +++ b/app/src/main/java/com/futo/platformplayer/dialogs/MigrateDialog.kt @@ -213,6 +213,8 @@ class MigrateDialog : AlertDialog { _uiResultBot.visibility = View.VISIBLE; } catch (e: Throwable) { Logger.e(TAG, "Failed to update import UI.", e) + } finally { + window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } } } catch (e: Throwable) { diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt index fea155de..033eb62b 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt @@ -142,7 +142,6 @@ class VideoDetailFragment : MainFragment { } override fun onHide() { super.onHide(); - activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } fun preventPictureInPicture() { @@ -175,6 +174,7 @@ class VideoDetailFragment : MainFragment { _viewDetail?.onStop(); close(); + activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); StatePlayer.instance.clearQueue(); StatePlayer.instance.setPlayerClosed(); } diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt index 84b66898..70ebd3cb 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt @@ -23,6 +23,7 @@ import android.view.MotionEvent import android.view.View import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.view.ViewGroup.LayoutParams.WRAP_CONTENT +import android.view.WindowManager import android.widget.* import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.lifecycleScope