diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-08 09:09:58 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-09-08 09:09:58 +0200 |
| commit | f110dccfd445ccfe21e3473f4f818b81916b3d6c (patch) | |
| tree | 1461abd179b058dc127baa5b7bf787bb92e9ecbe | |
| parent | 7701d39d98d23fa4ad8de6962081ba76a470ad79 (diff) | |
| parent | 12f0d9252cea2e6ba42150942a844106f3bdf497 (diff) | |
| download | mullvadvpn-f110dccfd445ccfe21e3473f4f818b81916b3d6c.tar.xz mullvadvpn-f110dccfd445ccfe21e3473f4f818b81916b3d6c.zip | |
Merge branch 'crash-in-mullvadtopbarwithdevicename-droid-2147'
| -rw-r--r-- | android/app/build.gradle.kts | 6 | ||||
| -rw-r--r-- | android/app/src/main/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | android/lib/resource/src/main/res/xml/locales_config.xml | 22 |
3 files changed, 29 insertions, 2 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 640f8ae82a..478074bab2 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -62,7 +62,11 @@ android { androidResources { @Suppress("UnstableApiUsage") - generateLocaleConfig = true + // Due to a bug in the Android platform we need to disable this as the auto-generated local + // config causes a crash on some versions of android. + // See: https://issuetracker.google.com/issues/399131926#comment29 + // Restoring this behavior when the issue has been resolved is tracked in: DROID-2163 + generateLocaleConfig = false } if (keystorePropertiesFile.exists()) { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 60b1374db1..7b31b30a9c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -27,7 +27,7 @@ <application android:name=".MullvadApplication" android:banner="@mipmap/ic_banner" android:allowBackup="false" - tools:targetApi="31" + tools:targetApi="33" android:memtagMode="async" android:fullBackupContent="@xml/full_backup_content" android:dataExtractionRules="@xml/data_extraction_rules" @@ -35,6 +35,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher" android:theme="@style/Theme.App.Starting" + android:localeConfig="@xml/locales_config" tools:ignore="CredManMissingDal,CredentialDependency,GoogleAppIndexingWarning"> <!-- diff --git a/android/lib/resource/src/main/res/xml/locales_config.xml b/android/lib/resource/src/main/res/xml/locales_config.xml new file mode 100644 index 0000000000..66a7f7385c --- /dev/null +++ b/android/lib/resource/src/main/res/xml/locales_config.xml @@ -0,0 +1,22 @@ +<locale-config xmlns:android="http://schemas.android.com/apk/res/android"> + <locale android:name="en-US"/> + <locale android:name="da"/> + <locale android:name="de"/> + <locale android:name="es"/> + <locale android:name="fi"/> + <locale android:name="fr"/> + <locale android:name="it"/> + <locale android:name="ja"/> + <locale android:name="ko"/> + <locale android:name="my"/> + <locale android:name="nb"/> + <locale android:name="nl"/> + <locale android:name="pl"/> + <locale android:name="pt"/> + <locale android:name="ru"/> + <locale android:name="sv"/> + <locale android:name="th"/> + <locale android:name="tr"/> + <locale android:name="zh-CN"/> + <locale android:name="zh-TW"/> +</locale-config> |