Merge pull request #598 from Automattic/task/410-enable-eoy

End of Year: Enable feature
Automattic · Nov 21, 2022 · 2b1d2dd · 2b1d2dd
2 parents c5a8705 + 1e1a9a4
commit 2b1d2dd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,9 @@
 -----
 
 *   New Features:
-    *   Support Android 13 per-app language preferences
+    * Add End of Year stats
+        ([#410](https://github.com/Automattic/pocket-casts-android/issues/410)).  
+    * Support Android 13 per-app language preferences
         ([#519](https://github.com/Automattic/pocket-casts-android/pull/519)).
 *   Bug Fixes:
     *   Fixed some layout issues in the EpisodeFragment

diff --git a/base.gradle b/base.gradle
@@ -28,7 +28,6 @@ android {
         buildConfigField "String", "SHARING_SERVER_SECRET", "\"${project.sharingServerSecret}\""
 
         // Feature Flags
-        buildConfigField "boolean", "END_OF_YEAR_ENABLED", "false"
         buildConfigField "boolean", "END_OF_YEAR_REQUIRE_LOGIN", "true"
         buildConfigField "boolean", "ONBOARDING_ENABLED", "false"
         buildConfigField "boolean", "SINGLE_SIGN_ON_ENABLED", "false"

diff --git a/...c/main/java/au/com/shiftyjelly/pocketcasts/repositories/endofyear/EndOfYearManagerImpl.kt b/...c/main/java/au/com/shiftyjelly/pocketcasts/repositories/endofyear/EndOfYearManagerImpl.kt
@@ -5,7 +5,6 @@ import au.com.shiftyjelly.pocketcasts.models.db.helper.ListenedNumbers
 import au.com.shiftyjelly.pocketcasts.models.db.helper.LongestEpisode
 import au.com.shiftyjelly.pocketcasts.models.db.helper.TopPodcast
 import au.com.shiftyjelly.pocketcasts.preferences.Settings
-import au.com.shiftyjelly.pocketcasts.repositories.BuildConfig
 import au.com.shiftyjelly.pocketcasts.repositories.endofyear.stories.Story
 import au.com.shiftyjelly.pocketcasts.repositories.endofyear.stories.StoryEpilogue
 import au.com.shiftyjelly.pocketcasts.repositories.endofyear.stories.StoryIntro
@@ -51,8 +50,7 @@ class EndOfYearManagerImpl @Inject constructor(
         get() = Dispatchers.Default
 
     override suspend fun isEligibleForStories(): Boolean =
-        hasEpisodesPlayedUpto(YEAR, TimeUnit.MINUTES.toSeconds(EPISODE_MINIMUM_PLAYED_TIME_IN_MIN)) &&
-            BuildConfig.END_OF_YEAR_ENABLED
+        hasEpisodesPlayedUpto(YEAR, TimeUnit.MINUTES.toSeconds(EPISODE_MINIMUM_PLAYED_TIME_IN_MIN))
 
     /**
      * Download the year's listening history.