fix: review fixes + dropped upstream improvements on the vibration path

Bot review (PR utkarshdalal#1214):

- ContainerUtils.toContainerData / applyToContainer: normalize vibrationMode
  via PrefManager.normalizeVibrationModeInput and clamp vibrationIntensity
  to 0..100 at the read/write boundary. Stops a stale 'both' (or any other
  invalid value) carried over from the prior schema from propagating into
  ContainerData and back to disk.
- ContainerData.Saver/restorer: same defence on the Compose Saver round-trip
  via a private VALID_RESTORED_VIBRATION_MODES whitelist plus an
  Int.coerceIn(0, 100) on intensity. Rebuilt invalid mode strings fall back
  to 'controller'.
- WinHandler.startRumblePoller: re-check 'running' after acquiring
  rumbleNotifyLock so a stop() that runs between the outer while(running)
  check and the synchronized block is observed before the poller goes
  into wait(0). Without this, stop()'s notifyAll() is the only chance to
  wake the poller and a tight race could miss it.
- WinHandler.rumbleViaVibratorManager: Arrays.sort(ids) instead of a
  two-element manual swap. Generalises the heavy/light motor selection to
  3+ vibrator controllers (DualSense edition variants); 2-vibrator cases
  produce the same result as before.

Broader review (dropped from upstream PR utkarshdalal#1261 when copying pre-cleanup's
WinHandler wholesale):

- WinHandler GET_GAMEPAD adoption: when no current controller is set,
  consult ControllerManager.getAssignedDeviceForSlot(0) instead of
  ExternalController.getController(0). The latter queries InputDevice ID
  0 — an arbitrary number that rarely corresponds to the user's slot-0
  assignment.
- WinHandler.start(): call initializeAssignedControllers() so saved slot
  assignments are pre-registered before the first GET_GAMEPAD packet
  arrives. Pre-cleanup defined the method but never called it (dead code);
  upstream's PR called it from start(), and games that probe controllers
  at startup were depending on that pre-registration.

Author: TideGear

app/src/main/java/app/gamenative/utils/ContainerUtils.kt

@@ -325,8 +325,11 @@ object ContainerUtils {
             sharpnessEffect = container.getExtra("sharpnessEffect", "None"),
             sharpnessLevel = container.getExtra("sharpnessLevel", "100").toIntOrNull() ?: 100,
             sharpnessDenoise = container.getExtra("sharpnessDenoise", "100").toIntOrNull() ?: 100,
-            vibrationMode = container.getExtra("vibrationMode", "controller"),
-            vibrationIntensity = container.getExtra("vibrationIntensity", "100").toIntOrNull() ?: 100,
+            vibrationMode = PrefManager.normalizeVibrationModeInput(
+                container.getExtra("vibrationMode", "controller"),
+            ),
+            vibrationIntensity = (container.getExtra("vibrationIntensity", "100").toIntOrNull() ?: 100)
+                .coerceIn(0, 100),
         )
     }
 
