getodk · grzesiek2010 · Jul 11, 2024 · Jul 3, 2024 · Jul 3, 2024 · Jul 3, 2024
diff --git a/...src/androidTest/java/org/odk/collect/android/feature/entitymanagement/ViewEntitiesTest.kt b/...src/androidTest/java/org/odk/collect/android/feature/entitymanagement/ViewEntitiesTest.kt
@@ -21,9 +21,12 @@ class ViewEntitiesTest {
     @Test
     fun canViewLocallyCreatedEntitiesInBrowser() {
         testDependencies.server.addForm("one-question-entity-registration.xml")
+        testDependencies.server.addForm(
+            "one-question-entity-follow-up.xml",
+            listOf(StubOpenRosaServer.EntityListItem("people.csv"))
+        )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .addEntityListInBrowser("people")
             .startBlankForm("One Question Entity Registration")
             .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy"))
             .openEntityBrowser()
@@ -39,7 +42,6 @@ class ViewEntitiesTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .addEntityListInBrowser("people")
             .refreshForms()
             .openEntityBrowser()
             .clickOnList("people")

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/EntityFormTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/EntityFormTest.kt
@@ -6,6 +6,7 @@ import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 import org.odk.collect.android.support.StubOpenRosaServer.EntityListItem
+import org.odk.collect.android.support.StubOpenRosaServer.MediaFileItem
 import org.odk.collect.android.support.TestDependencies
 import org.odk.collect.android.support.pages.FormEntryPage
 import org.odk.collect.android.support.pages.MainMenuPage
@@ -27,7 +28,7 @@ class EntityFormTest {
         testDependencies.server.addForm("one-question-entity-registration.xml")
         testDependencies.server.addForm(
             "one-question-entity-update.xml",
-            listOf(EntityListItem("people.csv"))
+            listOf(MediaFileItem("people.csv"))
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
@@ -51,7 +52,7 @@ class EntityFormTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .setupEntities("people")
+            .enableLocalEntitiesInForms()
 
             .startBlankForm("One Question Entity Registration")
             .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy"))
@@ -71,7 +72,7 @@ class EntityFormTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .setupEntities("people")
+            .enableLocalEntitiesInForms()
 
             .startBlankForm("One Question Entity Update") // Open to create cached form def
             .pressBackAndDiscardForm()
@@ -93,7 +94,7 @@ class EntityFormTest {
         )
 
         rule.withMatchExactlyProject(testDependencies.server.url)
-            .setupEntities("people")
+            .enableLocalEntitiesInForms()
 
             .startBlankForm("One Question Entity Update")
             .assertQuestion("Select person")
@@ -124,7 +125,6 @@ class EntityFormTest {
 
         rule.withProject(testDependencies.server)
             .enableLocalEntitiesInForms()
-            .addEntityListInBrowser("people")
 
             .clickGetBlankForm()
             .clickClearAll()

diff --git a/...ct_app/src/androidTest/java/org/odk/collect/android/feature/projects/SwitchProjectTest.kt b/...ct_app/src/androidTest/java/org/odk/collect/android/feature/projects/SwitchProjectTest.kt
@@ -5,6 +5,7 @@ import androidx.test.rule.GrantPermissionRule
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
+import org.odk.collect.android.support.StubOpenRosaServer.EntityListItem
 import org.odk.collect.android.support.TestDependencies
 import org.odk.collect.android.support.pages.EntitiesPage
 import org.odk.collect.android.support.pages.ExperimentalPage
@@ -47,7 +48,16 @@ class SwitchProjectTest {
 
     @Test
     fun switchingProject_switchesSettingsFormsInstancesAndEntities() {
-        testDependencies.server.addForm("One Question Entity Registration", "one-question-entity", "1", "one-question-entity-registration.xml")
+        testDependencies.server.addForm(
+            "One Question Entity Registration",
+            "one-question-entity",
+            "1",
+            "one-question-entity-registration.xml"
+        )
+        testDependencies.server.addForm(
+            "one-question-entity-update.xml",
+            listOf(EntityListItem("people.csv"))
+        )
 
         rule.startAtMainMenu()
             // Copy and fill form
@@ -76,7 +86,6 @@ class SwitchProjectTest {
             .clickOKOnDialog(MainMenuPage())
 
             // Fill form
-            .addEntityListInBrowser("people")
             .startBlankForm("One Question Entity Registration")
             .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Alice"))
             .clickSendFinalizedForm(1)

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/StubOpenRosaServer.java b/collect_app/src/androidTest/java/org/odk/collect/android/support/StubOpenRosaServer.java
@@ -275,8 +275,15 @@ private InputStream getManifestResponse(@NonNull URI uri) throws IOException {
                     mediaFileHash = Md5.getMd5Hash(getResourceAsStream("media/" + mediaFile.getFile()));
                 }
 
+                if (mediaFile instanceof EntityListItem) {
+                    stringBuilder
+                            .append("<mediaFile type=\"entityList\">");
+                } else {
+                    stringBuilder
+                            .append("<mediaFile>");
+                }
+
                 stringBuilder
-                        .append("<mediaFile>")
                         .append("<filename>" + mediaFile.getName() + "</filename>\n");
 
                 if (noHashPrefixInMediaFiles) {

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/MainMenuPage.java b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/MainMenuPage.java
@@ -17,7 +17,6 @@
 import org.odk.collect.android.support.StorageUtils;
 import org.odk.collect.android.support.TestScheduler;
 import org.odk.collect.testshared.WaitFor;
-import org.odk.collect.strings.R.string;
 
 import java.io.IOException;
 import java.util.List;
@@ -288,30 +287,12 @@ public EntitiesPage openEntityBrowser() {
         return new EntitiesPage().assertOnPage();
     }
 
-    public MainMenuPage addEntityListInBrowser(String entityList) {
-        return openEntityBrowser()
-                .clickOptionsIcon(string.add_entity_list)
-                .clickOnTextInPopup(string.add_entity_list)
-                .inputText(entityList)
-                .clickOnTextInDialog(string.add)
-                .assertText(entityList)
-                .pressBack(new ExperimentalPage())
-                .pressBack(new ProjectSettingsPage())
-                .pressBack(new MainMenuPage());
-    }
-
     public MainMenuPage refreshForms() {
         return clickFillBlankForm()
                 .clickRefresh()
                 .pressBack(new MainMenuPage());
     }
 
-    public MainMenuPage setupEntities(String entityList) {
-        return enableLocalEntitiesInForms()
-                .addEntityListInBrowser(entityList)
-                .refreshForms();
-    }
-
     @NotNull
     public MainMenuPage enableLocalEntitiesInForms() {
         return openProjectSettingsDialog()

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
@@ -110,8 +110,8 @@ object ServerFormUseCases {
                 }
             }
 
-            val dataset = mediaFile.filename.substringBefore(".csv")
-            if (entitiesRepository.getLists().contains(dataset)) {
+            if (mediaFile.isEntityList) {
+                val dataset = mediaFile.filename.substringBefore(".csv")
                 LocalEntityUseCases.updateLocalEntitiesFromServer(dataset, tempMediaFile, entitiesRepository)
             }
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/openrosa/OpenRosaResponseParserImpl.kt b/collect_app/src/main/java/org/odk/collect/android/openrosa/OpenRosaResponseParserImpl.kt
@@ -154,6 +154,8 @@ class OpenRosaResponseParserImpl : OpenRosaResponseParser {
                 continue
             }
 
+            val type = mediaFileElement.getAttributeValue(null, "type")
+
             val name = mediaFileElement.name
             if (name.equals("mediaFile", ignoreCase = true)) {
                 var filename: String? = null
@@ -201,7 +203,7 @@ class OpenRosaResponseParserImpl : OpenRosaResponseParser {
                     return null
                 }
 
-                files.add(MediaFile(filename, hash, downloadUrl))
+                files.add(MediaFile(filename, hash, downloadUrl, type == "entityList"))
             }
         }
         return files

diff --git a/collect_app/src/test/java/org/odk/collect/android/openrosa/OpenRosaResponseParserImplTest.kt b/collect_app/src/test/java/org/odk/collect/android/openrosa/OpenRosaResponseParserImplTest.kt
@@ -71,4 +71,54 @@ class OpenRosaResponseParserImplTest {
         val formList = OpenRosaResponseParserImpl().parseManifest(Document())
         assertThat(formList, equalTo(null))
     }
+
+    @Test
+    fun `parseManifest() when media file has type entityList returns isEntityList as true`() {
+        val response = StringBuilder()
+            .appendLine("<?xml version='1.0' encoding='UTF-8' ?>")
+            .appendLine("<manifest xmlns=\"http://openrosa.org/xforms/xformsManifest\">")
+            .appendLine("<mediaFile type=\"entityList\">")
+            .appendLine("<filename>badgers.csv</filename>")
+            .appendLine("<hash>blah</hash>")
+            .appendLine("<downloadUrl>http://funk.appspot.com/binaryData?blobKey=%3A477e3</downloadUrl>")
+            .appendLine("</mediaFile>")
+            .appendLine("</manifest>")
+            .toString()
+
+        val doc = StringReader(response).use { reader ->
+            val parser = KXmlParser()
+            parser.setInput(reader)
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true)
+            Document().also { it.parse(parser) }
+        }
+
+        val mediaFiles = OpenRosaResponseParserImpl().parseManifest(doc)!!
+        assertThat(mediaFiles.size, equalTo(1))
+        assertThat(mediaFiles[0].isEntityList, equalTo(true))
+    }
+
+    @Test
+    fun `parseManifest() when media file does not have type returns isEntityList as false`() {
+        val response = StringBuilder()
+            .appendLine("<?xml version='1.0' encoding='UTF-8' ?>")
+            .appendLine("<manifest xmlns=\"http://openrosa.org/xforms/xformsManifest\">")
+            .appendLine("<mediaFile>")
+            .appendLine("<filename>badgers.csv</filename>")
+            .appendLine("<hash>blah</hash>")
+            .appendLine("<downloadUrl>http://funk.appspot.com/binaryData?blobKey=%3A477e3</downloadUrl>")
+            .appendLine("</mediaFile>")
+            .appendLine("</manifest>")
+            .toString()
+
+        val doc = StringReader(response).use { reader ->
+            val parser = KXmlParser()
+            parser.setInput(reader)
+            parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true)
+            Document().also { it.parse(parser) }
+        }
+
+        val mediaFiles = OpenRosaResponseParserImpl().parseManifest(doc)!!
+        assertThat(mediaFiles.size, equalTo(1))
+        assertThat(mediaFiles[0].isEntityList, equalTo(false))
+    }
 }
diff --git a/entities/src/main/java/org/odk/collect/entities/browser/EntitiesViewModel.kt b/entities/src/main/java/org/odk/collect/entities/browser/EntitiesViewModel.kt
@@ -36,11 +36,4 @@ class EntitiesViewModel(
             _lists.postValue(entitiesRepository.getLists().toList())
         }
     }
-
-    fun addEntityList(name: String) {
-        scheduler.immediate {
-            entitiesRepository.addList(name)
-            _lists.postValue(entitiesRepository.getLists().toList())
-        }
-    }
 }
diff --git a/entities/src/main/java/org/odk/collect/entities/browser/EntityListsFragment.kt b/entities/src/main/java/org/odk/collect/entities/browser/EntityListsFragment.kt
@@ -1,6 +1,5 @@
 package org.odk.collect.entities.browser
 
-import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.Menu
@@ -18,9 +17,7 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.odk.collect.entities.R
-import org.odk.collect.entities.databinding.AddEntitiesDialogLayoutBinding
 import org.odk.collect.entities.databinding.EntityListItemLayoutBinding
 import org.odk.collect.entities.databinding.ListLayoutBinding
 import org.odk.collect.lists.RecyclerViewUtils
@@ -50,15 +47,14 @@ class EntityListsFragment(
         }
 
         menuHost().addMenuProvider(
-            ListsMenuProvider(entitiesViewModel, requireContext()),
+            ListsMenuProvider(entitiesViewModel),
             viewLifecycleOwner
         )
     }
 }
 
 private class ListsMenuProvider(
-    private val entitiesViewModel: EntitiesViewModel,
-    private val context: Context
+    private val entitiesViewModel: EntitiesViewModel
 ) : MenuProvider {
     override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
         menuInflater.inflate(R.menu.entity_lists, menu)
@@ -71,18 +67,6 @@ private class ListsMenuProvider(
                 true
             }
 
-            R.id.add_entity_list -> {
-                val binding = AddEntitiesDialogLayoutBinding.inflate(LayoutInflater.from(context))
-                MaterialAlertDialogBuilder(context)
-                    .setView(binding.root)
-                    .setTitle(org.odk.collect.strings.R.string.add_entity_list)
-                    .setPositiveButton(org.odk.collect.strings.R.string.add) { _, _ ->
-                        entitiesViewModel.addEntityList(binding.entityListName.text.toString())
-                    }
-                    .show()
-                true
-            }
-
             else -> false
         }
     }

diff --git a/entities/src/main/res/layout/add_entities_dialog_layout.xml b/entities/src/main/res/layout/add_entities_dialog_layout.xml
diff --git a/entities/src/main/res/menu/entity_lists.xml b/entities/src/main/res/menu/entity_lists.xml
@@ -6,9 +6,4 @@
         android:id="@+id/clear_entities"
         android:title="@string/clear_entities"
         app:showAsAction="never" />
-
-    <item
-        android:id="@+id/add_entity_list"
-        android:title="@string/add_entity_list"
-        app:showAsAction="never" />
 </menu>
diff --git a/forms/src/main/java/org/odk/collect/forms/MediaFile.kt b/forms/src/main/java/org/odk/collect/forms/MediaFile.kt
@@ -17,8 +17,9 @@ package org.odk.collect.forms
 
 import java.io.Serializable
 
-data class MediaFile(
+data class MediaFile @JvmOverloads constructor(
     val filename: String,
     val hash: String,
-    val downloadUrl: String
+    val downloadUrl: String,
+    val isEntityList: Boolean = false
 ) : Serializable
diff --git a/strings/src/main/res/values-de/strings.xml b/strings/src/main/res/values-de/strings.xml
@@ -935,8 +935,7 @@
   <!--Text for button that deletes all entities for the project-->
   <string name="clear_entities">Alle löschen</string>
   <!--Text for button that adds a new entity list-->
-  <string name="add_entity_list">Objektliste hinzufügen</string>
-  <!--Label for entity that has been created offline and is not on the server yet-->
+    <!--Label for entity that has been created offline and is not on the server yet-->
   <string name="offline">Offline</string>
   <!--##############################################
     # Crash handling

diff --git a/strings/src/main/res/values-fi/strings.xml b/strings/src/main/res/values-fi/strings.xml
@@ -941,8 +941,7 @@
   <!--Text for button that deletes all entities for the project-->
   <string name="clear_entities">Poista kaikki</string>
   <!--Text for button that adds a new entity list-->
-  <string name="add_entity_list">Lisää entiteettilista</string>
-  <!--Label for entity that has been created offline and is not on the server yet-->
+    <!--Label for entity that has been created offline and is not on the server yet-->
   <string name="offline">Offline</string>
   <!--##############################################
     # Crash handling

diff --git a/strings/src/main/res/values-fr/strings.xml b/strings/src/main/res/values-fr/strings.xml
@@ -945,8 +945,7 @@
   <!--Text for button that deletes all entities for the project-->
   <string name="clear_entities">Tout supprimer</string>
   <!--Text for button that adds a new entity list-->
-  <string name="add_entity_list">Ajouter liste d\'entités</string>
-  <!--Label for entity that has been created offline and is not on the server yet-->
+    <!--Label for entity that has been created offline and is not on the server yet-->
   <string name="offline">Hors ligne</string>
   <!--##############################################
     # Crash handling