Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: back gesture handling in no internet activity #6646

Merged
merged 1 commit into from
Oct 21, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.github.libretube.ui.activities
import android.content.Intent
import android.os.Bundle
import androidx.activity.addCallback
import androidx.fragment.app.Fragment
import androidx.fragment.app.commit
import androidx.fragment.app.replace
import com.github.libretube.R
Expand Down Expand Up @@ -43,17 +44,27 @@ class NoInternetActivity : BaseActivity() {
setContentView(binding.root)

onBackPressedDispatcher.addCallback(this) {
supportFragmentManager.fragments.filterIsInstance<DownloadsFragment>()
.firstOrNull()
?.let {
supportFragmentManager.commit {
remove(it)
}
}
?: finishAffinity()
if (removeFragment<DownloadsFragment>() || removeFragment<AudioPlayerFragment>()) return@addCallback

finishAffinity()
}
}

private inline fun <reified T: Fragment> removeFragment(): Boolean {
val fragment = supportFragmentManager.fragments.filterIsInstance<T>()
.firstOrNull()

if (fragment != null) {
supportFragmentManager.commit {
remove(fragment)
}

return true
}

return false
}

override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)

Expand Down
Loading