From 380f0d6dfc1133ddf5985b9e6e081c2bc35f6133 Mon Sep 17 00:00:00 2001 From: Kenneth Murerwa Date: Mon, 24 Feb 2025 20:03:07 +0300 Subject: [PATCH] Revert unintended changes on the FeatureFlagsLogger --- .../analytics/FeatureFlagsLogger.kt | 39 ++++++++++++------- .../oppia/android/util/logging/BUILD.bazel | 1 + .../FeatureFlagNameToIntegerConverter.kt | 39 ++++++++++++------- 3 files changed, 53 insertions(+), 26 deletions(-) diff --git a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt index c71c2880725..f6983f25aee 100644 --- a/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt +++ b/domain/src/main/java/org/oppia/android/domain/oppialogger/analytics/FeatureFlagsLogger.kt @@ -3,6 +3,14 @@ package org.oppia.android.domain.oppialogger.analytics import org.oppia.android.app.model.EventLog import org.oppia.android.app.model.EventLog.FeatureFlagItemContext import org.oppia.android.app.model.EventLog.FeatureFlagListContext +import org.oppia.android.util.platformparameter.APP_AND_OS_DEPRECATION +import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT +import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI +import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS +import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY +import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2 +import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION +import org.oppia.android.util.platformparameter.EXTRA_TOPIC_TABS_UI import org.oppia.android.util.platformparameter.EnableAppAndOsDeprecation import org.oppia.android.util.platformparameter.EnableDownloadsSupport import org.oppia.android.util.platformparameter.EnableEditAccountsOptionsUi @@ -16,7 +24,12 @@ import org.oppia.android.util.platformparameter.EnableNpsSurvey import org.oppia.android.util.platformparameter.EnableOnboardingFlowV2 import org.oppia.android.util.platformparameter.EnablePerformanceMetricsCollection import org.oppia.android.util.platformparameter.EnableSpotlightUi +import org.oppia.android.util.platformparameter.FAST_LANGUAGE_SWITCHING_IN_LESSON +import org.oppia.android.util.platformparameter.INTERACTION_CONFIG_CHANGE_STATE_RETENTION +import org.oppia.android.util.platformparameter.LEARNER_STUDY_ANALYTICS +import org.oppia.android.util.platformparameter.LOGGING_LEARNER_STUDY_IDS import org.oppia.android.util.platformparameter.PlatformParameterValue +import org.oppia.android.util.platformparameter.SPOTLIGHT_UI import javax.inject.Inject import javax.inject.Singleton @@ -63,19 +76,19 @@ class FeatureFlagsLogger @Inject constructor( * @return a list of key-value pairs of [String] and [PlatformParameterValue] */ private var featureFlagItemMap: Map> = mapOf( - "DOWNLOADS_SUPPORT" to enableDownloadsSupport, - "EXTRA_TOPIC_TABS_UI" to enableExtraTopicTabsUi, - "LEARNER_STUDY_ANALYTICS" to enableLearnerStudyAnalytics, - "FAST_LANGUAGE_SWITCHING_IN_LESSON" to enableFastLanguageSwitchingInLesson, - "LOGGING_LEARNER_STUDY_IDS" to enableLoggingLearnerStudyIds, - "EDIT_ACCOUNTS_OPTIONS_UI" to enableEditAccountsOptionsUi, - "ENABLE_PERFORMANCE_METRICS_COLLECTION" to enablePerformanceMetricsCollection, - "SPOTLIGHT_UI" to enableSpotlightUi, - "INTERACTION_CONFIG_CHANGE_STATE_RETEN" to enableInteractionConfigChangeStateRetention, - "APP_AND_OS_DEPRECATION" to enableAppAndOsDeprecation, - "ENABLE_NPS_SURVEY" to enableNpsSurvey, - "ENABLE_ONBOARDING_FLOW_V2" to enableOnboardingFlowV2, - "ENABLE_MULTIPLE_CLASSROOMS" to enableMultipleClassrooms, + DOWNLOADS_SUPPORT to enableDownloadsSupport, + EXTRA_TOPIC_TABS_UI to enableExtraTopicTabsUi, + LEARNER_STUDY_ANALYTICS to enableLearnerStudyAnalytics, + FAST_LANGUAGE_SWITCHING_IN_LESSON to enableFastLanguageSwitchingInLesson, + LOGGING_LEARNER_STUDY_IDS to enableLoggingLearnerStudyIds, + EDIT_ACCOUNTS_OPTIONS_UI to enableEditAccountsOptionsUi, + ENABLE_PERFORMANCE_METRICS_COLLECTION to enablePerformanceMetricsCollection, + SPOTLIGHT_UI to enableSpotlightUi, + INTERACTION_CONFIG_CHANGE_STATE_RETENTION to enableInteractionConfigChangeStateRetention, + APP_AND_OS_DEPRECATION to enableAppAndOsDeprecation, + ENABLE_NPS_SURVEY to enableNpsSurvey, + ENABLE_ONBOARDING_FLOW_V2 to enableOnboardingFlowV2, + ENABLE_MULTIPLE_CLASSROOMS to enableMultipleClassrooms, ) /** diff --git a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel index c4da4c4e974..c484e2b4139 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel +++ b/utility/src/main/java/org/oppia/android/util/logging/BUILD.bazel @@ -196,6 +196,7 @@ kt_android_library( "FeatureFlagNameToIntegerConverter.kt", ], deps = [ + "//domain/src/main/java/org/oppia/android/domain/oppialogger/analytics:controller", "//model/src/main/proto:event_logger_java_proto_lite", "//third_party:javax_inject_javax_inject", ], diff --git a/utility/src/main/java/org/oppia/android/util/logging/FeatureFlagNameToIntegerConverter.kt b/utility/src/main/java/org/oppia/android/util/logging/FeatureFlagNameToIntegerConverter.kt index 86733705935..97dbe2ae645 100644 --- a/utility/src/main/java/org/oppia/android/util/logging/FeatureFlagNameToIntegerConverter.kt +++ b/utility/src/main/java/org/oppia/android/util/logging/FeatureFlagNameToIntegerConverter.kt @@ -1,5 +1,18 @@ package org.oppia.android.util.logging +import org.oppia.android.util.platformparameter.APP_AND_OS_DEPRECATION +import org.oppia.android.util.platformparameter.DOWNLOADS_SUPPORT +import org.oppia.android.util.platformparameter.EDIT_ACCOUNTS_OPTIONS_UI +import org.oppia.android.util.platformparameter.ENABLE_MULTIPLE_CLASSROOMS +import org.oppia.android.util.platformparameter.ENABLE_NPS_SURVEY +import org.oppia.android.util.platformparameter.ENABLE_ONBOARDING_FLOW_V2 +import org.oppia.android.util.platformparameter.ENABLE_PERFORMANCE_METRICS_COLLECTION +import org.oppia.android.util.platformparameter.EXTRA_TOPIC_TABS_UI +import org.oppia.android.util.platformparameter.FAST_LANGUAGE_SWITCHING_IN_LESSON +import org.oppia.android.util.platformparameter.INTERACTION_CONFIG_CHANGE_STATE_RETENTION +import org.oppia.android.util.platformparameter.LEARNER_STUDY_ANALYTICS +import org.oppia.android.util.platformparameter.LOGGING_LEARNER_STUDY_IDS +import org.oppia.android.util.platformparameter.SPOTLIGHT_UI import javax.inject.Inject /** @@ -14,19 +27,19 @@ class FeatureFlagNameToIntegerConverter @Inject constructor() { */ fun convertToInteger(flagName: String): Int { return when (flagName) { - "DOWNLOADS_SUPPORT" -> 1 - "EXTRA_TOPIC_TABS_UI" -> 2 - "LEARNER_STUDY_ANALYTICS" -> 3 - "FAST_LANGUAGE_SWITCHING_IN_LESSON" -> 4 - "LOGGING_LEARNER_STUDY_IDS" -> 5 - "EDIT_ACCOUNTS_OPTIONS_UI" -> 6 - "ENABLE_PERFORMANCE_METRICS_COLLECTION" -> 7 - "SPOTLIGHT_UI" -> 8 - "INTERACTION_CONFIG_CHANGE_STATE_RETEN" -> 9 - "APP_AND_OS_DEPRECATION" -> 10 - "ENABLE_NPS_SURVEY" -> 11 - "ENABLE_ONBOARDING_FLOW_V2" -> 12 - "ENABLE_MULTIPLE_CLASSROOMS" -> 13 + DOWNLOADS_SUPPORT -> 1 + EXTRA_TOPIC_TABS_UI -> 2 + LEARNER_STUDY_ANALYTICS -> 3 + FAST_LANGUAGE_SWITCHING_IN_LESSON -> 4 + LOGGING_LEARNER_STUDY_IDS -> 5 + EDIT_ACCOUNTS_OPTIONS_UI -> 6 + ENABLE_PERFORMANCE_METRICS_COLLECTION -> 7 + SPOTLIGHT_UI -> 8 + INTERACTION_CONFIG_CHANGE_STATE_RETENTION -> 9 + APP_AND_OS_DEPRECATION -> 10 + ENABLE_NPS_SURVEY -> 11 + ENABLE_ONBOARDING_FLOW_V2 -> 12 + ENABLE_MULTIPLE_CLASSROOMS -> 13 else -> -1 } }