Fix crash when rotating device on unsupported channels

GGAutomaton · Apr 4, 2022 · 2e771cd · 2e771cd
1 parent 629b685
commit 2e771cd
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -77,6 +77,8 @@ public class ChannelFragment extends BaseListInfoFragment<StreamInfoItem, Channe
     private final CompositeDisposable disposables = new CompositeDisposable();
     private Disposable subscribeButtonMonitor;
 
+    private boolean channelContentNotSupported;
+
     /*//////////////////////////////////////////////////////////////////////////
     // Views
     //////////////////////////////////////////////////////////////////////////*/
@@ -130,6 +132,9 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         channelBinding = FragmentChannelBinding.bind(rootView);
+        if (channelContentNotSupported) {
+            showContentNotSupported();
+        }
     }
 
     @Override
@@ -524,9 +529,15 @@ public void handleResult(@NonNull final ChannelInfo result) {
             playlistControlBinding.getRoot().setVisibility(View.GONE);
         }
 
+        channelContentNotSupported = false;
         for (final Throwable throwable : result.getErrors()) {
             if (throwable instanceof ContentNotSupportedException) {
-                showContentNotSupported();
+                /*
+                channelBinding might not be initialized when handleResult() is called
+                (e.g. after rotating the screen, https://github.com/TeamNewPipe/NewPipe/issues/6696)
+                showContentNotSupported() will be called later
+                 */
+                channelContentNotSupported = true;
             }
         }