Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue #236 - Wrong custom emoji displayed when filtering

This commit is contained in:
Thomas 2022-07-10 18:36:25 +02:00
parent 993ecc2382
commit 1437976f38
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
View File

@ -664,6 +664,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
return statusList.size(); return statusList.size();
} }
private List<Emoji> emojisList = new ArrayList<>();
/** /**
* Initialize text watcher for content writing * Initialize text watcher for content writing
* It will allow to complete autocomplete edit text while starting words with @, #, : etc. * It will allow to complete autocomplete edit text while starting words with @, #, : etc.
@ -672,7 +673,6 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
* @return {@link TextWatcher} * @return {@link TextWatcher}
*/ */
public TextWatcher initializeTextWatcher(ComposeAdapter.ComposeViewHolder holder) { public TextWatcher initializeTextWatcher(ComposeAdapter.ComposeViewHolder holder) {
final List<Emoji>[] emojis = new List[]{null};
String pattern = "(.|\\s)*(@[\\w_-]+@[a-z0-9.\\-]+|@[\\w_-]+)"; String pattern = "(.|\\s)*(@[\\w_-]+@[a-z0-9.\\-]+|@[\\w_-]+)";
final Pattern mentionPattern = Pattern.compile(pattern); final Pattern mentionPattern = Pattern.compile(pattern);
@ -958,13 +958,13 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
new Thread(() -> { new Thread(() -> {
List<Emoji> emojisToDisplay = new ArrayList<>(); List<Emoji> emojisToDisplay = new ArrayList<>();
try { try {
if (emojis[0] == null) { if (emojisList == null || emojisList.size() == 0) {
emojis[0] = new EmojiInstance(context).getEmojiList(BaseMainActivity.currentInstance); emojisList = new EmojiInstance(context).getEmojiList(BaseMainActivity.currentInstance);
} }
if (emojis[0] == null) { if (emojis == null) {
return; return;
} }
for (Emoji emoji : emojis[0]) { for (Emoji emoji : emojisList) {
if (shortcode != null && emoji.shortcode.contains(shortcode)) { if (shortcode != null && emoji.shortcode.contains(shortcode)) {
emojisToDisplay.add(emoji); emojisToDisplay.add(emoji);
if (emojisToDisplay.size() >= 10) { if (emojisToDisplay.size() >= 10) {
@ -983,7 +983,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
if (searchA.length > 0) { if (searchA.length > 0) {
final String search = searchA[searchA.length - 1]; final String search = searchA[searchA.length - 1];
holder.binding.content.setOnItemClickListener((parent, view, position, id) -> { holder.binding.content.setOnItemClickListener((parent, view, position, id) -> {
String shortcodeSelected = emojis[0].get(position).shortcode; String shortcodeSelected = emojisToDisplay.get(position).shortcode;
String deltaSearch = ""; String deltaSearch = "";
int searchLength = searchDeep; int searchLength = searchDeep;
if (currentCursorPosition < searchDeep) { //Less than 15 characters are written before the cursor position if (currentCursorPosition < searchDeep) { //Less than 15 characters are written before the cursor position