From 2b3c63e6c76530429743bfcd5d59fa84211f0484 Mon Sep 17 00:00:00 2001 From: ashiagr Date: Mon, 21 Nov 2022 13:22:30 +0530 Subject: [PATCH 1/3] Enable EoY feature --- base.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base.gradle b/base.gradle index 822daf53e10..0a335309926 100644 --- a/base.gradle +++ b/base.gradle @@ -28,7 +28,7 @@ android { buildConfigField "String", "SHARING_SERVER_SECRET", "\"${project.sharingServerSecret}\"" // Feature Flags - buildConfigField "boolean", "END_OF_YEAR_ENABLED", "false" + buildConfigField "boolean", "END_OF_YEAR_ENABLED", "true" buildConfigField "boolean", "END_OF_YEAR_REQUIRE_LOGIN", "true" buildConfigField "boolean", "ONBOARDING_ENABLED", "false" buildConfigField "boolean", "SINGLE_SIGN_ON_ENABLED", "false" From a2cec895364ea9cf757497d32700a3fc9af2223e Mon Sep 17 00:00:00 2001 From: ashiagr Date: Mon, 21 Nov 2022 20:08:10 +0530 Subject: [PATCH 2/3] Remove EoY feature flag --- base.gradle | 1 - .../repositories/endofyear/EndOfYearManagerImpl.kt | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/base.gradle b/base.gradle index 0a335309926..3ca99fafeda 100644 --- 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", "true" buildConfigField "boolean", "END_OF_YEAR_REQUIRE_LOGIN", "true" buildConfigField "boolean", "ONBOARDING_ENABLED", "false" buildConfigField "boolean", "SINGLE_SIGN_ON_ENABLED", "false" diff --git a/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/endofyear/EndOfYearManagerImpl.kt b/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/endofyear/EndOfYearManagerImpl.kt index 4c631dca662..861305d347e 100644 --- a/modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/endofyear/EndOfYearManagerImpl.kt +++ b/modules/services/repositories/src/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. From 1e1a9a4bf85f1b9b178589fed2a218c9722b8a7e Mon Sep 17 00:00:00 2001 From: ashiagr Date: Mon, 21 Nov 2022 20:13:09 +0530 Subject: [PATCH 3/3] Add change log --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 071a584adc0..3dea830ac82 100644 --- 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