fix ContentNotSupportedError not showing if cached and rename function

TeamNewPipe · Apr 9, 2020 · 5eba4e3 · 5eba4e3
1 parent 7012fba
commit 5eba4e3
Showing 1 changed file with 10 additions and 2 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
@@ -437,10 +437,12 @@ public void handleResult(@NonNull final ChannelInfo result) {
             // handling ContentNotSupportedException not to show the error but an appropriate string
             // so that crashes won't be sent uselessly and the user will understand what happened
             Iterator<Throwable> it = errors.iterator();
+            Throwable contentNotSupported = null;
             while (it.hasNext()) {
                 Throwable throwable = it.next();
                 if (throwable instanceof ContentNotSupportedException) {
-                    updateNoVideoDisplay();
+                    showContentNotSupported();
+                    contentNotSupported = throwable;
                     it.remove();
                 }
             }
@@ -449,6 +451,12 @@ public void handleResult(@NonNull final ChannelInfo result) {
                 showSnackBarError(result.getErrors(), UserAction.REQUESTED_CHANNEL,
                         NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
             }
+
+            if (contentNotSupported != null) {
+                // adding it after snackbarError so that it's not removed and
+                // the CNS error will still show up even if the channel is cached
+                errors.add(contentNotSupported);
+            }
         }
 
         if (disposables != null) {
@@ -468,7 +476,7 @@ public void handleResult(@NonNull final ChannelInfo result) {
                 .playOnBackgroundPlayer(activity, getPlayQueue(), false));
     }
 
-    private void updateNoVideoDisplay() {
+    private void showContentNotSupported() {
         contentNotSupportedTextView.setVisibility(View.VISIBLE);
         kaomojiTextView.setText("(︶︹︺)");
         kaomojiTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);