Skip to content

fix(M8): prevent isBusy lockups + avoid classifier teardown crash #7

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
youssofal wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(M8): prevent isBusy lockups + avoid classifier teardown crash #7

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
5 changes: 3 additions & 2 deletions app/src/main/java/com/yoyostudios/clashcompanion/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,9 @@ class MainActivity : ComponentActivity() {
override fun onDestroy() {
super.onDestroy()
overlayManager?.hide()
HandDetector.stopScanning()
CardClassifier.destroy()
HandDetector.destroy()
// CardClassifier is a process-scoped singleton (PyTorch). Destroying it while a scan coroutine
// is mid-inference can crash native code (destroyed mutex). Let the OS clean up on process exit.
scope.cancel()
}
}
6 changes: 6 additions & 0 deletions app/src/main/java/com/yoyostudios/clashcompanion/command/CommandRouter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,7 @@ Or if waiting is better: {"action":"wait","reasoning":"<15 words max>"}"""
val msg = "Low confidence: $card? ($pct% < ${(threshold * 100).toInt()}%)"
overlay?.updateStatus(msg)
Log.w(TAG, "CMD: $msg")
isBusy = false
return
}

Expand All @@ -878,13 +879,15 @@ Or if waiting is better: {"action":"wait","reasoning":"<15 words max>"}"""
val msg = "Not in hand: $card (hand: $handCards)"
overlay?.updateStatus(msg)
Log.w(TAG, "CMD: $msg")
isBusy = false
return
}

if (slotIndex < 0 || slotIndex >= Coordinates.CARD_SLOTS.size) {
val msg = "ERROR: Invalid slot index $slotIndex for $card"
overlay?.updateStatus(msg)
Log.e(TAG, "CMD: $msg")
isBusy = false
return
}

Expand All @@ -901,13 +904,15 @@ Or if waiting is better: {"action":"wait","reasoning":"<15 words max>"}"""
val msg = "ERROR: No zone for $card"
overlay?.updateStatus(msg)
Log.e(TAG, "CMD: $msg")
isBusy = false
return
}
val zoneCoords = Coordinates.ZONE_MAP[zone]
if (zoneCoords == null) {
val msg = "ERROR: Unknown zone '$zone'"
overlay?.updateStatus(msg)
Log.e(TAG, "CMD: $msg")
isBusy = false
return
}
zoneX = zoneCoords.first
Expand All @@ -920,6 +925,7 @@ Or if waiting is better: {"action":"wait","reasoning":"<15 words max>"}"""
val msg = "ERROR: Accessibility service not connected"
overlay?.updateStatus(msg)
Log.e(TAG, "CMD: $msg")
isBusy = false
return
}

Expand Down