From 7248375a3a889608919cdcadcd65ee8db2315684 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 18 Nov 2020 23:19:43 +0100 Subject: [PATCH 1/2] linkify web URLs in description in App Details fdroid-website#510 fdroid-website#167 fdroidserver#845 fdroiddata@d6c5315a jekyll-fdroid!60 --- .../fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index df72f51c9..21982aab3 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -17,6 +17,7 @@ import android.text.TextUtils; import android.text.format.DateFormat; import android.text.method.LinkMovementMethod; import android.text.style.URLSpan; +import android.text.util.Linkify; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; @@ -29,7 +30,6 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; - import androidx.annotation.DrawableRes; import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; @@ -40,13 +40,13 @@ import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.os.ConfigurationCompat; import androidx.core.os.LocaleListCompat; import androidx.core.text.HtmlCompat; +import androidx.core.text.util.LinkifyCompat; import androidx.core.view.ViewCompat; import androidx.core.widget.TextViewCompat; import androidx.gridlayout.widget.GridLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearSmoothScroller; import androidx.recyclerview.widget.RecyclerView; - import org.apache.commons.io.FilenameUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; @@ -71,6 +71,7 @@ import java.util.Locale; @SuppressWarnings("LineLength") public class AppDetailsRecyclerViewAdapter extends RecyclerView.Adapter { + public static final String TAG = "AppDetailsRecyclerViewA"; public interface AppDetailsRecyclerViewAdapterCallbacks { @@ -533,6 +534,8 @@ public class AppDetailsRecyclerViewAdapter null, new Utils.HtmlTagHandler()); descriptionView.setMovementMethod(LinkMovementMethod.getInstance()); descriptionView.setText(trimTrailingNewlines(desc)); + LinkifyCompat.addLinks(descriptionView, Linkify.WEB_URLS); + if (descriptionView.getText() instanceof Spannable) { Spannable spannable = (Spannable) descriptionView.getText(); URLSpan[] spans = spannable.getSpans(0, spannable.length(), URLSpan.class); From 331d4a174d176d716df242d7a5aa5f97878d3dbc Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 18 Nov 2020 23:30:16 +0100 Subject: [PATCH 2/2] fix checkstyle EmptyStatement --- .../java/org/fdroid/fdroid/net/ConnectivityMonitorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java b/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java index 5df37b184..6919c5c85 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java +++ b/app/src/main/java/org/fdroid/fdroid/net/ConnectivityMonitorService.java @@ -80,7 +80,7 @@ public class ConnectivityMonitorService extends JobIntentService { * cases when looking through the network devices, especially on bad ROMs. */ public static int getNetworkState(Context context) { - ConnectivityManager cm = ContextCompat.getSystemService(context, ConnectivityManager.class);; + ConnectivityManager cm = ContextCompat.getSystemService(context, ConnectivityManager.class); if (cm == null) { return FLAG_NET_UNAVAILABLE; }