feat: enhance background tab and webview persistence

- Improve WebView lifecycle management for background playback
- Add `getTabById` to `BrowserRepository`
- Optimize tab rendering in `BrowserScreen`
- Update app version to 1.110

Author: aanneion

.github/workflows/release.yml

@@ -92,7 +92,19 @@ jobs:
           VER="${{ steps.version_step.outputs.version }}"
           mkdir -p release-assets
           APK_NAME="Feather-Browser-${TAG}.apk"
-          cp app/build/outputs/apk/release/app-release.apk "release-assets/${APK_NAME}"
+          FOUND_APK=$(find app/build/outputs/apk/release -name "*.apk" 2>/dev/null | head -n 1)
+          if [ -z "$FOUND_APK" ]; then
+            FOUND_APK=$(find . -name "*release*.apk" 2>/dev/null | head -n 1)
+          fi
+          if [ -n "$FOUND_APK" ] && [ -f "$FOUND_APK" ]; then
+            cp "$FOUND_APK" "release-assets/${APK_NAME}"
+          elif [ -f app/build/outputs/apk/release/app-release.apk ]; then
+            cp app/build/outputs/apk/release/app-release.apk "release-assets/${APK_NAME}"
+          else
+            echo "Error: Release APK not found!"
+            find . -name "*.apk"
+            exit 1
+          fi
           cd release-assets
           sha256sum "${APK_NAME}" > "${APK_NAME}.sha256"
           echo "apk_name=${APK_NAME}" >> $GITHUB_OUTPUT

app/build.gradle.kts

@@ -9,8 +9,8 @@ android {
   namespace = "com.example"
   compileSdk { version = release(36) { minorApiLevel = 1 } }
 
-  val envVersionCode = System.getenv("APP_VERSION_CODE")?.toIntOrNull() ?: 109
-  val envVersionName = System.getenv("APP_VERSION_NAME") ?: "1.0.109"
+  val envVersionCode = System.getenv("APP_VERSION_CODE")?.toIntOrNull() ?: 110
+  val envVersionName = System.getenv("APP_VERSION_NAME") ?: "1.0.110"
 
   defaultConfig {
     applicationId = "apps.feather.browser"

app/src/main/java/com/example/browser/BrowserViewModel.kt

@@ -20,10 +20,12 @@ import com.example.privacy.ContentBlocker
 import com.example.privacy.PrivacyManager
 import com.example.weather.WeatherRepository
 import com.example.weather.WeatherUiState
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import java.util.UUID
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class BrowserViewModel(application: Application) : AndroidViewModel(application) {
 
     private val context: Context get() = getApplication()
@@ -602,7 +604,20 @@ class BrowserViewModel(application: Application) : AndroidViewModel(application)
                 isPrivate = isPrivate
             )
             repository.saveTab(newTab)
-            selectTab(tabId, autoDismiss = autoDismiss)
+            setBarsVisible(true)
+            _activeTabId.value = tabId
+            _activeTabState.value = ActiveTabState(
+                id = tabId,
+                profileId = profileId,
+                url = url,
+                title = if (url.isBlank()) "New Tab" else url,
+                isPrivate = isPrivate,
+                isDesktopMode = false,
+                blockedCount = 0
+            )
+            if (autoDismiss) {
+                dismissSheet()
+            }
         }
     }
 
