SiVa warning improvements (#208)

* MOPPAND-822
open-eid · Nov 25, 2021 · f3c3302 · f3c3302
1 parent d9d0300
commit f3c3302
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/ee/ria/DigiDoc/android/signature/update/Intent.java b/app/src/main/java/ee/ria/DigiDoc/android/signature/update/Intent.java
@@ -90,7 +90,9 @@ abstract class DocumentViewIntent implements Intent, Action {
         abstract boolean confirmation();
 
         static DocumentViewIntent confirmation(File containerFile, DataFile document) {
-            if (SignedContainer.isContainer(containerFile)) {
+            String containerFileExtension = getFileExtension(containerFile.getName()).toLowerCase(Locale.US);
+            String documentFileExtension = getFileExtension(document.name()).toLowerCase(Locale.US);
+            if (!containerFileExtension.equals("pdf") && !documentFileExtension.equals("pdf") && SignedContainer.isContainer(containerFile)) {
                 boolean isConfirmationNeeded;
                 try {
                     SignedContainer signedContainer = SignedContainer.open(containerFile);
@@ -106,6 +108,8 @@ static DocumentViewIntent confirmation(File containerFile, DataFile document) {
                     Timber.log(Log.ERROR, e, "Unable to get data file from container");
                     return create(containerFile, document, false);
                 }
+            } else if (containerFileExtension.equals("pdf") && documentFileExtension.equals("pdf")) {
+                return create(containerFile, document, false);
             } else {
                 boolean isConfirmationNeeded = SivaUtil.isSivaConfirmationNeeded(containerFile, document);
                 return create(containerFile, document, isConfirmationNeeded);

diff --git a/app/src/main/java/ee/ria/DigiDoc/android/signature/update/Processor.java b/app/src/main/java/ee/ria/DigiDoc/android/signature/update/Processor.java
@@ -1,6 +1,7 @@
 package ee.ria.DigiDoc.android.signature.update;
 
 import static android.app.Activity.RESULT_OK;
+import static com.google.common.io.Files.getFileExtension;
 import static ee.ria.DigiDoc.android.Constants.SAVE_FILE;
 import static ee.ria.DigiDoc.android.utils.IntentUtils.createSaveIntent;
 import static ee.ria.DigiDoc.android.utils.IntentUtils.createSendIntent;
@@ -19,6 +20,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
@@ -206,9 +208,10 @@ final class Processor implements ObservableTransformer<Action, Result> {
                         .observeOn(AndroidSchedulers.mainThread())
                         .map(documentFile -> {
                             Transaction transaction;
+                            String documentFileExtension = getFileExtension(documentFile.getName()).toLowerCase(Locale.US);
                             boolean isSignedPdfDataFile =
-                                    SivaUtil.isSivaConfirmationNeeded(ImmutableList.of(FileStream.create(documentFile)));
-                            if (isSignedPdfDataFile && SignedContainer.isContainer(documentFile)) {
+                                    (SivaUtil.isSivaConfirmationNeeded(ImmutableList.of(FileStream.create(documentFile))) && documentFileExtension.equals("pdf"));
+                            if (!isSignedPdfDataFile && SignedContainer.isContainer(documentFile)) {
                                 transaction = Transaction.push(SignatureUpdateScreen
                                         .create(true, true, documentFile, false, false));
                             } else if (CryptoContainer.isContainerFileName(documentFile.getName())) {