Merge pull request #18537 from wordpress-mobile/issue/migrate-fb-remote-config-to-be

AjeshRPai · web-flow · commit 8a2057dad687 · 2023-05-29T17:23:15.000+05:30
Migrate from Firebase remote config to BE remote config
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -423,7 +423,6 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-process:$androidxLifecycleVersion"
     implementation "com.android.volley:volley:$androidVolleyVersion"
     implementation "com.google.firebase:firebase-messaging:$firebaseMessagingVersion"
-    implementation "com.google.firebase:firebase-config:$firebaseConfigVersion"
     implementation "com.google.android.gms:play-services-auth:$googlePlayServicesAuthVersion"
     implementation "com.google.android.gms:play-services-code-scanner:$googlePlayServicesCodeScannerVersion"
     implementation "com.google.mlkit:barcode-scanning-common:$googleMLKitBarcodeScanningVersion"
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkOpenWebLinksWithJetpackHelper.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkOpenWebLinksWithJetpackHelper.kt
@@ -6,20 +6,20 @@ import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
 import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.DateTimeUtilsWrapper
-import org.wordpress.android.util.FirebaseRemoteConfigWrapper
 import org.wordpress.android.util.PackageManagerWrapper
 import org.wordpress.android.util.config.OpenWebLinksWithJetpackFlowFeatureConfig
