Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions app/src/main/java/com/papi/nova/Game.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5233,6 +5233,10 @@ object : com.papi.nova.api.PolarisEventSource.EventListener {
override fun onSessionEvent(event:String, state:String, message:String) {
LimeLog.info("Nova SSE: " + event + " [" + state + "] " + message)
novaProgressOverlay!!.updateState(state, message)
if (com.papi.nova.api.PolarisSessionEvents.shouldFinishGameActivity(event, state)) {
LimeLog.info("Nova SSE: terminal session event received; ending local stream activity")
runOnUiThread { finishAfterRemotePolarisSessionEnd() }
}
}
override fun onStateUpdate(sessionState:String, cageRunning:Boolean, screenLocked:Boolean) {
novaProgressOverlay!!.updateState(sessionState, "")
Expand Down Expand Up @@ -5821,6 +5825,22 @@ host ?: this@Game.getIntent().getStringExtra(EXTRA_HOST)
)
}

private fun finishAfterRemotePolarisSessionEnd() {
if (isFinishing || isDestroyed) {
return
}
markLocalSessionEnd()
stopBackgroundResumeWindow()
stopPolarisLiveSessionStatusRefresh()
if (novaReconnectOverlay != null) {
novaReconnectOverlay!!.dismiss()
}
if (novaProgressOverlay != null) {
novaProgressOverlay!!.dismiss()
}
finish()
}

fun disconnect() {
prepareBackgroundResumeWindow()
if (prefConfig!!.smartClipboardSync)
Expand Down
19 changes: 19 additions & 0 deletions app/src/main/java/com/papi/nova/api/PolarisSessionEvents.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.papi.nova.api

object PolarisSessionEvents {
private val terminalEvents = setOf(
"stream_ended",
"session_ended",
"stream_resume_timeout",
)

@JvmStatic
fun shouldFinishGameActivity(event: String?, state: String?): Boolean {
val normalizedEvent = event?.trim()?.lowercase().orEmpty()
val normalizedState = state?.trim()?.lowercase().orEmpty()
if (terminalEvents.contains(normalizedEvent)) {
return true
}
return normalizedState == "idle" && normalizedEvent == "stream_ended"
}
}
23 changes: 23 additions & 0 deletions app/src/test/java/com/papi/nova/api/PolarisSessionEventsTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.papi.nova.api

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

class PolarisSessionEventsTest {
@Test
fun terminalStreamEndedFinishesGameActivity() {
assertTrue(PolarisSessionEvents.shouldFinishGameActivity("stream_ended", "idle"))
}

@Test
fun streamResumeTimeoutFinishesGameActivity() {
assertTrue(PolarisSessionEvents.shouldFinishGameActivity("stream_resume_timeout", "idle"))
}

@Test
fun activeStreamingEventsDoNotFinishGameActivity() {
assertFalse(PolarisSessionEvents.shouldFinishGameActivity("stream_active", "streaming"))
assertFalse(PolarisSessionEvents.shouldFinishGameActivity("cage_starting", "cage_starting"))
}
}
Loading