Skip to content

Commit

Permalink
Merge branch 'change-launch-mode-from-singletask-to-singleinstance-dr…
Browse files Browse the repository at this point in the history
…oid-633'
  • Loading branch information
Pururun committed Jan 8, 2024
2 parents 63aa10f + 631b411 commit e7f11f1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ Line wrap the file at 100 chars. Th
#### Android
- Migrate to Compose Navigation which also improves screen transition animations.

### Security
#### Android
- Change from singleTask to singleInstance to fix Task Affinity Vulnerability in Android 8.


## [android/2023.10] - 2023-12-14
Identical to `android/2023.10-beta1`.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
tools:ignore="GoogleAppIndexingWarning">
<activity android:name="net.mullvad.mullvadvpn.TestActivity"
android:label="@string/app_name"
android:launchMode="singleTask"
android:launchMode="singleInstance"
android:configChanges="orientation|screenSize|screenLayout"
android:screenOrientation="locked"
android:windowSoftInputMode="adjustPan"
Expand Down
6 changes: 5 additions & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,14 @@
<!--
MainActivity
Must be exported in order to be launchable.
Launch mode should singleInstance to avoid this vulnerability;
https://developer.android.com/privacy-and-security/risks/strandhogg
This can be disregarded when the minimum supported version is 28 or higher
since after that it has been patched on a OS level.
-->
<activity android:name="net.mullvad.mullvadvpn.ui.MainActivity"
android:exported="true"
android:launchMode="singleTask"
android:launchMode="singleInstance"
android:configChanges="orientation|screenSize|screenLayout"
android:screenOrientation="fullUser"
android:windowSoftInputMode="adjustResize">
Expand Down

0 comments on commit e7f11f1

Please sign in to comment.