Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Better fix for previous issue

Browse source
This commit is contained in:
Sylvain Berfini 2014-05-28 11:24:58 +02:00
parent a1339deb61
commit 5c3413a3d5
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/org/linphone/ui/BubbleChat.java
View file

@ -123,7 +123,7 @@ public class BubbleChat {
Spanned text = null; Spanned text = null;
if (message != null) { if (message != null) {
if (context.getResources().getBoolean(R.bool.emoticons_in_messages)) { if (context.getResources().getBoolean(R.bool.emoticons_in_messages)) {
text = getSmiledText(context, getTextWithHttpLinks(message), message); text = getSmiledText(context, getTextWithHttpLinks(message));
//text = getTextWithHttpLinks(message); //text = getTextWithHttpLinks(message);
} else { } else {
text = getTextWithHttpLinks(message); text = getTextWithHttpLinks(message);
@ -257,17 +257,16 @@ public class BubbleChat {
cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR)); cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR));
} }
public static Spannable getSmiledText(Context context, Spanned spanned, String text) { public static Spannable getSmiledText(Context context, Spanned spanned) {
SpannableStringBuilder builder = new SpannableStringBuilder(spanned); SpannableStringBuilder builder = new SpannableStringBuilder(spanned);
String text = spanned.toString();
for (Entry<String, Integer> entry : emoticons.entrySet()) { for (Entry<String, Integer> entry : emoticons.entrySet()) {
String key = entry.getKey(); String key = entry.getKey();
int indexOf = text.indexOf(key); int indexOf = text.indexOf(key);
while (indexOf >= 0) { while (indexOf >= 0) {
int end = indexOf + key.length(); int end = indexOf + key.length();
if (end <= spanned.length()) { builder.setSpan(new ImageSpan(context, entry.getValue()), indexOf, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
builder.setSpan(new ImageSpan(context, entry.getValue()), indexOf, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
}
indexOf = text.indexOf(key, end); indexOf = text.indexOf(key, end);
} }
} }