Merge pull request #3892 from wb9688/fix-local-playlist-tab

Fix crash when opening video in local playlist tab

app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java

@@ -148,10 +148,8 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte
         switch (item.getItemId()) {
             case R.id.action_search:
                 try {
-                    NavigationHelper.openSearchFragment(
+                    NavigationHelper.openSearchFragment(getFM(),
-                            getFragmentManager(),
+                            ServiceHelper.getSelectedServiceId(activity), "");
-                            ServiceHelper.getSelectedServiceId(activity),
-                            "");
                 } catch (Exception e) {
                     ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
                 }

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -504,7 +504,7 @@ public class VideoDetailFragment
             case ReCaptchaActivity.RECAPTCHA_REQUEST:
                 if (resultCode == Activity.RESULT_OK) {
                     NavigationHelper
-                            .openVideoDetailFragment(getFragmentManager(), serviceId, url, name);
+                            .openVideoDetailFragment(getFM(), serviceId, url, name);
                 } else {
                     Log.e(TAG, "ReCaptcha failed");
                 }
@@ -578,9 +578,9 @@ public class VideoDetailFragment
                 openPopupPlayer(false);
                 break;
             case R.id.detail_controls_playlist_append:
-                if (getFragmentManager() != null && currentInfo != null) {
+                if (getFM() != null && currentInfo != null) {
                     PlaylistAppendDialog.fromStreamInfo(currentInfo)
-                            .show(getFragmentManager(), TAG);
+                            .show(getFM(), TAG);
                 }
                 break;
             case R.id.detail_controls_download:
@@ -633,11 +633,8 @@ public class VideoDetailFragment
 
     private void openChannel(final String subChannelUrl, final String subChannelName) {
         try {
-            NavigationHelper.openChannelFragment(
+            NavigationHelper.openChannelFragment(getFM(), currentInfo.getServiceId(),
-                    getFragmentManager(),
+                    subChannelUrl, subChannelName);
-                    currentInfo.getServiceId(),
-                    subChannelUrl,
-                    subChannelName);
         } catch (Exception e) {
             ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
         }

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -426,8 +426,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo>
             case R.id.sub_channel_title_view:
                 if (!TextUtils.isEmpty(currentInfo.getParentChannelUrl())) {
                     try {
-                        NavigationHelper.openChannelFragment(getFragmentManager(),
+                        NavigationHelper.openChannelFragment(getFM(), currentInfo.getServiceId(),
-                                currentInfo.getServiceId(), currentInfo.getParentChannelUrl(),
+                                currentInfo.getParentChannelUrl(),
                                 currentInfo.getParentChannelName());
                     } catch (Exception e) {
                         ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -286,10 +286,8 @@ public class PlaylistFragment extends BaseListInfoFragment<PlaylistInfo> {
             if (!TextUtils.isEmpty(result.getUploaderUrl())) {
                 headerUploaderLayout.setOnClickListener(v -> {
                     try {
-                        NavigationHelper.openChannelFragment(getFragmentManager(),
+                        NavigationHelper.openChannelFragment(getFM(), result.getServiceId(),
-                                result.getServiceId(),
+                                result.getUploaderUrl(), result.getUploaderName());
-                                result.getUploaderUrl(),
-                                result.getUploaderName());
                     } catch (Exception e) {
                         ErrorActivity.reportUiError((AppCompatActivity) getActivity(), e);
                     }

app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java

@@ -505,7 +505,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                 Log.d(TAG, "onClick() called with: v = [" + v + "]");
             }
             if (TextUtils.isEmpty(searchEditText.getText())) {
-                NavigationHelper.gotoMainFragment(getFragmentManager());
+                NavigationHelper.gotoMainFragment(getFM());
                 return;
             }
 
@@ -807,7 +807,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(intent -> {
-                            getFragmentManager().popBackStackImmediate();
+                            getFM().popBackStackImmediate();
                             activity.startActivity(intent);
                         }, throwable ->
                                 showError(getString(R.string.url_not_supported_toast), false)));

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -177,7 +177,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
             public void selected(final LocalItem selectedItem) {
                 if (selectedItem instanceof PlaylistStreamEntry) {
                     final PlaylistStreamEntry item = (PlaylistStreamEntry) selectedItem;
-                    NavigationHelper.openVideoDetailFragment(getFragmentManager(),
+                    NavigationHelper.openVideoDetailFragment(getFM(),
                             item.getStreamEntity().getServiceId(), item.getStreamEntity().getUrl(),
                             item.getStreamEntity().getTitle());
                 }