mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-18 03:48:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge #868

Browse Source 
868: Deps/net.lingala.zip4j zip4j 2.10.0 r=TheLastProject a=TheLastProject



Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sylvia van Os <sylvia@hackerchick.me>
This commit is contained in:
bors[bot]
2022-04-17 12:27:33 +00:00
committed by GitHub
parent 749a4ddb29 de6248a5d6
commit a80ab32f07
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -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'

7
app/src/main/java/protect/card_locker/importexport/MultiFormatImporter.java
View File

@@ -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();