From 8b9f89eab23d1f6652621cacd1012c6d38210a71 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 14 Dec 2018 12:27:47 -0200 Subject: [PATCH] [android] Clarify the meaning of image save state --- .../briar/android/conversation/ImageViewModel.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 fc5b6cdff..7975d70f4 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 @@ -50,9 +50,12 @@ public class ImageViewModel extends AndroidViewModel { @IoExecutor private final Executor ioExecutor; + /** + * true means there was an error saving the image, false if image was saved. + */ + private final MutableLiveData saveState = new MutableLiveData<>(); private final MutableLiveData imageClicked = new MutableLiveData<>(); - private final MutableLiveData saveState = new MutableLiveData<>(); private int toolbarTop, toolbarBottom; @Inject @@ -106,8 +109,9 @@ public class ImageViewModel extends AndroidViewModel { } /** - * A LiveData that is true if the image was saved, - * false if there was an error and null otherwise. + * A LiveData that is true if there was an error + * and false if the image was saved. + * It can be null otherwise, if no image was saved recently. * * Call {@link #onSaveStateSeen()} after consuming an update. */ @@ -126,7 +130,7 @@ public class ImageViewModel extends AndroidViewModel { @UiThread void saveImage(AttachmentItem attachment, @Nullable Uri uri) { if (uri == null) { - saveState.setValue(false); + saveState.setValue(true); } else { saveImage(attachment, () -> getOutputStream(uri), null); } -- 2.26.2