Bug 1835937 - Fix crash when changing autoplay site permission in private browsing

app/src/main/java/org/mozilla/fenix/components/PermissionStorage.kt

@@ -24,8 +24,8 @@ class PermissionStorage(
      * Persists the [sitePermissions] provided as a parameter.
      * @param sitePermissions the [sitePermissions] to be stored.
      */
-    suspend fun add(sitePermissions: SitePermissions) = withContext(dispatcher) {
-        permissionsStorage.save(sitePermissions, private = false)
+    suspend fun add(sitePermissions: SitePermissions, private: Boolean) = withContext(dispatcher) {
+        permissionsStorage.save(sitePermissions, private = private)
     }
 
     /**

app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsController.kt

@@ -120,6 +120,7 @@ class DefaultQuickSettingsController(
     private val displayPermissions: () -> Unit,
     private val engine: Engine = context.components.core.engine,
 ) : QuickSettingsController {
+
     override fun handlePermissionsShown() {
         displayPermissions()
     }
@@ -170,7 +171,7 @@ class DefaultQuickSettingsController(
             }
             val sitePermissions =
                 autoplayValue.createSitePermissionsFromCustomRules(origin, settings)
-            handleAutoplayAdd(sitePermissions)
+            handleAutoplayAdd(sitePermissions, tab?.content?.private ?: false)
             sitePermissions
         } else {
             val newPermission = autoplayValue.updateSitePermissions(permissions)
@@ -298,9 +299,9 @@ class DefaultQuickSettingsController(
     }
 
     @VisibleForTesting
-    internal fun handleAutoplayAdd(sitePermissions: SitePermissions) {
+    internal fun handleAutoplayAdd(sitePermissions: SitePermissions, private: Boolean) {
         ioScope.launch {
-            permissionStorage.add(sitePermissions)
+            permissionStorage.add(sitePermissions, private)
             reload(sessionId)
         }
     }

app/src/test/java/org/mozilla/fenix/components/PermissionStorageTest.kt

@@ -28,11 +28,22 @@ class PermissionStorageTest {
         val sitePermissionsStorage: SitePermissionsStorage = mockk(relaxed = true)
         val storage = PermissionStorage(testContext, this.coroutineContext, sitePermissionsStorage)
 
-        storage.add(sitePermissions)
+        storage.add(sitePermissions, false)
 
         coVerify { sitePermissionsStorage.save(sitePermissions, private = false) }
     }
 
+    @Test
+    fun `add permission in privateBrowsing`() = runTest {
+        val sitePermissions: SitePermissions = mockk(relaxed = true)
+        val sitePermissionsStorage: SitePermissionsStorage = mockk(relaxed = true)
+        val storage = PermissionStorage(testContext, this.coroutineContext, sitePermissionsStorage)
+
+        storage.add(sitePermissions, true)
+
+        coVerify { sitePermissionsStorage.save(sitePermissions, private = true) }
+    }
+
     @Test
     fun `find sitePermissions by origin`() = runTest {
         val sitePermissions: SitePermissions = mockk(relaxed = true)

app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt

@@ -210,14 +210,14 @@ class DefaultQuickSettingsControllerTest {
         val autoplayValue = mockk<AutoplayValue.AllowAll>(relaxed = true)
 
         every { store.dispatch(any()) } returns mockk()
-        every { controller.handleAutoplayAdd(any()) } returns Unit
+        every { controller.handleAutoplayAdd(any(), any()) } returns Unit
 
         controller.sitePermissions = null
 
         controller.handleAutoplayChanged(autoplayValue)
 
         verify {
-            controller.handleAutoplayAdd(any())
+            controller.handleAutoplayAdd(any(), any())
             store.dispatch(any())
         }
     }
@@ -227,7 +227,7 @@ class DefaultQuickSettingsControllerTest {
         val autoplayValue = mockk<AutoplayValue.AllowAll>(relaxed = true)
 
         every { store.dispatch(any()) } returns mockk()
-        every { controller.handleAutoplayAdd(any()) } returns Unit
+        every { controller.handleAutoplayAdd(any(), any()) } returns Unit
         every { controller.handlePermissionsChange(any()) } returns Unit
         every { autoplayValue.updateSitePermissions(any()) } returns mockk()
 
@@ -296,11 +296,11 @@ class DefaultQuickSettingsControllerTest {
         runTestOnMain {
             val testPermissions = mockk<SitePermissions>()
 
-            controller.handleAutoplayAdd(testPermissions)
+            controller.handleAutoplayAdd(testPermissions, true)
             advanceUntilIdle()
 
             coVerifyOrder {
-                permissionStorage.add(testPermissions)
+                permissionStorage.add(testPermissions, true)
                 reload(tab.id)
             }
         }