Skip to content

Try to fix emoji search ending #2326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
eranl wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Try to fix emoji search ending #2326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40221e0
Add emoji search ending logging
eranl Feb 26, 2026
5138c03
Delay saving the emoji
eranl Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiSearchActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ import helium314.keyboard.settings.CloseIcon
import helium314.keyboard.settings.SearchIcon
import kotlin.properties.Delegates

private const val TAG = "emoji-search"
const val TAG = "emoji-search"

/**
* This activity is displayed in a gap created for it above the keyboard and below the host app, and disables the host app.
Expand Down Expand Up @@ -260,20 +260,22 @@ class EmojiSearchActivity : ComponentActivity() {
}

override fun onStop() {
Log.d(TAG, "search ending. Selected emoji: ${pressedKey?.let { getEmoji(it) }}. imeClosed: $imeClosed")
val intent = Intent(this, LatinIME::class.java).setAction(EMOJI_SEARCH_DONE_ACTION)
.putExtra(IME_CLOSED_KEY, imeClosed)
pressedKey?.let {
intent.putExtra(EMOJI_KEY, if (it.code == KeyCode.MULTIPLE_CODE_POINTS)
it.getOutputText()
else
Character.toString(it.code))

intent.putExtra(EMOJI_KEY, getEmoji(it))
KeyboardSwitcher.getInstance().emojiPalettesView.addRecentKey(it)
}
startService(intent)
super.onStop()
}

private fun getEmoji(key: Key): String? = if (key.code == KeyCode.MULTIPLE_CODE_POINTS)
key.getOutputText()
else
Character.toString(key.code)

private fun init() {
Log.d(TAG, "init start")
@Suppress("DEPRECATION")
Expand Down
25 changes: 19 additions & 6 deletions app/src/main/java/helium314/keyboard/latin/LatinIME.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import helium314.keyboard.keyboard.KeyboardActionListenerImpl;
import helium314.keyboard.keyboard.emoji.EmojiPalettesView;
import helium314.keyboard.keyboard.emoji.EmojiSearchActivity;
import helium314.keyboard.keyboard.emoji.EmojiSearchActivityKt;
import helium314.keyboard.keyboard.internal.KeyboardIconsSet;
import helium314.keyboard.keyboard.internal.keyboard_parser.floris.KeyCode;
import helium314.keyboard.latin.common.InsetsOutlineProvider;
Expand Down Expand Up @@ -1712,21 +1713,25 @@ void launchSettings() {
}

public void launchEmojiSearch() {
Log.d("emoji-search", "before activity launch");
Log.d(EmojiSearchActivityKt.TAG, "before activity launch");
startActivity(new Intent().setClass(this, EmojiSearchActivity.class)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_MULTIPLE_TASK));
}

@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.d(EmojiSearchActivityKt.TAG, "after activity closing. isEmojiSearch: " + isEmojiSearch() + ". Intent: " + intent +
(intent != null ? ". imeClosed: " + isImeClosed(intent) + ". selected emoji: " + getSelectedEmoji(intent) : ""));
if (intent != null && EmojiSearchActivity.EMOJI_SEARCH_DONE_ACTION.equals(intent.getAction()) && ! isEmojiSearch()) {
if (intent.getBooleanExtra(EmojiSearchActivity.IME_CLOSED_KEY, false)) {
if (isImeClosed(intent)) {
requestHideSelf(0);
} else {
mHandler.postDelayed(() -> KeyboardSwitcher.getInstance().setEmojiKeyboard(), 100);
if (intent.hasExtra(EmojiSearchActivity.EMOJI_KEY)) {
onTextInput(intent.getStringExtra(EmojiSearchActivity.EMOJI_KEY));
}
mHandler.postDelayed(() -> {
if (intent.hasExtra(EmojiSearchActivity.EMOJI_KEY)) {
onTextInput(getSelectedEmoji(intent));
}
KeyboardSwitcher.getInstance().setEmojiKeyboard();
}, 100);
}

stopSelf(startId); // Allow the service to be destroyed when unbound
Expand All @@ -1736,6 +1741,14 @@ public int onStartCommand(Intent intent, int flags, int startId) {
return super.onStartCommand(intent, flags, startId);
}

private static boolean isImeClosed(Intent intent) {
return intent.getBooleanExtra(EmojiSearchActivity.IME_CLOSED_KEY, false);
}

private static String getSelectedEmoji(Intent intent) {
return intent.getStringExtra(EmojiSearchActivity.EMOJI_KEY);
}

public boolean isEmojiSearch() {
return getEmojiSearchActivityHeight() > 0;
}
Expand Down