From 34468c16addb6f82b006ad0ed2a33cf4fef5d6b8 Mon Sep 17 00:00:00 2001
From: GGAutomaton <32899400+GGAutomaton@users.noreply.github.com>
Date: Wed, 4 May 2022 23:34:07 +0800
Subject: [PATCH] Show "content not supported" if needed

---
 .../list/channel/ChannelFragment.java          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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
index 6ad811320..0f268410b 100644
--- 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
@@ -132,9 +132,7 @@ public class ChannelFragment extends BaseListInfoFragment<StreamInfoItem, Channe
     public void onViewCreated(@NonNull final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         channelBinding = FragmentChannelBinding.bind(rootView);
-        if (channelContentNotSupported) {
-            showContentNotSupported();
-        }
+        showContentNotSupportedIfNeeded();
     }
 
     @Override
@@ -532,12 +530,8 @@ public class ChannelFragment extends BaseListInfoFragment<StreamInfoItem, Channe
         channelContentNotSupported = false;
         for (final Throwable throwable : result.getErrors()) {
             if (throwable instanceof ContentNotSupportedException) {
-                /*
-                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;
+                showContentNotSupportedIfNeeded();
             }
         }
 
@@ -569,7 +563,13 @@ public class ChannelFragment extends BaseListInfoFragment<StreamInfoItem, Channe
         });
     }
 
-    private void showContentNotSupported() {
+    private void showContentNotSupportedIfNeeded() {
+        // channelBinding might not be initialized when handleResult() is called
+        // (e.g. after rotating the screen, #6696)
+        if (!channelContentNotSupported || channelBinding == null) {
+            return;
+        }
+
         channelBinding.errorContentNotSupported.setVisibility(View.VISIBLE);
         channelBinding.channelKaomoji.setText("(︶︹︺)");
         channelBinding.channelKaomoji.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);