Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1354055 - Don't cache wrong result in OSPreferences::ReadSystemLocales on Android. r=jfkthame,rnewman

Browse Source 
MozReview-Commit-ID: Li7wUQnC9Gz

--HG--
extra : rebase_source : 5cd5794e16dfdd9f3534fab0c83523f1abb55e6e
This commit is contained in:
Zibi Braniecki 2017-04-06 13:00:02 +02:00
parent 8151866656
commit ccbf32129b
3 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
intl/locale/OSPreferences.cpp
View File

@ -38,12 +38,21 @@ OSPreferences::GetInstance()
bool
OSPreferences::GetSystemLocales(nsTArray<nsCString>& aRetVal)
{
bool status = true;
if (mSystemLocales.IsEmpty()) {
status = ReadSystemLocales(mSystemLocales);
if (!mSystemLocales.IsEmpty()) {
aRetVal = mSystemLocales;
return true;
}
aRetVal = mSystemLocales;
return status;
if (ReadSystemLocales(aRetVal)) {
mSystemLocales = aRetVal;
return true;
}
// If we failed to get the system locale, we still need
// to return something because there are tests out there that
// depend on system locale to be set.
aRetVal.AppendElement(NS_LITERAL_CSTRING("en-US"));
return false;
}
void
@ -294,15 +303,22 @@ OSPreferences::GetDateTimeConnectorPattern(const nsACString& aLocale,
NS_IMETHODIMP
OSPreferences::GetSystemLocales(uint32_t* aCount, char*** aOutArray)
{
if (mSystemLocales.IsEmpty()) {
ReadSystemLocales(mSystemLocales);
}
AutoTArray<nsCString,10> tempLocales;
nsTArray<nsCString>* systemLocalesPtr;
*aCount = mSystemLocales.Length();
if (!mSystemLocales.IsEmpty()) {
// use cached value
systemLocalesPtr = &mSystemLocales;
} else {
// get a (perhaps temporary/fallback/hack) value
GetSystemLocales(tempLocales);
systemLocalesPtr = &tempLocales;
}
*aCount = systemLocalesPtr->Length();
*aOutArray = static_cast<char**>(moz_xmalloc(*aCount * sizeof(char*)));
for (uint32_t i = 0; i < *aCount; i++) {
(*aOutArray)[i] = moz_xstrdup(mSystemLocales[i].get());
(*aOutArray)[i] = moz_xstrdup((*systemLocalesPtr)[i].get());
}
return NS_OK;
@ -311,12 +327,14 @@ OSPreferences::GetSystemLocales(uint32_t* aCount, char*** aOutArray)
NS_IMETHODIMP
OSPreferences::GetSystemLocale(nsACString& aRetVal)
{
if (mSystemLocales.IsEmpty()) {
ReadSystemLocales(mSystemLocales);
}
if (!mSystemLocales.IsEmpty()) {
aRetVal = mSystemLocales[0];
} else {
AutoTArray<nsCString,10> locales;
GetSystemLocales(locales);
if (!locales.IsEmpty()) {
aRetVal = locales[0];
}
}
return NS_OK;
}

13
intl/locale/android/OSPreferences_android.cpp
View File

@ -15,13 +15,16 @@ OSPreferences::ReadSystemLocales(nsTArray<nsCString>& aLocaleList)
//XXX: This is a quite sizable hack to work around the fact that we cannot
// retrieve OS locale in C++ without reaching out to JNI.
// Once we fix this (bug 1337078), this hack should not be necessary.
nsAutoCString locale;
if (!NS_SUCCEEDED(Preferences::GetCString("intl.locale.os", &locale)) ||
locale.IsEmpty()) {
locale.AssignLiteral("en-US");
//
//XXX: Notice, this value may be empty on an early read. In that case
// we won't add anything to the return list so that it doesn't get
// cached in mSystemLocales.
nsAdoptingCString locale = Preferences::GetCString("intl.locale.os");
if (!locale.IsEmpty()) {
aLocaleList.AppendElement(locale);
return true;
}
return true;
return false;
}
bool

7
intl/locale/tests/unit/test_localeService.js
View File

@ -45,6 +45,7 @@ add_test(function test_getAppLocalesAsLangTags() {
const PREF_MATCH_OS_LOCALE = "intl.locale.matchOS";
const PREF_SELECTED_LOCALE = "general.useragent.locale";
const PREF_OS_LOCALE = "intl.locale.os";
const REQ_LOC_CHANGE_EVENT = "intl:requested-locales-changed";
add_test(function test_getRequestedLocales() {
@ -67,6 +68,7 @@ add_test(function test_getRequestedLocales_matchOS() {
Services.prefs.setBoolPref(PREF_MATCH_OS_LOCALE, false);
Services.prefs.setCharPref(PREF_SELECTED_LOCALE, "ar-IR");
Services.prefs.setCharPref(PREF_OS_LOCALE, "en-US");
const observer = {
observe: function (aSubject, aTopic, aData) {
@ -138,6 +140,7 @@ add_test(function test_isAppLocaleRTL() {
});
do_register_cleanup(() => {
Services.prefs.clearUserPref(PREF_SELECTED_LOCALE);
Services.prefs.clearUserPref(PREF_MATCH_OS_LOCALE);
Services.prefs.clearUserPref(PREF_SELECTED_LOCALE);
Services.prefs.clearUserPref(PREF_MATCH_OS_LOCALE);
Services.prefs.clearUserPref(PREF_OS_LOCALE, "en-US");
});