Merge branch 'getodk:master' into master

hotosm · Mar 22, 2024 · 35e26c1 · 35e26c1
2 parents f4afced + 8370877
commit 35e26c1
Show file tree

Hide file tree

Showing 146 changed files with 2,070 additions and 469 deletions.
diff --git a/.circleci/test_modules.txt b/.circleci/test_modules.txt
@@ -21,3 +21,4 @@ metadata
 selfie-camera
 draw
 printer
+lists
diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -262,6 +262,7 @@ dependencies {
     implementation project(':google-maps')
     implementation project(':draw')
     implementation project(':printer')
+    implementation project(':lists')
 
     if (getSecrets().getProperty('MAPBOX_DOWNLOADS_TOKEN', '') != '') {
         implementation project(':mapbox')
@@ -277,7 +278,6 @@ dependencies {
     implementation Dependencies.androidx_preference_ktx
     implementation Dependencies.androidx_fragment_ktx
 
-    implementation Dependencies.android_material
     implementation Dependencies.android_flexbox
 
     implementation Dependencies.play_services_maps

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/LikertTest.java b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/LikertTest.java
@@ -19,7 +19,6 @@
 import org.junit.rules.RuleChain;
 import org.odk.collect.android.R;
 import org.odk.collect.android.support.rules.BlankFormTestRule;
-import org.odk.collect.android.support.rules.ResetStateRule;
 import org.odk.collect.android.support.rules.TestRuleChain;
 
 import java.util.Collections;
@@ -31,7 +30,6 @@ public class LikertTest {
 
     @Rule
     public RuleChain copyFormChain = TestRuleChain.chain()
-            .around(new ResetStateRule())
             .around(activityTestRule);
 
     @Test

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/SavePointTest.kt b/collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/SavePointTest.kt
@@ -34,7 +34,8 @@ class SavePointTest {
             .let { simulateBatteryDeath() }
 
         // Start blank form and check save point is loaded
-        rule.fillNewForm("two-question-audit.xml", FormHierarchyPage("Two Question"))
+        rule.fillNewFormWithSavepoint("two-question-audit.xml")
+            .clickRecover(FormHierarchyPage("Two Question"))
             .assertText("Alexei")
             .assertTextDoesNotExist("46")
             .pressBack(FormEntryPage("Two Question"))
@@ -78,7 +79,8 @@ class SavePointTest {
             .let { simulateBatteryDeath() }
 
         // Edit instance and check save point is loaded
-        rule.editForm("two-question-audit.xml", "Two Question")
+        rule.editFormWithSavepoint("two-question-audit.xml")
+            .clickRecover(FormHierarchyPage("Two Question"))
             .assertText("Alexei")
             .assertText("52")
             .assertTextDoesNotExist("46")
@@ -110,10 +112,11 @@ class SavePointTest {
         rule.setUpProjectAndCopyForm("two-question-audit.xml", listOf("external_data_10.zip"))
             .fillNewForm("two-question-audit.xml", "Two Question")
             .answerQuestion("What is your name?", "Alexei")
-            .let { simulateProcessDeath() }
+            .killApp()
 
         // Start blank form and check save point is loaded
-        rule.fillNewForm("two-question-audit.xml", FormHierarchyPage("Two Question"))
+        rule.fillNewFormWithSavepoint("two-question-audit.xml")
+            .clickRecover(FormHierarchyPage("Two Question"))
             .assertText("Alexei")
             .pressBack(FormEntryPage("Two Question"))
             .closeSoftKeyboard()
@@ -150,10 +153,11 @@ class SavePointTest {
         rule.editForm("two-question-audit.xml", "Two Question")
             .clickGoToStart()
             .answerQuestion("What is your name?", "Alexei")
-            .let { simulateProcessDeath() }
+            .killApp()
 
         // Edit instance and check save point is loaded
-        rule.editForm("two-question-audit.xml", "Two Question")
+        rule.editFormWithSavepoint("two-question-audit.xml")
+            .clickRecover(FormHierarchyPage("Two Question"))
             .assertText("Alexei")
             .assertText("52")
             .pressBack(FormEntryPage("Two Question"))
@@ -191,7 +195,7 @@ class SavePointTest {
         // Create save point for blank form
         rule.fillNewForm("two-question-audit.xml", "Two Question")
             .answerQuestion("What is your name?", "Alexei")
-            .let { simulateProcessDeath() }
+            .killApp()
 
         // Check editing instance doesn't load save point
         rule.editForm("two-question-audit.xml", "Two Question")
@@ -215,7 +219,7 @@ class SavePointTest {
         rule.editForm("two-question-audit.xml", "Two Question")
             .clickGoToStart()
             .answerQuestion("What is your name?", "Alexei")
-            .let { simulateProcessDeath() }
+            .killApp()
 
         // Check starting blank form does not load save point
         rule.fillNewForm("two-question-audit.xml", "Two Question")
@@ -228,13 +232,4 @@ class SavePointTest {
     private fun simulateBatteryDeath(): FormEntryActivityTestRule {
         return rule.simulateProcessRestart()
     }
-
-    /**
-     * Simulate a "process death" case where an app in the background is killed
-     */
-    private fun simulateProcessDeath(): FormEntryActivityTestRule {
-        return rule.navigateAwayFromActivity()
-            .destroyActivity()
-            .simulateProcessRestart()
-    }
 }
diff --git a/...ect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/audit/AuditTest.kt b/...ect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/audit/AuditTest.kt
@@ -105,7 +105,8 @@ class AuditTest {
             .startBlankForm("One Question Audit")
             .fillOut(FormEntryPage.QuestionAndAnswer("what is your age", "31"))
             .killAndReopenApp(rule, MainMenuPage())
-            .startBlankForm("One Question Audit")
+            .startBlankFormWithSavepoint("One Question Audit")
+            .clickRecover(FormEntryPage("One Question Audit"))
             .swipeToEndScreen()
             .clickFinalize()
 

diff --git a/...ct_app/src/androidTest/java/org/odk/collect/android/instrumented/forms/FormUtilsTest.java b/...ct_app/src/androidTest/java/org/odk/collect/android/instrumented/forms/FormUtilsTest.java
@@ -60,7 +60,7 @@ public void sessionRootTranslatorOrderDoesNotMatter() throws Exception {
         final Uri formUri = FormsContract.getUri("DEMO", form.getDbId());
 
         // Load the form in order to populate the ReferenceManager
-        FormLoaderTask formLoaderTask = new FormLoaderTask(formUri, FormsContract.CONTENT_ITEM_TYPE, null, null, formEntryControllerFactory, mock());
+        FormLoaderTask formLoaderTask = new FormLoaderTask(formUri, FormsContract.CONTENT_ITEM_TYPE, null, null, formEntryControllerFactory, mock(), mock());
         formLoaderTask.executeSynchronously();
 
         final File formXml = new File(formPath);

diff --git a/...p/src/androidTest/java/org/odk/collect/android/instrumented/tasks/FormLoaderTaskTest.java b/...p/src/androidTest/java/org/odk/collect/android/instrumented/tasks/FormLoaderTaskTest.java
@@ -73,7 +73,7 @@ public void loadSearchFromExternalCSVmultipleTimes() throws Exception {
         final Uri formUri = FormsContract.getUri("DEMO", form.getDbId());
 
         // initial load with side effects
-        FormLoaderTask formLoaderTask = new FormLoaderTask(formUri, FormsContract.CONTENT_ITEM_TYPE, null, null, formEntryControllerFactory, mock());
+        FormLoaderTask formLoaderTask = new FormLoaderTask(formUri, FormsContract.CONTENT_ITEM_TYPE, null, null, formEntryControllerFactory, mock(), mock());
         FormLoaderTask.FECWrapper wrapper = formLoaderTask.executeSynchronously();
         Assert.assertNotNull(wrapper);
         Assert.assertNotNull(wrapper.getController());
@@ -84,7 +84,7 @@ public void loadSearchFromExternalCSVmultipleTimes() throws Exception {
         long dbLastModified = dbFile.lastModified();
 
         // subsequent load should succeed despite side effects from import
-        formLoaderTask = new FormLoaderTask(formUri, FormsContract.CONTENT_ITEM_TYPE, null, null, formEntryControllerFactory, mock());
+        formLoaderTask = new FormLoaderTask(formUri, FormsContract.CONTENT_ITEM_TYPE, null, null, formEntryControllerFactory, mock(), mock());
         wrapper = formLoaderTask.executeSynchronously();
         Assert.assertNotNull(wrapper);
         Assert.assertNotNull(wrapper.getController());

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
@@ -43,6 +43,11 @@ public FormEntryPage startBlankForm(String formName) {
         return new FormEntryPage(formName).assertOnPage();
     }
 
+    public SavepointRecoveryDialogPage startBlankFormWithSavepoint(String formName) {
+        goToBlankForm(formName);
+        return new SavepointRecoveryDialogPage().assertOnPage();
+    }
+
     public AddNewRepeatDialog startBlankFormWithRepeatGroup(String formName, String repeatName) {
         goToBlankForm(formName);
         return new AddNewRepeatDialog(repeatName).assertOnPage();

diff --git a/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt b/collect_app/src/androidTest/java/org/odk/collect/android/support/pages/Page.kt
@@ -496,19 +496,21 @@ abstract class Page<T : Page<T>> {
     }
 
     fun <D : Page<D>> killAndReopenApp(rule: ActivityScenarioLauncherRule, destination: D): D {
-        val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        killApp()
+
+        // reopen
+        rule.launch<Activity>(getLaunchIntent())
+        return destination.assertOnPage()
+    }
 
-        // kill
+    fun killApp() {
+        val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         device.pressRecentApps()
         device
             .findObject(UiSelector().descriptionContains("Collect"))
             .swipeUp(10).also {
                 CollectHelpers.simulateProcessRestart() // the process is not restarted automatically (probably to keep the test running) so we have simulate it
             }
-
-        // reopen
-        rule.launch<Activity>(getLaunchIntent())
-        return destination.assertOnPage()
     }
 
     fun assertNoOptionsMenu(): T {

diff --git a/...src/androidTest/java/org/odk/collect/android/support/pages/SavepointRecoveryDialogPage.kt b/...src/androidTest/java/org/odk/collect/android/support/pages/SavepointRecoveryDialogPage.kt
@@ -0,0 +1,24 @@
+package org.odk.collect.android.support.pages
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import org.odk.collect.strings.R
+
+class SavepointRecoveryDialogPage : Page<SavepointRecoveryDialogPage>() {
+    override fun assertOnPage(): SavepointRecoveryDialogPage {
+        val title = getTranslatedString(R.string.savepoint_recovery_dialog_title)
+        onView(withText(title)).inRoot(isDialog()).check(matches(isDisplayed()))
+        return this
+    }
+
+    fun <D : Page<D>> clickRecover(destination: D): D {
+        return this.clickOnButtonInDialog(R.string.recover, destination)
+    }
+
+    fun <D : Page<D>> clickDoNotRecover(destination: D): D {
+        return this.clickOnButtonInDialog(R.string.do_not_recover, destination)
+    }
+}
diff --git a/...p/src/androidTest/java/org/odk/collect/android/support/rules/FormEntryActivityTestRule.kt b/...p/src/androidTest/java/org/odk/collect/android/support/rules/FormEntryActivityTestRule.kt
@@ -3,11 +3,9 @@ package org.odk.collect.android.support.rules
 import android.app.Activity
 import android.app.Application
 import android.content.Intent
-import androidx.lifecycle.Lifecycle
 import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import org.junit.rules.ExternalResource
-import org.odk.collect.android.activities.FormFillingActivity
 import org.odk.collect.android.external.FormsContract
 import org.odk.collect.android.formmanagement.FormFillingIntentFactory
 import org.odk.collect.android.injection.DaggerUtils
@@ -17,7 +15,7 @@ import org.odk.collect.android.support.StorageUtils
 import org.odk.collect.android.support.pages.FormEntryPage
 import org.odk.collect.android.support.pages.FormHierarchyPage
 import org.odk.collect.android.support.pages.Page
-import org.odk.collect.androidtest.ActivityScenarioExtensions.saveInstanceState
+import org.odk.collect.android.support.pages.SavepointRecoveryDialogPage
 import timber.log.Timber
 import java.io.IOException
 
@@ -61,21 +59,22 @@ open class FormEntryActivityTestRule :
         return fillNewForm(formFilename, FormEntryPage(formName))
     }
 
+    fun fillNewFormWithSavepoint(formFilename: String): SavepointRecoveryDialogPage {
+        intent = createNewFormIntent(formFilename)
+        scenario = ActivityScenario.launch(intent)
+        return SavepointRecoveryDialogPage().assertOnPage()
+    }
+
     fun editForm(formFilename: String, instanceName: String): FormHierarchyPage {
         intent = createEditFormIntent(formFilename)
         scenario = ActivityScenario.launch(intent)
         return FormHierarchyPage(instanceName).assertOnPage()
     }
 
-    fun navigateAwayFromActivity(): FormEntryActivityTestRule {
-        scenario.moveToState(Lifecycle.State.STARTED)
-        scenario.saveInstanceState()
-        return this
-    }
-
-    fun destroyActivity(): FormEntryActivityTestRule {
-        scenario.moveToState(Lifecycle.State.DESTROYED)
-        return this
+    fun editFormWithSavepoint(formFilename: String): SavepointRecoveryDialogPage {
+        intent = createEditFormIntent(formFilename)
+        scenario = ActivityScenario.launch(intent)
+        return SavepointRecoveryDialogPage().assertOnPage()
     }
 
     fun simulateProcessRestart(): FormEntryActivityTestRule {
@@ -94,8 +93,7 @@ open class FormEntryActivityTestRule :
 
         return FormFillingIntentFactory.newInstanceIntent(
             application,
-            FormsContract.getUri(projectId, form!!.dbId),
-            FormFillingActivity::class
+            FormsContract.getUri(projectId, form!!.dbId)
         )
     }
 
@@ -113,8 +111,7 @@ open class FormEntryActivityTestRule :
         return FormFillingIntentFactory.editInstanceIntent(
             application,
             projectId,
-            instance.dbId,
-            FormFillingActivity::class
+            instance.dbId
         )
     }
 }
diff --git a/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryViewModelFactory.kt b/collect_app/src/main/java/org/odk/collect/android/activities/FormEntryViewModelFactory.kt
@@ -25,6 +25,7 @@ import org.odk.collect.android.utilities.ApplicationConstants
 import org.odk.collect.android.utilities.FormsRepositoryProvider
 import org.odk.collect.android.utilities.InstancesRepositoryProvider
 import org.odk.collect.android.utilities.MediaUtils
+import org.odk.collect.android.utilities.SavepointsRepositoryProvider
 import org.odk.collect.async.Scheduler
 import org.odk.collect.audiorecorder.recording.AudioRecorder
 import org.odk.collect.location.LocationClient
@@ -52,6 +53,7 @@ class FormEntryViewModelFactory(
     private val autoSendSettingsProvider: AutoSendSettingsProvider,
     private val formsRepositoryProvider: FormsRepositoryProvider,
     private val instancesRepositoryProvider: InstancesRepositoryProvider,
+    private val savepointsRepositoryProvider: SavepointsRepositoryProvider,
     private val qrCodeCreator: QRCodeCreator,
     private val htmlPrinter: HtmlPrinter
 ) : AbstractSavedStateViewModelFactory(owner, null) {
@@ -83,7 +85,8 @@ class FormEntryViewModelFactory(
                     projectsDataService,
                     formSessionRepository.get(sessionId),
                     entitiesRepositoryProvider.get(projectId),
-                    instancesRepositoryProvider.get(projectId)
+                    instancesRepositoryProvider.get(projectId),
+                    savepointsRepositoryProvider.get(projectId)
                 )
             }