From 3ace604efff8a623aee04ff261ce6087cb151bc7 Mon Sep 17 00:00:00 2001 From: tehcneko <7764726+tehcneko@users.noreply.github.com> Date: Wed, 10 Feb 2021 19:23:49 +0800 Subject: [PATCH] [app] Use linkifycompat --- .../manager/ui/activity/RepoItemActivity.java | 2 +- .../io/github/lsposed/manager/util/NavUtil.java | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/RepoItemActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/RepoItemActivity.java index 493fe04c..59cf88ce 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/RepoItemActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/RepoItemActivity.java @@ -103,7 +103,7 @@ public class RepoItemActivity extends BaseActivity { .usePlugin(TaskListPlugin.create(this)) .usePlugin(HtmlPlugin.create()) .usePlugin(GlideImagesPlugin.create(GlideApp.with(this))) - .usePlugin(LinkifyPlugin.create(Linkify.WEB_URLS)) + .usePlugin(LinkifyPlugin.create(Linkify.WEB_URLS, true)) .usePlugin(SoftBreakAddsNewLinePlugin.create()) .build(); module = RepoLoader.getInstance().getOnlineModule(modulePackageName); diff --git a/app/src/main/java/io/github/lsposed/manager/util/NavUtil.java b/app/src/main/java/io/github/lsposed/manager/util/NavUtil.java index 035ca1a1..1857862f 100644 --- a/app/src/main/java/io/github/lsposed/manager/util/NavUtil.java +++ b/app/src/main/java/io/github/lsposed/manager/util/NavUtil.java @@ -1,10 +1,6 @@ package io.github.lsposed.manager.util; import android.net.Uri; -import android.text.Spannable; -import android.text.SpannableString; -import android.text.style.URLSpan; -import android.text.util.Linkify; import androidx.browser.customtabs.CustomTabColorSchemeParams; import androidx.browser.customtabs.CustomTabsIntent; @@ -14,17 +10,6 @@ import io.github.lsposed.manager.ui.activity.BaseActivity; public final class NavUtil { - public static Uri parseURL(String str) { - if (str == null || str.isEmpty()) - return null; - - Spannable spannable = new SpannableString(str); - Linkify.addLinks(spannable, Linkify.WEB_URLS | Linkify.EMAIL_ADDRESSES); - - URLSpan[] spans = spannable.getSpans(0, spannable.length(), URLSpan.class); - return (spans.length > 0) ? Uri.parse(spans[0].getURL()) : null; - } - public static void startURL(BaseActivity activity, Uri uri) { CustomTabsIntent.Builder customTabsIntent = new CustomTabsIntent.Builder(); customTabsIntent.setShowTitle(true); @@ -40,6 +25,6 @@ public final class NavUtil { } public static void startURL(BaseActivity activity, String url) { - startURL(activity, parseURL(url)); + startURL(activity, Uri.parse(url)); } } \ No newline at end of file