From 1fc5dba3d576814b9ffda1ebd06b8ea5275f3115 Mon Sep 17 00:00:00 2001
From: Sylvain <[EMAIL REDACTED]>
Date: Tue, 8 Feb 2022 17:41:17 +0100
Subject: [PATCH] Android: test for SOURCE_KEYBOARD / SOURCE_MOUSE. Don't
compare to 0, since there are several bits (see #5322, #2718)
---
.../app/src/main/java/org/libsdl/app/SDLActivity.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
index 173fcb0614b..5c08c035a85 100644
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -1905,7 +1905,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
}
}
- if ((source & InputDevice.SOURCE_KEYBOARD) != 0) {
+ if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
if (SDLActivity.isTextInputEvent(event)) {
SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1);
@@ -1918,7 +1918,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
}
}
- if ((source & InputDevice.SOURCE_MOUSE) != 0) {
+ if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
// on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
// they are ignored here because sending them as mouse input to SDL is messy
if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {