Handle entities that have been removed on the server

collect_app/src/androidTest/java/org/odk/collect/android/feature/entitymanagement/ViewEntitiesTest.kt

@@ -27,7 +27,7 @@ class ViewEntitiesTest {
             .startBlankForm("One Question Entity Registration")
             .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy"))
             .openEntityBrowser()
-            .clickOnDataset("people")
+            .clickOnList("people")
             .assertEntity("Logan Roy", "full_name: Logan Roy")
     }
 
@@ -42,7 +42,7 @@ class ViewEntitiesTest {
             .addEntityListInBrowser("people")
             .refreshForms()
             .openEntityBrowser()
-            .clickOnDataset("people")
+            .clickOnList("people")
             .assertEntity("Roman Roy", "full_name: Roman Roy")
     }
 }

collect_app/src/androidTest/java/org/odk/collect/android/feature/projects/SwitchProjectTest.kt

@@ -84,7 +84,7 @@ class SwitchProjectTest {
             .pressBack(MainMenuPage())
 
             .openEntityBrowser()
-            .clickOnDataset("people")
+            .clickOnList("people")
             .assertEntity("Alice", "full_name: Alice")
             .pressBack(EntitiesPage())
             .pressBack(ExperimentalPage())

collect_app/src/androidTest/java/org/odk/collect/android/support/pages/EntitiesPage.kt

@@ -1,16 +1,14 @@
 package org.odk.collect.android.support.pages
 
-import org.odk.collect.android.R
-
 class EntitiesPage : Page<EntitiesPage>() {
 
     override fun assertOnPage(): EntitiesPage {
         assertToolbarTitle(org.odk.collect.strings.R.string.entities_title)
         return this
     }
 
-    fun clickOnDataset(datasetName: String): DatasetPage {
-        clickOnText(datasetName)
-        return DatasetPage(datasetName)
+    fun clickOnList(list: String): EntityListPage {
+        clickOnText(list)
+        return EntityListPage(list)
     }
 }

collect_app/src/androidTest/java/org/odk/collect/android/support/pages/EntityListPage.kt

@@ -0,0 +1,15 @@
+package org.odk.collect.android.support.pages
+
+class EntityListPage(private val datasetName: String) : Page<EntityListPage>() {
+
+    override fun assertOnPage(): EntityListPage {
+        assertToolbarTitle(datasetName)
+        return this
+    }
+
+    fun assertEntity(label: String, properties: String): EntityListPage {
+        assertText(label)
+        assertText(properties)
+        return this
+    }
+}

collect_app/src/main/java/org/odk/collect/android/entities/JsonFileEntitiesRepository.kt

@@ -11,29 +11,35 @@ class JsonFileEntitiesRepository(directory: File) : EntitiesRepository {
 
     private val entitiesFile = File(directory, "entities.json")
 
-    override fun getDatasets(): Set<String> {
+    override fun getLists(): Set<String> {
         return readJson().keys
     }
 
-    override fun getEntities(dataset: String): List<Entity> {
-        return readEntities().filter { it.dataset == dataset }
+    override fun getEntities(list: String): List<Entity> {
+        return readEntities().filter { it.list == list }
     }
 
     override fun save(vararg entities: Entity) {
         val storedEntities = readEntities()
 
         entities.forEach { entity ->
-            val existing = storedEntities.find { it.id == entity.id && it.dataset == entity.dataset }
+            val existing = storedEntities.find { it.id == entity.id }
 
             if (existing != null) {
+                val state = when (existing.state) {
+                    Entity.State.OFFLINE -> entity.state
+                    Entity.State.ONLINE -> Entity.State.ONLINE
+                }
+
                 storedEntities.remove(existing)
                 storedEntities.add(
                     Entity(
-                        entity.dataset,
+                        entity.list,
                         entity.id,
                         entity.label ?: existing.label,
                         version = entity.version,
-                        properties = mergeProperties(existing, entity)
+                        properties = mergeProperties(existing, entity),
+                        state = state
                     )
                 )
             } else {
@@ -49,27 +55,33 @@ class JsonFileEntitiesRepository(directory: File) : EntitiesRepository {
         entitiesFile.delete()
     }
 
-    override fun addDataset(dataset: String) {
+    override fun addList(list: String) {
         val existing = readJson()
-        if (!existing.containsKey(dataset)) {
-            existing[dataset] = mutableListOf()
+        if (!existing.containsKey(list)) {
+            existing[list] = mutableListOf()
         }
 
         writeJson(existing)
     }
 
+    override fun delete(id: String) {
+        val existing = readEntities()
+        existing.removeIf { it.id == id }
+        writeEntities(existing)
+    }
+
     private fun writeEntities(entities: MutableList<Entity>) {
         val map = mutableMapOf<String, MutableList<JsonEntity>>()
         entities.forEach {
-            map.getOrPut(it.dataset) { mutableListOf() }.add(it.toJson())
+            map.getOrPut(it.list) { mutableListOf() }.add(it.toJson())
         }
 
         writeJson(map)
     }
 
     private fun readEntities(): MutableList<Entity> {
-        return readJson().entries.flatMap { (dataset, entities) ->
-            entities.map { it.toEntity(dataset) }
+        return readJson().entries.flatMap { (list, entities) ->
+            entities.map { it.toEntity(list) }
         }.toMutableList()
     }
 
@@ -81,20 +93,26 @@ class JsonFileEntitiesRepository(directory: File) : EntitiesRepository {
             entitiesFile.createNewFile()
         }
 
-        val typeToken = TypeToken.getParameterized(
-            MutableMap::class.java,
-            String::class.java,
-            TypeToken.getParameterized(MutableList::class.java, JsonEntity::class.java).type
-        )
+        try {
+            val typeToken = TypeToken.getParameterized(
+                MutableMap::class.java,
+                String::class.java,
+                TypeToken.getParameterized(MutableList::class.java, JsonEntity::class.java).type
+            )
 
-        val json = entitiesFile.readText()
-        return if (json.isNotBlank()) {
-            val parsedJson =
-                Gson().fromJson<MutableMap<String, MutableList<JsonEntity>>>(json, typeToken.type)
+            val json = entitiesFile.readText()
+            return if (json.isNotBlank()) {
+                val parsedJson =
+                    Gson().fromJson<MutableMap<String, MutableList<JsonEntity>>>(json, typeToken.type)
 
-            parsedJson
-        } else {
-            mutableMapOf()
+                parsedJson
+            } else {
+                mutableMapOf()
+            }
+        } catch (e: Exception) {
+            entitiesFile.delete()
+            entitiesFile.createNewFile()
+            return mutableMapOf()
         }
     }
 
@@ -120,17 +138,25 @@ class JsonFileEntitiesRepository(directory: File) : EntitiesRepository {
     private data class JsonEntity(
         val id: String,
         val label: String?,
-        val version: Int = 1,
-        val properties: Map<String, String>
+        val version: Int,
+        val properties: Map<String, String>,
+        val offline: Boolean
     )
 
-    private fun JsonEntity.toEntity(dataset: String): Entity {
+    private fun JsonEntity.toEntity(list: String): Entity {
+        val state = if (this.offline) {
+            Entity.State.OFFLINE
+        } else {
+            Entity.State.ONLINE
+        }
+
         return Entity(
-            dataset,
+            list,
             this.id,
             this.label,
             this.version,
-            this.properties.entries.map { Pair(it.key, it.value) }
+            this.properties.entries.map { Pair(it.key, it.value) },
+            state
         )
     }
 
@@ -139,7 +165,8 @@ class JsonFileEntitiesRepository(directory: File) : EntitiesRepository {
             this.id,
             this.label,
             this.version,
-            this.properties.toMap()
+            this.properties.toMap(),
+            this.state == Entity.State.OFFLINE
         )
     }
 }

collect_app/src/main/java/org/odk/collect/android/formentry/FormEntryUseCases.kt

@@ -160,7 +160,7 @@ object FormEntryUseCases {
     ) {
         formController.finalizeForm()
         formController.getEntities().forEach { entity ->
-            if (entitiesRepository.getDatasets().contains(entity.dataset)) {
+            if (entitiesRepository.getLists().contains(entity.list)) {
                 entitiesRepository.save(entity)
             }
         }

collect_app/src/main/java/org/odk/collect/android/formlists/blankformlist/BlankFormListAdapter.kt

@@ -7,6 +7,7 @@ import android.widget.Button
 import androidx.recyclerview.widget.RecyclerView
 import org.odk.collect.android.R
 import org.odk.collect.androidshared.ui.multiclicksafe.MultiClickGuard
+import org.odk.collect.lists.RecyclerViewUtils.matchParentWidth
 
 class BlankFormListAdapter(
     val listener: OnFormItemClickListener
@@ -63,10 +64,7 @@ class BlankFormListAdapter(
         }
 
         init {
-            itemView.layoutParams = ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT
-            )
+            matchParentWidth()
         }
     }
 }

collect_app/src/main/java/org/odk/collect/android/formlists/blankformlist/DeleteBlankFormFragment.kt

@@ -16,6 +16,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.odk.collect.android.R
 import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
 import org.odk.collect.lists.RecyclerViewUtils
+import org.odk.collect.lists.RecyclerViewUtils.matchParentWidth
 import org.odk.collect.lists.multiselect.MultiSelectAdapter
 import org.odk.collect.lists.multiselect.MultiSelectControlsFragment
 import org.odk.collect.lists.multiselect.MultiSelectItem
@@ -110,10 +111,7 @@ private class SelectableBlankFormListItemViewHolder(parent: ViewGroup) :
     ) {
 
     init {
-        itemView.layoutParams = ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT
-        )
+        matchParentWidth()
     }
 
     override fun setItem(item: BlankFormListItem) {

collect_app/src/main/java/org/odk/collect/android/formlists/savedformlist/SelectableSavedFormListItemViewHolder.kt

@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import android.widget.CheckBox
 import org.odk.collect.android.R
 import org.odk.collect.forms.instances.Instance
+import org.odk.collect.lists.RecyclerViewUtils.matchParentWidth
 import org.odk.collect.lists.multiselect.MultiSelectAdapter
 
 class SelectableSavedFormListItemViewHolder(parent: ViewGroup) :
@@ -14,10 +15,7 @@ class SelectableSavedFormListItemViewHolder(parent: ViewGroup) :
     private var selectView = itemView
 
     init {
-        itemView.layoutParams = ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.WRAP_CONTENT
-        )
+        matchParentWidth()
     }
 
     override fun setItem(item: Instance) {

collect_app/src/main/java/org/odk/collect/android/formmanagement/ServerFormUseCases.kt

@@ -111,7 +111,7 @@ object ServerFormUseCases {
             }
 
             val dataset = mediaFile.filename.substringBefore(".csv")
-            if (entitiesRepository.getDatasets().contains(dataset)) {
+            if (entitiesRepository.getLists().contains(dataset)) {
                 LocalEntityUseCases.updateLocalEntities(dataset, tempMediaFile, entitiesRepository)
             }
         }

collect_app/src/main/res/values/attrs.xml

@@ -16,4 +16,8 @@
         <attr name="name" format="string" />
         <attr name="highlightable" format="boolean" />
     </declare-styleable>
+
+    <declare-styleable name="CollectCustomAttributes">
+        <attr name="widgetButtonIconQuestionWidgetStyle" format="reference" />
+    </declare-styleable>
 </resources>