Ignore all ExoPlayer caches on error

I suspect this can cause issues if the remote item is taken down due to a label request.
tidal-music · Aug 8, 2024 · 6457ed3 · 6457ed3
1 parent 8cdb20f
commit 6457ed3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/...m/tidal/sdk/player/playbackengine/datasource/CacheKeyAesCipherDataSourceFactoryFactory.kt b/...m/tidal/sdk/player/playbackengine/datasource/CacheKeyAesCipherDataSourceFactoryFactory.kt
@@ -15,6 +15,7 @@ internal class CacheKeyAesCipherDataSourceFactoryFactory(
     fun create(cache: Cache) = CacheKeyAesCipherDataSourceFactory(
         cacheKeyFactory,
         encryption!!.secretKey,
-        cacheDataSourceFactory.setCache(cache),
+        cacheDataSourceFactory.setCache(cache)
+            .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR),
     )
 }
diff --git a/...tlin/com/tidal/sdk/player/playbackengine/offline/OfflinePlayDrmDataSourceFactoryHelper.kt b/...tlin/com/tidal/sdk/player/playbackengine/offline/OfflinePlayDrmDataSourceFactoryHelper.kt
@@ -17,4 +17,5 @@ internal class OfflinePlayDrmDataSourceFactoryHelper(
 ) : OfflineDataSourceFactoryHelper<DataSource.Factory>(offlineCacheProvider) {
 
     override fun create(cache: Cache) = cacheDataSourceFactory.setCache(cache)
+        .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
 }
diff --git a/...ine/src/main/kotlin/com/tidal/sdk/player/playbackengine/player/di/MediaSourcererModule.kt b/...ine/src/main/kotlin/com/tidal/sdk/player/playbackengine/player/di/MediaSourcererModule.kt
@@ -158,6 +158,7 @@ internal object MediaSourcererModule {
             .setUpstreamDataSourceFactory(okHttpDataSourceFactory)
             .setCacheReadDataSourceFactory(fileDataSourceFactory)
             .setCacheWriteDataSinkFactory(cacheDataSinkFactory)
+            .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
     }
 
     @Provides

diff --git a/.../com/tidal/sdk/player/playbackengine/offline/OfflinePlayDrmDataSourceFactoryHelperTest.kt b/.../com/tidal/sdk/player/playbackengine/offline/OfflinePlayDrmDataSourceFactoryHelperTest.kt
@@ -31,11 +31,14 @@ internal class OfflinePlayDrmDataSourceFactoryHelperTest {
     fun create() {
         val cache = mock<Cache>()
         whenever(cacheDataSourceFactory.setCache(cache)).thenReturn(cacheDataSourceFactory)
+        whenever(cacheDataSourceFactory.setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR))
+            .thenReturn(cacheDataSourceFactory)
 
         val actualDataSourceFactory = offlinePlayDrmDataSourceFactoryHelper.create(cache)
 
         assertThat(actualDataSourceFactory).isSameAs(cacheDataSourceFactory)
         verify(cacheDataSourceFactory).setCache(cache)
+        verify(cacheDataSourceFactory).setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
         verifyNoMoreInteractions(
             cache,
             cacheDataSourceFactory,