+import org.wordpress.android.util.config.RemoteConfigWrapper
 import java.util.Date
 import javax.inject.Inject
 
 @Suppress("TooManyFunctions")
 class DeepLinkOpenWebLinksWithJetpackHelper @Inject constructor(
     private val openWebLinksWithJetpackFlowFeatureConfig: OpenWebLinksWithJetpackFlowFeatureConfig,
     private val appPrefsWrapper: AppPrefsWrapper,
-    private val firebaseRemoteConfigWrapper: FirebaseRemoteConfigWrapper,
     private val packageManagerWrapper: PackageManagerWrapper,
     private val dateTimeUtilsWrapper: DateTimeUtilsWrapper,
-    private val buildConfigWrapper: BuildConfigWrapper
+    private val buildConfigWrapper: BuildConfigWrapper,
+    private val remoteConfigWrapper: RemoteConfigWrapper
 ) {
     fun shouldShowOpenLinksInJetpackOverlay() = showOverlay()
 
@@ -76,7 +76,7 @@ class DeepLinkOpenWebLinksWithJetpackHelper @Inject constructor(
     }
 
     private fun hasExceededOverlayFrequency(): Boolean {
-        val frequency = firebaseRemoteConfigWrapper.getOpenWebLinksWithJetpackFlowFrequency()
+        val frequency = remoteConfigWrapper.getOpenWebLinksWithJetpackFlowFrequency()
         if (frequency == 0L) return false // Only show the overlay 1X and it's already been shown do not show again
 
         val lastShownDate = Date(getOpenWebLinksWithJetpackOverlayLastShownTimestamp())
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsFragment.kt
@@ -91,7 +91,7 @@ class ThreatDetailsFragment : Fragment(R.layout.threat_details_fragment) {
                     ActivityLauncher.viewScanRequestFixState(requireActivity(), site, events.threatId)
                 }
                 is ShowGetFreeEstimate -> {
-                    ActivityLauncher.openUrlExternal(context, events.url())
+                    ActivityLauncher.openUrlExternal(context, events.url)
                 }
                 is ShowJetpackSettings -> ActivityLauncher.openUrlExternal(context, events.url)
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsNavigationEvents.kt
@@ -1,12 +1,9 @@
 package org.wordpress.android.ui.jetpack.scan.details
 
 import androidx.annotation.StringRes
-import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import org.wordpress.android.R
 import org.wordpress.android.ui.utils.UiString
 
-private const val CODEABLE_GET_FREE_ESTIMATE_FIREBASE_KEY = "codeable_get_free_estimate_url"
-
 sealed class ThreatDetailsNavigationEvents {
     class OpenThreatActionDialog(
         val title: UiString,
@@ -24,9 +21,7 @@ sealed class ThreatDetailsNavigationEvents {
 
     data class ShowUpdatedFixState(val threatId: Long) : ThreatDetailsNavigationEvents()
 
-    object ShowGetFreeEstimate : ThreatDetailsNavigationEvents() {
-        fun url() = FirebaseRemoteConfig.getInstance().getString(CODEABLE_GET_FREE_ESTIMATE_FIREBASE_KEY)
-    }
+    data class ShowGetFreeEstimate(val url: String) : ThreatDetailsNavigationEvents()
 
     data class ShowJetpackSettings(val url: String) : ThreatDetailsNavigationEvents()
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModel.kt
@@ -30,6 +30,7 @@ import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.util.config.RemoteConfigWrapper
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ResourceProvider
 import javax.inject.Inject
@@ -43,7 +44,8 @@ class ThreatDetailsViewModel @Inject constructor(
     private val builder: ThreatDetailsListItemsBuilder,
     private val htmlMessageUtils: HtmlMessageUtils,
     private val resourceProvider: ResourceProvider,
-    private val scanTracker: ScanTracker
+    private val scanTracker: ScanTracker,
+    private val remoteConfigWrapper: RemoteConfigWrapper
 ) : ViewModel() {
     private lateinit var site: SiteModel
     private lateinit var threatModel: ThreatModel
@@ -153,7 +155,9 @@ class ThreatDetailsViewModel @Inject constructor(
 
     private fun onGetFreeEstimateButtonClicked() {
         scanTracker.trackOnGetFreeEstimateButtonClicked()
-        updateNavigationEvent(ThreatDetailsNavigationEvents.ShowGetFreeEstimate)
+        updateNavigationEvent(ThreatDetailsNavigationEvents.ShowGetFreeEstimate(
+            remoteConfigWrapper.getCodeableGetFreeEstimateUrl())
+        )
     }
 
     private fun onEnterServerCredsIconClicked() {
diff --git a/WordPress/src/main/java/org/wordpress/android/util/FirebaseRemoteConfigWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/FirebaseRemoteConfigWrapper.kt
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/CodeableGetFreeEstimateUrlConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/CodeableGetFreeEstimateUrlConfig.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.annotation.RemoteFieldDefaultGenerater
+import javax.inject.Inject
+
+const val CODEABLE_GET_FREE_ESTIMATE_URL_REMOTE_FIELD = "codeable_get_free_estimate_url"
+const val CODEABLE_GET_FREE_ESTIMATE_URL_DEFAULT = "https://codeable.io/partners/jetpack-scan/"
+
+@RemoteFieldDefaultGenerater(
+    remoteField = CODEABLE_GET_FREE_ESTIMATE_URL_REMOTE_FIELD,
+    defaultValue = CODEABLE_GET_FREE_ESTIMATE_URL_DEFAULT
+)
+
+class CodeableGetFreeEstimateUrlConfig @Inject constructor(appConfig: AppConfig) :
+    RemoteConfigField<String>(
+        appConfig,
+        CODEABLE_GET_FREE_ESTIMATE_URL_REMOTE_FIELD
+    )
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/OpenWebLinksWithJetpackFlowFrequencyConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/OpenWebLinksWithJetpackFlowFrequencyConfig.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.annotation.RemoteFieldDefaultGenerater
+import javax.inject.Inject
+
+const val OPEN_WEB_LINKS_WITH_JETPACK_FLOW_FREQUENCY_REMOTE_FIELD = "open_web_links_with_jetpack_flow_frequency"
+const val OPEN_WEB_LINKS_WITH_JETPACK_FLOW_FREQUENCY_DEFAULT = "0"
+
+@RemoteFieldDefaultGenerater(
+    remoteField = OPEN_WEB_LINKS_WITH_JETPACK_FLOW_FREQUENCY_REMOTE_FIELD,
+    defaultValue = OPEN_WEB_LINKS_WITH_JETPACK_FLOW_FREQUENCY_DEFAULT
+)
+
+class OpenWebLinksWithJetpackFlowFrequencyConfig @Inject constructor(appConfig: AppConfig) :
+    RemoteConfigField<Long>(
+        appConfig,
+        OPEN_WEB_LINKS_WITH_JETPACK_FLOW_FREQUENCY_REMOTE_FIELD
+    )
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/PerformanceMonitoringSampleRateConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/PerformanceMonitoringSampleRateConfig.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.annotation.RemoteFieldDefaultGenerater
+import javax.inject.Inject
+
+const val PERFORMANCE_MONITORING_SAMPLE_RATE_REMOTE_FIELD = "wp_android_performance_monitoring_sample_rate"
+const val PERFORMANCE_MONITORING_SAMPLE_RATE_DEFAULT = "0.0"
+
+@RemoteFieldDefaultGenerater(
+    remoteField = PERFORMANCE_MONITORING_SAMPLE_RATE_REMOTE_FIELD,
+    defaultValue = PERFORMANCE_MONITORING_SAMPLE_RATE_DEFAULT
+)
+
+class PerformanceMonitoringSampleRateConfig @Inject constructor(appConfig: AppConfig) :
+    RemoteConfigField<Double>(
+        appConfig,
+        PERFORMANCE_MONITORING_SAMPLE_RATE_REMOTE_FIELD
+    )
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/RemoteConfigField.kt b/WordPress/src/main/java/org/wordpress/android/util/config/RemoteConfigField.kt
@@ -8,6 +8,7 @@ open class RemoteConfigField<T : Any>(val appConfig: AppConfig, val remoteField:
             Int::class -> remoteFieldValue.toInt() as R
             String::class -> remoteFieldValue as R
             Long::class -> remoteFieldValue.toLong() as R
+            Double::class -> remoteFieldValue.toDouble() as R
             // add other types here if need
             else -> throw IllegalStateException("Unknown Generic Type")
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/RemoteConfigWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/config/RemoteConfigWrapper.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.util.config
+
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RemoteConfigWrapper @Inject constructor(
+    private val openWebLinksWithJetpackFlowFrequencyConfig: OpenWebLinksWithJetpackFlowFrequencyConfig,
+    private val codeableGetFreeEstimateUrlConfig: CodeableGetFreeEstimateUrlConfig,
+    private val performanceMonitoringSampleRateConfig: PerformanceMonitoringSampleRateConfig
+) {
+    fun getOpenWebLinksWithJetpackFlowFrequency() = openWebLinksWithJetpackFlowFrequencyConfig.getValue<Long>()
+    fun getPerformanceMonitoringSampleRate() = performanceMonitoringSampleRateConfig.getValue<Double>()
+    fun getCodeableGetFreeEstimateUrl() = codeableGetFreeEstimateUrlConfig.getValue<String>()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/crashlogging/WPPerformanceMonitoringConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/crashlogging/WPPerformanceMonitoringConfig.kt
@@ -3,11 +3,11 @@ package org.wordpress.android.util.crashlogging
 import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig
 import org.wordpress.android.util.BuildConfigWrapper
 import javax.inject.Inject
-import org.wordpress.android.util.FirebaseRemoteConfigWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.config.RemoteConfigWrapper
 
 class WPPerformanceMonitoringConfig @Inject constructor(
-    private val remoteConfigWrapper: FirebaseRemoteConfigWrapper,
+    private val remoteConfigWrapper: RemoteConfigWrapper,
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
     private val buildConfigWrapper: BuildConfigWrapper
 ) {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkOpenWebLinksWithJetpackHelperTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkOpenWebLinksWithJetpackHelperTest.kt
@@ -15,9 +15,9 @@ import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.DateTimeUtils
 import org.wordpress.android.util.DateTimeUtilsWrapper
-import org.wordpress.android.util.FirebaseRemoteConfigWrapper
 import org.wordpress.android.util.PackageManagerWrapper
 import org.wordpress.android.util.config.OpenWebLinksWithJetpackFlowFeatureConfig
+import org.wordpress.android.util.config.RemoteConfigWrapper
 import java.util.Date
 
 @ExperimentalCoroutinesApi
@@ -30,8 +30,7 @@ class DeepLinkOpenWebLinksWithJetpackHelperTest : BaseUnitTest() {
     lateinit var appPrefsWrapper: AppPrefsWrapper
 
     @Mock
-    lateinit var firebaseRemoteConfigWrapper: FirebaseRemoteConfigWrapper
-
+    lateinit var remoteConfigWrapper: RemoteConfigWrapper
     @Mock
     lateinit var packageManagerWrapper: PackageManagerWrapper
 
@@ -48,10 +47,10 @@ class DeepLinkOpenWebLinksWithJetpackHelperTest : BaseUnitTest() {
         helper = DeepLinkOpenWebLinksWithJetpackHelper(
             openWebLinksWithJetpackFlowFeatureConfig,
             appPrefsWrapper,
-            firebaseRemoteConfigWrapper,
             packageManagerWrapper,
             dateTimeUtilsWrapper,
-            buildConfigWrapper
+            buildConfigWrapper,
+            remoteConfigWrapper
         )
     }
 
@@ -207,7 +206,6 @@ class DeepLinkOpenWebLinksWithJetpackHelperTest : BaseUnitTest() {
         setFeatureEnabled(isFeatureFlagEnabled)
         setJetpackInstalled(isJetpackInstalled)
         setIsOpenWebLinksWithJetpack(isOpenWebLinksWithJetpack)
-//        setDeepLinkHandlerComponentEnabled(isDeepLinkComponentEnabled)
         setLastShownTimestamp(overlayLastShownTimestamp)
         setFlowFrequency(flowFrequency)
         setDaysBetween(overlayLastShownTimestamp)
@@ -228,7 +226,7 @@ class DeepLinkOpenWebLinksWithJetpackHelperTest : BaseUnitTest() {
     }
 
     private fun setFlowFrequency(value: Long) {
-        whenever(firebaseRemoteConfigWrapper.getOpenWebLinksWithJetpackFlowFrequency()).thenReturn(value)
+        whenever(remoteConfigWrapper.getOpenWebLinksWithJetpackFlowFrequency()).thenReturn(value)
     }
 
     private fun setDaysBetween(lastShownTimestamp: Long) {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModelTest.kt
@@ -38,6 +38,7 @@ import org.wordpress.android.ui.utils.HtmlMessageUtils
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.util.config.RemoteConfigWrapper
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ResourceProvider
 
@@ -81,6 +82,9 @@ class ThreatDetailsViewModelTest : BaseUnitTest() {
     @Mock
     private lateinit var scanStore: ScanStore
 
+    @Mock
+    private lateinit var remoteConfigWrapper: RemoteConfigWrapper
+
     private lateinit var viewModel: ThreatDetailsViewModel
     private val threatId = 1L
     private val fakeUiStringText = UiStringText("")
@@ -99,7 +103,8 @@ class ThreatDetailsViewModelTest : BaseUnitTest() {
             builder,
             htmlMessageUtils,
             resourceProvider,
-            scanTracker
+            scanTracker,
+            remoteConfigWrapper
         )
         whenever(site.name).thenReturn(TEST_SITE_NAME)
         whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
@@ -116,6 +121,7 @@ class ThreatDetailsViewModelTest : BaseUnitTest() {
             DescriptionState(UiStringRes(R.string.threat_fix_fixable_edit))
         }
         whenever(scanStore.hasValidCredentials(site)).thenReturn(true)
+        whenever(remoteConfigWrapper.getCodeableGetFreeEstimateUrl()).thenReturn("https://www.wordpress.com")
     }
 
     @Test
diff --git a/WordPress/src/test/java/org/wordpress/android/util/crashlogging/WPPerformanceMonitoringConfigTest.kt b/WordPress/src/test/java/org/wordpress/android/util/crashlogging/WPPerformanceMonitoringConfigTest.kt
@@ -7,13 +7,13 @@ import org.mockito.kotlin.whenever
 import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.assertj.core.api.Assertions.assertThat
-import org.wordpress.android.util.FirebaseRemoteConfigWrapper
+import org.wordpress.android.util.config.RemoteConfigWrapper
 
 private const val VALID_SAMPLE_RATE = 0.01
 private const val INVALID_SAMPLE_RATE = 0.0
 
 class WPPerformanceMonitoringConfigTest {
-    private val remoteConfig: FirebaseRemoteConfigWrapper = mock()
+    private val remoteConfig: RemoteConfigWrapper = mock()
     private val analytics: AnalyticsTrackerWrapper = mock()
     private val buildConfig: BuildConfigWrapper = mock()
 
diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,6 @@ ext {
     chrisbanesPhotoviewVersion = '2.3.0'
     eventBusVersion = '3.3.1'
     facebookShimmerVersion = '0.5.0'
-    firebaseConfigVersion = '19.1.3'
     firebaseMessagingVersion = '21.1.0'
     glideVersion = '4.10.0'
     glideVolleyVersion = '4.6.1@aar'

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class ThreatDetailsFragment : Fragment(R.layout.threat_details_fragment) {`
`91`	`91`	`ActivityLauncher.viewScanRequestFixState(requireActivity(), site, events.threatId)`
`92`	`92`	`}`
`93`	`93`	`is ShowGetFreeEstimate -> {`
`94`		`- ActivityLauncher.openUrlExternal(context, events.url())`
	`94`	`+ ActivityLauncher.openUrlExternal(context, events.url)`
`95`	`95`	`}`
`96`	`96`	`is ShowJetpackSettings -> ActivityLauncher.openUrlExternal(context, events.url)`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ open class RemoteConfigField<T : Any>(val appConfig: AppConfig, val remoteField:`
`8`	`8`	`Int::class -> remoteFieldValue.toInt() as R`
`9`	`9`	`String::class -> remoteFieldValue as R`
`10`	`10`	`Long::class -> remoteFieldValue.toLong() as R`
	`11`	`+ Double::class -> remoteFieldValue.toDouble() as R`
`11`	`12`	`// add other types here if need`
`12`	`13`	`else -> throw IllegalStateException("Unknown Generic Type")`
`13`	`14`	`}`