Convert boolean to proxies for type

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

@@ -22,20 +22,62 @@ data class ServerFormDetails @JvmOverloads constructor(
     val formId: String?,
     val formVersion: String?,
     val hash: String?,
+    val manifest: ManifestFile?,
+    val type: Type
+) : Serializable {
+
+    @Deprecated(message = "Use primary constructor instead")
+    constructor(
+        formName: String?,
+        downloadUrl: String?,
+        formId: String?,
+        formVersion: String?,
+        hash: String?,
+        isNotOnDevice: Boolean,
+        isUpdated: Boolean,
+        manifest: ManifestFile?,
+    ) : this(
+        formName,
+        downloadUrl,
+        formId,
+        formVersion,
+        hash,
+        manifest,
+        if (isNotOnDevice) {
+            Type.New
+        } else if (isUpdated) {
+            Type.UpdatedVersion
+        } else {
+            Type.OnDevice
+        }
+    )
+
     @Deprecated(
         message = "Use type instead",
         replaceWith = ReplaceWith("type")
-    ) val isNotOnDevice: Boolean,
+    )
+    val isNotOnDevice: Boolean = when (type) {
+        Type.OnDevice -> false
+        Type.New -> true
+        Type.UpdatedVersion -> false
+        Type.UpdatedHash -> false
+        Type.UpdatedMedia -> false
+    }
+
     @Deprecated(
         message = "Use type instead",
         replaceWith = ReplaceWith("type")
-    ) val isUpdated: Boolean,
-    val manifest: ManifestFile?,
-    val type: Type? = null
-) : Serializable {
+    )
+    val isUpdated: Boolean = when (type) {
+        Type.OnDevice -> false
+        Type.New -> false
+        Type.UpdatedVersion -> true
+        Type.UpdatedHash -> true
+        Type.UpdatedMedia -> true
+    }
 
     companion object {
-        private const val serialVersionUID = 3L
+        private const val serialVersionUID = 4L
     }
 
     enum class Type {

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

@@ -86,8 +86,6 @@ object ServerFormUseCases {
                 listItem.formID,
                 listItem.version,
                 listItem.hash,
-                !thisFormAlreadyDownloaded,
-                isNewerFormVersionAvailable || areNewerMediaFilesAvailable,
                 manifestFile,
                 type
             )

collect_app/src/main/java/org/odk/collect/android/notifications/NotificationManagerNotifier.kt

@@ -34,8 +34,9 @@ class NotificationManagerNotifier(
         val notificationId = uniqueIdGenerator.getInt(FORM_UPDATE_NOTIFICATION_IDENTIFIER)
 
         val metaPrefs = settingsProvider.getMetaSettings()
-        val updateId = updates
-            .mapTo(HashSet()) { (_, _, formId, _, hash, _, _, manifest) -> formId + hash + manifest?.hash }
+        val updateId = updates.mapTo(HashSet()) { (_, _, formId, _, hash, manifest, _) ->
+            formId + hash + manifest?.hash
+        }
         if (metaPrefs.getStringSet(MetaKeys.LAST_UPDATED_NOTIFICATION) != updateId) {
             notificationManager.notify(
                 notificationId,