6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Merge pull request #261 from vector-im/feature/e2e_file

Browse Source 
Encrypt attachment in e2e rooms
This commit is contained in:
Benoit Marty
2019-07-02 16:44:17 +02:00
committed by GitHub
parent ee9440c1cb 0980a41752
commit 498b1f2b06
44 changed files with 941 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vector/src/main/res/layout/activity_image_media_viewer.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@ -18,4 +19,11 @@
app:failureImageInitScaleType="center"
app:optimizeDisplay="true" />
<ImageView
android:id="@+id/encryptedImageView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="visible" />
</LinearLayout>