Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-22 15:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Avoid repeated calls to Resources.getSystem().

Browse Source
This commit is contained in:
akwizgran
2020-01-08 16:55:14 +00:00
parent da7f57e0af
commit 50d144c917
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-android/src/main/java/org/briarproject/briar/android/Localizer.java
View File

@@ -4,7 +4,6 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.support.v4.text.TextUtilsCompat;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.api.android.AndroidNotificationManager; import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -13,8 +12,10 @@ import java.util.Locale;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import androidx.core.text.TextUtilsCompat;
import static android.os.Build.VERSION.SDK_INT; import static android.os.Build.VERSION.SDK_INT;
import static android.support.v4.view.ViewCompat.LAYOUT_DIRECTION_LTR; import static androidx.core.view.ViewCompat.LAYOUT_DIRECTION_LTR;
import static org.briarproject.briar.android.settings.SettingsFragment.LANGUAGE; import static org.briarproject.briar.android.settings.SettingsFragment.LANGUAGE;
@NotNullByDefault @NotNullByDefault
@@ -77,8 +78,9 @@ public class Localizer {
if (tag.contains("-")) { if (tag.contains("-")) {
String[] langArray = tag.split("-"); String[] langArray = tag.split("-");
return new Locale(langArray[0], langArray[1]); return new Locale(langArray[0], langArray[1]);
} else } else {
return new Locale(tag); return new Locale(tag);
}
} }
// Returns the localized version of context // Returns the localized version of context
@@ -108,21 +110,22 @@ public class Localizer {
private void updateConfiguration(Configuration conf, Locale locale) { private void updateConfiguration(Configuration conf, Locale locale) {
if (SDK_INT >= 17) { if (SDK_INT >= 17) {
conf.setLocale(locale); conf.setLocale(locale);
} else } else {
conf.locale = locale; conf.locale = locale;
}
} }
private void setLocaleAndSystemConfiguration(@Nullable Locale locale) { private void setLocaleAndSystemConfiguration(@Nullable Locale locale) {
if (locale == null) return; if (locale == null) return;
Locale.setDefault(locale); Locale.setDefault(locale);
if (SDK_INT >= 23) return; if (SDK_INT >= 23) return;
Configuration systemConfiguration = Resources systemResources = Resources.getSystem();
Resources.getSystem().getConfiguration(); Configuration systemConfiguration = systemResources.getConfiguration();
updateConfiguration(systemConfiguration, locale); updateConfiguration(systemConfiguration, locale);
// DateUtils uses the system resources, so we need to update them too. // DateUtils uses the system resources, so we need to update them too.
//noinspection deprecation //noinspection deprecation
Resources.getSystem().updateConfiguration(systemConfiguration, systemResources.updateConfiguration(systemConfiguration,
Resources.getSystem().getDisplayMetrics()); systemResources.getDisplayMetrics());
} }
private Locale getLocaleFromConfig(Configuration config) { private Locale getLocaleFromConfig(Configuration config) {