GameActivity onTextInputEvent getting called twice

[jb55]

When I press a on the virtual keyboard

static void onTextInputEvent(GameActivity* activity,
                             const GameTextInputState* state) {
    struct android_app* android_app = ToApp(activity);
    LOGV("got text input event: '%.*s'", state->text_length, state->text_UTF8);
    pthread_mutex_lock(&android_app->mutex);
    if (!android_app->destroyed) {
        android_app->textInputState = 1;
        notifyInput(android_app);
    }
    pthread_mutex_unlock(&android_app->mutex);
}

03-11 17:00:55.721 28026 28026 V android_activity: got text input event: 'a'
03-11 17:00:55.721 28026 28086 I RustStdoutStderr: Notifying Input Available    
03-11 17:00:55.722 28026 28026 V android_activity: got text input event: 'aa'

only seems to happen on one of my devices. bizarre.

[jb55]

I thought it might be a double-callback register or something but this didn't fix it (still get an a and then aa event)

diff --git a/android-activity/game-activity-csrc/game-activity/GameActivity.cpp b/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
index 4dbc9e83ecac..cda7e6b717e5 100644
--- a/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
+++ b/android-activity/game-activity-csrc/game-activity/GameActivity.cpp
@@ -405,6 +405,10 @@ static int mainWorkCallback(int fd, int events, void *data) {
 // ------------------------------------------------------------------------
 static thread_local std::string g_error_msg;
 
+extern "C" {
+	void glue_onTextInputEvent(GameActivity* activity, const GameTextInputState* state);
+};
+
 static jlong initializeNativeCode_native(
     JNIEnv *env, jobject javaGameActivity, jstring internalDataDir,
     jstring obbDir, jstring externalDataDir, jobject jAssetMgr,
@@ -488,9 +492,9 @@ static jlong initializeNativeCode_native(
     GameActivity_onCreate_C(code, rawSavedState, rawSavedSize);
 
     code->gameTextInput = GameTextInput_init(env, 0);
+
     GameTextInput_setEventCallback(code->gameTextInput,
-                                   reinterpret_cast<GameTextInputEventCallback>(
-                                       code->callbacks.onTextInputEvent),
+                                   reinterpret_cast<GameTextInputEventCallback>(glue_onTextInputEvent),
                                    code);
 
     if (rawSavedState != NULL) {
diff --git a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
index 6b70cfee904f..f6a4221bdff1 100644
--- a/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
+++ b/android-activity/game-activity-csrc/game-activity/native_app_glue/android_native_app_glue.c
@@ -668,17 +668,6 @@ void android_app_clear_key_events(struct android_input_buffer* inputBuffer) {
     inputBuffer->keyEventsCount = 0;
 }
 
-static void onTextInputEvent(GameActivity* activity,
-                             const GameTextInputState* state) {
-    struct android_app* android_app = ToApp(activity);
-    pthread_mutex_lock(&android_app->mutex);
-    if (!android_app->destroyed) {
-        android_app->textInputState = 1;
-        notifyInput(android_app);
-    }
-    pthread_mutex_unlock(&android_app->mutex);
-}
-
 static void onWindowInsetsChanged(GameActivity* activity) {
     LOGV("WindowInsetsChanged: %p", activity);
     android_app_write_cmd(ToApp(activity), APP_CMD_WINDOW_INSETS_CHANGED);
@@ -697,6 +686,18 @@ static void onContentRectChanged(GameActivity* activity, const ARect *rect) {
     pthread_mutex_unlock(&android_app->mutex);
 }
 
+void glue_onTextInputEvent(GameActivity* activity, const GameTextInputState* state) {
+    struct android_app* android_app = (struct android_app*)activity->instance;
+    LOGV("got text input event: '%.*s'. composingRegion: %d %d", state->text_length, state->text_UTF8,
+		    state->composingRegion.start, state->composingRegion.end);
+    pthread_mutex_lock(&android_app->mutex);
+    if (!android_app->destroyed) {
+        android_app->textInputState = 1;
+        notifyInput(android_app);
+    }
+    pthread_mutex_unlock(&android_app->mutex);
+}
+
 // XXX: This symbol is renamed with a _C suffix and then re-exported from
 // Rust because Rust/Cargo don't give us a way to directly export symbols
 // from C/C++ code: https://github.com/rust-lang/rfcs/issues/2771
@@ -714,7 +715,7 @@ void GameActivity_onCreate_C(GameActivity* activity, void* savedState,
     activity->callbacks->onTouchEvent = onTouchEvent;
     activity->callbacks->onKeyDown = onKey;
     activity->callbacks->onKeyUp = onKey;
-    activity->callbacks->onTextInputEvent = onTextInputEvent;
+    activity->callbacks->onTextInputEvent = NULL;
     activity->callbacks->onConfigurationChanged = onConfigurationChanged;
     activity->callbacks->onTrimMemory = onTrimMemory;
     activity->callbacks->onWindowFocusChanged = onWindowFocusChanged;
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
index 7cf38949a34d..d460f69e2104 100644
--- a/android-activity/src/game_activity/mod.rs
+++ b/android-activity/src/game_activity/mod.rs
@@ -832,6 +832,7 @@ impl<'a> InputIteratorInner<'a> {
                 // before the java main thread really updates the state.
                 if (*app_ptr).textInputState != 0 {
                     let state = self.native_app.text_input_state(); // Will clear .textInputState
+                    log::debug!("sending InputEvent::TextEvent({state:?})");
                     let _ = callback(&InputEvent::TextEvent(state));
                     return true;
                 }

[jb55]

Hoping:

• Update to gamesdk v4.0.0 with our rebased patches #189

will fix this

[jb55]

Could this be why? "GameActivity loading native library twice" -> double callbacks? 🤔 spotted at:

• Fix deadlock on activity onDestroy #94 (comment)

by @znakeeye

• https://issuetracker.google.com/issues/387030986

[jb55]

Just confirmed that 4.0.0 fixes this...

• Update to GameActivity 4.0.0 #191