From 88c8bd32a50d07e66944baf963ec7a202e2a8805 Mon Sep 17 00:00:00 2001 From: cketti Date: Tue, 29 Mar 2022 01:22:46 +0200 Subject: [PATCH 1/2] Truncate existing file when saving image --- .../briar/android/conversation/ImageViewModel.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java index 84e9af5d8..823151fca 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java @@ -1,6 +1,7 @@ package org.briarproject.briar.android.conversation; import android.app.Application; +import android.content.ContentResolver; import android.graphics.drawable.Drawable; import android.net.Uri; import android.view.View; @@ -249,8 +250,8 @@ public class ImageViewModel extends DbViewModel implements EventListener { } private OutputStream getOutputStream(Uri uri) throws IOException { - OutputStream os = - getApplication().getContentResolver().openOutputStream(uri); + ContentResolver contentResolver = getApplication().getContentResolver(); + OutputStream os = contentResolver.openOutputStream(uri, "wt"); if (os == null) throw new IOException(); return os; } From 50f97180376b1213e48d4ad5c6effcbe6b3ad369 Mon Sep 17 00:00:00 2001 From: cketti Date: Tue, 29 Mar 2022 01:27:01 +0200 Subject: [PATCH 2/2] Truncate existing file when writing to removable drive --- .../bramble/plugin/file/AndroidRemovableDrivePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java b/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java index c781fc86a..3d038f145 100644 --- a/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java +++ b/bramble-android/src/main/java/org/briarproject/bramble/plugin/file/AndroidRemovableDrivePlugin.java @@ -39,6 +39,6 @@ class AndroidRemovableDrivePlugin extends RemovableDrivePlugin { OutputStream openOutputStream(TransportProperties p) throws IOException { String uri = p.get(PROP_URI); if (isNullOrEmpty(uri)) throw new IllegalArgumentException(); - return app.getContentResolver().openOutputStream(Uri.parse(uri)); + return app.getContentResolver().openOutputStream(Uri.parse(uri), "wt"); } }