demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Truncate existing file before zip export

Browse Source 
In "w" mode it is not guaranteed to truncate, which will result in a
corrupted zip.
This commit is contained in:
José Rebelo
2025-10-05 22:44:06 +01:00
parent a7c026fd5d
commit eb37c343d1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/backup/ZipBackupExportJob.java
+7 -1
View File
@@ -60,7 +60,7 @@ public class ZipBackupExportJob extends AbstractZipBackupJob {
@Override
public void run() {
try (final OutputStream outputStream = getContext().getContentResolver().openOutputStream(mUri);
try (final OutputStream outputStream = getContext().getContentResolver().openOutputStream(mUri, "wt");
final ZipOutputStream zipOut = new ZipOutputStream(outputStream)) {
if (isAborted()) return;
@@ -149,6 +149,7 @@ public class ZipBackupExportJob extends AbstractZipBackupJob {
final ZipEntry zipEntry = new ZipEntry(zipEntryName);
zipOut.putNextEntry(zipEntry);
zipOut.write(preferencesJson.getBytes(StandardCharsets.UTF_8));
zipOut.closeEntry();
}
private static void exportDatabase(final ZipOutputStream zipOut, final Context context) throws IOException {
@@ -163,6 +164,8 @@ public class ZipBackupExportJob extends AbstractZipBackupJob {
} catch (final Exception e) {
throw new IOException("Failed to export database", e);
}
zipOut.closeEntry();
}
/**
@@ -230,6 +233,8 @@ public class ZipBackupExportJob extends AbstractZipBackupJob {
} catch (final Exception e) {
throw new IOException("Failed to write " + relativePath, e);
}
zipOut.closeEntry();
}
private static void addMetadata(final ZipOutputStream zipOut) throws IOException {
@@ -254,6 +259,7 @@ public class ZipBackupExportJob extends AbstractZipBackupJob {
zipEntry.setComment(comment);
zipOut.putNextEntry(zipEntry);
zipOut.write(metadataJson.getBytes(StandardCharsets.UTF_8));
zipOut.closeEntry();
zipOut.setComment(comment);
}