Catch errors while processing timestamp-links

Otherwise the complete app crashes, which is bad
gitryder · Aug 4, 2021 · 51c60e5 · 51c60e5
1 parent 12e46e0
commit 51c60e5
Showing 1 changed file with 21 additions and 13 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
@@ -5,6 +5,7 @@
 import android.text.method.LinkMovementMethod;
 import android.text.style.URLSpan;
 import android.text.util.Linkify;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
@@ -32,6 +33,8 @@
 import de.hdodenhof.circleimageview.CircleImageView;
 
 public class CommentsMiniInfoItemHolder extends InfoItemHolder {
+    private static final String TAG = "CommentsMiniIIHolder";
+
     private static final int COMMENT_DEFAULT_LINES = 2;
     private static final int COMMENT_EXPANDED_LINES = 1000;
     private static final Pattern PATTERN = Pattern.compile("(\\d+:)?(\\d+)?:(\\d+)");
@@ -53,20 +56,25 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     private final Linkify.TransformFilter timestampLink = new Linkify.TransformFilter() {
         @Override
         public String transformUrl(final Matcher match, final String url) {
-            int timestamp = 0;
-            final String hours = match.group(1);
-            final String minutes = match.group(2);
-            final String seconds = match.group(3);
-            if (hours != null) {
-                timestamp += (Integer.parseInt(hours.replace(":", "")) * 3600);
-            }
-            if (minutes != null) {
-                timestamp += (Integer.parseInt(minutes.replace(":", "")) * 60);
-            }
-            if (seconds != null) {
-                timestamp += (Integer.parseInt(seconds));
+            try {
+                int timestamp = 0;
+                final String hours = match.group(1);
+                final String minutes = match.group(2);
+                final String seconds = match.group(3);
+                if (hours != null) {
+                    timestamp += (Integer.parseInt(hours.replace(":", "")) * 3600);
+                }
+                if (minutes != null) {
+                    timestamp += (Integer.parseInt(minutes.replace(":", "")) * 60);
+                }
+                if (seconds != null) {
+                    timestamp += (Integer.parseInt(seconds));
+                }
+                return streamUrl + url.replace(match.group(0), "#timestamp=" + timestamp);
+            } catch (final Exception ex) {
+                Log.d(TAG, "Unable to process url='" + url + "' as timestampLink", ex);
+                return url;
             }
-            return streamUrl + url.replace(match.group(0), "#timestamp=" + timestamp);
         }
     };