diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index 5854e0beea..4d64fae7bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -667,6 +667,8 @@ class FrontEndActivity : ComponentActivity() { private var shortcutLibraryScanning by mutableStateOf(false) @Volatile private var libraryScanGeneration = 0 private var pendingGameLink: String? = null + private var gameLinkReading = false + private var gameLinkTried = false private var gameSyncFolder by mutableStateOf(null) private fun pickGameExport(game: Library.SteamGame?) { onSavePicked = { folder -> @@ -707,14 +709,20 @@ class FrontEndActivity : ComponentActivity() { shortcutLibraryScanning = true } else shortcutLibraryScanning = false pendingGameLink = null + gameLinkReading = false + gameLinkTried = false if (GameLaunchIntent.accepts(request.action)) { + gameLinkReading = true + com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) val copy = Intent(request) Thread({ val id = GameLaunchIntent.read(this, copy) ui.post { if (intent === request && !isDestroyed) { + gameLinkReading = false pendingGameLink = id if (id == null) { + syncDualPanel() android.widget.Toast.makeText(this, R.string.game_link_invalid, android.widget.Toast.LENGTH_LONG).show() } else refresh() } @@ -922,12 +930,17 @@ class FrontEndActivity : ComponentActivity() { private fun handleGameLink(games: List) { if (!lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) return val id = pendingGameLink ?: return + gameLinkTried = true + ui.postDelayed({ + if (!isDestroyed && lifecycle.currentState.isAtLeast(androidx.lifecycle.Lifecycle.State.RESUMED)) syncDualPanel() + }, LINK_PANEL_MS) val game = games.firstOrNull { it.gameIdString == id } if (game == null) { pendingGameLink = null intent.data = null intent.action = Intent.ACTION_MAIN intent.removeExtra(GameLaunchIntent.EXTRA_APP_ID) + syncDualPanel() android.widget.Toast.makeText(this, R.string.game_link_missing, android.widget.Toast.LENGTH_LONG).show() } else if (launchGame(game, returnHome = true)) { pendingGameLink = null @@ -1498,6 +1511,9 @@ class FrontEndActivity : ComponentActivity() { super.onNewIntent(intent) setIntent(intent) if (intent.action == SteamIntegration.ACTION_SETUP) { + gameLinkReading = false + pendingGameLink = null + syncDualPanel() readIntegrationIntent(intent) return } @@ -1688,7 +1704,7 @@ class FrontEndActivity : ComponentActivity() { com.droiddeck.launcher.stores.battlenet.BattleNetClient.opener = null displayManager.unregisterDisplayListener(secondScreenDisplayListener) launcherStarted = false - com.droiddeck.launcher.ui.DualScreenPanel.hide() + com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) flood = null returning = null floodProgress = 0f @@ -1734,10 +1750,13 @@ class FrontEndActivity : ComponentActivity() { } private fun syncDualPanel() { + if (launchPending()) return if (launcherStarted && dualDisplayId >= 0) com.droiddeck.launcher.ui.DualScreenPanel.show(this, dualDisplayId, taskId) - else com.droiddeck.launcher.ui.DualScreenPanel.hide() + else com.droiddeck.launcher.ui.DualScreenPanel.hide(taskId) } + private fun launchPending(): Boolean = gameLinkReading || (pendingGameLink != null && !gameLinkTried) + private fun launchAndroidApp(app: HomeApp.LaunchableApp, displayId: Int?) { try { HomeApp.launch(this, app, displayId) @@ -2639,6 +2658,7 @@ class FrontEndActivity : ComponentActivity() { companion object { private const val TAG = "MainActivity" private const val MEDIA_SETTLE_MS = 1500L + private const val LINK_PANEL_MS = 1500L private const val SESSION_SWITCH_WAIT_MS = 30_000L private const val SESSION_SWITCH_POLL_MS = 250L private const val KEY_PENDING_SWITCH = "pending_switch" diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt index 882daaec7b..47e111ce91 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DualScreenPanel.kt @@ -114,7 +114,7 @@ object DualScreenPanel { } fun show(context: Context, display: Int, task: Int) { - if (shownOn == display) return + if (shownOn == display) { ownerTask = task; return } hide() displayId = display ownerTask = task @@ -134,6 +134,10 @@ object DualScreenPanel { activity = null } + fun hide(task: Int) { + if (ownerTask == task || ownerTask < 0) hide() + } + internal fun attach(host: DualScreenActivity): Boolean { if (!launching && activity == null) return false if (activity !== host) activity?.finishAndRemoveTask() diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt new file mode 100644 index 0000000000..010c66cabd --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DualScreenPanelOwnerTest.kt @@ -0,0 +1,32 @@ +package com.droiddeck.launcher.ui + +import org.junit.After +import org.junit.Assert.assertEquals +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class DualScreenPanelOwnerTest { + private val app get() = RuntimeEnvironment.getApplication() + + @After fun clear() = DualScreenPanel.hide() + + @Test fun aLauncherThatStopsLeavesThePanelOfTheOneThatTookItOver() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.show(app, 2, 11) + DualScreenPanel.hide(10) + assertEquals(2, DualScreenPanel.shownOn) + DualScreenPanel.hide(11) + assertEquals(-1, DualScreenPanel.shownOn) + } + + @Test fun theOwnerHidesItsOwnPanel() { + DualScreenPanel.show(app, 2, 10) + DualScreenPanel.hide(10) + assertEquals(-1, DualScreenPanel.shownOn) + } +}