Fix merge

Automattic · Oct 28, 2024 · ec63f70 · ec63f70
1 parent a4ddef4
commit ec63f70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/...ayer/src/test/java/au/com/shiftyjelly/pocketcasts/player/viewmodel/PlayerViewModelTest.kt b/...ayer/src/test/java/au/com/shiftyjelly/pocketcasts/player/viewmodel/PlayerViewModelTest.kt
@@ -18,6 +18,7 @@ import au.com.shiftyjelly.pocketcasts.preferences.UserSetting
 import au.com.shiftyjelly.pocketcasts.preferences.model.ArtworkConfiguration
 import au.com.shiftyjelly.pocketcasts.preferences.model.ShelfItem
 import au.com.shiftyjelly.pocketcasts.repositories.bookmark.BookmarkManager
+import au.com.shiftyjelly.pocketcasts.repositories.download.DownloadManager
 import au.com.shiftyjelly.pocketcasts.repositories.playback.PlaybackManager
 import au.com.shiftyjelly.pocketcasts.repositories.playback.PlaybackState
 import au.com.shiftyjelly.pocketcasts.repositories.playback.SleepTimer
@@ -70,6 +71,9 @@ class PlayerViewModelTest {
     @Mock
     private lateinit var bookmarkManager: BookmarkManager
 
+    @Mock
+    private lateinit var downloadManager: DownloadManager
+
     @Mock
     private lateinit var podcastManager: PodcastManager
 
@@ -192,6 +196,7 @@ class PlayerViewModelTest {
             userEpisodeManager = userEpisodeManager,
             podcastManager = podcastManager,
             bookmarkManager = bookmarkManager,
+            downloadManager = downloadManager,
             sleepTimer = sleepTimer,
             settings = settings,
             theme = theme,

diff --git a/.../services/utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/featureflag/Feature.kt b/.../services/utils/src/main/java/au/com/shiftyjelly/pocketcasts/utils/featureflag/Feature.kt
@@ -163,14 +163,6 @@ enum class Feature(
         hasFirebaseRemoteFlag = false,
         hasDevToggle = true,
     ),
-    CUSTOM_PLAYBACK_SETTINGS(
-        key = "custom_playback_settings",
-        title = "Custom playback settings",
-        defaultValue = BuildConfig.DEBUG,
-        tier = FeatureTier.Free,
-        hasFirebaseRemoteFlag = false,
-        hasDevToggle = true,
-    ),
     ;
 
     companion object {