diff --git a/app/src/main/java/com/droiddeck/launcher/session/BrowserHandoff.kt b/app/src/main/java/com/droiddeck/launcher/session/BrowserHandoff.kt new file mode 100644 index 0000000000..062afbfc78 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/BrowserHandoff.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.session + +internal class BrowserHandoff(private val timeoutMs: Long) { + private var startedAt = -1L + private var sessionLeft = false + + fun begin(now: Long) { + startedAt = now + sessionLeft = false + } + + fun sessionHidden() { + if (startedAt >= 0) sessionLeft = true + } + + fun sessionShown() { + if (sessionLeft) clear() + } + + fun clear() { + startedAt = -1L + sessionLeft = false + } + + fun active(now: Long): Boolean = startedAt >= 0 && now - startedAt < timeoutMs +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 8da979cc39..d45bc531a6 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -23,6 +23,7 @@ import android.os.IBinder import android.os.Handler import android.os.Looper import android.os.PowerManager +import android.os.SystemClock import android.hardware.display.DisplayManager import android.view.Display import android.util.Log @@ -85,7 +86,12 @@ class SessionService : Service() { private var activityDisplayId = Display.DEFAULT_DISPLAY private var xrActivityVisible = false private var signInHold = false - private val hasVisibleSurface get() = !SessionVisibilityPolicy.isHidden( + private val browserHandoff = BrowserHandoff(BROWSER_HANDOFF_TIMEOUT_MS) + private val browserHandoffExpired = Runnable { + suspendAttemptFailed = false + updateSuspendPolicy() + } + private val hasVisibleSurface get() = browserHandoff.active(SystemClock.elapsedRealtime()) || !SessionVisibilityPolicy.isHidden( activityStarted = activityVisible || signInHold, defaultDisplayOn = (getSystemService(Context.POWER_SERVICE) as? PowerManager)?.isInteractive ?: screenOn, activityOnDefaultDisplay = activityDisplayId == Display.DEFAULT_DISPLAY, @@ -235,6 +241,7 @@ class SessionService : Service() { ACTION_ACTIVITY_VISIBLE -> { if (!SessionState.pipActive) pipTask = false activityVisible = true + browserHandoff.sessionShown() activityDisplayId = intent.getIntExtra(EXTRA_ACTIVITY_DISPLAY_ID, activityDisplayId) sessionDisplayId = intent.getIntExtra(EXTRA_DISPLAY_ID, sessionDisplayId) screenOn = readScreenOn() @@ -258,6 +265,7 @@ class SessionService : Service() { } ACTION_ACTIVITY_HIDDEN -> { activityVisible = false + browserHandoff.sessionHidden() activityDisplayId = intent.getIntExtra(EXTRA_ACTIVITY_DISPLAY_ID, activityDisplayId) suspendAttemptFailed = false updateSuspendPolicy() @@ -287,6 +295,17 @@ class SessionService : Service() { updateSuspendPolicy() return START_NOT_STICKY } + ACTION_BROWSER_HANDOFF -> { + if (!SessionState.running) return START_NOT_STICKY + browserHandoff.begin(SystemClock.elapsedRealtime()) + if (!activityVisible) browserHandoff.sessionHidden() + mainHandler.removeCallbacks(browserHandoffExpired) + mainHandler.postDelayed(browserHandoffExpired, BROWSER_HANDOFF_TIMEOUT_MS) + if (!manualHold) manualPauseRequested = false + suspendAttemptFailed = false + updateSuspendPolicy() + return START_NOT_STICKY + } ACTION_MIC_CHANGED -> { if (SessionState.running && SessionState.micAvailable && !SessionState.suspended) { val enabled = intent.getBooleanExtra("enabled", false) @@ -343,6 +362,8 @@ class SessionService : Service() { activityVisible = true xrActivityVisible = false signInHold = false + browserHandoff.clear() + mainHandler.removeCallbacks(browserHandoffExpired) sessionDisplayId = intent?.getIntExtra(EXTRA_DISPLAY_ID, Display.DEFAULT_DISPLAY) ?: Display.DEFAULT_DISPLAY activityDisplayId = intent?.getIntExtra(EXTRA_ACTIVITY_DISPLAY_ID, sessionDisplayId) ?: sessionDisplayId screenOn = readScreenOn() @@ -2409,6 +2430,8 @@ class SessionService : Service() { private const val ACTION_XR_ACTIVITY_HIDDEN = "com.droiddeck.launcher.XR_ACTIVITY_HIDDEN" private const val ACTION_SIGN_IN_HOLD = "com.droiddeck.launcher.SIGN_IN_HOLD" private const val EXTRA_HOLD = "hold" + private const val ACTION_BROWSER_HANDOFF = "com.droiddeck.launcher.BROWSER_HANDOFF" + private const val BROWSER_HANDOFF_TIMEOUT_MS = 10 * 60_000L private const val ACTION_TRACK_AUXILIARY = "com.droiddeck.launcher.TRACK_AUXILIARY" private const val ACTION_STOP_AUXILIARY = "com.droiddeck.launcher.STOP_AUXILIARY" private const val ACTION_AUXILIARY_EXITED = "com.droiddeck.launcher.AUXILIARY_EXITED" @@ -2511,6 +2534,11 @@ class SessionService : Service() { context.startService(Intent(context, SessionService::class.java).setAction(ACTION_SIGN_IN_HOLD).putExtra(EXTRA_HOLD, hold)) } + fun holdForBrowserHandoff(context: Context) { + if (!SessionState.running) return + context.startService(Intent(context, SessionService::class.java).setAction(ACTION_BROWSER_HANDOFF)) + } + fun pause(context: Context) { context.startService(Intent(context, SessionService::class.java).setAction(ACTION_PAUSE_NOW)) } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt index c89ada3f93..979e363ccd 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/StoreLaunchRequests.kt @@ -114,6 +114,7 @@ object StoreLaunchRequests { if (!(url.startsWith("https://") || url.startsWith("http://"))) JSONObject().put("ok", false).put("reason", "not-http") else try { app.startActivity(android.content.Intent(android.content.Intent.ACTION_VIEW, android.net.Uri.parse(url)).addFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK)) + com.droiddeck.launcher.session.SessionService.holdForBrowserHandoff(app) Log.i(TAG, "open-url: " + StoreLog.redactUrl(url)) JSONObject().put("ok", true) } catch (e: Exception) { diff --git a/app/src/test/java/com/droiddeck/launcher/session/BrowserHandoffTest.kt b/app/src/test/java/com/droiddeck/launcher/session/BrowserHandoffTest.kt new file mode 100644 index 0000000000..0d01833441 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/BrowserHandoffTest.kt @@ -0,0 +1,58 @@ +package com.droiddeck.launcher.session + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class BrowserHandoffTest { + private fun hidden(handoff: BrowserHandoff, activityStarted: Boolean, now: Long) = + SessionVisibilityPolicy.isHidden(activityStarted || handoff.active(now), true, true, true) + + @Test fun pendingHandoffKeepsBackgroundedSessionAwake() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.sessionHidden() + assertFalse(hidden(handoff, activityStarted = false, now = 500)) + } + + @Test fun handoffEndsWhenSessionViewReturns() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.sessionHidden() + handoff.sessionShown() + assertFalse(handoff.active(10)) + assertTrue(hidden(handoff, activityStarted = false, now = 20)) + } + + @Test fun shownBeforeLeavingDoesNotEndHandoff() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.sessionShown() + handoff.sessionHidden() + assertFalse(hidden(handoff, activityStarted = false, now = 100)) + } + + @Test fun handoffExpiresAfterTimeout() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.sessionHidden() + assertTrue(handoff.active(999)) + assertTrue(hidden(handoff, activityStarted = false, now = 1_000)) + } + + @Test fun normalBackgroundingStillHidesSession() { + val handoff = BrowserHandoff(1_000) + handoff.sessionHidden() + assertFalse(handoff.active(0)) + assertTrue(hidden(handoff, activityStarted = false, now = 0)) + } + + @Test fun newHandoffRestartsTimer() { + val handoff = BrowserHandoff(1_000) + handoff.begin(0) + handoff.begin(900) + assertTrue(handoff.active(1_500)) + handoff.clear() + assertFalse(handoff.active(1_500)) + } +}