Remove hashWithPrefix

grzesiek2010 · Nov 25, 2021 · 62955ac · 62955ac
1 parent 0d611f4
commit 62955ac
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
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
@@ -102,6 +102,8 @@ class OpenRosaResponseParserImpl : OpenRosaResponseParser {
                         hash = XFormParser.getXMLText(child, true)
                         if (hash != null && (hash.length == 0 || !hash.startsWith("md5:"))) {
                             hash = null
+                        } else {
+                            hash = hash.substring("md5:".length)
                         }
                     }
                 }

diff --git a/collect_app/src/test/java/org/odk/collect/android/formmanagement/FormsUpdaterTest.kt b/collect_app/src/test/java/org/odk/collect/android/formmanagement/FormsUpdaterTest.kt
@@ -163,7 +163,7 @@ class FormsUpdaterTest {
                     "http://$formId",
                     formId,
                     formVersion,
-                    "md5:${getMd5Hash(updatedXForm)}",
+                    getMd5Hash(updatedXForm),
                     "blah",
                     null
                 )

diff --git a/...app/src/test/java/org/odk/collect/android/formmanagement/ServerFormsDetailsFetcherTest.kt b/...app/src/test/java/org/odk/collect/android/formmanagement/ServerFormsDetailsFetcherTest.kt
@@ -297,7 +297,7 @@ class ServerFormsDetailsFetcherTest {
     @Test
     fun whenAFormExists_andItsNewerVersionWithManifestIsAvailableButHasNullHash_isNotNewOrUpdated() {
         whenever(formSource.fetchFormList()).thenReturn(
-            listOf(FORM_WITH_MANIFEST.copy(hashWithPrefix = null))
+            listOf(FORM_WITH_MANIFEST.copy(hash = null))
         )
 
         formsRepository.save(
@@ -342,13 +342,13 @@ private val MEDIA_FILE = MediaFile(
 )
 
 private val FORM_WITHOUT_MANIFEST =
-    FormListItem("http://example.com/form-1", "form-1", "1", "md5:form-1-hash", "Form 1", null)
+    FormListItem("http://example.com/form-1", "form-1", "1", "form-1-hash", "Form 1", null)
 
 private val FORM_WITH_MANIFEST = FormListItem(
     "http://example.com/form-2",
     "form-2",
     "2",
-    "md5:form-2-hash",
+    "form-2-hash",
     "Form 2",
     MANIFEST_URL
 )
diff --git a/forms/src/main/java/org/odk/collect/forms/FormListItem.kt b/forms/src/main/java/org/odk/collect/forms/FormListItem.kt
@@ -4,10 +4,7 @@ data class FormListItem(
     val downloadURL: String,
     val formID: String,
     val version: String,
-    private val hashWithPrefix: String?,
+    val hash: String?,
     val name: String,
     val manifestURL: String?
-) {
-
-    val hash = hashWithPrefix?.substring("md5:".length)
-}
+)