Skip to content

Fix resource leak in ImportDatabaseActivity #254

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

Merged
merged 1 commit into from
Jun 17, 2025
Merged

Fix resource leak in ImportDatabaseActivity #254

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
20 changes: 8 additions & 12 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,23 +282,22 @@ 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 (final FileInputStream fileInputStream = new FileInputStream(dbFile.getAbsolutePath());
final ZipInputStream zip_stream = new ZipInputStream(new BufferedInputStream(fileInputStream))) {
ZipEntry zipEntry = zip_stream.getNextEntry();
if ((zipEntry != null) && zipEntry.isDirectory())
zipEntry = zip_stream.getNextEntry();
if (zipEntry != null) {
String filename = zipEntry.getName();
if (filename.endsWith(".sqlite")) {
String output_filename = dbFile.getAbsolutePath().replaceFirst(".zip$", ".sqlite");
FileOutputStream fout = new FileOutputStream(output_filename);
byte[] buffer = new byte[4096];
int count = 0;
while ((count = zip_stream.read(buffer)) != -1) {
fout.write(buffer, 0, count);
try (FileOutputStream fout = new FileOutputStream(output_filename)) {
byte[] buffer = new byte[4096];
int count;
while ((count = zip_stream.read(buffer)) != -1) {
fout.write(buffer, 0, count);
}
}
fout.close();
dbFile = new File(output_filename);
delete_file = dbFile;
Log.d(TAG, "New filename: " + output_filename);
Expand All @@ -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
Loading