From 72de54e4e04595b4cc87e67989e234ed038f811a Mon Sep 17 00:00:00 2001 From: Dmitry Brant Date: Wed, 15 Oct 2025 12:22:47 -0400 Subject: [PATCH 1/2] Prevent possible crash due to null RemoteConfig. --- app/src/main/java/org/wikipedia/settings/RemoteConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/wikipedia/settings/RemoteConfig.kt b/app/src/main/java/org/wikipedia/settings/RemoteConfig.kt index 77796543515..f6b12b8a70b 100644 --- a/app/src/main/java/org/wikipedia/settings/RemoteConfig.kt +++ b/app/src/main/java/org/wikipedia/settings/RemoteConfig.kt @@ -20,7 +20,7 @@ object RemoteConfig { RemoteConfigImpl() } } - return curConfig!! + return curConfig ?: RemoteConfigImpl() } fun updateConfig(config: RemoteConfigImpl) { From 8c1c845a9b0802bf4f2eebd1be40bca124906613 Mon Sep 17 00:00:00 2001 From: Dmitry Brant Date: Wed, 15 Oct 2025 12:27:01 -0400 Subject: [PATCH 2/2] Update YiR remote config. --- .../main/java/org/wikipedia/settings/RemoteConfig.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/wikipedia/settings/RemoteConfig.kt b/app/src/main/java/org/wikipedia/settings/RemoteConfig.kt index f6b12b8a70b..cbb99abd9a0 100644 --- a/app/src/main/java/org/wikipedia/settings/RemoteConfig.kt +++ b/app/src/main/java/org/wikipedia/settings/RemoteConfig.kt @@ -41,7 +41,11 @@ object RemoteConfig { @Suppress("unused") @Serializable class RemoteConfigCommonV1 { - val yir: RemoteConfigYearInReview? = null + val yir: List = emptyList() + + fun getYirForYear(year: Int): RemoteConfigYearInReview? { + return yir.find { it.year == year } + } } @Suppress("unused") @@ -93,7 +97,7 @@ object RemoteConfig { @Serializable class TopReadPercentage( val identifier: String = "", - val min: Int? = null, - val max: Int? = null + val min: Int = 0, + val max: Int = Int.MAX_VALUE ) }