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

Make spotbugs happy

Browse Source
This commit is contained in:
Sylvia van Os
2021-10-06 19:58:29 +02:00
parent b26050b6bf
commit 5a88909cd2
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/protect/card_locker/ImportExportActivity.java
View File

@@ -20,6 +20,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
@@ -405,6 +406,8 @@ public class ImportExportActivity extends CatimaAppCompatActivity
Log.e(TAG, "Starting file export with: " + uri.toString());
startExport(writer, uri);
writer.close();
}
else
{
@@ -421,9 +424,11 @@ public class ImportExportActivity extends CatimaAppCompatActivity
Log.e(TAG, "Starting file import with: " + uri.toString());
startImport(reader, uri, importDataFormat, password);
reader.close();
}
}
catch(FileNotFoundException e)
catch(IOException e)
{
Log.e(TAG, "Failed to import/export file: " + uri.toString(), e);
if (requestCode == CHOOSE_EXPORT_LOCATION)

4
app/src/main/java/protect/card_locker/importexport/StocardImporter.java
View File

@@ -116,14 +116,14 @@ public class StocardImporter implements Importer
.substring("/loyalty-card-providers/".length())
);
try {
if (jsonObject.has("input_barcode_format")) {
loyaltyCardHashMap = appendToLoyaltyCardHashMap(
loyaltyCardHashMap,
cardName,
"barcodeType",
jsonObject.getString("input_barcode_format")
);
} catch (JSONException ignored) {}
}
}
} else if (fileName.endsWith("notes/default.json")) {
loyaltyCardHashMap = appendToLoyaltyCardHashMap(