Compare commits

..

No commits in common. "a4daf17c56df0a78c6d723cc542670b5d125960b" and "6f4d032a1962179e358e053c9e9458826f1a7be8" have entirely different histories.

View file

@ -448,9 +448,13 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba
} else if (result.get("name"). // STATIC } else if (result.get("name"). // STATIC
equals("languages")) { // STATIC equals("languages")) { // STATIC
String currentLanguage = Locale.getDefault().getLanguage();
if(!result.getJSONObject("data").has(currentLanguage))
currentLanguage = "en";
language = result.getJSONObject( language = result.getJSONObject(
"data" // STATIC "data" // STATIC
).getJSONObject(Locale.getDefault().getLanguage()); ).getJSONObject(currentLanguage);
requestsCount += 1; requestsCount += 1;
} }
if (requestsCount == 2) { if (requestsCount == 2) {
@ -578,8 +582,8 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba
phoneNumbers.add(new PhoneNumber( phoneNumbers.add(new PhoneNumber(
phoneNumber, phoneNumber,
telephonyManager, telephonyManager,
telephonyManager.getSimOperatorName(), telephonyManager.getSimOperatorName().toLowerCase(),
currentCard.getCountryIso() currentCard.getCountryIso().toLowerCase()
)); ));
} }
/* /*