fixes-2: search, homepage recents, extensions, and settings theming

app/build.gradle

@@ -188,6 +188,8 @@ dependencies {
     implementation "org.mozilla.components:support-webextensions:$mozComponentsVersion"
     implementation "org.mozilla.components:support-ktx:$mozComponentsVersion"
     implementation "org.mozilla.components:support-locale:$mozComponentsVersion"
+    implementation "org.mozilla.components:support-remotesettings:$mozComponentsVersion"
+    implementation "org.mozilla.appservices:remotesettings:153.0"
 
     // Mozilla UI components
     implementation "org.mozilla.components:ui-autocomplete:$mozComponentsVersion"

app/src/main/AndroidManifest.xml

@@ -221,6 +221,12 @@
             android:exported="false"
         />
 
+    <service
+            android:name=".downloads.ParallelDownloadService"
+            android:foregroundServiceType="dataSync"
+            android:exported="false"
+        />
+
     <!-- Custom Tabs Service -->
     <service
             android:name=".customtabs.CustomTabsService"

app/src/main/java/com/prirai/android/nira/BaseBrowserFragment.kt

@@ -57,7 +57,6 @@ import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.withContext
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.selector.findCustomTab
-import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
 import mozilla.components.browser.state.selector.findTabOrCustomTab
 import mozilla.components.browser.state.selector.findTabOrCustomTabOrSelectedTab
 import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
@@ -156,16 +155,20 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
 
     private var _binding: FragmentBrowserBinding? = null
     protected val binding get() = _binding!!
+    protected val bindingOrNull: FragmentBrowserBinding? get() = _binding
 
     @CallSuper
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        // For custom tabs: read EXTRA_SESSION_ID (used by external apps)
-        // For normal browsing: customTabSessionId should be null so SessionFeature follows selected tab
-        customTabSessionId = requireArguments().getString(EXTRA_SESSION_ID)
+        // Only pin SessionFeature for a real custom tab. A normal tab id in this arg
+        // freezes EngineView on that session after later selectTab() calls.
+        val argSessionId = requireArguments().getString(EXTRA_SESSION_ID)
+        customTabSessionId = argSessionId?.takeIf {
+            requireContext().components.store.state.findCustomTab(it) != null
+        }
 
         _binding = FragmentBrowserBinding.inflate(inflater, container, false)
         val view = binding.root
@@ -611,7 +614,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
     internal fun expandToolbarOnNavigation(store: BrowserStore) {
         consumeFlow(store) { flow ->
             flow.mapNotNull { state ->
-                state.findCustomTabOrSelectedTab(customTabSessionId)
+                state.findTabOrCustomTabOrSelectedTab(customTabSessionId)
             }
                 .ifAnyChanged { tab ->
                     arrayOf(tab.content.url, tab.content.loadRequest)
@@ -979,7 +982,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
 
     @VisibleForTesting
     internal fun getCurrentTab(): SessionState? {
-        return requireContext().components.store.state.findCustomTabOrSelectedTab(customTabSessionId)
+        return requireContext().components.store.state.findTabOrCustomTabOrSelectedTab(customTabSessionId)
     }
 
     override fun onHomePressed() = pipFeature?.onHomePressed() ?: false
@@ -1184,7 +1187,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
         // Lifecycle-aware features cleaned up automatically
         webContentPositionManager?.destroy()
         webContentPositionManager = null
-        binding.engineView.setActivityContext(null)
+        _binding?.engineView?.setActivityContext(null)
         _browserInteractor = null
         _unifiedToolbar = null
         _binding = null

app/src/main/java/com/prirai/android/nira/BrowserActivity.kt

@@ -26,6 +26,7 @@ import com.prirai.android.nira.browser.BrowsingMode
 import com.prirai.android.nira.browser.BrowsingModeManager
 import com.prirai.android.nira.browser.DefaultBrowsingModeManager
 import com.prirai.android.nira.browser.SearchEngineList
+import com.prirai.android.nira.browser.SearchEnginePreferences
 import com.prirai.android.nira.databinding.ActivityMainBinding
 import com.prirai.android.nira.ext.alreadyOnDestination
 import com.prirai.android.nira.ext.components
@@ -36,7 +37,6 @@ import com.prirai.android.nira.search.SearchDialogFragmentDirections
 import com.prirai.android.nira.theme.applyAppTheme
 import com.prirai.android.nira.utils.Utils
 import kotlinx.coroutines.launch
-import mozilla.components.browser.icons.IconRequest
 import mozilla.components.browser.state.action.AppLifecycleAction
 import mozilla.components.browser.state.search.SearchEngine
 import mozilla.components.browser.state.state.SessionState
@@ -45,7 +45,6 @@ import mozilla.components.browser.state.state.selectedOrDefaultSearchEngine
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.EngineView
 import mozilla.components.feature.contextmenu.ext.DefaultSelectionActionDelegate
-import mozilla.components.feature.search.ext.createSearchEngine
 import mozilla.components.support.base.feature.ActivityResultHandler
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.ktx.kotlin.isUrl
@@ -149,8 +148,12 @@ open class BrowserActivity : LocaleAwareAppCompatActivity(), ComponentCallbacks2
         // OPTIMIZATION: Defer search engine setup to after first frame
         // This was accessing components.store.state which triggers heavy initialization
         view.post {
-            setupSearchEngines()
-            // Also prefetch publicSuffixList after UI is ready
+            lifecycleScope.launch {
+                SearchEnginePreferences.apply(this@BrowserActivity, private = false)
+                if (UserPreferences(this@BrowserActivity).privateSearchEngineChoice >= 0) {
+                    SearchEnginePreferences.apply(this@BrowserActivity, private = true)
+                }
+            }
             components.publicSuffixList.prefetch()
         }
 
@@ -570,54 +573,6 @@ open class BrowserActivity : LocaleAwareAppCompatActivity(), ComponentCallbacks2
         super.attachBaseContext(base)
     }
 
-    /**
-     * Setup search engines - extracted to separate method for deferred initialization
-     */
-    private fun setupSearchEngines() {
-        //TODO: Move to settings page so app restart no longer required
-        //TODO: Differentiate between using search engine / adding to list - the code below removes all from list as I don't support adding to list, only setting as default
-        for (i in components.store.state.search.customSearchEngines) {
-            components.searchUseCases.removeSearchEngine(i)
-        }
-
-        if (UserPreferences(this).customSearchEngine) {
-            // SECURITY: Use lifecycle-aware coroutine scope
-            lifecycleScope.launch {
-                val customSearch =
-                    createSearchEngine(
-                        name = "Custom Search",
-                        url = UserPreferences(this@BrowserActivity).customSearchEngineURL,
-                        icon = components.icons.loadIcon(IconRequest(UserPreferences(this@BrowserActivity).customSearchEngineURL))
-                            .await().bitmap
-                    )
-
-                runOnUiThread {
-                    components.searchUseCases.addSearchEngine(
-                        customSearch
-                    )
-                    components.searchUseCases.selectSearchEngine(
-                        customSearch
-                    )
-                }
-            }
-        } else {
-            if (SearchEngineList(this).getEngines()[UserPreferences(this).searchEngineChoice].type == SearchEngine.Type.BUNDLED) {
-                components.searchUseCases.selectSearchEngine(
-                    SearchEngineList(this).getEngines()[UserPreferences(this).searchEngineChoice]
-                )
-            } else {
-                components.searchUseCases.addSearchEngine(
-                    SearchEngineList(this).getEngines()[UserPreferences(
-                        this
-                    ).searchEngineChoice]
-                )
-                components.searchUseCases.selectSearchEngine(
-                    SearchEngineList(this).getEngines()[UserPreferences(this).searchEngineChoice]
-                )
-            }
-        }
-    }
-
     private fun updateToolbarAndStatusBarTheme() {
         val selectedTab = components.store.state.tabs.find { it.id == components.store.state.selectedTabId }
         val isPrivate = selectedTab?.content?.private == true

app/src/main/java/com/prirai/android/nira/BrowserApp.kt

@@ -200,6 +200,12 @@ class BrowserApp : Application() {
                 },
                 onExtensionsLoaded = { extensions ->
                     components.addonUpdater.registerForFutureUpdates(extensions)
+                    applicationScope.launch(Dispatchers.IO) {
+                        val profileId = com.prirai.android.nira.browser.profile.ProfileManager
+                            .getInstance(this@BrowserApp).getActiveProfile().id
+                        com.prirai.android.nira.browser.profile.ProfileAddonPolicy
+                            .applyForProfile(this@BrowserApp, profileId)
+                    }
                 },
                 onUpdatePermissionRequest = components.addonUpdater::onUpdatePermissionRequest,
             )