Merge pull request #532 from martenrebane/MOPPAND-1319-2

Fix opening files from ASICS containers
open-eid · Sep 23, 2024 · 9246f7b · 9246f7b
2 parents 9a05685 + ef94c64
commit 9246f7b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/src/main/java/ee/ria/DigiDoc/android/signature/update/SignatureUpdateView.java b/app/src/main/java/ee/ria/DigiDoc/android/signature/update/SignatureUpdateView.java
@@ -652,7 +652,7 @@ private Observable<DocumentsAddIntent> addDocumentsIntent() {
     private Observable<DocumentViewIntent> documentViewIntent() {
         return Observable.mergeArray(adapter.documentClicks()
                 .map(document -> DocumentViewIntent.confirmation(getContext(),
-                        (nestedFile != null && isSivaConfirmed) ? nestedFile : containerFile, document)),
+                        (nestedFile != null && SignedContainer.isContainer(getContext(), nestedFile) && isSivaConfirmed) ? nestedFile : containerFile, document)),
                         sivaConfirmationDialog.positiveButtonClicks()
                                 .map(ignored -> DocumentViewIntent.open(
                                         (nestedFile != null && isSivaConfirmed) ? nestedFile : containerFile,
@@ -791,7 +791,7 @@ public void onAttachedToWindow() {
         disposables.add(adapter.scrollToTop().subscribe(ignored -> listView.scrollToPosition(0)));
         disposables.add(adapter.documentSaveClicks().subscribe(document ->
                 documentSaveIntentSubject.onNext(DocumentSaveIntent
-                        .create((nestedFile != null && isSivaConfirmed) ? nestedFile : containerFile, document, isSivaConfirmed))));
+                        .create((nestedFile != null && SignedContainer.isContainer(getContext(), nestedFile) && isSivaConfirmed) ? nestedFile : containerFile, document, isSivaConfirmed))));
         disposables.add(adapter.signatureClicks().subscribe(signature ->
                 signatureViewIntentSubject.onNext(SignatureViewIntent
                         .create(containerFile, signature, isSivaConfirmed))));