From fb75e43a741229ae516dfb3e996c7c2602938802 Mon Sep 17 00:00:00 2001
From: Anas Khalil <anaskhl@hotmail.com>
Date: Tue, 19 Jan 2021 21:19:14 +0200
Subject: [PATCH] On export, skip encrypted submissions with manifest but no
 .enc file and mark as failed #895

---
 .../opendatakit/briefcase/export/SubmissionParser.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/org/opendatakit/briefcase/export/SubmissionParser.java b/src/org/opendatakit/briefcase/export/SubmissionParser.java
index b3174b379..a134d86ba 100644
--- a/src/org/opendatakit/briefcase/export/SubmissionParser.java
+++ b/src/org/opendatakit/briefcase/export/SubmissionParser.java
@@ -84,7 +84,14 @@ static List<Path> getOrderedListOfSubmissionFiles(FormDefinition formDef, DateRa
           Path submissionFile = instanceDir.resolve("submission.xml");
           try {
             Optional<OffsetDateTime> submissionDate = readSubmissionDate(submissionFile);
-            paths.add(Pair.of(submissionFile, submissionDate.orElse(OffsetDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC))));
+            if (formDef.isFileEncryptedForm() && !Files.exists(instanceDir.resolve("submission.xml.enc")))
+            {
+              log.info(String.format("Can't find encrypted form file (submission.xml.enc) in %s", instanceDir.getFileName()));
+            }
+            else
+            {
+              paths.add(Pair.of(submissionFile, submissionDate.orElse(OffsetDateTime.of(1970, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC))));
+            }
           } catch (Throwable t) {
             log.error("Can't read submission date", t);
             EventBus.publish(ExportEvent.failureSubmission(formDef, instanceDir.getFileName().toString(), t));