From 768488eb04c2b82a43f107ae55a913dff581af21 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 7 Dec 2018 13:54:13 -0200 Subject: [PATCH] [android] Show (tinted) security icon when warning about saving attachments --- .../briar/android/conversation/ImageActivity.java | 7 ++++++- .../briar/android/conversation/ImageViewModel.java | 2 +- briar-android/src/main/res/drawable/ic_security.xml | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 briar-android/src/main/res/drawable/ic_security.xml diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java index 796a1b893..f36cbab0f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java @@ -11,6 +11,8 @@ import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; import android.support.design.widget.AppBarLayout; import android.support.design.widget.Snackbar; +import android.support.v4.content.ContextCompat; +import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.app.AlertDialog.Builder; import android.support.v7.widget.Toolbar; import android.transition.Fade; @@ -285,7 +287,10 @@ public class ImageActivity extends BriarActivity Builder builder = new Builder(this, R.style.BriarDialogTheme); builder.setTitle(getString(R.string.dialog_title_save_image)); builder.setMessage(getString(R.string.dialog_message_save_image)); - builder.setIcon(R.drawable.emoji_google_1f6af); + Drawable icon = ContextCompat.getDrawable(this, R.drawable.ic_security); + DrawableCompat.setTint(requireNonNull(icon), + ContextCompat.getColor(this, R.color.color_primary)); + builder.setIcon(icon); builder.setPositiveButton(R.string.save_image, okListener); builder.setNegativeButton(R.string.cancel, null); builder.show(); 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 da1735857..059f657e3 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 @@ -82,7 +82,7 @@ public class ImageViewModel extends AndroidViewModel { @UiThread void saveImage(AttachmentItem attachment, @Nullable Uri uri) { if (uri == null) { - saveState.setValue(true); + saveState.setValue(false); } else { saveImage(attachment, () -> getOutputStream(uri), null); } diff --git a/briar-android/src/main/res/drawable/ic_security.xml b/briar-android/src/main/res/drawable/ic_security.xml new file mode 100644 index 000000000..918642399 --- /dev/null +++ b/briar-android/src/main/res/drawable/ic_security.xml @@ -0,0 +1,9 @@ + + +