From eb515673f4813295301beb981e2bad7a76270e1d Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Sat, 13 Apr 2019 10:18:43 +0200 Subject: [PATCH] Autolink web prevents other markdown links from beeing rendered --- .../java/com/github/gotify/messages/ListMessageAdapter.java | 2 ++ app/src/main/res/layout/message_item.xml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java index cb8606f..786639b 100644 --- a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java +++ b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java @@ -75,8 +75,10 @@ public class ListMessageAdapter extends BaseAdapter { ViewHolder holder = new ViewHolder(view); final MessageWithImage message = items.get(position); if (Extras.useMarkdown(message.message)) { + holder.message.setAutoLinkMask(0); markwon.setMarkdown(holder.message, message.message.getMessage()); } else { + holder.message.setAutoLinkMask(Linkify.WEB_URLS); holder.message.setText(message.message.getMessage()); } holder.title.setText(message.message.getTitle()); diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml index 4dab43c..7599912 100644 --- a/app/src/main/res/layout/message_item.xml +++ b/app/src/main/res/layout/message_item.xml @@ -46,7 +46,6 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" - android:autoLink="web" android:textIsSelectable="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/message_image"