Fixed(SensorAPI): Use shortest matched sensor

TomoBossi · agnostic-apollo · commit d5da717331a3 · 2025-03-15T12:59:25.000+05:00
Previously, one sensor name is a substring of another sensor name (like `ORIENTATION` and `DEVICE_ORIENTATION`), then the first matched sensor in available sensors list would get registered, depending on order of sensors. Now we use the shortest match for the requested sensor in the available sensors list, the shortest being an exact match if requested sensor is passed exactly (ignoring case). Closes #570
diff --git a/app/src/main/java/com/termux/api/apis/SensorAPI.java b/app/src/main/java/com/termux/api/apis/SensorAPI.java
@@ -287,17 +287,25 @@ protected static List<Sensor> getSensorsToListenTo(SensorManager sensorManager,
             } else {
 
                 // try to find matching sensors that were sent in request
-                for (String sensorName : requestedSensors) {
+                for (String requestedSensor : requestedSensors) {
                     // ignore case
-                    sensorName = sensorName.toUpperCase();
+                    requestedSensor = requestedSensor.toUpperCase();
 
-                    for (Sensor sensor : availableSensors) {
-                        if (sensor.getName().toUpperCase().contains(sensorName)) {
-                            sensorManager.registerListener(sensorEventListener, sensor, SensorManager.SENSOR_DELAY_UI);
-                            sensorsToListenTo.add(sensor);
-                            break;
+                    Sensor shortestMatchSensor = null;
+                    int shortestMatchSensorLength = Integer.MAX_VALUE;
+
+                    for (Sensor availableSensor : availableSensors) {
+                        String sensorName = availableSensor.getName().toUpperCase();
+                        if (sensorName.contains(requestedSensor) && sensorName.length() < shortestMatchSensorLength) {
+                            shortestMatchSensor = availableSensor;
+                            shortestMatchSensorLength = sensorName.length();
                         }
                     }
+
+                    if (shortestMatchSensor != null) {
+                        sensorManager.registerListener(sensorEventListener, shortestMatchSensor, SensorManager.SENSOR_DELAY_UI);
+                        sensorsToListenTo.add(shortestMatchSensor);
+                    }
                 }
             }
             return sensorsToListenTo;
