Skip to content

fix: refresh Thor diagnostics after display events #45

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

Merged
castdrian merged 1 commit into from
Aug 23, 2026
Merged

fix: refresh Thor diagnostics after display events #45

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
32 changes: 27 additions & 5 deletions app/src/main/java/dev/adrian/thortools/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class MainActivity : ComponentActivity() {
private var displayManager: DisplayManager? = null
private var secondaryPresentation: ThorPresentation? = null
private var secondaryDisplayRetry: Job? = null
private var displayRefreshJob: Job? = null
private var secondaryDisplayRetryCount = 0
private var secondaryPresentationRequested = false
private var activityResumed = false
Expand All @@ -38,17 +39,20 @@ class MainActivity : ComponentActivity() {

private val displayListener = object : DisplayManager.DisplayListener {
override fun onDisplayAdded(displayId: Int) {
scheduleDisplayRefresh()
requestSecondaryDisplay()
}

override fun onDisplayRemoved(displayId: Int) {
scheduleDisplayRefresh()
if (secondaryPresentation?.display?.displayId == displayId) {
dismissSecondaryDisplay()
scheduleSecondaryDisplayRetry()
}
}

override fun onDisplayChanged(displayId: Int) {
scheduleDisplayRefresh()
requestSecondaryDisplay()
}
}
Expand Down Expand Up @@ -92,6 +96,8 @@ class MainActivity : ComponentActivity() {
activityResumed = false
secondaryDisplayRetry?.cancel()
secondaryDisplayRetry = null
displayRefreshJob?.cancel()
displayRefreshJob = null
super.onPause()
}

Expand All @@ -109,6 +115,8 @@ class MainActivity : ComponentActivity() {
activityResumed = false
secondaryDisplayRetry?.cancel()
secondaryDisplayRetry = null
displayRefreshJob?.cancel()
displayRefreshJob = null
secondaryDisplayRetryCount = 0
dismissSecondaryDisplay(clearRequest = true)
displayManager?.unregisterDisplayListener(displayListener)
Expand All @@ -130,11 +138,13 @@ class MainActivity : ComponentActivity() {
.firstOrNull { candidate ->
candidate.displayId != Display.DEFAULT_DISPLAY &&
candidate.modeOrNull()?.let { mode ->
DeviceProfile.isThorLowerDisplay(
mode.physicalWidth,
mode.physicalHeight,
candidate.rotation,
)
candidate.rotationOrNull()?.let { rotation ->
DeviceProfile.isThorLowerDisplay(
mode.physicalWidth,
mode.physicalHeight,
rotation,
)
}
} == true
}
if (display == null) {
Expand Down Expand Up @@ -176,6 +186,16 @@ class MainActivity : ComponentActivity() {
}
}

private fun scheduleDisplayRefresh() {
if (!sessionLoaded || !activityResumed || isFinishing) return
displayRefreshJob?.cancel()
displayRefreshJob = lifecycleScope.launch {
delay(250L)
displayRefreshJob = null
if (activityResumed && !isFinishing) session.refresh()
}
}

private fun scheduleSecondaryDisplayRetry() {
if (!secondaryPresentationRequested || !activityResumed || isFinishing || secondaryDisplayRetry?.isActive == true) return
secondaryDisplayRetryCount = (secondaryDisplayRetryCount + 1).coerceAtMost(8)
Expand All @@ -201,6 +221,8 @@ class MainActivity : ComponentActivity() {

private fun Display.modeOrNull(): Display.Mode? = runCatching { mode }.getOrNull()

private fun Display.rotationOrNull(): Int? = runCatching { rotation }.getOrNull()

private class ThorPresentation(
private val activity: ComponentActivity,
display: Display,
Expand Down
5 changes: 4 additions & 1 deletion app/src/test/java/dev/adrian/thortools/MainActivityLifecycleContractTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@ class MainActivityLifecycleContractTest {
val removed = source.substringAfter("override fun onDisplayRemoved(displayId: Int)").substringBefore("override fun onDisplayChanged")

assertTrue(source.contains("private var secondaryPresentationRequested = false"))
assertTrue(source.contains("private var displayRefreshJob: Job? = null"))
assertTrue(source.contains("secondaryPresentationRequested = true"))
assertTrue(source.contains("scheduleDisplayRefresh()"))
assertTrue(show.contains("!secondaryPresentationRequested || !activityResumed || isFinishing"))
assertTrue(show.contains("if (display == null)"))
assertTrue(show.contains("scheduleSecondaryDisplayRetry()"))
assertTrue(show.contains("candidate.rotation"))
assertTrue(show.contains("candidate.rotationOrNull()"))
assertTrue(show.contains("candidate.modeOrNull()"))
assertTrue(source.contains("private fun Display.modeOrNull(): Display.Mode?"))
assertTrue(source.contains("private fun Display.rotationOrNull(): Int?"))
assertFalse(show.contains("candidate.mode.physicalWidth"))
assertTrue(removed.contains("scheduleSecondaryDisplayRetry()"))
assertTrue(show.contains("catch (_: WindowManager.BadTokenException)"))
Expand Down