@@ -873,7 +888,7 @@ class BrowserViewModel(application: Application) : AndroidViewModel(application)
             }
         }
         viewModelScope.launch {
-            val cur = currentTabs.value.find { it.id == tabId }
+            val cur = currentTabs.value.find { it.id == tabId } ?: repository.getTab(tabId)
             if (cur != null && cur.url != url) {
                 repository.saveTab(cur.copy(url = url, lastAccessedAt = System.currentTimeMillis()))
             }
@@ -889,7 +904,7 @@ class BrowserViewModel(application: Application) : AndroidViewModel(application)
             }
         }
         viewModelScope.launch {
-            val cur = currentTabs.value.find { it.id == tabId }
+            val cur = currentTabs.value.find { it.id == tabId } ?: repository.getTab(tabId)
             if (cur != null) {
                 if (cur.title != title) {
                     repository.saveTab(cur.copy(title = title))

app/src/main/java/com/example/data/BrowserRepository.kt

@@ -152,6 +152,10 @@ class BrowserRepository(private val database: AppDatabase) {
     }
 
     // Tabs
+    suspend fun getTab(tabId: String): BrowserTab? = withContext(Dispatchers.IO) {
+        database.tabDao().getTabById(tabId)
+    }
+
     suspend fun saveTab(tab: BrowserTab) = withContext(Dispatchers.IO) {
         database.tabDao().insertTab(tab)
     }

app/src/main/java/com/example/data/dao/Daos.kt

@@ -24,6 +24,9 @@ interface ProfileDao {
 
 @Dao
 interface TabDao {
+    @Query("SELECT * FROM browser_tabs WHERE id = :tabId LIMIT 1")
+    suspend fun getTabById(tabId: String): BrowserTab?
+
     @Query("SELECT * FROM browser_tabs WHERE profileId = :profileId AND isPrivate = 0 ORDER BY lastAccessedAt DESC")
     fun getTabsForProfile(profileId: String): Flow<List<BrowserTab>>
 

app/src/main/java/com/example/media/MediaSessionManager.kt

@@ -151,7 +151,13 @@ object MediaSessionManager {
 
     fun onMediaEnded(context: Context, tabId: String) {
         if (_activeMediaTabId.value == tabId || _activeMediaTabId.value == null) {
-            stopPlayback(context)
+            scope.launch {
+                // Short grace period to allow YouTube playlist or next track autoplay to start seamlessly
+                kotlinx.coroutines.delay(1000)
+                if (!_isPlaying.value && (_activeMediaTabId.value == tabId || _activeMediaTabId.value == null)) {
+                    stopPlayback(context)
+                }
+            }
         }
     }
 

app/src/main/java/com/example/ui/BrowserScreen.kt

@@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
@@ -294,16 +295,30 @@ fun BrowserScreen(
                     .padding(top = effectiveTopPadding, bottom = effectiveBottomPadding)
                     .background(MaterialTheme.colorScheme.background)
             ) {
+                val loadedTabIds = remember { mutableStateMapOf<String, Boolean>() }
+                val openTabIdSet = remember(openTabs) { openTabs.map { it.id }.toSet() }
+                LaunchedEffect(openTabIdSet) {
+                    val toRemove = loadedTabIds.keys.filter { it !in openTabIdSet }
+                    toRemove.forEach { loadedTabIds.remove(it) }
+                }
+
                 // Persistent WebViews for open tabs to keep background playback and prevent reloads
                 for (tab in openTabs) {
-                    val hasLoadedUrl = tab.url.isNotBlank() && tab.url != "about:blank"
                     val isActive = (tab.id == activeTabId && !isHome)
-                    if (hasLoadedUrl || isActive) {
+                    val hasLoadedUrl = tab.url.isNotBlank() && tab.url != "about:blank"
+                    if (isActive || hasLoadedUrl) {
+                        loadedTabIds[tab.id] = true
+                    }
+                    val shouldRender = loadedTabIds[tab.id] == true || isActive
+                    if (shouldRender) {
                         key(tab.id) {
                             Box(
                                 modifier = Modifier
                                     .fillMaxSize()
                                     .zIndex(if (isActive) 1f else 0f)
+                                    .graphicsLayer {
+                                        alpha = if (isActive) 1f else 0f
+                                    }
                                     .then(
                                         if (!isActive) Modifier.pointerInput(Unit) {} else Modifier
                                     )

app/src/main/java/com/example/ui/components/WebViewContainer.kt

@@ -109,6 +109,36 @@ class PersistentWebView(context: Context) : WebView(context) {
         } catch (e: Throwable) { }
     }
 
+    override fun isShown(): Boolean {
+        return if (allowBackgroundPlayback) true else super.isShown()
+    }
+
+    override fun getVisibility(): Int {
+        return if (allowBackgroundPlayback) View.VISIBLE else super.getVisibility()
+    }
+
+    override fun getWindowVisibility(): Int {
+        return if (allowBackgroundPlayback) View.VISIBLE else super.getWindowVisibility()
+    }
+
+    override fun hasWindowFocus(): Boolean {
+        return if (allowBackgroundPlayback) true else super.hasWindowFocus()
+    }
+
+    override fun onWindowFocusChanged(hasWindowFocus: Boolean) {
+        try {
+            val effectiveFocus = if (allowBackgroundPlayback) true else hasWindowFocus
+            super.onWindowFocusChanged(effectiveFocus)
+        } catch (e: Throwable) { }
+    }
+
+    override fun dispatchWindowFocusChanged(hasFocus: Boolean) {
+        try {
+            val effectiveFocus = if (allowBackgroundPlayback) true else hasFocus
+            super.dispatchWindowFocusChanged(effectiveFocus)
+        } catch (e: Throwable) { }
+    }
+
     override fun onPause() {
         if (!allowBackgroundPlayback) {
             try {
@@ -399,7 +429,8 @@ fun WebViewContainer(
                 factory = { ctx ->
                     val swipeRefresh = SwipeRefreshLayout(ctx).apply {
                         isNestedScrollingEnabled = true
-                        visibility = if (isActive) View.VISIBLE else View.GONE
+                        visibility = View.VISIBLE
+                        isEnabled = (customVideoView == null) && isActive
                         layoutParams = ViewGroup.LayoutParams(
                             ViewGroup.LayoutParams.MATCH_PARENT,
                             ViewGroup.LayoutParams.MATCH_PARENT
@@ -934,7 +965,7 @@ fun WebViewContainer(
                 },
                 update = { swipeRefresh ->
                     swipeRefreshRef = swipeRefresh
-                    swipeRefresh.visibility = if (isActive) View.VISIBLE else View.GONE
+                    swipeRefresh.visibility = View.VISIBLE
                     val webView = (0 until swipeRefresh.childCount)
                         .map { swipeRefresh.getChildAt(it) }
                         .filterIsInstance<PersistentWebView>()
@@ -946,8 +977,8 @@ fun WebViewContainer(
                         webView.allowBackgroundPlayback = enableBackgroundPlay
                     }
 
-                    // Pull-to-refresh enabled unless custom video view is active
-                    swipeRefresh.isEnabled = (customVideoView == null)
+                    // Pull-to-refresh enabled unless custom video view is active, and only for active tab
+                    swipeRefresh.isEnabled = (customVideoView == null) && isActive
 
                     val primaryColor = if (effectiveDark) android.graphics.Color.parseColor("#80D8FF") else android.graphics.Color.parseColor("#00668B")
                     val progressBgColor = if (effectiveDark) android.graphics.Color.parseColor("#2C2C2C") else android.graphics.Color.WHITE