diff options
Diffstat (limited to 'src')
22 files changed, 8 insertions, 137 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index f3d5d8bd..df2933c9 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -12,6 +12,7 @@ import de.duenndns.ssl.MemorizingTrustManager; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.xmpp.XmppConnection; +import github.ankushsachdeva.emojicon.EmojiconHandler; import android.app.AlertDialog; import android.app.Fragment; @@ -165,8 +166,11 @@ public class SettingsActivity extends XmppActivity implements } break; case "dont_trust_system_cas": - xmppConnectionService.updateMemorizingTrustmanager(); - reconnectAccounts(); + xmppConnectionService.updateMemorizingTrustmanager(); + reconnectAccounts(); + break; + case "parse_emoticons": + EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS); break; } } diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index c42dd305..7443c0cb 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -119,8 +119,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { Pair<String,Boolean> preview = UIHelper.getMessagePreview(activity,message); mLastMessage.setVisibility(View.VISIBLE); imagePreview.setVisibility(View.GONE); - boolean parseEmoticons = Settings.PARSE_EMOTICONS; - CharSequence msgText = parseEmoticons ? UIHelper.transformAsciiEmoticons(getContext(), preview.first) : preview.first; + CharSequence msgText = preview.first; mLastMessage.setText(msgText); if (preview.second) { if (conversation.isRead()) { 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 9699f7d4..b6979cc6 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -252,10 +252,7 @@ public class MessageAdapter extends ArrayAdapter<Message> { Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); viewHolder.messageBody.setText(span); } else { - boolean parseEmoticons = Settings.PARSE_EMOTICONS; - viewHolder.messageBody.setText(parseEmoticons ? UIHelper - .transformAsciiEmoticons(getContext(), message.getMergedBody()) - : formattedBody); + viewHolder.messageBody.setText(formattedBody); } } else { String privateMarker; diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 1e3d1caf..76f48037 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -142,135 +142,6 @@ public class UIHelper { } } - public static final Map<Pattern, Integer> ANDROID_EMOTICONS = new HashMap<Pattern, Integer>(); - - private static final Factory spannableFactory = Spannable.Factory - .getInstance(); - - static { - addPattern(ANDROID_EMOTICONS, ":)", R.drawable.emo_im_happy); - addPattern(ANDROID_EMOTICONS, ":-)", R.drawable.emo_im_happy); - addPattern(ANDROID_EMOTICONS, ":(", R.drawable.emo_im_sad); - addPattern(ANDROID_EMOTICONS, ":-(", R.drawable.emo_im_sad); - addPattern(ANDROID_EMOTICONS, ";)", R.drawable.emo_im_winking); - addPattern(ANDROID_EMOTICONS, ";-)", R.drawable.emo_im_winking); - addPattern(ANDROID_EMOTICONS, ":P", - R.drawable.emo_im_tongue_sticking_out); - addPattern(ANDROID_EMOTICONS, ":-P", - R.drawable.emo_im_tongue_sticking_out); - addPattern(ANDROID_EMOTICONS, "=-O", R.drawable.emo_im_surprised); - addPattern(ANDROID_EMOTICONS, ":*", R.drawable.emo_im_kissing); - addPattern(ANDROID_EMOTICONS, ":-*", R.drawable.emo_im_kissing); - addPattern(ANDROID_EMOTICONS, ":O", R.drawable.emo_im_wtf); - addPattern(ANDROID_EMOTICONS, ":-O", R.drawable.emo_im_wtf); - addPattern(ANDROID_EMOTICONS, "B)", R.drawable.emo_im_cool); - addPattern(ANDROID_EMOTICONS, "B-)", R.drawable.emo_im_cool); - addPattern(ANDROID_EMOTICONS, "8)", R.drawable.emo_im_cool); - addPattern(ANDROID_EMOTICONS, "8-)", R.drawable.emo_im_cool); - addPattern(ANDROID_EMOTICONS, ":$", R.drawable.emo_im_money_mouth); - addPattern(ANDROID_EMOTICONS, ":-$", R.drawable.emo_im_money_mouth); - addPattern(ANDROID_EMOTICONS, ":-!", R.drawable.emo_im_foot_in_mouth); - addPattern(ANDROID_EMOTICONS, ":-[", R.drawable.emo_im_embarrassed); - addPattern(ANDROID_EMOTICONS, "O:)", R.drawable.emo_im_angel); - addPattern(ANDROID_EMOTICONS, "O:-)", R.drawable.emo_im_angel); - addPattern(ANDROID_EMOTICONS, ":\\", R.drawable.emo_im_undecided); - addPattern(ANDROID_EMOTICONS, ":-\\", R.drawable.emo_im_undecided); - addPattern(ANDROID_EMOTICONS, ":'(", R.drawable.emo_im_crying); - addPattern(ANDROID_EMOTICONS, ":D", R.drawable.emo_im_laughing); - addPattern(ANDROID_EMOTICONS, ":-D", R.drawable.emo_im_laughing); - addPattern(ANDROID_EMOTICONS, "O_o", R.drawable.emo_im_wtf); - addPattern(ANDROID_EMOTICONS, "o_O", R.drawable.emo_im_wtf); - addPattern(ANDROID_EMOTICONS, ">:O", R.drawable.emo_im_yelling); - addPattern(ANDROID_EMOTICONS, ">:0", R.drawable.emo_im_yelling); - addPattern(ANDROID_EMOTICONS, ":S", R.drawable.emo_im_lips_are_sealed); - addPattern(ANDROID_EMOTICONS, ":-S", R.drawable.emo_im_lips_are_sealed); - addPattern(ANDROID_EMOTICONS, "<3", R.drawable.emo_im_heart); - } - - private static void addPattern(Map<Pattern, Integer> map, String smile, - int resource) { - map.put(Pattern.compile(Pattern.quote(smile)), resource); - } - - private static boolean getSmiledText(Context context, Spannable spannable) { - boolean hasChanges = false; - Map<Pattern, Integer> emoticons = ANDROID_EMOTICONS; - for (Entry<Pattern, Integer> entry : emoticons.entrySet()) { - Matcher matcher = entry.getKey().matcher(spannable); - while (matcher.find()) { - boolean set = true; - for (ImageSpan span : spannable.getSpans(matcher.start(), - matcher.end(), ImageSpan.class)) - if (spannable.getSpanStart(span) >= matcher.start() - && spannable.getSpanEnd(span) <= matcher.end()) - spannable.removeSpan(span); - else { - set = false; - break; - } - if (set) { - spannable.setSpan(new ImageSpan(context, entry.getValue()), - matcher.start(), matcher.end(), - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - hasChanges = true; - } - } - } - return hasChanges; - } - - private final static class EmoticonPattern { - Pattern pattern; - String replacement; - - EmoticonPattern(String ascii, int unicode) { - this.pattern = Pattern.compile("(?<=(^|\\s))" + ascii - + "(?=(\\s|$))"); - this.replacement = new String(new int[] { unicode, }, 0, 1); - } - - String replaceAll(String body) { - return pattern.matcher(body).replaceAll(replacement); - } - } - - private static final EmoticonPattern[] patterns = new EmoticonPattern[] { - new EmoticonPattern(":-?D", 0x1f600), - new EmoticonPattern("\\^\\^", 0x1f601), - new EmoticonPattern(":'D", 0x1f602), - new EmoticonPattern("\\]-?D", 0x1f608), - new EmoticonPattern(";-?\\)", 0x1f609), - new EmoticonPattern(":-?\\)", 0x1f60a), - new EmoticonPattern("[B8]-?\\)", 0x1f60e), - new EmoticonPattern(":-?\\|", 0x1f610), - new EmoticonPattern(":-?[/\\\\]", 0x1f615), - new EmoticonPattern(":-?\\*", 0x1f617), - new EmoticonPattern(":-?[Ppb]", 0x1f61b), - new EmoticonPattern(":-?\\(", 0x1f61e), - new EmoticonPattern(":-?[0Oo]", 0x1f62e), - new EmoticonPattern("\\\\o/", 0x1F631), }; - - public static String transformAsciiEmoticonsToUtf8(String body) { - if (body != null) { - for (EmoticonPattern p : patterns) { - body = p.replaceAll(body); - } - } - return body; - } - - public static Spannable transformAsciiEmoticons(Context context, String body) { - Spannable spannable; - if (Config.UTF8_EMOTICONS) { - spannable = spannableFactory.newSpannable(transformAsciiEmoticonsToUtf8(body)); - } - else { - spannable = spannableFactory.newSpannable(body); - getSmiledText(context, spannable); - } - return spannable; - } - public static int getColorForName(String name) { if (name.isEmpty()) { return 0xFF202020; diff --git a/src/main/res/drawable/emo_im_angel.png b/src/main/res/drawable/emo_im_angel.png Binary files differdeleted file mode 100644 index c34dfa69..00000000 --- a/src/main/res/drawable/emo_im_angel.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_cool.png b/src/main/res/drawable/emo_im_cool.png Binary files differdeleted file mode 100644 index d8eeb34e..00000000 --- a/src/main/res/drawable/emo_im_cool.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_crying.png b/src/main/res/drawable/emo_im_crying.png Binary files differdeleted file mode 100644 index 1cafdb32..00000000 --- a/src/main/res/drawable/emo_im_crying.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_embarrassed.png b/src/main/res/drawable/emo_im_embarrassed.png Binary files differdeleted file mode 100644 index e4db9634..00000000 --- a/src/main/res/drawable/emo_im_embarrassed.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_foot_in_mouth.png b/src/main/res/drawable/emo_im_foot_in_mouth.png Binary files differdeleted file mode 100644 index 09d1fba6..00000000 --- a/src/main/res/drawable/emo_im_foot_in_mouth.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_happy.png b/src/main/res/drawable/emo_im_happy.png Binary files differdeleted file mode 100644 index b86602ae..00000000 --- a/src/main/res/drawable/emo_im_happy.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_heart.png b/src/main/res/drawable/emo_im_heart.png Binary files differdeleted file mode 100644 index d88bcccd..00000000 --- a/src/main/res/drawable/emo_im_heart.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_kissing.png b/src/main/res/drawable/emo_im_kissing.png Binary files differdeleted file mode 100644 index 56378f6a..00000000 --- a/src/main/res/drawable/emo_im_kissing.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_laughing.png b/src/main/res/drawable/emo_im_laughing.png Binary files differdeleted file mode 100644 index 980bf281..00000000 --- a/src/main/res/drawable/emo_im_laughing.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_lips_are_sealed.png b/src/main/res/drawable/emo_im_lips_are_sealed.png Binary files differdeleted file mode 100644 index f2de993b..00000000 --- a/src/main/res/drawable/emo_im_lips_are_sealed.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_money_mouth.png b/src/main/res/drawable/emo_im_money_mouth.png Binary files differdeleted file mode 100644 index 08c53fd6..00000000 --- a/src/main/res/drawable/emo_im_money_mouth.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_sad.png b/src/main/res/drawable/emo_im_sad.png Binary files differdeleted file mode 100644 index 31c08d06..00000000 --- a/src/main/res/drawable/emo_im_sad.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_surprised.png b/src/main/res/drawable/emo_im_surprised.png Binary files differdeleted file mode 100644 index abe8c7ad..00000000 --- a/src/main/res/drawable/emo_im_surprised.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_tongue_sticking_out.png b/src/main/res/drawable/emo_im_tongue_sticking_out.png Binary files differdeleted file mode 100644 index 6f0f47b0..00000000 --- a/src/main/res/drawable/emo_im_tongue_sticking_out.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_undecided.png b/src/main/res/drawable/emo_im_undecided.png Binary files differdeleted file mode 100644 index eb4f8c5b..00000000 --- a/src/main/res/drawable/emo_im_undecided.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_winking.png b/src/main/res/drawable/emo_im_winking.png Binary files differdeleted file mode 100644 index 568562ad..00000000 --- a/src/main/res/drawable/emo_im_winking.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_wtf.png b/src/main/res/drawable/emo_im_wtf.png Binary files differdeleted file mode 100644 index 41dd47fc..00000000 --- a/src/main/res/drawable/emo_im_wtf.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_yelling.png b/src/main/res/drawable/emo_im_yelling.png Binary files differdeleted file mode 100644 index c3c8612b..00000000 --- a/src/main/res/drawable/emo_im_yelling.png +++ /dev/null |
