diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java b/app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java
index 7794283b5..ff7acd5d7 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java
@@ -282,9 +282,8 @@ protected String doInBackground(Void... args) {
 
                 if (dbFile.getAbsolutePath().endsWith(".zip")) {
                     // uncompress first
-                    try {
-                        final FileInputStream fileInputStream = new FileInputStream(dbFile.getAbsolutePath());
-                        final ZipInputStream zip_stream = new ZipInputStream(new BufferedInputStream(fileInputStream));
+                    try (FileInputStream fileInputStream = new FileInputStream(dbFile.getAbsolutePath());
+                         ZipInputStream zip_stream = new ZipInputStream(new BufferedInputStream(fileInputStream))) {
                         ZipEntry zipEntry = zip_stream.getNextEntry();
                         if ((zipEntry != null) && zipEntry.isDirectory())
                             zipEntry = zip_stream.getNextEntry();
@@ -314,9 +313,6 @@ protected String doInBackground(Void... args) {
                             return msg;
                         }
 
-                            zip_stream.close();
-                            fileInputStream.close();
-
                     } catch (IOException e) {
                         String msg = "Could not open file";
                         JoH.static_toast_long(msg);
@@ -359,7 +355,7 @@ public void run() {
 
             String result = DatabaseUtil.loadSql(xdrip.getAppContext(), dbFile.getAbsolutePath());
             if (delete_file != null) delete_file.delete();
-            statusDialog.dismiss();;
+            statusDialog.dismiss();
             return result;
         }