aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-08 22:24:47 +0100
committerlookshe <github@lookshe.org>2016-03-08 22:24:47 +0100
commita6442dd3ac1114807d9a50892388a8bd4e69a861 (patch)
tree17256a8e21938932f44130c0a0131b8314d5f260 /src/main
parentb0e651aa93b56dd1ee50fa5cc6d55eb9ba20b81b (diff)
parent4b4ba6cff85c0bc80fa354a70d7b35b4cef9a672 (diff)
Merge branch 'trz/rename' into trz/rebase
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java37
-rw-r--r--src/main/res/layout/message_received.xml2
-rw-r--r--src/main/res/layout/message_sent.xml2
3 files changed, 20 insertions, 21 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 36790041..f9a82e11 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -332,32 +332,22 @@ public class MessageAdapter extends ArrayAdapter<Message> {
}
int patternMatchCount = 0;
int oldAutoLinkMask = viewHolder.messageBody.getAutoLinkMask();
- Matcher matcher = null;
// first check if we have a match on XMPP_PATTERN so we do not have to check for EMAIL_ADDRESSES
- matcher = XMPP_PATTERN.matcher(body);
- if ((Linkify.EMAIL_ADDRESSES & oldAutoLinkMask) != 0 && matcher.find()) {
+ patternMatchCount += countMatches(XMPP_PATTERN, body);
+ if ((Linkify.EMAIL_ADDRESSES & oldAutoLinkMask) != 0 && patternMatchCount > 0) {
oldAutoLinkMask -= Linkify.EMAIL_ADDRESSES;
}
// count matches for all patterns
if ((Linkify.WEB_URLS & oldAutoLinkMask) != 0) {
- matcher = Patterns.WEB_URL.matcher(body);
- while (matcher.find()) {
- patternMatchCount++;
- }
+ patternMatchCount += countMatches(Patterns.WEB_URL, body);
}
if ((Linkify.EMAIL_ADDRESSES & oldAutoLinkMask) != 0) {
- matcher = Patterns.EMAIL_ADDRESS.matcher(body);
- while (matcher.find()) {
- patternMatchCount++;
- }
+ patternMatchCount += countMatches(Patterns.EMAIL_ADDRESS, body);
}
if ((Linkify.PHONE_NUMBERS & oldAutoLinkMask) != 0) {
- matcher = Patterns.PHONE.matcher(body);
- while (matcher.find()) {
- patternMatchCount++;
- }
+ patternMatchCount += countMatches(Patterns.PHONE, body);
}
viewHolder.messageBody.setTextIsSelectable(patternMatchCount <= 1);
@@ -369,12 +359,25 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder.messageBody.setTextIsSelectable(false);
}
viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
- viewHolder.messageBody.setLinkTextColor(this.getMessageTextColor(darkBackground, true));
- viewHolder.messageBody.setHighlightColor(activity.getResources().getColor(darkBackground ? R.color.grey800 : R.color.grey500));
viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
viewHolder.messageBody.setOnLongClickListener(openContextMenu);
}
+ /**
+ * Counts the number of occurrences of the pattern in body.
+ * @param pattern the pattern to match
+ * @param body the body to find the pattern
+ * @return the number of occurrences
+ */
+ private int countMatches(Pattern pattern, String body) {
+ Matcher matcher = pattern.matcher(body);
+ int count = 0;
+ while (matcher.find()) {
+ count++;
+ }
+ return count;
+ }
+
private void displayDownloadableMessage(ViewHolder viewHolder,
final Message message, String text) {
viewHolder.image.setVisibility(View.GONE);
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 93ab095b..fa690872 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -54,9 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web|phone|email"
- android:textColorLink="@color/primaryText"
android:textColor="@color/primaryText"
- android:textColorHighlight="@color/grey500"
android:textSize="?attr/TextSizeBody"
app:emojiconSize="28sp" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 909ae9c7..b74347d4 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -54,9 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web|phone|email"
- android:textColorLink="@color/primaryText"
android:textColor="@color/primaryText"
- android:textColorHighlight="@color/grey500"
android:textSize="?attr/TextSizeBody"
app:emojiconSize="28sp"/>