Reimplement progress

Author: seadowg

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

@@ -174,13 +174,18 @@ object ServerFormUseCases {
             existingFile?.getMd5Hash().contentEquals(mediaFile.hash)
         }
 
+        var progress = 1
+
         if (formToDownload.type != ServerFormDetails.Type.UpdatedMedia) {
             existingMediaFiles.forEach { (_, existingFile) ->
+                stateListener.progressUpdate(progress++)
                 copyFileToDirectory(existingFile, tempMediaDir)
             }
         }
 
         mediaFilesToDownload.forEach { (mediaFile, existingFile) ->
+            stateListener.progressUpdate(progress++)
+
             val tempMediaFile = File(tempMediaDir, mediaFile.filename)
             downloadMediaFile(
                 formSource,
@@ -198,6 +203,8 @@ object ServerFormUseCases {
         }
 
         entityLists.forEach { mediaFile ->
+            stateListener.progressUpdate(progress++)
+
             val tempMediaFile = File(tempMediaDir, mediaFile.filename)
             val entityListName = getEntityListFromFileName(mediaFile)
             val localEntityList = entitiesRepository.getList(entityListName)

collect_app/src/test/java/org/odk/collect/android/formmanagement/download/ServerFormDownloaderTest.java

@@ -19,10 +19,9 @@
 
 import com.google.common.io.Files;
 
-import org.junit.Ignore;
 import org.junit.Test;
-import org.odk.collect.android.formmanagement.metadata.FormMetadataParser;
 import org.odk.collect.android.formmanagement.ServerFormDetails;
+import org.odk.collect.android.formmanagement.metadata.FormMetadataParser;
 import org.odk.collect.entities.server.EntitySource;
 import org.odk.collect.entities.storage.EntitiesRepository;
 import org.odk.collect.entities.storage.InMemEntitiesRepository;
@@ -407,7 +406,6 @@ public void whenFormHasMediaFiles_andFileExistsInMediaDirPath_throwsDiskExceptio
     }
 
     @Test
-    @Ignore
     public void beforeDownloadingEachMediaFile_reportsProgress() throws Exception {
         String xform = createXFormBody("id", "version");
         ServerFormDetails serverFormDetails = new ServerFormDetails(