Merge pull request #8934 from Isira-Seneviratne/LinkifyCompat

Use LinkifyCompat.
TeamNewPipe · Oct 9, 2022 · 5b213a1 · 5b213a1
2 parents 34d81d3 + 464a646
commit 5b213a1
Showing 1 changed file with 19 additions and 32 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
@@ -12,6 +12,7 @@
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.text.util.LinkifyCompat;
 
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.error.ErrorUtil;
@@ -27,7 +28,7 @@
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.external_communication.TimestampExtractor;
 
-import java.util.regex.Matcher;
+import java.util.Objects;
 
 public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     private static final String TAG = "CommentsMiniIIHolder";
@@ -39,35 +40,14 @@ public class CommentsMiniInfoItemHolder extends InfoItemHolder {
     private final int commentVerticalPadding;
 
     private final RelativeLayout itemRoot;
-    public final ImageView itemThumbnailView;
+    private final ImageView itemThumbnailView;
     private final TextView itemContentView;
     private final TextView itemLikesCountView;
     private final TextView itemPublishedTime;
 
     private String commentText;
     private String streamUrl;
 
-    private final Linkify.TransformFilter timestampLink = new Linkify.TransformFilter() {
-        @Override
-        public String transformUrl(final Matcher match, final String url) {
-            try {
-                final TimestampExtractor.TimestampMatchDTO timestampMatchDTO =
-                        TimestampExtractor.getTimestampFromMatcher(match, commentText);
-
-                if (timestampMatchDTO == null) {
-                    return url;
-                }
-
-                return streamUrl + url.replace(
-                        match.group(0),
-                        "#timestamp=" + timestampMatchDTO.seconds());
-            } catch (final Exception ex) {
-                Log.e(TAG, "Unable to process url='" + url + "' as timestampLink", ex);
-                return url;
-            }
-        }
-    };
-
     CommentsMiniInfoItemHolder(final InfoItemBuilder infoItemBuilder, final int layoutId,
                                final ViewGroup parent) {
         super(infoItemBuilder, layoutId, parent);
@@ -243,14 +223,21 @@ private void expand() {
     }
 
     private void linkify() {
-        Linkify.addLinks(
-                itemContentView,
-                Linkify.WEB_URLS);
-        Linkify.addLinks(
-                itemContentView,
-                TimestampExtractor.TIMESTAMPS_PATTERN,
-                null,
-                null,
-                timestampLink);
+        LinkifyCompat.addLinks(itemContentView, Linkify.WEB_URLS);
+        LinkifyCompat.addLinks(itemContentView, TimestampExtractor.TIMESTAMPS_PATTERN, null, null,
+                (match, url) -> {
+                    try {
+                        final var timestampMatch = TimestampExtractor
+                                .getTimestampFromMatcher(match, commentText);
+                        if (timestampMatch == null) {
+                            return url;
+                        }
+                        return streamUrl + url.replace(Objects.requireNonNull(match.group(0)),
+                                "#timestamp=" + timestampMatch.seconds());
+                    } catch (final Exception ex) {
+                        Log.e(TAG, "Unable to process url='" + url + "' as timestampLink", ex);
+                        return url;
+                    }
+                });
     }
 }