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" />