From 967dd1f18d2d58774751ae33a1e337dd7e7bc254 Mon Sep 17 00:00:00 2001 From: Katelyn Dickey Date: Mon, 22 Aug 2022 01:04:38 -0400 Subject: [PATCH 1/5] Add clickable links for conversations --- .../briar/android/conversation/ConversationActivity.java | 7 +++++++ .../android/conversation/ConversationItemViewHolder.java | 2 ++ .../briar/android/conversation/ConversationListener.java | 2 ++ .../res/layout/list_item_conversation_msg_in_content.xml | 2 ++ .../src/main/res/layout/list_item_conversation_msg_out.xml | 2 ++ briar-android/src/main/res/values/color.xml | 1 + 6 files changed, 16 insertions(+) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java index 22f8fa178..a73eb92bf 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java @@ -66,6 +66,7 @@ import org.briarproject.briar.android.view.TextAttachmentController.AttachmentLi import org.briarproject.briar.android.view.TextInputView; import org.briarproject.briar.android.view.TextSendController; import org.briarproject.briar.android.view.TextSendController.SendState; +import org.briarproject.briar.android.widget.LinkDialogFragment; import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.briar.api.autodelete.event.ConversationMessagesDeletedEvent; @@ -476,6 +477,12 @@ public class ConversationActivity extends BriarActivity actionMode = null; } + @Override + public void onLinkClick(String url) { + LinkDialogFragment f = LinkDialogFragment.newInstance(url); + f.show(getSupportFragmentManager(), f.getUniqueTag()); + } + private void addSelectionTracker() { RecyclerView recyclerView = list.getRecyclerView(); if (recyclerView.getAdapter() != adapter) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java index 42fdd03c3..9a433b16a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java @@ -19,6 +19,7 @@ import static android.view.View.VISIBLE; import static org.briarproject.bramble.util.StringUtils.trim; import static org.briarproject.briar.android.util.UiUtils.formatDate; import static org.briarproject.briar.android.util.UiUtils.formatDuration; +import static org.briarproject.briar.android.util.UiUtils.makeLinksClickable; import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER; @UiThread @@ -58,6 +59,7 @@ abstract class ConversationItemViewHolder extends ViewHolder { if (item.getText() != null) { text.setText(trim(item.getText())); + makeLinksClickable(text, listener::onLinkClick); } long timestamp = item.getTime(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java index ad392705e..de9b526c7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationListener.java @@ -20,4 +20,6 @@ interface ConversationListener { void onAutoDeleteTimerNoticeClicked(); + void onLinkClick(String url); + } diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml index 63b679572..f0f226729 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml @@ -41,6 +41,8 @@ android:layout_marginRight="@dimen/message_bubble_padding_sides_inner" android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner" android:textColor="?android:attr/textColorPrimary" + android:textColorLink="@color/briar_text_link" + android:autoLink="web" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/statusLayout" app:layout_constraintEnd_toEndOf="parent" diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml index 7e03d0a7f..144dfc1a9 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml @@ -49,6 +49,8 @@ android:layout_marginRight="@dimen/message_bubble_padding_sides_inner" android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner" android:textColor="@color/briar_text_primary_inverse" + android:textColorLink="@color/briar_text_link_inverse" + android:autoLink="web" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/statusLayout" app:layout_constraintEnd_toEndOf="parent" diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml index 486bd4f4a..5722c8cd0 100644 --- a/briar-android/src/main/res/values/color.xml +++ b/briar-android/src/main/res/values/color.xml @@ -67,6 +67,7 @@ @color/briar_blue_400 + @android:color/white #df000000 @android:color/white #b4ffffff From d825227eb57ef2b4f80c2f30f22fb15dbe00c14a Mon Sep 17 00:00:00 2001 From: Katelyn Dickey Date: Tue, 3 Jan 2023 16:47:28 -0500 Subject: [PATCH 2/5] Add clickable links to threads (forums/groups) --- .../android/privategroup/conversation/GroupActivity.java | 7 +++++++ .../briar/android/threaded/BaseThreadItemViewHolder.java | 2 ++ .../briar/android/threaded/ThreadItemAdapter.java | 1 + .../briar/android/threaded/ThreadListActivity.java | 7 +++++++ briar-android/src/main/res/layout/list_item_thread.xml | 2 ++ 5 files changed, 19 insertions(+) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java index cc0b8289f..44742c5c7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java @@ -13,6 +13,7 @@ import org.briarproject.briar.android.privategroup.memberlist.GroupMemberListAct import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity; import org.briarproject.briar.android.threaded.ThreadListActivity; import org.briarproject.briar.android.threaded.ThreadListViewModel; +import org.briarproject.briar.android.widget.LinkDialogFragment; import org.briarproject.nullsafety.MethodsNotNullByDefault; import org.briarproject.nullsafety.ParametersNotNullByDefault; @@ -158,6 +159,12 @@ public class GroupActivity extends if (isDissolved != null && !isDissolved) super.onReplyClick(item); } + @Override + public void onLinkClick(String url){ + LinkDialogFragment f = LinkDialogFragment.newInstance(url); + f.show(getSupportFragmentManager(), f.getUniqueTag()); + } + private void setGroupEnabled(boolean enabled) { sendController.setReady(enabled); list.getRecyclerView().setAlpha(enabled ? 1f : 0.5f); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java index 3de0b5ce5..9545ead34 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java @@ -20,6 +20,7 @@ import androidx.annotation.UiThread; import androidx.recyclerview.widget.RecyclerView; import static androidx.core.content.ContextCompat.getColor; +import static org.briarproject.briar.android.util.UiUtils.makeLinksClickable; @UiThread @NotNullByDefault @@ -43,6 +44,7 @@ public abstract class BaseThreadItemViewHolder @CallSuper public void bind(I item, ThreadItemListener listener) { textView.setText(StringUtils.trim(item.getText())); + makeLinksClickable(textView, listener::onLinkClick); author.setAuthor(item.getAuthor(), item.getAuthorInfo()); author.setDate(item.getTimestamp()); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java index cca103919..2941cdf94 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadItemAdapter.java @@ -137,6 +137,7 @@ public class ThreadItemAdapter public interface ThreadItemListener { void onReplyClick(I item); + void onLinkClick(String url); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index 003061618..1939a5d9b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -19,6 +19,7 @@ import org.briarproject.briar.android.view.TextSendController; import org.briarproject.briar.android.view.TextSendController.SendListener; import org.briarproject.briar.android.view.TextSendController.SendState; import org.briarproject.briar.android.view.UnreadMessageButton; +import org.briarproject.briar.android.widget.LinkDialogFragment; import org.briarproject.briar.api.attachment.AttachmentHeader; import org.briarproject.nullsafety.MethodsNotNullByDefault; import org.briarproject.nullsafety.ParametersNotNullByDefault; @@ -202,6 +203,12 @@ public abstract class ThreadListActivity Date: Tue, 3 Jan 2023 17:05:08 -0500 Subject: [PATCH 3/5] Add clickable links to notices/requests --- .../android/conversation/ConversationNoticeViewHolder.java | 2 ++ .../src/main/res/layout/list_item_conversation_notice_in.xml | 2 ++ .../src/main/res/layout/list_item_conversation_notice_out.xml | 2 ++ .../src/main/res/layout/list_item_conversation_request.xml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java index 2109b5f57..7e5b5b94d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java @@ -13,6 +13,7 @@ import static android.view.View.GONE; import static android.view.View.VISIBLE; import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty; import static org.briarproject.bramble.util.StringUtils.trim; +import static org.briarproject.briar.android.util.UiUtils.makeLinksClickable; @UiThread @NotNullByDefault @@ -40,6 +41,7 @@ class ConversationNoticeViewHolder extends ConversationItemViewHolder { } else { msgText.setVisibility(VISIBLE); msgText.setText(trim(text)); + makeLinksClickable(msgText, listener::onLinkClick); layout.setBackgroundResource(isIncoming() ? R.drawable.notice_in_bottom : R.drawable.notice_out_bottom); } diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml index 0a6a2fcd1..9fa638980 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml @@ -21,6 +21,8 @@ android:layout_marginRight="@dimen/message_bubble_margin_non_tail" android:background="@drawable/msg_in_top" android:elevation="@dimen/message_bubble_elevation" + android:textColorLink="@color/briar_text_link" + android:autoLink="web" tools:text="Short message" tools:visibility="visible" /> diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml index ff473129c..cb50d217b 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml @@ -23,6 +23,8 @@ android:background="@drawable/msg_out_top" android:elevation="@dimen/message_bubble_elevation" android:textColor="@color/briar_text_primary_inverse" + android:textColorLink="@color/briar_text_link_inverse" + android:autoLink="web" tools:text="This is a long long long message that spans over several lines.\n\nIt ends here." tools:visibility="visible" /> diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml index 9ac5087a0..053c2fe40 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_request.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml @@ -22,6 +22,8 @@ android:background="@drawable/msg_in_top" android:elevation="@dimen/message_bubble_elevation" android:textColor="?android:attr/textColorPrimary" + android:textColorLink="@color/briar_text_link" + android:autoLink="web" tools:text="Short message" tools:visibility="visible" /> From 5e44e4d3085ee392d2856f73f5e809a48ca85b46 Mon Sep 17 00:00:00 2001 From: Katelyn Dickey Date: Sun, 4 Sep 2022 13:41:51 -0400 Subject: [PATCH 4/5] Add clickable links to blog comments --- .../briar/android/blog/BlogPostViewHolder.java | 7 ++++++- .../src/main/res/layout/list_item_blog_comment.xml | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java index 46067a496..5fd3c8d4f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java @@ -3,6 +3,7 @@ package org.briarproject.briar.android.blog; import android.content.Context; import android.content.Intent; import android.text.Spanned; +import android.text.util.Linkify; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -170,7 +171,11 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder { // TODO make author clickable #624 text.setText(c.getComment()); - if (fullText) text.setTextIsSelectable(true); + if (fullText) { + text.setTextIsSelectable(true); + Linkify.addLinks(text, Linkify.WEB_URLS); + makeLinksClickable(text, listener::onLinkClick); + } commentContainer.addView(v); } diff --git a/briar-android/src/main/res/layout/list_item_blog_comment.xml b/briar-android/src/main/res/layout/list_item_blog_comment.xml index 732a48b7b..e325a9e53 100644 --- a/briar-android/src/main/res/layout/list_item_blog_comment.xml +++ b/briar-android/src/main/res/layout/list_item_blog_comment.xml @@ -33,6 +33,7 @@ android:paddingBottom="@dimen/listitem_vertical_margin" android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/text_size_small" + android:textColorLink="@color/briar_text_link" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/authorView" From f959c329356b34ca33d0642072254dcf8971174a Mon Sep 17 00:00:00 2001 From: Katelyn Dickey Date: Thu, 5 Jan 2023 17:20:40 -0500 Subject: [PATCH 5/5] Remove autoLink attribute which was causing warnings to show twice, and highlight links in comments before a blog is expanded --- .../briarproject/briar/android/blog/BlogPostViewHolder.java | 3 ++- .../briar/android/conversation/ConversationItemViewHolder.java | 2 ++ .../android/conversation/ConversationNoticeViewHolder.java | 2 ++ .../briar/android/threaded/BaseThreadItemViewHolder.java | 2 ++ .../main/res/layout/list_item_conversation_msg_in_content.xml | 1 - .../src/main/res/layout/list_item_conversation_msg_out.xml | 1 - .../src/main/res/layout/list_item_conversation_notice_in.xml | 1 - .../src/main/res/layout/list_item_conversation_notice_out.xml | 1 - .../src/main/res/layout/list_item_conversation_request.xml | 1 - briar-android/src/main/res/layout/list_item_thread.xml | 1 - 10 files changed, 8 insertions(+), 7 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java index 5fd3c8d4f..c16ca3f29 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java @@ -171,9 +171,10 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder { // TODO make author clickable #624 text.setText(c.getComment()); + Linkify.addLinks(text, Linkify.WEB_URLS); + text.setMovementMethod(null); if (fullText) { text.setTextIsSelectable(true); - Linkify.addLinks(text, Linkify.WEB_URLS); makeLinksClickable(text, listener::onLinkClick); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java index 9a433b16a..d28ff2a12 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java @@ -1,6 +1,7 @@ package org.briarproject.briar.android.conversation; import android.content.Context; +import android.text.util.Linkify; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -59,6 +60,7 @@ abstract class ConversationItemViewHolder extends ViewHolder { if (item.getText() != null) { text.setText(trim(item.getText())); + Linkify.addLinks(text, Linkify.WEB_URLS); makeLinksClickable(text, listener::onLinkClick); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java index 7e5b5b94d..98abdcab1 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java @@ -1,5 +1,6 @@ package org.briarproject.briar.android.conversation; +import android.text.util.Linkify; import android.view.View; import android.widget.TextView; @@ -41,6 +42,7 @@ class ConversationNoticeViewHolder extends ConversationItemViewHolder { } else { msgText.setVisibility(VISIBLE); msgText.setText(trim(text)); + Linkify.addLinks(msgText, Linkify.WEB_URLS); makeLinksClickable(msgText, listener::onLinkClick); layout.setBackgroundResource(isIncoming() ? R.drawable.notice_in_bottom : R.drawable.notice_out_bottom); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java index 9545ead34..fbd784528 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java @@ -4,6 +4,7 @@ import android.animation.Animator; import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; import android.content.Context; +import android.text.util.Linkify; import android.view.View; import android.view.ViewGroup; import android.view.animation.AccelerateInterpolator; @@ -44,6 +45,7 @@ public abstract class BaseThreadItemViewHolder @CallSuper public void bind(I item, ThreadItemListener listener) { textView.setText(StringUtils.trim(item.getText())); + Linkify.addLinks(textView, Linkify.WEB_URLS); makeLinksClickable(textView, listener::onLinkClick); author.setAuthor(item.getAuthor(), item.getAuthorInfo()); diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml index f0f226729..6c9dba640 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_msg_in_content.xml @@ -42,7 +42,6 @@ android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner" android:textColor="?android:attr/textColorPrimary" android:textColorLink="@color/briar_text_link" - android:autoLink="web" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/statusLayout" app:layout_constraintEnd_toEndOf="parent" diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml index 144dfc1a9..82df8b666 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml @@ -50,7 +50,6 @@ android:layout_marginBottom="@dimen/message_bubble_padding_bottom_inner" android:textColor="@color/briar_text_primary_inverse" android:textColorLink="@color/briar_text_link_inverse" - android:autoLink="web" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/statusLayout" app:layout_constraintEnd_toEndOf="parent" diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml index 9fa638980..11fbe8f7c 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml @@ -22,7 +22,6 @@ android:background="@drawable/msg_in_top" android:elevation="@dimen/message_bubble_elevation" android:textColorLink="@color/briar_text_link" - android:autoLink="web" tools:text="Short message" tools:visibility="visible" /> diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml index cb50d217b..70c7574fa 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml @@ -24,7 +24,6 @@ android:elevation="@dimen/message_bubble_elevation" android:textColor="@color/briar_text_primary_inverse" android:textColorLink="@color/briar_text_link_inverse" - android:autoLink="web" tools:text="This is a long long long message that spans over several lines.\n\nIt ends here." tools:visibility="visible" /> diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml index 053c2fe40..56468fda0 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_request.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml @@ -23,7 +23,6 @@ android:elevation="@dimen/message_bubble_elevation" android:textColor="?android:attr/textColorPrimary" android:textColorLink="@color/briar_text_link" - android:autoLink="web" tools:text="Short message" tools:visibility="visible" /> diff --git a/briar-android/src/main/res/layout/list_item_thread.xml b/briar-android/src/main/res/layout/list_item_thread.xml index 65f3e6084..8c625d60a 100644 --- a/briar-android/src/main/res/layout/list_item_thread.xml +++ b/briar-android/src/main/res/layout/list_item_thread.xml @@ -115,7 +115,6 @@ android:textIsSelectable="true" android:textSize="@dimen/text_size_medium" android:textColorLink="@color/briar_text_link" - android:autoLink="web" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"