Merge pull request #6466 from seadowg/static-csv-property

Set user property when there is a static CSV and entity list clash
getodk · Oct 23, 2024 · 49c74d9 · 49c74d9
2 parents 14b8a59 + 2b12da6
commit 49c74d9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/async/src/main/java/org/odk/collect/async/TaskSpecWorker.kt b/async/src/main/java/org/odk/collect/async/TaskSpecWorker.kt
@@ -16,7 +16,7 @@ class TaskSpecWorker(
     override fun doWork(): Result {
         val cellularOnly = inputData.getBoolean(DATA_CELLULAR_ONLY, false)
         if (cellularOnly && connectivityProvider.currentNetwork != Scheduler.NetworkType.CELLULAR) {
-            Analytics.setUserProperty("EncounteredMeteredNonCellularInTasks", "true")
+            Analytics.setUserProperty("SawMeteredNonCellular", "true")
             return Result.retry()
         }
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/formmanagement/ServerFormUseCases.kt b/collect_app/src/main/java/org/odk/collect/android/formmanagement/ServerFormUseCases.kt
@@ -1,5 +1,6 @@
 package org.odk.collect.android.formmanagement
 
+import org.odk.collect.analytics.Analytics
 import org.odk.collect.android.formmanagement.download.FormDownloadException
 import org.odk.collect.android.formmanagement.download.FormDownloader
 import org.odk.collect.android.utilities.FileUtils
@@ -111,14 +112,28 @@ object ServerFormUseCases {
             }
 
             if (mediaFile.isEntityList) {
-                val dataset = mediaFile.filename.substringBefore(".csv")
-                LocalEntityUseCases.updateLocalEntitiesFromServer(dataset, tempMediaFile, entitiesRepository)
+                val entityListName = getEntityListFromFileName(mediaFile)
+                LocalEntityUseCases.updateLocalEntitiesFromServer(entityListName, tempMediaFile, entitiesRepository)
+            } else {
+                /**
+                 * Track CSVs that have names that clash with entity lists in the project. If
+                 * these CSVs are being used as part of a `select_one_from_file` question, the
+                 * instance ID will be the file name with the extension removed.
+                 */
+                val isCsv = mediaFile.filename.endsWith(".csv")
+                val mostLikelyInstanceId = getEntityListFromFileName(mediaFile)
+                if (isCsv && entitiesRepository.getLists().contains(mostLikelyInstanceId)) {
+                    Analytics.setUserProperty("HasEntityListCollision", "true")
+                }
             }
         }
 
         return atLeastOneNewMediaFileDetected
     }
 
+    private fun getEntityListFromFileName(mediaFile: MediaFile) =
+        mediaFile.filename.substringBefore(".csv")
+
     private fun searchForExistingMediaFile(
         formsRepository: FormsRepository,
         formToDownload: ServerFormDetails,