kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-15 06:40:30 +05:30
Code Issues Projects Releases Wiki Activity

Merge branch 'libre-tube:master' into master

Browse Source
This commit is contained in:
XelXen 2022-09-18 14:48:12 +05:30 committed by GitHub
commit 46b29f3813
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/github/libretube/activities/MainActivity.kt
View File

@ -165,8 +165,6 @@ class MainActivity : BaseActivity() {
// new way of handling back presses // new way of handling back presses
onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) { onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
navController.popBackStack(R.id.searchFragment, false)
if (binding.mainMotionLayout.progress == 0F) { if (binding.mainMotionLayout.progress == 0F) {
try { try {
minimizePlayer() minimizePlayer()
@ -289,6 +287,13 @@ class MainActivity : BaseActivity() {
} }
override fun onQueryTextChange(newText: String?): Boolean { override fun onQueryTextChange(newText: String?): Boolean {
// prevent malicious navigation when the search view is getting collapsed
if (navController.currentDestination?.id == R.id.searchResultFragment &&
(newText == null || newText == "")
) {
return false
}
if (navController.currentDestination?.id != R.id.searchFragment) { if (navController.currentDestination?.id != R.id.searchFragment) {
val bundle = Bundle() val bundle = Bundle()
bundle.putString("query", newText) bundle.putString("query", newText)
@ -296,6 +301,7 @@ class MainActivity : BaseActivity() {
} else { } else {
searchViewModel.setQuery(newText) searchViewModel.setQuery(newText)
} }
return true return true
} }
}) })