From de6248a5d637c4bb34638bf90ce958a00708f205 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Sun, 17 Apr 2022 14:25:26 +0200
Subject: [PATCH] Fix wrong password detection

---
 .../card_locker/importexport/MultiFormatImporter.java      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java b/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
index 58b0d34ee..362c14317 100644
--- a/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
@@ -54,7 +54,12 @@ public class MultiFormatImporter {
                 database.setTransactionSuccessful();
                 return new ImportExportResult(ImportExportResultType.Success);
             } catch (ZipException e) {
-                return new ImportExportResult(ImportExportResultType.BadPassword);
+                if (e.getType().equals(ZipException.Type.WRONG_PASSWORD)) {
+                    return new ImportExportResult(ImportExportResultType.BadPassword);
+                } else {
+                    Log.e(TAG, "Failed to import data", e);
+                    error = e.toString();
+                }
             } catch (Exception e) {
                 Log.e(TAG, "Failed to import data", e);
                 error = e.toString();