diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-05 11:51:41 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-05 11:51:41 -0300 |
| commit | 284a08c528ac520c9e4dfef33254e7b511bf8679 (patch) | |
| tree | 3e40e6794bd4cf2cbd003511cd437c28a71b5ef9 | |
| parent | 9198c0971896713a8c5a05b592f1913b686025c4 (diff) | |
| parent | 810f6e799d50e5244f566122e538c24a0f6cba79 (diff) | |
| download | mullvadvpn-284a08c528ac520c9e4dfef33254e7b511bf8679.tar.xz mullvadvpn-284a08c528ac520c9e4dfef33254e7b511bf8679.zip | |
Merge branch 'ignore-touch-events-when-obscured'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | android/src/main/res/layout/main.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d8eda8525b..839a1a6542 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,8 @@ Line wrap the file at 100 chars. Th - Show the remaining account time in the Settings screen in days if it's less than 3 months. - Prevent commands to connect or disconnect to be sent when the device is locked. - Make all screens scrollable to better handle small screens and split-screen mode. +- Ignore touch events when another view is shown on top of the app in order to prevent tapjacking + attacks. #### Linux - Send an ICMP reject message or TCP reset packet when blocking outgoing packets to prevent diff --git a/android/src/main/res/layout/main.xml b/android/src/main/res/layout/main.xml index 57a99f2668..7839409631 100644 --- a/android/src/main/res/layout/main.xml +++ b/android/src/main/res/layout/main.xml @@ -1,4 +1,5 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/main_fragment" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:filterTouchesWhenObscured="true" /> |