Separate switch task stops from lock replay (#2511)

- Stop Repeat, Auto Scroll, and gesture patterns before starting external switch holds
- Suppress holds for captured Gesture Lock while preserving release replay
- Add task tests proving captured Gesture Lock is not stopped as a task

🤖 Auto-generated

Co-authored-by: Owen McGirr <o.a.mcgirr@gmail.com>

Author: enaboapps

app/src/main/java/com/enaboapps/switchify/service/core/Tasks.kt

@@ -36,7 +36,11 @@ class Tasks private constructor() {
      * @return True if any ongoing task was found and potentially stopped/advanced, false otherwise.
      */
     fun stopOngoingTaskForSwitchPress(): Boolean {
-        return stopOngoingTask()
+        return stopStoppableTask()
+    }
+
+    fun stopStoppableTaskForExternalSwitchPress(): Boolean {
+        return stopStoppableTask()
     }
 
     fun onOngoingTaskStarted() {
@@ -55,10 +59,10 @@ class Tasks private constructor() {
 
     fun stopOngoingTaskForSwitchAction(action: SwitchAction): Boolean {
         if (shouldBypassOngoingTaskStop(action)) return false
-        return stopOngoingTask()
+        return stopStoppableTask()
     }
 
-    private fun stopOngoingTask(): Boolean {
+    private fun stopStoppableTask(): Boolean {
         if (GestureRepeatManager.instance.stopRepeatForSwitchPress()) return true
 
         // Stop auto-scrolling if active

app/src/main/java/com/enaboapps/switchify/service/switches/external/ExternalSwitchListener.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import com.enaboapps.switchify.backend.preferences.PreferenceManager
 import com.enaboapps.switchify.service.core.ServiceCore
 import com.enaboapps.switchify.service.core.Tasks
+import com.enaboapps.switchify.service.gestures.GestureLockManager
 import com.enaboapps.switchify.service.scanning.ScanningManager
 import com.enaboapps.switchify.service.selection.SelectionHandler
 import com.enaboapps.switchify.service.stats.StatsCollector
@@ -58,11 +59,16 @@ class ExternalSwitchListener(
         // Record stats for switch press
         StatsCollector.getInstance().recordSwitchPress("external", keyCode.toString())
 
-        val hasHoldActions = switchEvent.holdActions.isNotEmpty()
-        if (!hasHoldActions &&
-            Tasks.getInstance().stopOngoingTaskForSwitchAction(switchEvent.pressAction)
-        ) {
+        if (Tasks.getInstance().stopStoppableTaskForExternalSwitchPress()) {
             latestAction = null
+            ExternalSwitchLongPressHandler.cancelLongPress()
+            return true
+        }
+
+        if (GestureLockManager.instance.isGestureLockEngaged()) {
+            latestAction = AbsorbedSwitchAction(switchEvent, System.currentTimeMillis())
+            ExternalSwitchLongPressHandler.cancelLongPress()
+            ExternalSwitchLongPressHandler.startLongPress(context, switchEvent.name, emptyList())
             return true
         }
 

app/src/test/java/com/enaboapps/switchify/service/core/TasksTest.kt

@@ -12,6 +12,7 @@ import com.enaboapps.switchify.switches.SwitchAction
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -84,6 +85,51 @@ class TasksTest {
         assertTrue(repeatManager.isWaitingForGesture())
     }
 
+    @Test
+    fun stopStoppableTaskForExternalSwitchPressStopsRepeat() {
+        repeatManager.setAutoRepeatEnabledForTesting(true)
+        repeatManager.onGesturePerformed(testGesture())
+
+        assertTrue(tasks.stopStoppableTaskForExternalSwitchPress())
+
+        assertFalse(repeatManager.isRepeatSessionActive())
+        assertTrue(repeatManager.isWaitingForGesture())
+    }
+
+    @Test
+    fun stopStoppableTaskForExternalSwitchPressStopsAutoScroll() {
+        assertTrue(autoScrollManager.startAutoScroll(scrollGesture()))
+        messages.clear()
+
+        assertTrue(tasks.stopStoppableTaskForExternalSwitchPress())
+
+        assertFalse(autoScrollManager.isAutoScrolling())
+        assertEquals(listOf(R.string.hud_auto_scroll_stopped), messages)
+    }
+
+    @Test
+    fun stopStoppableTaskForExternalSwitchPressIgnoresGestureLockEngaged() {
+        lockManager.enableLockForNextGesture(showMessage = false)
+        lockManager.setLockedGestureData(testGesture())
+
+        assertFalse(tasks.stopStoppableTaskForExternalSwitchPress())
+
+        assertTrue(lockManager.isGestureLockEngaged())
+        assertNotNull(lockManager.getLockedGestureData())
+    }
+
+    @Test
+    fun stopStoppableTaskForExternalSwitchPressIgnoresWaitingModes() {
+        repeatManager.setAutoRepeatEnabledForTesting(true)
+        lockManager.enableLockForNextGesture(showMessage = false)
+
+        assertFalse(tasks.stopStoppableTaskForExternalSwitchPress())
+
+        assertTrue(repeatManager.isWaitingForGesture())
+        assertTrue(lockManager.isLocked())
+        assertFalse(lockManager.isGestureLockEngaged())
+    }
+
     @Test
     fun shouldAbsorbSwitchReleaseTrueWhileRepeatSessionActive() {
         repeatManager.setAutoRepeatEnabledForTesting(true)