fix: android startup crash and input events

mehah · Feb 27, 2023 · e21a547 · e21a547
1 parent b8ce34f
commit e21a547
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/src/framework/core/application.cpp b/src/framework/core/application.cpp
@@ -89,7 +89,11 @@ void Application::init(std::vector<std::string>& args)
     g_configs.init();
 
     // initialize resources
+#ifdef ANDROID
+    g_resources.init(nullptr);
+#else
     g_resources.init(args[0].data());
+#endif
 
     // initialize lua
     g_lua.init();

diff --git a/src/framework/platform/androidmanager.h b/src/framework/platform/androidmanager.h
@@ -20,8 +20,9 @@
  * THE SOFTWARE.
  */
 
-#ifndef ANDROIDMANAGER_H
-#define ANDROIDMANAGER_H
+#pragma once
+
+#ifdef ANDROID
 
 #include <game-activity/native_app_glue/android_native_app_glue.h>
 #include <string>

diff --git a/src/framework/platform/androidwindow.cpp b/src/framework/platform/androidwindow.cpp
@@ -200,14 +200,14 @@ void AndroidWindow::poll() {
             case TOUCH_DOWN:
             case TOUCH_LONGPRESS:
             case TOUCH_UP:
-                processFingerdownAndFingerup();
+                processFingerDownAndUp();
                 break;
             case TOUCH_MOTION:
-                processFingermotion();
+                processFingerMotion();
             case KEY_DOWN:
             case KEY_UP:
             case EVENT_UNDEFINED:
-                processKeyDownOrKeyUp();
+                processKeyDownOrUp();
                 break;
         }
 
@@ -217,7 +217,7 @@ void AndroidWindow::poll() {
     fireKeysPress();
 }
 
-void AndroidWindow::processKeyDownOrKeyUp() {
+void AndroidWindow::processKeyDownOrUp() {
     if(m_currentEvent.type == KEY_DOWN || m_currentEvent.type == KEY_UP) {
         Fw::Key keyCode = Fw::KeyUnknown;
         KeyCode key = m_currentEvent.keyCode;
@@ -246,7 +246,7 @@ void AndroidWindow::processTextInput() {
     }
 }
 
-void AndroidWindow::processFingerdownAndFingerup() {
+void AndroidWindow::processFingerDownAndUp() {
     bool isTouchdown = m_currentEvent.type == TOUCH_DOWN;
     Fw::MouseButton mouseButton = (m_currentEvent.type == TOUCH_LONGPRESS) ?
         Fw::MouseRightButton : Fw::MouseLeftButton;
@@ -268,7 +268,7 @@ void AndroidWindow::processFingerdownAndFingerup() {
         m_onInputEvent(m_inputEvent);
 }
 
-void AndroidWindow::processFingermotion() {
+void AndroidWindow::processFingerMotion() {
     m_inputEvent.reset();
     m_inputEvent.type = Fw::MouseMoveInputEvent;
 
@@ -344,6 +344,9 @@ void AndroidWindow::initializeAndroidApp(android_app* app) {
         auto *engine = (AndroidWindow*) app->userData;
         engine->handleCmd(cmd);
     };
+
+    android_app_set_key_event_filter(m_app, NULL);
+    android_app_set_motion_event_filter(m_app, NULL);
 }
 
 void AndroidWindow::onNativeTouch(int actionType,

diff --git a/src/framework/platform/androidwindow.h b/src/framework/platform/androidwindow.h
@@ -20,8 +20,9 @@
  * THE SOFTWARE.
  */
 
-#ifndef ANDROIDWINDOW_H
-#define ANDROIDWINDOW_H
+#pragma once
+
+#ifdef ANDROID
 
 #include "platformwindow.h"
 #include <android/native_window.h>
@@ -89,10 +90,10 @@ class AndroidWindow : public PlatformWindow
                        uint32_t pointerIndex,
                        GameActivityMotionEvent* motionEvent);
 
-    void processKeyDownOrKeyUp();
+    void processKeyDownOrUp();
     void processTextInput();
-    void processFingerdownAndFingerup();
-    void processFingermotion();
+    void processFingerDownAndUp();
+    void processFingerMotion();
 
     void handleNativeEvents();
     void handleCmd(int32_t cmd);