remove existing comment replies screens before adding new one. Also close all comment replies screens when the video details screen is closed.

Author: aivelon

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

@@ -2446,6 +2446,7 @@ private void setOverlayLook(final AppBarLayout appBar,
         // SlideOffset < 0 when mini player is about to close via swipe.
         // Stop animation in this case
         if (behavior == null || slideOffset < 0) {
+            NavigationHelper.closeCommentRepliesFragments(activity);
             return;
         }
         binding.overlayLayout.setAlpha(Math.min(MAX_OVERLAY_ALPHA, 1 - slideOffset));

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

@@ -1009,7 +1009,11 @@ public void handleSuggestions(@NonNull final List<SuggestionItem> suggestions) {
             Log.d(TAG, "handleSuggestions() called with: suggestions = [" + suggestions + "]");
         }
         suggestionListAdapter.submitList(suggestions,
-                () -> searchBinding.suggestionsList.scrollToPosition(0));
+                () -> {
+                    if (searchBinding != null) {
+                        searchBinding.suggestionsList.scrollToPosition(0);
+                    }
+                });
 
         if (suggestionsPanelVisible && isErrorPanelVisible()) {
             hideLoading();

app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java

@@ -501,13 +501,49 @@ public static void openCommentAuthorIfPresent(@NonNull final FragmentActivity ac
 
     public static void openCommentRepliesFragment(@NonNull final FragmentActivity activity,
                                                   @NonNull final CommentsInfoItem comment) {
+        closeCommentRepliesFragments(activity);
         defaultTransaction(activity.getSupportFragmentManager())
                 .replace(R.id.fragment_holder, new CommentRepliesFragment(comment),
                         CommentRepliesFragment.TAG)
                 .addToBackStack(CommentRepliesFragment.TAG)
                 .commit();
     }
 
+    // This removes all of the top CommentRepliesFragment instances.
+    // Ideally there should only be one since we remove existing before opening a new one.
+    public static void closeCommentRepliesFragments(@NonNull final FragmentActivity activity) {
+        final FragmentManager fm = activity.getSupportFragmentManager();
+
+        // Remove all existing fragment instances tagged as CommentRepliesFragment
+        final FragmentTransaction tx = defaultTransaction(fm);
+        boolean removed = false;
+        for (final Fragment fragment : fm.getFragments()) {
+            if (fragment != null && CommentRepliesFragment.TAG.equals(fragment.getTag())) {
+                tx.remove(fragment);
+                removed = true;
+            }
+        }
+        if (removed) {
+            tx.commit();
+        }
+
+        // Only pop back stack entries named CommentRepliesFragment.TAG if they are at the top.
+        while (true) {
+            final int count = fm.getBackStackEntryCount();
+            if (count == 0) {
+                break;
+            }
+            final FragmentManager.BackStackEntry topEntry = fm.getBackStackEntryAt(count - 1);
+            final String topName = topEntry.getName();
+            if (CommentRepliesFragment.TAG.equals(topName)) {
+                // Safe to pop the topmost matching entry (it won't remove other unrelated entries)
+                fm.popBackStackImmediate(topName, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+            } else {
+                break;
+            }
+        }
+    }
+
     public static void openPlaylistFragment(final FragmentManager fragmentManager,
                                             final int serviceId, final String url,
                                             @NonNull final String name) {