Merge pull request #3300 from B0pol/content_not_supported

handle ContentNotSupportedException

app/build.gradle

@@ -136,7 +136,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:69e0624e3'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:a5155fb'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 

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

@@ -20,6 +20,7 @@
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.ReCaptchaActivity;
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
+import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.report.ErrorActivity;
 import org.schabi.newpipe.report.UserAction;
@@ -216,6 +217,9 @@ protected boolean onError(final Throwable exception) {
         } else if (exception instanceof IOException) {
             showError(getString(R.string.network_error), true);
             return true;
+        } else if (exception instanceof ContentNotSupportedException) {
+            showError(getString(R.string.content_not_supported), false);
+            return true;
         }
 
         return false;

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

@@ -6,6 +6,7 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -30,6 +31,7 @@
 import org.schabi.newpipe.extractor.ListExtractor;
 import org.schabi.newpipe.extractor.NewPipe;
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
+import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
 import org.schabi.newpipe.extractor.exceptions.ExtractionException;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.fragments.list.BaseListInfoFragment;
@@ -45,6 +47,7 @@
 import org.schabi.newpipe.util.ShareUtils;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -83,6 +86,9 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     private LinearLayout headerPopupButton;
     private LinearLayout headerBackgroundButton;
     private MenuItem menuRssButton;
+    private TextView contentNotSupportedTextView;
+    private TextView kaomojiTextView;
+    private TextView noVideosTextView;
 
     public static ChannelFragment getInstance(final int serviceId, final String url,
                                               final String name) {
@@ -118,6 +124,14 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
         return inflater.inflate(R.layout.fragment_channel, container, false);
     }
 
+    @Override
+    public void onViewCreated(final View rootView, final Bundle savedInstanceState) {
+        super.onViewCreated(rootView, savedInstanceState);
+        contentNotSupportedTextView = rootView.findViewById(R.id.error_content_not_supported);
+        kaomojiTextView = rootView.findViewById(R.id.channel_kaomoji);
+        noVideosTextView = rootView.findViewById(R.id.channel_no_videos);
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -234,7 +248,7 @@ private void monitorSubscription(final ChannelInfo info) {
                 .debounce(100, TimeUnit.MILLISECONDS)
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe((List<SubscriptionEntity> subscriptionEntities) ->
-                                updateSubscribeButton(!subscriptionEntities.isEmpty()), onError));
+                        updateSubscribeButton(!subscriptionEntities.isEmpty()), onError));
 
     }
 
@@ -417,9 +431,23 @@ public void handleResult(@NonNull final ChannelInfo result) {
 
         playlistCtrl.setVisibility(View.VISIBLE);
 
-        if (!result.getErrors().isEmpty()) {
-            showSnackBarError(result.getErrors(), UserAction.REQUESTED_CHANNEL,
-                    NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+        List<Throwable> errors = new ArrayList<>(result.getErrors());
+        if (!errors.isEmpty()) {
+
+            // 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
+            for (Iterator<Throwable> it = errors.iterator(); it.hasNext();) {
+                Throwable throwable = it.next();
+                if (throwable instanceof ContentNotSupportedException) {
+                    showContentNotSupported();
+                    it.remove();
+                }
+            }
+
+            if (!errors.isEmpty()) {
+                showSnackBarError(errors, UserAction.REQUESTED_CHANNEL,
+                        NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
+            }
         }
 
         if (disposables != null) {
@@ -439,6 +467,13 @@ public void handleResult(@NonNull final ChannelInfo result) {
                 .playOnBackgroundPlayer(activity, getPlayQueue(), false));
     }
 
+    private void showContentNotSupported() {
+        contentNotSupportedTextView.setVisibility(View.VISIBLE);
+        kaomojiTextView.setText("(︶︹︺)");
+        kaomojiTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);
+        noVideosTextView.setVisibility(View.GONE);
+    }
+
     private PlayQueue getPlayQueue() {
         return getPlayQueue(0);
     }

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

@@ -37,6 +37,7 @@
 import org.schabi.newpipe.extractor.channel.ChannelInfo;
 import org.schabi.newpipe.extractor.comments.CommentsInfo;
 import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
+import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
 import org.schabi.newpipe.extractor.exceptions.ParsingException;
 import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
 import org.schabi.newpipe.extractor.feed.FeedExtractor;
@@ -293,6 +294,8 @@ public static void handleGeneralException(final Context context, final int servi
                 Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show();
             } else if (exception instanceof ContentNotAvailableException) {
                 Toast.makeText(context, R.string.content_not_available, Toast.LENGTH_LONG).show();
+            } else if (exception instanceof ContentNotSupportedException) {
+                Toast.makeText(context, R.string.content_not_supported, Toast.LENGTH_LONG).show();
             } else {
                 int errorId = exception instanceof YoutubeStreamExtractor.DecryptException
                         ? R.string.youtube_signature_decryption_error

app/src/main/res/layout/fragment_channel.xml

@@ -32,6 +32,7 @@
         tools:visibility="visible">
 
         <TextView
+            android:id="@+id/channel_kaomoji"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -42,12 +43,22 @@
             tools:ignore="HardcodedText,UnusedAttribute"/>
 
         <TextView
+            android:id="@+id/channel_no_videos"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/empty_view_no_videos"
             android:textSize="24sp"/>
 
+        <TextView
+            android:layout_marginTop="20dp"
+            android:id="@+id/error_content_not_supported"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/content_not_supported"
+            android:textSize="15sp"
+            android:visibility="gone" />
+
     </LinearLayout>
 
     <!--ERROR PANEL-->

app/src/main/res/values-eo/strings.xml

@@ -586,4 +586,5 @@
     <string name="mute">Mutigi</string>
     <string name="unmute">Malmutigi</string>
     <string name="help">Helpo</string>
+    <string name="content_not_supported">Tio enhavo ne estas ankoraŭ subtenata per NewPipe.\n\nĜi espereble estos en sekvanta versio.</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -598,4 +598,5 @@
 \n
 \n Donc le choix vous revient : Préferez-vous la vitesse ou des informations précises \?</string>
     <string name="help">Aide</string>
+    <string name="content_not_supported">Ce contenu n\'est pas encore supporté par NewPipe.\n\nIl le sera peut-être dans une version future.</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -637,4 +637,5 @@
     <string name="feed_use_dedicated_fetch_method_enable_button">Enable fast mode</string>
     <string name="feed_use_dedicated_fetch_method_disable_button">Disable fast mode</string>
     <string name="feed_use_dedicated_fetch_method_help_text">Do you think feed loading is too slow? If so, try enabling fast loading (you can change it in settings or by pressing the button below).\n\nNewPipe offers two feed loading strategies:\n• Fetching the whole subscription channel, which is slow but complete.\n• Using a dedicated service endpoint, which is fast but usually not complete.\n\nThe difference between the two is that the fast one usually lacks some information, like the item\'s duration or type (can\'t distinguish between live videos and normal ones) and it may return less items.\n\nYouTube is an example of a service that offers this fast method with its RSS feed.\n\nSo the choice boils down to what you prefer: speed or precise information.</string>
+    <string name="content_not_supported">This content is not yet supported by NewPipe.\n\nIt will hopefully be supported in a future version.</string>
 </resources>