From f59f9ddec8a2b9be9ee97287d0ddc70f311e146d Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Wed, 24 Mar 2021 21:33:36 +0100
Subject: [PATCH] Make spotBugs happy

---
 .../card_locker/importexport/CsvDatabaseImporter.java        | 4 +++-
 .../java/protect/card_locker/importexport/FidmeImporter.java | 5 ++++-
 .../card_locker/importexport/VoucherVaultImporter.java       | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/importexport/CsvDatabaseImporter.java b/app/src/main/java/protect/card_locker/importexport/CsvDatabaseImporter.java
index 7654fd3d5..2054521c7 100644
--- a/app/src/main/java/protect/card_locker/importexport/CsvDatabaseImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/CsvDatabaseImporter.java
@@ -15,6 +15,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.Currency;
 import java.util.Date;
@@ -36,7 +38,7 @@ public class CsvDatabaseImporter implements DatabaseImporter
 {
     public void importData(DBHelper db, InputStream input) throws IOException, FormatException, InterruptedException
     {
-        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input));
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
 
         bufferedReader.mark(100);
 
diff --git a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java b/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
index d1979d12a..1f57cf1fd 100644
--- a/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/FidmeImporter.java
@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Currency;
@@ -54,7 +55,7 @@ public class FidmeImporter implements DatabaseImporter
         while ((zipEntry = zipInputStream.getNextEntry()) != null) {
             if (zipEntry.getName().equals("loyalty_programs.csv")) {
                 while ((read = zipInputStream.read(buffer, 0, 1024)) >= 0) {
-                    loyaltyCards.append(new String(buffer, 0, read));
+                    loyaltyCards.append(new String(buffer, 0, read, StandardCharsets.UTF_8));
                 }
             }
         }
@@ -85,6 +86,8 @@ public class FidmeImporter implements DatabaseImporter
         database.setTransactionSuccessful();
         database.endTransaction();
         database.close();
+
+        zipInputStream.close();
     }
 
     /**
diff --git a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
index 8c1121a6d..30c6bcb66 100644
--- a/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
+++ b/app/src/main/java/protect/card_locker/importexport/VoucherVaultImporter.java
@@ -15,6 +15,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Currency;
@@ -34,7 +35,7 @@ import protect.card_locker.FormatException;
 public class VoucherVaultImporter implements DatabaseImporter
 {
     public void importData(DBHelper db, InputStream input) throws IOException, FormatException, JSONException, ParseException {
-        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input));
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8));
 
         StringBuilder sb = new StringBuilder();
         String line;