thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 5 Pull requests 1 Wiki Activity Actions 1

Attempt to fix emoji search race

Browse source 
Seems like popup is still doing measure when new submit edits the list
can cause a crash.

(cherry picked from commit 8a7eb1e2a5c27dff6182fbd7d86c45a5157d422a)
This commit is contained in:
Stephen Paul Weber 2024-09-30 09:08:00 -05:00 committed by Arne
parent 6a23d41c2c
commit 7187a726b4
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/monocleschat/java/de/monocles/chat/EmojiSearch.java
View file

@ -27,6 +27,7 @@ import java.util.List;
import java.util.PriorityQueue;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.Semaphore;
import java.util.function.Consumer;
import me.xdrop.fuzzywuzzy.FuzzySearch;
@ -216,6 +217,7 @@ public class EmojiSearch {
}
};
final Consumer<Emoji> callback;
protected Semaphore doingUpdate = new Semaphore(1);
public EmojiSearchAdapter(final Consumer<Emoji> callback) {
super(DIFF);
@ -249,9 +251,15 @@ public class EmojiSearch {
public void search(final Activity activity, final String q) {
executor.execute(() -> {
final List<Emoji> results = find(q);
activity.runOnUiThread(() -> {
submitList(results);
});
try {
// Acquire outside so to not block UI thread
doingUpdate.acquire();
activity.runOnUiThread(() -> {
submitList(results, () -> {
activity.runOnUiThread(() -> doingUpdate.release());
});
});
} catch (final InterruptedException e) { }
});
}