From 69e3ebcc2622961558e63fbb1dbcdfcaab794013 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Wed, 27 May 2026 12:03:36 +0200
Subject: [PATCH] match controllers on android (#959)

* match controllers on android

* more

* more
---
 src/ui/android.rs |  7 +++----
 src/ui/input.rs   | 31 +++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/ui/android.rs b/src/ui/android.rs
index 5151889..2f8afdf 100644
--- a/src/ui/android.rs
+++ b/src/ui/android.rs
@@ -132,7 +132,6 @@ bind_java_type! {
         fn get_vendor_id() -> jint,
         fn get_product_id() -> jint,
         fn get_name() -> JString,
-        fn get_descriptor() -> JString,
     },
 }
 
@@ -395,10 +394,10 @@ fn list_controllers_on_jvm(env: &mut Env<'_>) -> jni::errors::Result<Vec<Control
         } else {
             "Unknown controller".to_string()
         };
-        let descriptor = if let Ok(descriptor) = device.get_descriptor(env)
-            && let Ok(descriptor) = descriptor.try_to_string(env)
+        let descriptor = if let Ok(product_id) = device.get_product_id(env)
+            && let Ok(vendor_id) = device.get_vendor_id(env)
         {
-            descriptor
+            format!("{}:{}:{}", name, vendor_id, product_id)
         } else {
             String::new()
         };
diff --git a/src/ui/input.rs b/src/ui/input.rs
index b3bb47e..1f90753 100644
--- a/src/ui/input.rs
+++ b/src/ui/input.rs
@@ -1177,10 +1177,33 @@ pub fn init(ui: &mut ui::Ui) {
             let mut joystick_id = sdl3_sys::everything::SDL_JoystickID(0);
 
             for joystick in get_joysticks().iter() {
-                let path = unsafe { sdl3_sys::joystick::SDL_GetJoystickPathForID(*joystick) };
-                if !path.is_null()
-                    && unsafe { std::ffi::CStr::from_ptr(path).to_str().unwrap() }
-                        == controller_assignment
+                let path = if cfg!(target_os = "android") {
+                    let name = if let name =
+                        unsafe { sdl3_sys::joystick::SDL_GetJoystickNameForID(*joystick) }
+                        && !name.is_null()
+                    {
+                        unsafe { std::ffi::CStr::from_ptr(name).to_str().unwrap() }.to_string()
+                    } else {
+                        "Unknown controller".to_string()
+                    };
+
+                    let vendor_id =
+                        unsafe { sdl3_sys::joystick::SDL_GetJoystickVendorForID(*joystick) };
+                    let product_id =
+                        unsafe { sdl3_sys::joystick::SDL_GetJoystickProductForID(*joystick) };
+                    Some(format!("{}:{}:{}", name, vendor_id, product_id))
+                } else {
+                    let path = unsafe { sdl3_sys::joystick::SDL_GetJoystickPathForID(*joystick) };
+                    if !path.is_null() {
+                        Some(
+                            unsafe { std::ffi::CStr::from_ptr(path).to_str().unwrap() }.to_string(),
+                        )
+                    } else {
+                        None
+                    }
+                };
+                if let Some(path) = path
+                    && path == *controller_assignment
                     && unsafe { sdl3_sys::joystick::SDL_GetJoystickFromID(*joystick) }.is_null()
                     && unsafe { sdl3_sys::gamepad::SDL_GetGamepadFromID(*joystick) }.is_null()
                 {