refactor: Feedback addressed

openedx · Feb 21, 2024 · 46a5a58 · 46a5a58
1 parent d1f3262
commit 46a5a58
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/app/.gitignore b/app/.gitignore
@@ -1 +1,2 @@
-/build
+/build
+/google-services.json
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,6 +17,12 @@ if (firebaseEnabled) {
     }
 
     preBuild.dependsOn(generateGoogleServicesJson)
+} else {
+    tasks.register('removeGoogleServicesJson') {
+        configHelper.removeGoogleServicesJson()
+    }
+
+    preBuild.dependsOn(removeGoogleServicesJson)
 }
 
 android {

diff --git a/app/src/main/java/org/openedx/app/AnalyticsManager.kt b/app/src/main/java/org/openedx/app/AnalyticsManager.kt
@@ -22,7 +22,7 @@ class AnalyticsManager(
 
     init {
         // Initialise all the analytics libraries here
-        if (config.getFirebaseConfig().projectId.isNotBlank()) {
+        if (config.getFirebaseConfig().enabled) {
             addAnalyticsTracker(FirebaseAnalytics(context = context))
         }
         val segmentConfig = config.getSegmentConfig()

diff --git a/buildSrc/src/main/groovy/org/edx/builder/ConfigHelper.groovy b/buildSrc/src/main/groovy/org/edx/builder/ConfigHelper.groovy
@@ -140,4 +140,12 @@ class ConfigHelper {
             it.write(new JsonBuilder(configJson).toPrettyString())
         }
     }
+
+    def removeGoogleServicesJson() {
+        def googleServicesJsonPath = projectDir.path + "/app/google-services.json"
+        def file = new File(googleServicesJsonPath)
+        if (file.exists()) {
+            file.delete()
+        }
+    }
 }