Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 11:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong language being selected for system default.

Browse Source
This commit is contained in:
Michelle Tang
2025-03-28 11:49:16 -04:00
committed by Greyson Parrelli
parent 88fd8fb36b
commit 5f7ce0d96d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java
View File

@@ -1,11 +1,11 @@
package org.thoughtcrime.securesms.util.dynamiclanguage;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.os.ConfigurationCompat;
import androidx.core.os.LocaleListCompat;
import org.thoughtcrime.securesms.BuildConfig;
@@ -41,10 +41,14 @@ final class LocaleParser {
* Get the first preferred language the app supports.
*/
private static @NonNull Locale findBestSystemLocale() {
final Configuration config = Resources.getSystem().getConfiguration();
LocaleListCompat localeList;
if (Build.VERSION.SDK_INT < 24) {
localeList = LocaleListCompat.create(Resources.getSystem().getConfiguration().locale);
} else {
localeList = LocaleListCompat.getAdjustedDefault();
}
final Locale firstMatch = ConfigurationCompat.getLocales(config)
.getFirstMatch(BuildConfig.LANGUAGES);
final Locale firstMatch = localeList.getFirstMatch(BuildConfig.LANGUAGES);
if (firstMatch != null) {
return firstMatch;