diff --git a/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java index 9344319cd264930052129c69e88fe725a3f2186d..c006793018ae69cbdd63eb13d8fbef18ebe8226e 100644 --- a/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java +++ b/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java @@ -104,8 +104,9 @@ public class EmojiPageView extends FrameLayout { emojiSize + 2 * pad)); view = emojiView; } + String emoji = model.getEmoji()[position]; + view.setEmoji(emoji); - view.setEmoji(model.getEmoji()[position]); return view; } } diff --git a/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java index 21eab06aeacba6b12feb34694a1c3ecbaddc3227..9b5780b252ec692483791d47c217892d421084f4 100644 --- a/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java +++ b/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java @@ -32,7 +32,7 @@ public class RecentEmojiPageModel implements EmojiPageModel { private static final Logger LOG = Logger.getLogger(RecentEmojiPageModel.class.getName()); - private static final String EMOJI_LRU_PREFERENCE = "pref_emoji_recent"; + private static final String EMOJI_LRU_PREFERENCE = "pref_emoji_recent2"; private static final int EMOJI_LRU_SIZE = 50; private final LinkedHashSet<String> recentlyUsed; // UI thread @@ -98,12 +98,12 @@ public class RecentEmojiPageModel implements EmojiPageModel { } private String serialize(LinkedHashSet<String> emojis) { - return StringUtils.join(emojis, ";"); + return StringUtils.join(emojis, "\t"); } private LinkedHashSet<String> deserialize(@Nullable String serialized) { if (serialized == null) return new LinkedHashSet<>(); - String[] list = serialized.split(";"); + String[] list = serialized.split("\t"); LinkedHashSet<String> result = new LinkedHashSet<>(list.length); Collections.addAll(result, list); return result;