Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1437-reversed-emoji' into 'master'

Browse Source 
[android] Add new emojis to the beginning of the list of recently used ones

Closes #1437

See merge request briar/briar!977
This commit is contained in:
akwizgran
2018-11-05 10:27:03 +00:00
parent 8547b4dc91 7429857b28
commit 7746364ae9
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/src/main/java/org/briarproject/briar/android/RecentEmojiImpl.java
View File

@@ -18,8 +18,7 @@ import org.briarproject.bramble.util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.LinkedList;
import java.util.LinkedHashSet;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.logging.Logger; import java.util.logging.Logger;
@@ -40,7 +39,7 @@ class RecentEmojiImpl implements RecentEmoji, Client {
private static final int EMOJI_LRU_SIZE = 50; private static final int EMOJI_LRU_SIZE = 50;
// UI thread // UI thread
private final LinkedHashSet<Emoji> recentlyUsed = new LinkedHashSet<>(); private final LinkedList<Emoji> recentlyUsed = new LinkedList<>();
private final Executor dbExecutor; private final Executor dbExecutor;
private final AndroidExecutor androidExecutor; private final AndroidExecutor androidExecutor;
@@ -62,13 +61,9 @@ class RecentEmojiImpl implements RecentEmoji, Client {
@Override @Override
public void addEmoji(Emoji emoji) { public void addEmoji(Emoji emoji) {
recentlyUsed.remove(emoji); recentlyUsed.remove(emoji);
recentlyUsed.add(emoji); recentlyUsed.add(0, emoji);
if (recentlyUsed.size() > EMOJI_LRU_SIZE) { if (recentlyUsed.size() > EMOJI_LRU_SIZE) recentlyUsed.removeLast();
Iterator<Emoji> iterator = recentlyUsed.iterator();
iterator.next();
iterator.remove();
}
} }
@Override @Override