diff --git a/app/src/main/java/com/example/notifyservice/MainActivity.java b/app/src/main/java/com/example/notifyservice/MainActivity.java index 2f9e6d4..134beb2 100644 --- a/app/src/main/java/com/example/notifyservice/MainActivity.java +++ b/app/src/main/java/com/example/notifyservice/MainActivity.java @@ -448,17 +448,9 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba } else if (result.get("name"). // STATIC equals("languages")) { // STATIC - String currentLanguage; - if(!result.getJSONObject("data").has(Locale.getDefault().getLanguage())) // STATIC - currentLanguage = "en"; // STATIC - else - currentLanguage = Locale.getDefault().getLanguage(); - - language = result.getJSONObject( "data" // STATIC - ).getJSONObject(currentLanguage); - + ).getJSONObject(Locale.getDefault().getLanguage()); requestsCount += 1; } if (requestsCount == 2) { @@ -468,7 +460,7 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba requestPermissions(retrievePermissions(this)); } } - } catch (Exception e) { + } catch (JSONException e) { // Log.i("ww", Arrays.toString(e.getStackTrace())); throw new RuntimeException(e); } @@ -586,8 +578,8 @@ public class MainActivity extends AppCompatActivity implements PostRequestCallba phoneNumbers.add(new PhoneNumber( phoneNumber, telephonyManager, - telephonyManager.getSimOperatorName().toLowerCase(), - currentCard.getCountryIso().toLowerCase() + telephonyManager.getSimOperatorName(), + currentCard.getCountryIso() )); } /*