Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 10:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not fail backup when missing attachments.

Browse Source
This commit is contained in:
Cody Henthorne
2022-08-12 11:21:21 -04:00
parent 90be2a0e53
commit 41a7560e76
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
View File

@@ -376,8 +376,8 @@ public class FullBackupExporter extends FullBackupBase {
}
}
EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
if (!TextUtils.isEmpty(data) && size > 0) {
EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
try (InputStream inputStream = openAttachmentStream(attachmentSecret, random, data)) {
outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
} catch (FileNotFoundException e) {
@@ -423,6 +423,8 @@ public class FullBackupExporter extends FullBackupBase {
while ((read = inputStream.read(buffer, 0, buffer.length)) != -1) {
result += read;
}
} catch (FileNotFoundException e) {
Log.w(TAG, "Missing attachment: " + e.getMessage());
}
return result;