Skip to content

fix: prevent delayed accessibility events from overwriting foreground cache #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeanTMaxim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: prevent delayed accessibility events from overwriting foreground cache #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions app/src/main/java/com/stardust/autojs/core/activity/ActivityInfoProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,15 @@ class ActivityInfoProvider(private val context: Context) : AccessibilityDelegate
override fun onAccessibilityEvent(service: AccessibilityService, event: AccessibilityEvent): Boolean {
if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
val window = service.getWindow(event.windowId)
if (window?.isFocused != false) {
val activeRoot = if (window == null) service.rootInActiveWindow else null
if (shouldAcceptWindowStateChange(
eventWindowId = event.windowId,
eventPackage = event.packageName,
eventWindowFocused = window?.isFocused,
activeRootWindowId = activeRoot?.windowId,
activeRootPackage = activeRoot?.packageName,
)) {
setLatestComponent(event.packageName, event.className)
return false
}
}
return false
Expand Down Expand Up @@ -189,6 +195,20 @@ class ActivityInfoProvider(private val context: Context) : AccessibilityDelegate
}
}

internal fun shouldAcceptWindowStateChange(
eventWindowId: Int,
eventPackage: CharSequence?,
eventWindowFocused: Boolean?,
activeRootWindowId: Int?,
activeRootPackage: CharSequence?,
): Boolean = when (eventWindowFocused) {
true -> true
false -> false
null -> eventPackage != null &&
eventWindowId == activeRootWindowId &&
eventPackage.toString() == activeRootPackage?.toString()
}

private fun AccessibilityService.getWindow(windowId: Int): AccessibilityWindowInfo? {
windows.forEach {
if (it.id == windowId) {
Expand Down
24 changes: 22 additions & 2 deletions app/src/main/java/org/autojs/autojs/core/activity/ActivityInfoProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,15 @@ class ActivityInfoProvider(private val context: Context) : AccessibilityDelegate
override fun onAccessibilityEvent(service: AccessibilityService, event: AccessibilityEvent): Boolean {
if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
val window = service.getWindow(event.windowId)
if (window?.isFocused != false) {
val activeRoot = if (window == null) service.rootInActiveWindow else null
if (shouldAcceptWindowStateChange(
eventWindowId = event.windowId,
eventPackage = event.packageName,
eventWindowFocused = window?.isFocused,
activeRootWindowId = activeRoot?.windowId,
activeRootPackage = activeRoot?.packageName,
)) {
setLatestComponent(event.packageName, event.className)
return false
}
}
return false
Expand Down Expand Up @@ -191,6 +197,20 @@ class ActivityInfoProvider(private val context: Context) : AccessibilityDelegate
}
}

internal fun shouldAcceptWindowStateChange(
eventWindowId: Int,
eventPackage: CharSequence?,
eventWindowFocused: Boolean?,
activeRootWindowId: Int?,
activeRootPackage: CharSequence?,
): Boolean = when (eventWindowFocused) {
true -> true
false -> false
null -> eventPackage != null &&
eventWindowId == activeRootWindowId &&
eventPackage.toString() == activeRootPackage?.toString()
}

private fun AccessibilityService.getWindow(windowId: Int): AccessibilityWindowInfo? {
windows.forEach {
if (it.id == windowId) {
Expand Down
87 changes: 87 additions & 0 deletions app/src/test/java/com/stardust/autojs/core/activity/ActivityInfoProviderPolicyTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
package com.stardust.autojs.core.activity

import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test

class ActivityInfoProviderPolicyTest {

@Test
fun `accepts a focused event window`() {
assertTrue(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = true,
activeRootWindowId = 8,
activeRootPackage = "com.example.other",
),
)
}

@Test
fun `rejects an unfocused event window even when the active root matches`() {
assertFalse(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = false,
activeRootWindowId = 7,
activeRootPackage = "com.example.app",
),
)
}

@Test
fun `rejects a missing event window when the active root window differs`() {
assertFalse(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = null,
activeRootWindowId = 8,
activeRootPackage = "com.example.app",
),
)
}

@Test
fun `rejects a missing event window when the active root package differs`() {
assertFalse(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = null,
activeRootWindowId = 7,
activeRootPackage = "com.example.other",
),
)
}

@Test
fun `accepts a missing event window verified by the active root`() {
assertTrue(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = null,
activeRootWindowId = 7,
activeRootPackage = "com.example.app",
),
)
}

@Test
fun `rejects a missing event window with no package evidence`() {
assertFalse(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = null,
eventWindowFocused = null,
activeRootWindowId = 7,
activeRootPackage = null,
),
)
}

}
87 changes: 87 additions & 0 deletions app/src/test/java/org/autojs/autojs/core/activity/ActivityInfoProviderPolicyTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
package org.autojs.autojs.core.activity

import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test

class ActivityInfoProviderPolicyTest {

@Test
fun `accepts a focused event window`() {
assertTrue(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = true,
activeRootWindowId = 8,
activeRootPackage = "com.example.other",
),
)
}

@Test
fun `rejects an unfocused event window even when the active root matches`() {
assertFalse(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = false,
activeRootWindowId = 7,
activeRootPackage = "com.example.app",
),
)
}

@Test
fun `rejects a missing event window when the active root window differs`() {
assertFalse(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = null,
activeRootWindowId = 8,
activeRootPackage = "com.example.app",
),
)
}

@Test
fun `rejects a missing event window when the active root package differs`() {
assertFalse(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = null,
activeRootWindowId = 7,
activeRootPackage = "com.example.other",
),
)
}

@Test
fun `accepts a missing event window verified by the active root`() {
assertTrue(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = "com.example.app",
eventWindowFocused = null,
activeRootWindowId = 7,
activeRootPackage = "com.example.app",
),
)
}

@Test
fun `rejects a missing event window with no package evidence`() {
assertFalse(
shouldAcceptWindowStateChange(
eventWindowId = 7,
eventPackage = null,
eventWindowFocused = null,
activeRootWindowId = 7,
activeRootPackage = null,
),
)
}

}