From cfbaeb1ffc58ce751c173958b20a1f00a1f670fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 17 Apr 2022 12:13:30 +0000 Subject: [PATCH 1/2] Bump zip4j from 2.9.1 to 2.10.0 Bumps [zip4j](https://github.com/srikanth-lingala/zip4j) from 2.9.1 to 2.10.0. - [Release notes](https://github.com/srikanth-lingala/zip4j/releases) - [Commits](https://github.com/srikanth-lingala/zip4j/compare/v2.9.1...v2.10.0) --- updated-dependencies: - dependency-name: net.lingala.zip4j:zip4j dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index b07f57f07..9a48dafc3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -98,7 +98,7 @@ dependencies { implementation 'org.apache.commons:commons-csv:1.9.0' implementation 'com.jaredrummler:colorpicker:1.1.0' implementation 'com.github.invissvenska:NumberPickerPreference:1.0.4' - implementation 'net.lingala.zip4j:zip4j:2.9.1' + implementation 'net.lingala.zip4j:zip4j:2.10.0' // SpotBugs implementation 'io.wcm.tooling.spotbugs:io.wcm.tooling.spotbugs.annotations:1.0.0' From de6248a5d637c4bb34638bf90ce958a00708f205 Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Sun, 17 Apr 2022 14:25:26 +0200 Subject: [PATCH 2/2] 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();