Skip to content
This repository has been archived by the owner on Jun 5, 2023. It is now read-only.

Commit

Permalink
behaviour: improve url handling in descriptions and comments to fix I…
Browse files Browse the repository at this point in the history 
…nfinityLoop1308/PipePipe#64
  • Loading branch information
NullPointerException committed Feb 7, 2023
1 parent a7d7f58 commit 8725955
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 26 deletions.
11 changes: 2 additions & 9 deletions app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,20 +243,13 @@ private void linkify() {
LinkifyCompat.addLinks(itemContentView, Linkify.WEB_URLS);
LinkifyCompat.addLinks(itemContentView, TimestampExtractor.TIMESTAMPS_PATTERN, null, null,
(match, url) -> {
try {
try { //here url is like 15:38 or 01:00:00
final var timestampMatch = TimestampExtractor
.getTimestampFromMatcher(match, commentText);
if (timestampMatch == null) {
return url;
}
if(streamUrl.contains("https://api.bilibili.com/x/v2/reply")){
return "https://m.bilibili.com/video/av" +
streamUrl.split("oid=")[1].split("&")[0]
+ url.replace(Objects.requireNonNull(match.group(0)),
"#timestamp=" + timestampMatch.seconds());
}
return streamUrl + url.replace(Objects.requireNonNull(match.group(0)),
"#timestamp=" + timestampMatch.seconds());
return "internal://timestamp/" + timestampMatch.seconds();
} catch (final Exception ex) {
Log.e(TAG, "Unable to process url='" + url + "' as timestampLink", ex);
return url;
Expand Down
39 changes: 30 additions & 9 deletions app/src/main/java/org/schabi/newpipe/util/external_communication/InternalUrlsHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static boolean handleUrlCommentsTimestamp(@NonNull final CompositeDisposa
disposables,
final Context context,
@NonNull final String url) {
return handleUrl(context, url, HASHTAG_TIMESTAMP_PATTERN, disposables);
return handleTimestampUrl(context, url, HASHTAG_TIMESTAMP_PATTERN, disposables);
}

/**
Expand All @@ -79,7 +79,7 @@ public static boolean handleUrlDescriptionTimestamp(@NonNull final CompositeDisp
disposables,
final Context context,
@NonNull final String url) {
return handleUrl(context, url, AMPERSAND_TIMESTAMP_PATTERN, disposables);
return handleTimestampUrl(context, url, AMPERSAND_TIMESTAMP_PATTERN, disposables);
}

/**
Expand All @@ -95,10 +95,16 @@ public static boolean handleUrlDescriptionTimestamp(@NonNull final CompositeDisp
* @param disposables a field of the Activity/Fragment class that calls this method
* @return true if the URL can be handled by NewPipe, false if it cannot
*/
private static boolean handleUrl(final Context context,
@NonNull final String url,
@NonNull final Pattern pattern,
@NonNull final CompositeDisposable disposables) {
private static boolean handleTimestampUrl(final Context context,
@NonNull final String url,
@NonNull final Pattern pattern,
@NonNull final CompositeDisposable disposables) {
if(url.contains("internal://timestamp/")) {
Intent intent = new Intent(ACTION_SEEK_TO);
intent.putExtra("Timestamp", url.split("internal://timestamp/")[1]);
context.sendBroadcast(intent);
return true;
}
final Matcher matcher = pattern.matcher(url);
if (!matcher.matches()) {
return false;
Expand All @@ -124,14 +130,29 @@ private static boolean handleUrl(final Context context,
}

if (linkType == StreamingService.LinkType.STREAM && seconds != -1) {
Intent intent = new Intent(ACTION_SEEK_TO);
intent.putExtra("Timestamp", seconds);
context.sendBroadcast(intent);
return playOnMain(context, matchedUrl, service, seconds, disposables);
} else {
NavigationHelper.openRouterActivity(context, matchedUrl);
}
return true;
}
public static boolean handleUrl(final Context context,
@NonNull final String url,
@NonNull final CompositeDisposable disposables) {
final StreamingService service;
final StreamingService.LinkType linkType;
try {
service = NewPipe.getServiceByUrl(url);
linkType = service.getLinkTypeByUrl(url);
if (linkType == StreamingService.LinkType.NONE) {
return false;
}
} catch (final ExtractionException e) {
return false;
}
NavigationHelper.openRouterActivity(context, url);
return true;
}

/**
* Play a content in the floating player.
Expand Down
18 changes: 10 additions & 8 deletions app/src/main/java/org/schabi/newpipe/util/external_communication/TextLinkifier.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.schabi.newpipe.util.external_communication;

import android.content.Context;
import android.content.Intent;
import android.text.SpannableStringBuilder;
import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
Expand Down Expand Up @@ -28,7 +29,7 @@
import io.reactivex.rxjava3.disposables.CompositeDisposable;
import io.reactivex.rxjava3.schedulers.Schedulers;

import static org.schabi.newpipe.util.external_communication.InternalUrlsHandler.playOnPopup;
import static org.schabi.newpipe.fragments.detail.VideoDetailFragment.ACTION_SEEK_TO;

public final class TextLinkifier {
public static final String TAG = TextLinkifier.class.getSimpleName();
Expand Down Expand Up @@ -192,12 +193,9 @@ private static void addClickListenersOnTimestamps(final Context context,
new ClickableSpan() {
@Override
public void onClick(@NonNull final View view) {
playOnPopup(
context,
relatedInfo.getUrl(),
relatedInfo.getService(),
timestampMatchDTO.seconds(),
disposables);
Intent intent = new Intent(ACTION_SEEK_TO);
intent.putExtra("Timestamp", timestampMatchDTO.seconds());
context.sendBroadcast(intent);
}
},
timestampMatchDTO.timestampStart(),
Expand Down Expand Up @@ -246,7 +244,11 @@ private static void changeIntentsOfDescriptionLinks(final TextView textView,
final String url = span.getURL();
final ClickableSpan clickableSpan = new ClickableSpan() {
public void onClick(@NonNull final View view) {
ShareUtils.openUrlInBrowser(context, url, false);
if (!InternalUrlsHandler.handleUrlDescriptionTimestamp(
new CompositeDisposable(), context, url)
&& !InternalUrlsHandler.handleUrl(context, url, new CompositeDisposable())) {
ShareUtils.openUrlInBrowser(context, url, false);
}
}
};

Expand Down

0 comments on commit 8725955

Please sign in to comment.