Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
579
Issues
579
List
Boards
Labels
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
768488eb
Verified
Commit
768488eb
authored
Dec 07, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[android] Show (tinted) security icon when warning about saving attachments
parent
a6b1ad48
Pipeline
#2865
passed with stage
in 11 minutes and 2 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
2 deletions
+16
-2
ImageActivity.java
...riarproject/briar/android/conversation/ImageActivity.java
+6
-1
ImageViewModel.java
...iarproject/briar/android/conversation/ImageViewModel.java
+1
-1
ic_security.xml
briar-android/src/main/res/drawable/ic_security.xml
+9
-0
No files found.
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java
View file @
768488eb
...
...
@@ -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
();
...
...
briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java
View file @
768488eb
...
...
@@ -82,7 +82,7 @@ public class ImageViewModel extends AndroidViewModel {
@UiThread
void
saveImage
(
AttachmentItem
attachment
,
@Nullable
Uri
uri
)
{
if
(
uri
==
null
)
{
saveState
.
setValue
(
tru
e
);
saveState
.
setValue
(
fals
e
);
}
else
{
saveImage
(
attachment
,
()
->
getOutputStream
(
uri
),
null
);
}
...
...
briar-android/src/main/res/drawable/ic_security.xml
0 → 100644
View file @
768488eb
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"
/>
</vector>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment