Skip to content

Fix ImportDatabaseActivity resource leak #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix ImportDatabaseActivity resource leak #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions app/src/main/java/com/eveningoutpost/dexdrip/ImportDatabaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand Down
Loading