From f13f4cc5d21397e92e59d2d609788d34ab5d1c8d Mon Sep 17 00:00:00 2001
From: TiA4f8R <74829229+TiA4f8R@users.noreply.github.com>
Date: Sat, 3 Apr 2021 18:57:16 +0200
Subject: [PATCH] Split handleUrl method into two methods

Split handleURL method, now private, into two methods:
handleUrlCommentsTimestamp and handleUrlDescriptionTimestamp. Code is
now more proper.
---
 .../util/CommentTextOnTouchListener.java      |  3 +-
 .../InternalUrlsHandler.java                  | 78 ++++++++++++-------
 .../external_communication/TextLinkifier.java |  2 +-
 3 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java b/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
index d0edc4bc4..dfe5e8ad0 100644
--- a/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
+++ b/app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java
@@ -50,7 +50,8 @@ public class CommentTextOnTouchListener implements View.OnTouchListener {
                     if (action == MotionEvent.ACTION_UP) {
                         if (link[0] instanceof URLSpan) {
                             final String url = ((URLSpan) link[0]).getURL();
-                            if (!InternalUrlsHandler.handleUrl(v.getContext(), url, 1)) {
+                            if (!InternalUrlsHandler.handleUrlCommentsTimestamp(v.getContext(),
+                                    url)) {
                                 ShareUtils.openUrlInBrowser(v.getContext(), url, false);
                             }
                         }
diff --git a/app/src/main/java/org/schabi/newpipe/util/external_communication/InternalUrlsHandler.java b/app/src/main/java/org/schabi/newpipe/util/external_communication/InternalUrlsHandler.java
index a234f6203..086ba0015 100644
--- a/app/src/main/java/org/schabi/newpipe/util/external_communication/InternalUrlsHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/util/external_communication/InternalUrlsHandler.java
@@ -20,6 +20,8 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Single;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
+import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty;
+
 public final class InternalUrlsHandler {
     private static final Pattern AMPERSAND_TIMESTAMP_PATTERN = Pattern.compile("(.*)&t=(\\d+)");
     private static final Pattern HASHTAG_TIMESTAMP_PATTERN =
@@ -28,48 +30,68 @@ public final class InternalUrlsHandler {
     private InternalUrlsHandler() {
     }
 
+    /**
+     * Handle a YouTube timestamp comment URL in NewPipe.
+     * <p>
+     * This method will check if the provided url is a YouTube comment description URL ({@code
+     * https://www.youtube.com/watch?v=}video_id{@code #timestamp=}time_in_seconds). If yes, the
+     * popup player will be opened when the user will click on the timestamp in the comment,
+     * at the time and for the video indicated in the timestamp.
+     *
+     * @param context the context to use
+     * @param url     the URL to check if it can be handled
+     * @return true if the URL can be handled by NewPipe, false if it cannot
+     */
+    public static boolean handleUrlCommentsTimestamp(final Context context, final String url) {
+        return handleUrl(context, url, HASHTAG_TIMESTAMP_PATTERN);
+    }
+
+    /**
+     * Handle a YouTube timestamp description URL in NewPipe.
+     * <p>
+     * This method will check if the provided url is a YouTube timestamp description URL ({@code
+     * https://www.youtube.com/watch?v=}video_id{@code &t=}time_in_seconds). If yes, the popup
+     * player will be opened when the user will click on the timestamp in the video description,
+     * at the time and for the video indicated in the timestamp.
+     *
+     * @param context the context to use
+     * @param url     the URL to check if it can be handled
+     * @return true if the URL can be handled by NewPipe, false if it cannot
+     */
+    public static boolean handleUrlDescriptionTimestamp(final Context context, final String url) {
+        return handleUrl(context, url, AMPERSAND_TIMESTAMP_PATTERN);
+    }
+
     /**
      * Handle an URL in NewPipe.
      * <p>
      * This method will check if the provided url can be handled in NewPipe or not. If this is a
-     * service URL with a timestamp, the popup player will be opened.
-     * <p>
-     * The timestamp param accepts two integers, corresponding to two timestamps types:
-     * 0 for {@code &t=} (used for timestamps in descriptions),
-     * 1 for {@code #timestamp=} (used for timestamps in comments).
-     * Any other value of this integer will return false.
+     * service URL with a timestamp, the popup player will be opened and true will be returned;
+     * else, false will be returned.
      *
-     * @param context       the context to be used
+     * @param context       the context to use
      * @param url           the URL to check if it can be handled
-     * @param timestampType the type of timestamp
+     * @param pattern       the pattern
      * @return true if the URL can be handled by NewPipe, false if it cannot
      */
-    public static boolean handleUrl(final Context context,
-                                    final String url,
-                                    final int timestampType) {
-        String matchedUrl = "";
-        int seconds = -1;
-        final Matcher matcher;
-
-        if (timestampType == 0) {
-            matcher = AMPERSAND_TIMESTAMP_PATTERN.matcher(url);
-        } else if (timestampType == 1) {
-            matcher = HASHTAG_TIMESTAMP_PATTERN.matcher(url);
+    private static boolean handleUrl(final Context context,
+                                     final String url,
+                                     final Pattern pattern) {
+        final String matchedUrl;
+        final StreamingService service;
+        final StreamingService.LinkType linkType;
+        final int seconds;
+        final Matcher matcher = pattern.matcher(url);
+        if (matcher.matches()) {
+            matchedUrl = matcher.group(1);
+            seconds = Integer.parseInt(matcher.group(2));
         } else {
             return false;
         }
 
-        if (matcher.matches()) {
-            matchedUrl = matcher.group(1);
-            seconds = Integer.parseInt(matcher.group(2));
-        }
-        if (matchedUrl == null || matchedUrl.isEmpty()) {
+        if (isNullOrEmpty(matchedUrl)) {
             return false;
         }
-
-        final StreamingService service;
-        final StreamingService.LinkType linkType;
-
         try {
             service = NewPipe.getServiceByUrl(matchedUrl);
             linkType = service.getLinkTypeByUrl(matchedUrl);
diff --git a/app/src/main/java/org/schabi/newpipe/util/external_communication/TextLinkifier.java b/app/src/main/java/org/schabi/newpipe/util/external_communication/TextLinkifier.java
index d63b8c5bb..50a453e35 100644
--- a/app/src/main/java/org/schabi/newpipe/util/external_communication/TextLinkifier.java
+++ b/app/src/main/java/org/schabi/newpipe/util/external_communication/TextLinkifier.java
@@ -245,7 +245,7 @@ public final class TextLinkifier {
                 final String url = span.getURL();
                 final ClickableSpan clickableSpan = new ClickableSpan() {
                     public void onClick(@NonNull final View view) {
-                        if (!InternalUrlsHandler.handleUrl(context, url, 0)) {
+                        if (!InternalUrlsHandler.handleUrlDescriptionTimestamp(context, url)) {
                             ShareUtils.openUrlInBrowser(context, url, false);
                         }
                     }