@@ -495,8 +498,14 @@ object ContainerUtils {
         container.putExtra("sharpnessEffect", containerData.sharpnessEffect)
         container.putExtra("sharpnessLevel", containerData.sharpnessLevel.toString())
         container.putExtra("sharpnessDenoise", containerData.sharpnessDenoise.toString())
-        container.putExtra("vibrationMode", containerData.vibrationMode)
-        container.putExtra("vibrationIntensity", containerData.vibrationIntensity.toString())
+        container.putExtra(
+            "vibrationMode",
+            PrefManager.normalizeVibrationModeInput(containerData.vibrationMode),
+        )
+        container.putExtra(
+            "vibrationIntensity",
+            containerData.vibrationIntensity.coerceIn(0, 100).toString(),
+        )
         try {
             container.language = containerData.language
         } catch (e: Exception) {

app/src/main/java/com/winlator/container/ContainerData.kt

@@ -104,6 +104,8 @@ data class ContainerData(
     val sharpnessDenoise: Int = 100,
 ) {
     companion object {
+        private val VALID_RESTORED_VIBRATION_MODES = setOf("off", "controller", "device")
+
         val Saver = mapSaver(
             save = { state ->
                 mapOf(
@@ -188,8 +190,11 @@ data class ContainerData(
                     executablePath = savedMap["executablePath"] as String,
                     installPath = savedMap["installPath"] as String,
                     showFPS = savedMap["showFPS"] as Boolean,
-                    vibrationMode = (savedMap["vibrationMode"] as? String) ?: "controller",
-                    vibrationIntensity = (savedMap["vibrationIntensity"] as? Int) ?: 100,
+                    vibrationMode = (savedMap["vibrationMode"] as? String)
+                        ?.trim()?.lowercase()
+                        ?.takeIf { it in VALID_RESTORED_VIBRATION_MODES }
+                        ?: "controller",
+                    vibrationIntensity = ((savedMap["vibrationIntensity"] as? Int) ?: 100).coerceIn(0, 100),
                     launchRealSteam = savedMap["launchRealSteam"] as Boolean,
                     disableSteamOverlay = (savedMap["disableSteamOverlay"] as? Boolean) ?: true,
                     sdkCloudSaveSubdir = (savedMap["sdkCloudSaveSubdir"] as? String) ?: "",

app/src/main/java/com/winlator/winhandler/WinHandler.java

@@ -511,7 +511,14 @@ private void handleRequest(byte requestCode, final int port) throws IOException
                 final boolean useVirtualGamepad = inputControlsView != null && profile != null && profile.isVirtualGamepad();
                 int processId = this.receiveData.getInt();
                 if (!useVirtualGamepad && ((externalController = this.currentController) == null || !externalController.isConnected())) {
-                    this.currentController = ExternalController.getController(0);
+                    // Use ControllerManager as the single source of truth for slot 0
+                    // rather than ExternalController.getController(0) which queries
+                    // InputDevice ID 0 — that ID is arbitrary and rarely matches the
+                    // user's slot-0 assignment.
+                    InputDevice p1Device = controllerManager.getAssignedDeviceForSlot(0);
+                    if (p1Device != null) {
+                        this.currentController = ExternalController.getController(p1Device.getId());
+                    }
                 }
                 boolean enabled2 = this.currentController != null || useVirtualGamepad;
                 if (enabled2) {
@@ -672,6 +679,11 @@ public void start() {
         }
         this.running = true;
         startSendThread();
+
+        // Pre-register controllers from saved slot assignments so games that probe
+        // for controllers at startup see them before the first input arrives.
+        initializeAssignedControllers();
+
         Executors.newSingleThreadExecutor().execute(() -> {
             try {
                 DatagramSocket datagramSocket = new DatagramSocket((SocketAddress) null);
@@ -786,6 +798,11 @@ private void startRumblePoller() {
                 if (waitMs <= 0) waitMs = 1; // never spin; ensure we yield to other threads
                 try {
                     synchronized (rumbleNotifyLock) {
+                        // Re-check running under the lock so a stop() that runs between the
+                        // outer while(running) check and this synchronized block is observed.
+                        // Without this, the poller would call wait(0) and miss the only
+                        // notify() the stop() path emits.
+                        if (!running) break;
                         // wait(0) means indefinite; cap at keepalive interval when rumbling.
                         rumbleNotifyLock.wait(waitMs == Long.MAX_VALUE ? 0 : waitMs);
                     }
@@ -847,13 +864,14 @@ private boolean rumbleViaVibratorManager(VibratorManager vm, short lowFreq, shor
         int lowAmp  = scaleAmplitude(lowFreq,  vibrationIntensity);
         if (lowAmp == 0 && highAmp == 0) { vm.cancel(); return true; }
 
-        // Determine which ID drives the low-freq (heavy/left) motor and which drives
-        // the high-freq (light/right) motor by sorting IDs ascending.
+        // Sort IDs ascending so the low-freq (heavy/left) and high-freq (light/right)
+        // selection is well-defined regardless of the order getVibratorIds() returned.
+        // Manual two-element swap was correct for 2 IDs; sort generalises to 3+.
+        Arrays.sort(ids);
         int lowMotorId  = ids[0];
         int highMotorId = ids.length >= 2 ? ids[1] : ids[0];
 
         if (ids.length >= 2) {
-            if (ids[0] > ids[1]) { lowMotorId = ids[1]; highMotorId = ids[0]; }
             String motorKey = lowMotorId + "_" + highMotorId;
             if (loggedRumbleMotorIds.add(motorKey)) {
                 Log.d(TAG, "Rumble motors: lowMotor=" + lowMotorId + " highMotor=" + highMotorId);