diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-08 23:21:44 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-08 23:22:36 +0100 |
commit | 9af0794911b7993b612d23b3851fc5f5754bb2a0 (patch) | |
tree | 68e8b00f6031e4c19ca4dbcbdbbb2101acabd499 /src/main/java/de/thedevstack/conversationsplus/ui | |
parent | a5243a8160bd9d939299a44db8e28331ac756911 (diff) | |
parent | 85bb3f537ae253d367c4be19305d4ad3c2bb8f76 (diff) |
Merge remote branch 'master'
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java index 79f3412d..cc6ea18c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/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); |