Merge branch 'hotfix/5.270.1'

Author: joshliebe

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherAdapter.kt

@@ -442,13 +442,15 @@ class TabSwitcherAdapter(
         if (holder is TabSwitcherViewHolder) {
             holder.cancelLoadJobs()
         }
+
+        val glide = Glide.with(holder.itemView.context.applicationContext)
         when (holder) {
             is TabSwitcherViewHolder.GridTabViewHolder -> {
-                Glide.with(holder.rootView).clear(holder.tabPreview)
-                Glide.with(holder.rootView).clear(holder.favicon)
+                glide.clear(holder.tabPreview)
+                glide.clear(holder.favicon)
             }
             is TabSwitcherViewHolder.ListTabViewHolder -> {
-                Glide.with(holder.rootView).clear(holder.favicon)
+                glide.clear(holder.favicon)
             }
         }
     }

app/version/version.properties

@@ -1 +1 @@
-VERSION=5.270.0
+VERSION=5.270.1

pir/pir-impl/src/main/java/com/duckduckgo/pir/impl/brokers/BrokerJsonUpdater.kt

@@ -110,13 +110,13 @@ class RealBrokerJsonUpdater @Inject constructor(
 
         val updatedJsons = jsonEtagsFromConfig.toSet() - existingEtags.toSet()
 
-        pirRepository.updateBrokerJsons(jsonEtagsFromConfig)
-
         if (updatedJsons.isNotEmpty()) {
             logcat { "PIR-update: Downloading updated broker json files: $updatedJsons" }
             brokerDataDownloader.downloadBrokerData(updatedJsons.map { it.fileName })
         } else {
             logcat { "PIR-update: No broker json files to update." }
         }
+
+        pirRepository.updateBrokerJsons(jsonEtagsFromConfig)
     }
 }

pir/pir-impl/src/test/kotlin/com/duckduckgo/pir/impl/brokers/RealBrokerJsonUpdaterTest.kt

@@ -273,4 +273,24 @@ class RealBrokerJsonUpdaterTest {
         verify(mockPirRepository, never()).updateMainEtag(any())
         verify(mockPirRepository, never()).updateBrokerJsons(any())
     }
+
+    @Test
+    fun whenDownloadBrokerDataThrowsExceptionThenBrokerJsonsNotUpdated() = runTest {
+        // Given
+        val successResponse = Response.success(testMainConfig)
+        whenever(mockPirRepository.getCurrentMainEtag()).thenReturn("old-etag")
+        whenever(mockPirRepository.getStoredBrokersCount()).thenReturn(2)
+        whenever(mockDbpService.getMainConfig("old-etag")).thenReturn(successResponse)
+        whenever(mockPirRepository.getAllLocalBrokerJsons()).thenReturn(testExistingBrokerJsons)
+        whenever(mockBrokerDataDownloader.downloadBrokerData(any())).thenThrow(RuntimeException("Download failed"))
+
+        // When
+        val result = testee.update()
+
+        // Then - etags should NOT be saved when download fails
+        assertFalse(result)
+        verify(mockBrokerDataDownloader).downloadBrokerData(listOf(testFileName2, testFileName3))
+        verify(mockPirRepository, never()).updateBrokerJsons(any())
+        verify(mockPirRepository, never()).updateMainEtag(any())
+    }
 }