Merge branch 'refactor' into Playlist-Compose

Isira-Seneviratne · Isira-Seneviratne · commit cdacc048e123 · 2025-04-06T07:18:03.000+05:30
diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java
@@ -578,8 +578,8 @@ public void onBackPressed() {
             if (player instanceof BackPressable backPressable && !backPressable.onBackPressed()) {
                 BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder)
                         .setState(BottomSheetBehavior.STATE_COLLAPSED);
-                return;
             }
+            return;
         }
 
         if (fragmentManager.getBackStackEntryCount() == 1) {

Original file line number	Diff line number	Diff line change
`@@ -578,8 +578,8 @@ public void onBackPressed() {`
`578`	`578`	`if (player instanceof BackPressable backPressable && !backPressable.onBackPressed()) {`
`579`	`579`	`BottomSheetBehavior.from(mainBinding.fragmentPlayerHolder)`
`580`	`580`	`.setState(BottomSheetBehavior.STATE_COLLAPSED);`
`581`		`- return;`
`582`	`581`	`}`
	`582`	`+ return;`
`583`	`583`	`}`
`584`	`584`
`585`	`585`	`if (fragmentManager.getBackStackEntryCount() == 1) {`