Remove isNotOnDevice

collect_app/src/main/java/org/odk/collect/android/activities/FormDownloadListActivity.java

@@ -460,7 +460,7 @@ public boolean isLocalFormSuperseded(String formId) {
         }
 
         ServerFormDetails form = viewModel.getFormDetailsByFormId().get(formId);
-        return form.isNotOnDevice() || form.isUpdated();
+        return form.getType() != ServerFormDetails.Type.OnDevice;
     }
 
     /**

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

@@ -52,18 +52,6 @@ data class ServerFormDetails @JvmOverloads constructor(
         }
     )
 
-    @Deprecated(
-        message = "Use type instead",
-        replaceWith = ReplaceWith("type")
-    )
-    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")

collect_app/src/main/java/org/odk/collect/android/formmanagement/matchexactly/ServerFormsSynchronizer.java

@@ -40,7 +40,7 @@ public void synchronize() throws FormSourceException {
         boolean downloadException = false;
 
         for (ServerFormDetails form : formList) {
-            if (form.isNotOnDevice() || form.isUpdated()) {
+            if (form.getType() != ServerFormDetails.Type.OnDevice) {
                 try {
                     formDownloader.downloadForm(form, null, null);
                 } catch (FormDownloadException.DownloadingInterrupted e) {