From 927b6096c66505336adda3100c32e261b2f4f35a Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 23 Jul 2021 11:09:04 -0300
Subject: [PATCH] Upgrade AGP and Gradle.

---
 .../java/org/thoughtcrime/securesms/util/DateUtils.java   | 2 +-
 .../{xml-mcc202-mnc1 => xml-mcc202-mnc001}/mms_config.xml | 0
 .../{xml-mcc202-mnc5 => xml-mcc202-mnc005}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc208-mnc1 => xml-mcc208-mnc001}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc214-mnc1 => xml-mcc214-mnc001}/mms_config.xml | 0
 .../{xml-mcc214-mnc3 => xml-mcc214-mnc003}/mms_config.xml | 0
 .../{xml-mcc214-mnc6 => xml-mcc214-mnc006}/mms_config.xml | 0
 .../{xml-mcc214-mnc7 => xml-mcc214-mnc007}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc218-mnc5 => xml-mcc218-mnc005}/mms_config.xml | 0
 .../{xml-mcc219-mnc1 => xml-mcc219-mnc001}/mms_config.xml | 0
 .../{xml-mcc220-mnc4 => xml-mcc220-mnc004}/mms_config.xml | 0
 .../{xml-mcc222-mnc1 => xml-mcc222-mnc001}/mms_config.xml | 0
 .../{xml-mcc222-mnc8 => xml-mcc222-mnc008}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc226-mnc1 => xml-mcc226-mnc001}/mms_config.xml | 0
 .../{xml-mcc226-mnc3 => xml-mcc226-mnc003}/mms_config.xml | 0
 .../{xml-mcc226-mnc6 => xml-mcc226-mnc006}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc228-mnc1 => xml-mcc228-mnc001}/mms_config.xml | 0
 .../{xml-mcc230-mnc1 => xml-mcc230-mnc001}/mms_config.xml | 0
 .../{xml-mcc230-mnc3 => xml-mcc230-mnc003}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc231-mnc2 => xml-mcc231-mnc002}/mms_config.xml | 0
 .../{xml-mcc232-mnc1 => xml-mcc232-mnc001}/mms_config.xml | 0
 .../{xml-mcc232-mnc3 => xml-mcc232-mnc003}/mms_config.xml | 0
 .../{xml-mcc232-mnc7 => xml-mcc232-mnc007}/mms_config.xml | 0
 .../{xml-mcc234-mnc3 => xml-mcc234-mnc003}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc238-mnc2 => xml-mcc238-mnc002}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc240-mnc1 => xml-mcc240-mnc001}/mms_config.xml | 0
 .../{xml-mcc240-mnc4 => xml-mcc240-mnc004}/mms_config.xml | 0
 .../{xml-mcc240-mnc8 => xml-mcc240-mnc008}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc242-mnc1 => xml-mcc242-mnc001}/mms_config.xml | 0
 .../{xml-mcc242-mnc2 => xml-mcc242-mnc002}/mms_config.xml | 0
 .../{xml-mcc242-mnc5 => xml-mcc242-mnc005}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc255-mnc1 => xml-mcc255-mnc001}/mms_config.xml | 0
 .../{xml-mcc260-mnc1 => xml-mcc260-mnc001}/mms_config.xml | 0
 .../{xml-mcc260-mnc2 => xml-mcc260-mnc002}/mms_config.xml | 0
 .../{xml-mcc260-mnc3 => xml-mcc260-mnc003}/mms_config.xml | 0
 .../{xml-mcc260-mnc5 => xml-mcc260-mnc005}/mms_config.xml | 0
 .../{xml-mcc260-mnc6 => xml-mcc260-mnc006}/mms_config.xml | 0
 .../{xml-mcc262-mnc1 => xml-mcc262-mnc001}/mms_config.xml | 0
 .../{xml-mcc262-mnc2 => xml-mcc262-mnc002}/mms_config.xml | 0
 .../{xml-mcc262-mnc4 => xml-mcc262-mnc004}/mms_config.xml | 0
 .../{xml-mcc262-mnc7 => xml-mcc262-mnc007}/mms_config.xml | 0
 .../{xml-mcc262-mnc9 => xml-mcc262-mnc009}/mms_config.xml | 0
 .../{xml-mcc268-mnc1 => xml-mcc268-mnc001}/mms_config.xml | 0
 .../{xml-mcc272-mnc1 => xml-mcc272-mnc001}/mms_config.xml | 0
 .../{xml-mcc274-mnc2 => xml-mcc274-mnc002}/mms_config.xml | 0
 .../{xml-mcc274-mnc3 => xml-mcc274-mnc003}/mms_config.xml | 0
 .../{xml-mcc276-mnc2 => xml-mcc276-mnc002}/mms_config.xml | 0
 .../{xml-mcc278-mnc1 => xml-mcc278-mnc001}/mms_config.xml | 0
 .../{xml-mcc284-mnc1 => xml-mcc284-mnc001}/mms_config.xml | 0
 .../{xml-mcc286-mnc1 => xml-mcc286-mnc001}/mms_config.xml | 0
 .../{xml-mcc286-mnc2 => xml-mcc286-mnc002}/mms_config.xml | 0
 .../{xml-mcc286-mnc3 => xml-mcc286-mnc003}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc294-mnc1 => xml-mcc294-mnc001}/mms_config.xml | 0
 .../{xml-mcc294-mnc2 => xml-mcc294-mnc002}/mms_config.xml | 0
 .../{xml-mcc294-mnc3 => xml-mcc294-mnc003}/mms_config.xml | 0
 .../{xml-mcc297-mnc2 => xml-mcc297-mnc002}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc310-mnc5 => xml-mcc310-mnc005}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc310-mnc4 => xml-mcc310-mnc013}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc334-mnc2 => xml-mcc334-mnc002}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc418-mnc5 => xml-mcc418-mnc005}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc420-mnc4 => xml-mcc420-mnc004}/mms_config.xml | 0
 .../{xml-mcc426-mnc2 => xml-mcc426-mnc002}/mms_config.xml | 0
 .../{xml-mcc427-mnc2 => xml-mcc427-mnc002}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc450-mnc2 => xml-mcc450-mnc002}/mms_config.xml | 0
 .../{xml-mcc450-mnc5 => xml-mcc450-mnc005}/mms_config.xml | 0
 .../{xml-mcc450-mnc6 => xml-mcc450-mnc006}/mms_config.xml | 0
 .../{xml-mcc450-mnc8 => xml-mcc450-mnc008}/mms_config.xml | 0
 .../{xml-mcc505-mnc1 => xml-mcc505-mnc001}/mms_config.xml | 0
 .../{xml-mcc505-mnc3 => xml-mcc505-mnc003}/mms_config.xml | 0
 .../{xml-mcc505-mnc7 => xml-mcc505-mnc007}/mms_config.xml | 0
 .../{xml-mcc530-mnc1 => xml-mcc530-mnc001}/mms_config.xml | 0
 .../{xml-mcc530-mnc5 => xml-mcc530-mnc005}/mms_config.xml | 0
 .../{xml-mcc602-mnc2 => xml-mcc602-mnc002}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc604-mnc2 => xml-mcc604-mnc002}/mms_config.xml | 0
 .../mms_config.xml                                        | 0
 .../{xml-mcc655-mnc1 => xml-mcc655-mnc001}/mms_config.xml | 0
 build.gradle                                              | 2 +-
 gradle/wrapper/gradle-wrapper.properties                  | 8 ++++----
 111 files changed, 6 insertions(+), 6 deletions(-)
 rename app/src/main/res/{xml-mcc202-mnc1 => xml-mcc202-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc202-mnc5 => xml-mcc202-mnc005}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc204-mnc16 => xml-mcc204-mnc016}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc204-mnc20 => xml-mcc204-mnc020}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc208-mnc1 => xml-mcc208-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc208-mnc10 => xml-mcc208-mnc010}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc208-mnc15 => xml-mcc208-mnc015}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc208-mnc20 => xml-mcc208-mnc020}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc208-mnc26 => xml-mcc208-mnc026}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc214-mnc1 => xml-mcc214-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc214-mnc3 => xml-mcc214-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc214-mnc6 => xml-mcc214-mnc006}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc214-mnc7 => xml-mcc214-mnc007}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc214-mnc17 => xml-mcc214-mnc017}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc214-mnc21 => xml-mcc214-mnc021}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc216-mnc30 => xml-mcc216-mnc030}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc216-mnc70 => xml-mcc216-mnc070}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc218-mnc5 => xml-mcc218-mnc005}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc219-mnc1 => xml-mcc219-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc220-mnc4 => xml-mcc220-mnc004}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc222-mnc1 => xml-mcc222-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc222-mnc8 => xml-mcc222-mnc008}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc222-mnc10 => xml-mcc222-mnc010}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc226-mnc1 => xml-mcc226-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc226-mnc3 => xml-mcc226-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc226-mnc6 => xml-mcc226-mnc006}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc226-mnc10 => xml-mcc226-mnc010}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc228-mnc1 => xml-mcc228-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc230-mnc1 => xml-mcc230-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc230-mnc3 => xml-mcc230-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc230-mnc99 => xml-mcc230-mnc099}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc231-mnc2 => xml-mcc231-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc232-mnc1 => xml-mcc232-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc232-mnc3 => xml-mcc232-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc232-mnc7 => xml-mcc232-mnc007}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc234-mnc3 => xml-mcc234-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc234-mnc15 => xml-mcc234-mnc015}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc238-mnc2 => xml-mcc238-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc238-mnc77 => xml-mcc238-mnc077}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc240-mnc1 => xml-mcc240-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc240-mnc4 => xml-mcc240-mnc004}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc240-mnc8 => xml-mcc240-mnc008}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc240-mnc24 => xml-mcc240-mnc024}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc242-mnc1 => xml-mcc242-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc242-mnc2 => xml-mcc242-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc242-mnc5 => xml-mcc242-mnc005}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc244-mnc91 => xml-mcc244-mnc091}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc255-mnc1 => xml-mcc255-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc260-mnc1 => xml-mcc260-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc260-mnc2 => xml-mcc260-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc260-mnc3 => xml-mcc260-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc260-mnc5 => xml-mcc260-mnc005}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc260-mnc6 => xml-mcc260-mnc006}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc262-mnc1 => xml-mcc262-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc262-mnc2 => xml-mcc262-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc262-mnc4 => xml-mcc262-mnc004}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc262-mnc7 => xml-mcc262-mnc007}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc262-mnc9 => xml-mcc262-mnc009}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc268-mnc1 => xml-mcc268-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc272-mnc1 => xml-mcc272-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc274-mnc2 => xml-mcc274-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc274-mnc3 => xml-mcc274-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc276-mnc2 => xml-mcc276-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc278-mnc1 => xml-mcc278-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc284-mnc1 => xml-mcc284-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc286-mnc1 => xml-mcc286-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc286-mnc2 => xml-mcc286-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc286-mnc3 => xml-mcc286-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc293-mnc40 => xml-mcc293-mnc040}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc294-mnc1 => xml-mcc294-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc294-mnc2 => xml-mcc294-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc294-mnc3 => xml-mcc294-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc297-mnc2 => xml-mcc297-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc12 => xml-mcc310-mnc004}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc5 => xml-mcc310-mnc005}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc10 => xml-mcc310-mnc010}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc13 => xml-mcc310-mnc012}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc4 => xml-mcc310-mnc013}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc26 => xml-mcc310-mnc026}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc40 => xml-mcc310-mnc040}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc70 => xml-mcc310-mnc070}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc310-mnc90 => xml-mcc310-mnc090}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc311-mnc12 => xml-mcc311-mnc012}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc311-mnc70 => xml-mcc311-mnc070}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc334-mnc2 => xml-mcc334-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc334-mnc20 => xml-mcc334-mnc020}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc418-mnc5 => xml-mcc418-mnc005}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc418-mnc20 => xml-mcc418-mnc020}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc418-mnc30 => xml-mcc418-mnc030}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc420-mnc4 => xml-mcc420-mnc004}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc426-mnc2 => xml-mcc426-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc427-mnc2 => xml-mcc427-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc440-mnc20 => xml-mcc440-mnc020}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc450-mnc00 => xml-mcc450-mnc000}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc450-mnc2 => xml-mcc450-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc450-mnc5 => xml-mcc450-mnc005}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc450-mnc6 => xml-mcc450-mnc006}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc450-mnc8 => xml-mcc450-mnc008}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc505-mnc1 => xml-mcc505-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc505-mnc3 => xml-mcc505-mnc003}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc505-mnc7 => xml-mcc505-mnc007}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc530-mnc1 => xml-mcc530-mnc001}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc530-mnc5 => xml-mcc530-mnc005}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc602-mnc2 => xml-mcc602-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc604-mnc00 => xml-mcc604-mnc000}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc604-mnc2 => xml-mcc604-mnc002}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc647-mnc10 => xml-mcc647-mnc010}/mms_config.xml (100%)
 rename app/src/main/res/{xml-mcc655-mnc1 => xml-mcc655-mnc001}/mms_config.xml (100%)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
index ad61ec745..53802925a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java
@@ -197,7 +197,7 @@ public class DateUtils extends android.text.format.DateUtils {
    *
    * @return The timestamp if able to be parsed, otherwise -1.
    */
-  @SuppressLint("ObsoleteSdkInt")
+  @SuppressLint({ "ObsoleteSdkInt", "NewApi" })
   public static long parseIso8601(@Nullable String date) {
     SimpleDateFormat format;
     if (Build.VERSION.SDK_INT == 0 || Build.VERSION.SDK_INT >= 24) {
diff --git a/app/src/main/res/xml-mcc202-mnc1/mms_config.xml b/app/src/main/res/xml-mcc202-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc202-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc202-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc202-mnc5/mms_config.xml b/app/src/main/res/xml-mcc202-mnc005/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc202-mnc5/mms_config.xml
rename to app/src/main/res/xml-mcc202-mnc005/mms_config.xml
diff --git a/app/src/main/res/xml-mcc204-mnc16/mms_config.xml b/app/src/main/res/xml-mcc204-mnc016/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc204-mnc16/mms_config.xml
rename to app/src/main/res/xml-mcc204-mnc016/mms_config.xml
diff --git a/app/src/main/res/xml-mcc204-mnc20/mms_config.xml b/app/src/main/res/xml-mcc204-mnc020/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc204-mnc20/mms_config.xml
rename to app/src/main/res/xml-mcc204-mnc020/mms_config.xml
diff --git a/app/src/main/res/xml-mcc208-mnc1/mms_config.xml b/app/src/main/res/xml-mcc208-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc208-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc208-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc208-mnc10/mms_config.xml b/app/src/main/res/xml-mcc208-mnc010/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc208-mnc10/mms_config.xml
rename to app/src/main/res/xml-mcc208-mnc010/mms_config.xml
diff --git a/app/src/main/res/xml-mcc208-mnc15/mms_config.xml b/app/src/main/res/xml-mcc208-mnc015/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc208-mnc15/mms_config.xml
rename to app/src/main/res/xml-mcc208-mnc015/mms_config.xml
diff --git a/app/src/main/res/xml-mcc208-mnc20/mms_config.xml b/app/src/main/res/xml-mcc208-mnc020/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc208-mnc20/mms_config.xml
rename to app/src/main/res/xml-mcc208-mnc020/mms_config.xml
diff --git a/app/src/main/res/xml-mcc208-mnc26/mms_config.xml b/app/src/main/res/xml-mcc208-mnc026/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc208-mnc26/mms_config.xml
rename to app/src/main/res/xml-mcc208-mnc026/mms_config.xml
diff --git a/app/src/main/res/xml-mcc214-mnc1/mms_config.xml b/app/src/main/res/xml-mcc214-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc214-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc214-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc214-mnc3/mms_config.xml b/app/src/main/res/xml-mcc214-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc214-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc214-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc214-mnc6/mms_config.xml b/app/src/main/res/xml-mcc214-mnc006/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc214-mnc6/mms_config.xml
rename to app/src/main/res/xml-mcc214-mnc006/mms_config.xml
diff --git a/app/src/main/res/xml-mcc214-mnc7/mms_config.xml b/app/src/main/res/xml-mcc214-mnc007/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc214-mnc7/mms_config.xml
rename to app/src/main/res/xml-mcc214-mnc007/mms_config.xml
diff --git a/app/src/main/res/xml-mcc214-mnc17/mms_config.xml b/app/src/main/res/xml-mcc214-mnc017/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc214-mnc17/mms_config.xml
rename to app/src/main/res/xml-mcc214-mnc017/mms_config.xml
diff --git a/app/src/main/res/xml-mcc214-mnc21/mms_config.xml b/app/src/main/res/xml-mcc214-mnc021/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc214-mnc21/mms_config.xml
rename to app/src/main/res/xml-mcc214-mnc021/mms_config.xml
diff --git a/app/src/main/res/xml-mcc216-mnc30/mms_config.xml b/app/src/main/res/xml-mcc216-mnc030/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc216-mnc30/mms_config.xml
rename to app/src/main/res/xml-mcc216-mnc030/mms_config.xml
diff --git a/app/src/main/res/xml-mcc216-mnc70/mms_config.xml b/app/src/main/res/xml-mcc216-mnc070/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc216-mnc70/mms_config.xml
rename to app/src/main/res/xml-mcc216-mnc070/mms_config.xml
diff --git a/app/src/main/res/xml-mcc218-mnc5/mms_config.xml b/app/src/main/res/xml-mcc218-mnc005/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc218-mnc5/mms_config.xml
rename to app/src/main/res/xml-mcc218-mnc005/mms_config.xml
diff --git a/app/src/main/res/xml-mcc219-mnc1/mms_config.xml b/app/src/main/res/xml-mcc219-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc219-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc219-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc220-mnc4/mms_config.xml b/app/src/main/res/xml-mcc220-mnc004/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc220-mnc4/mms_config.xml
rename to app/src/main/res/xml-mcc220-mnc004/mms_config.xml
diff --git a/app/src/main/res/xml-mcc222-mnc1/mms_config.xml b/app/src/main/res/xml-mcc222-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc222-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc222-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc222-mnc8/mms_config.xml b/app/src/main/res/xml-mcc222-mnc008/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc222-mnc8/mms_config.xml
rename to app/src/main/res/xml-mcc222-mnc008/mms_config.xml
diff --git a/app/src/main/res/xml-mcc222-mnc10/mms_config.xml b/app/src/main/res/xml-mcc222-mnc010/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc222-mnc10/mms_config.xml
rename to app/src/main/res/xml-mcc222-mnc010/mms_config.xml
diff --git a/app/src/main/res/xml-mcc226-mnc1/mms_config.xml b/app/src/main/res/xml-mcc226-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc226-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc226-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc226-mnc3/mms_config.xml b/app/src/main/res/xml-mcc226-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc226-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc226-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc226-mnc6/mms_config.xml b/app/src/main/res/xml-mcc226-mnc006/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc226-mnc6/mms_config.xml
rename to app/src/main/res/xml-mcc226-mnc006/mms_config.xml
diff --git a/app/src/main/res/xml-mcc226-mnc10/mms_config.xml b/app/src/main/res/xml-mcc226-mnc010/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc226-mnc10/mms_config.xml
rename to app/src/main/res/xml-mcc226-mnc010/mms_config.xml
diff --git a/app/src/main/res/xml-mcc228-mnc1/mms_config.xml b/app/src/main/res/xml-mcc228-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc228-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc228-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc230-mnc1/mms_config.xml b/app/src/main/res/xml-mcc230-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc230-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc230-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc230-mnc3/mms_config.xml b/app/src/main/res/xml-mcc230-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc230-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc230-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc230-mnc99/mms_config.xml b/app/src/main/res/xml-mcc230-mnc099/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc230-mnc99/mms_config.xml
rename to app/src/main/res/xml-mcc230-mnc099/mms_config.xml
diff --git a/app/src/main/res/xml-mcc231-mnc2/mms_config.xml b/app/src/main/res/xml-mcc231-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc231-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc231-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc232-mnc1/mms_config.xml b/app/src/main/res/xml-mcc232-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc232-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc232-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc232-mnc3/mms_config.xml b/app/src/main/res/xml-mcc232-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc232-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc232-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc232-mnc7/mms_config.xml b/app/src/main/res/xml-mcc232-mnc007/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc232-mnc7/mms_config.xml
rename to app/src/main/res/xml-mcc232-mnc007/mms_config.xml
diff --git a/app/src/main/res/xml-mcc234-mnc3/mms_config.xml b/app/src/main/res/xml-mcc234-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc234-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc234-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc234-mnc15/mms_config.xml b/app/src/main/res/xml-mcc234-mnc015/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc234-mnc15/mms_config.xml
rename to app/src/main/res/xml-mcc234-mnc015/mms_config.xml
diff --git a/app/src/main/res/xml-mcc238-mnc2/mms_config.xml b/app/src/main/res/xml-mcc238-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc238-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc238-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc238-mnc77/mms_config.xml b/app/src/main/res/xml-mcc238-mnc077/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc238-mnc77/mms_config.xml
rename to app/src/main/res/xml-mcc238-mnc077/mms_config.xml
diff --git a/app/src/main/res/xml-mcc240-mnc1/mms_config.xml b/app/src/main/res/xml-mcc240-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc240-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc240-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc240-mnc4/mms_config.xml b/app/src/main/res/xml-mcc240-mnc004/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc240-mnc4/mms_config.xml
rename to app/src/main/res/xml-mcc240-mnc004/mms_config.xml
diff --git a/app/src/main/res/xml-mcc240-mnc8/mms_config.xml b/app/src/main/res/xml-mcc240-mnc008/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc240-mnc8/mms_config.xml
rename to app/src/main/res/xml-mcc240-mnc008/mms_config.xml
diff --git a/app/src/main/res/xml-mcc240-mnc24/mms_config.xml b/app/src/main/res/xml-mcc240-mnc024/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc240-mnc24/mms_config.xml
rename to app/src/main/res/xml-mcc240-mnc024/mms_config.xml
diff --git a/app/src/main/res/xml-mcc242-mnc1/mms_config.xml b/app/src/main/res/xml-mcc242-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc242-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc242-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc242-mnc2/mms_config.xml b/app/src/main/res/xml-mcc242-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc242-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc242-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc242-mnc5/mms_config.xml b/app/src/main/res/xml-mcc242-mnc005/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc242-mnc5/mms_config.xml
rename to app/src/main/res/xml-mcc242-mnc005/mms_config.xml
diff --git a/app/src/main/res/xml-mcc244-mnc91/mms_config.xml b/app/src/main/res/xml-mcc244-mnc091/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc244-mnc91/mms_config.xml
rename to app/src/main/res/xml-mcc244-mnc091/mms_config.xml
diff --git a/app/src/main/res/xml-mcc255-mnc1/mms_config.xml b/app/src/main/res/xml-mcc255-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc255-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc255-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc260-mnc1/mms_config.xml b/app/src/main/res/xml-mcc260-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc260-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc260-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc260-mnc2/mms_config.xml b/app/src/main/res/xml-mcc260-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc260-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc260-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc260-mnc3/mms_config.xml b/app/src/main/res/xml-mcc260-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc260-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc260-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc260-mnc5/mms_config.xml b/app/src/main/res/xml-mcc260-mnc005/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc260-mnc5/mms_config.xml
rename to app/src/main/res/xml-mcc260-mnc005/mms_config.xml
diff --git a/app/src/main/res/xml-mcc260-mnc6/mms_config.xml b/app/src/main/res/xml-mcc260-mnc006/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc260-mnc6/mms_config.xml
rename to app/src/main/res/xml-mcc260-mnc006/mms_config.xml
diff --git a/app/src/main/res/xml-mcc262-mnc1/mms_config.xml b/app/src/main/res/xml-mcc262-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc262-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc262-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc262-mnc2/mms_config.xml b/app/src/main/res/xml-mcc262-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc262-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc262-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc262-mnc4/mms_config.xml b/app/src/main/res/xml-mcc262-mnc004/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc262-mnc4/mms_config.xml
rename to app/src/main/res/xml-mcc262-mnc004/mms_config.xml
diff --git a/app/src/main/res/xml-mcc262-mnc7/mms_config.xml b/app/src/main/res/xml-mcc262-mnc007/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc262-mnc7/mms_config.xml
rename to app/src/main/res/xml-mcc262-mnc007/mms_config.xml
diff --git a/app/src/main/res/xml-mcc262-mnc9/mms_config.xml b/app/src/main/res/xml-mcc262-mnc009/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc262-mnc9/mms_config.xml
rename to app/src/main/res/xml-mcc262-mnc009/mms_config.xml
diff --git a/app/src/main/res/xml-mcc268-mnc1/mms_config.xml b/app/src/main/res/xml-mcc268-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc268-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc268-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc272-mnc1/mms_config.xml b/app/src/main/res/xml-mcc272-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc272-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc272-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc274-mnc2/mms_config.xml b/app/src/main/res/xml-mcc274-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc274-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc274-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc274-mnc3/mms_config.xml b/app/src/main/res/xml-mcc274-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc274-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc274-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc276-mnc2/mms_config.xml b/app/src/main/res/xml-mcc276-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc276-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc276-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc278-mnc1/mms_config.xml b/app/src/main/res/xml-mcc278-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc278-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc278-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc284-mnc1/mms_config.xml b/app/src/main/res/xml-mcc284-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc284-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc284-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc286-mnc1/mms_config.xml b/app/src/main/res/xml-mcc286-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc286-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc286-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc286-mnc2/mms_config.xml b/app/src/main/res/xml-mcc286-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc286-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc286-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc286-mnc3/mms_config.xml b/app/src/main/res/xml-mcc286-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc286-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc286-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc293-mnc40/mms_config.xml b/app/src/main/res/xml-mcc293-mnc040/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc293-mnc40/mms_config.xml
rename to app/src/main/res/xml-mcc293-mnc040/mms_config.xml
diff --git a/app/src/main/res/xml-mcc294-mnc1/mms_config.xml b/app/src/main/res/xml-mcc294-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc294-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc294-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc294-mnc2/mms_config.xml b/app/src/main/res/xml-mcc294-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc294-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc294-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc294-mnc3/mms_config.xml b/app/src/main/res/xml-mcc294-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc294-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc294-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc297-mnc2/mms_config.xml b/app/src/main/res/xml-mcc297-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc297-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc297-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc12/mms_config.xml b/app/src/main/res/xml-mcc310-mnc004/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc12/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc004/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc5/mms_config.xml b/app/src/main/res/xml-mcc310-mnc005/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc5/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc005/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc10/mms_config.xml b/app/src/main/res/xml-mcc310-mnc010/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc10/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc010/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc13/mms_config.xml b/app/src/main/res/xml-mcc310-mnc012/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc13/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc012/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc4/mms_config.xml b/app/src/main/res/xml-mcc310-mnc013/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc4/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc013/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc26/mms_config.xml b/app/src/main/res/xml-mcc310-mnc026/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc26/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc026/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc40/mms_config.xml b/app/src/main/res/xml-mcc310-mnc040/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc40/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc040/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc70/mms_config.xml b/app/src/main/res/xml-mcc310-mnc070/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc70/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc070/mms_config.xml
diff --git a/app/src/main/res/xml-mcc310-mnc90/mms_config.xml b/app/src/main/res/xml-mcc310-mnc090/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc310-mnc90/mms_config.xml
rename to app/src/main/res/xml-mcc310-mnc090/mms_config.xml
diff --git a/app/src/main/res/xml-mcc311-mnc12/mms_config.xml b/app/src/main/res/xml-mcc311-mnc012/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc311-mnc12/mms_config.xml
rename to app/src/main/res/xml-mcc311-mnc012/mms_config.xml
diff --git a/app/src/main/res/xml-mcc311-mnc70/mms_config.xml b/app/src/main/res/xml-mcc311-mnc070/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc311-mnc70/mms_config.xml
rename to app/src/main/res/xml-mcc311-mnc070/mms_config.xml
diff --git a/app/src/main/res/xml-mcc334-mnc2/mms_config.xml b/app/src/main/res/xml-mcc334-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc334-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc334-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc334-mnc20/mms_config.xml b/app/src/main/res/xml-mcc334-mnc020/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc334-mnc20/mms_config.xml
rename to app/src/main/res/xml-mcc334-mnc020/mms_config.xml
diff --git a/app/src/main/res/xml-mcc418-mnc5/mms_config.xml b/app/src/main/res/xml-mcc418-mnc005/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc418-mnc5/mms_config.xml
rename to app/src/main/res/xml-mcc418-mnc005/mms_config.xml
diff --git a/app/src/main/res/xml-mcc418-mnc20/mms_config.xml b/app/src/main/res/xml-mcc418-mnc020/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc418-mnc20/mms_config.xml
rename to app/src/main/res/xml-mcc418-mnc020/mms_config.xml
diff --git a/app/src/main/res/xml-mcc418-mnc30/mms_config.xml b/app/src/main/res/xml-mcc418-mnc030/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc418-mnc30/mms_config.xml
rename to app/src/main/res/xml-mcc418-mnc030/mms_config.xml
diff --git a/app/src/main/res/xml-mcc420-mnc4/mms_config.xml b/app/src/main/res/xml-mcc420-mnc004/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc420-mnc4/mms_config.xml
rename to app/src/main/res/xml-mcc420-mnc004/mms_config.xml
diff --git a/app/src/main/res/xml-mcc426-mnc2/mms_config.xml b/app/src/main/res/xml-mcc426-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc426-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc426-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc427-mnc2/mms_config.xml b/app/src/main/res/xml-mcc427-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc427-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc427-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc440-mnc20/mms_config.xml b/app/src/main/res/xml-mcc440-mnc020/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc440-mnc20/mms_config.xml
rename to app/src/main/res/xml-mcc440-mnc020/mms_config.xml
diff --git a/app/src/main/res/xml-mcc450-mnc00/mms_config.xml b/app/src/main/res/xml-mcc450-mnc000/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc450-mnc00/mms_config.xml
rename to app/src/main/res/xml-mcc450-mnc000/mms_config.xml
diff --git a/app/src/main/res/xml-mcc450-mnc2/mms_config.xml b/app/src/main/res/xml-mcc450-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc450-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc450-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc450-mnc5/mms_config.xml b/app/src/main/res/xml-mcc450-mnc005/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc450-mnc5/mms_config.xml
rename to app/src/main/res/xml-mcc450-mnc005/mms_config.xml
diff --git a/app/src/main/res/xml-mcc450-mnc6/mms_config.xml b/app/src/main/res/xml-mcc450-mnc006/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc450-mnc6/mms_config.xml
rename to app/src/main/res/xml-mcc450-mnc006/mms_config.xml
diff --git a/app/src/main/res/xml-mcc450-mnc8/mms_config.xml b/app/src/main/res/xml-mcc450-mnc008/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc450-mnc8/mms_config.xml
rename to app/src/main/res/xml-mcc450-mnc008/mms_config.xml
diff --git a/app/src/main/res/xml-mcc505-mnc1/mms_config.xml b/app/src/main/res/xml-mcc505-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc505-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc505-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc505-mnc3/mms_config.xml b/app/src/main/res/xml-mcc505-mnc003/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc505-mnc3/mms_config.xml
rename to app/src/main/res/xml-mcc505-mnc003/mms_config.xml
diff --git a/app/src/main/res/xml-mcc505-mnc7/mms_config.xml b/app/src/main/res/xml-mcc505-mnc007/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc505-mnc7/mms_config.xml
rename to app/src/main/res/xml-mcc505-mnc007/mms_config.xml
diff --git a/app/src/main/res/xml-mcc530-mnc1/mms_config.xml b/app/src/main/res/xml-mcc530-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc530-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc530-mnc001/mms_config.xml
diff --git a/app/src/main/res/xml-mcc530-mnc5/mms_config.xml b/app/src/main/res/xml-mcc530-mnc005/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc530-mnc5/mms_config.xml
rename to app/src/main/res/xml-mcc530-mnc005/mms_config.xml
diff --git a/app/src/main/res/xml-mcc602-mnc2/mms_config.xml b/app/src/main/res/xml-mcc602-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc602-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc602-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc604-mnc00/mms_config.xml b/app/src/main/res/xml-mcc604-mnc000/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc604-mnc00/mms_config.xml
rename to app/src/main/res/xml-mcc604-mnc000/mms_config.xml
diff --git a/app/src/main/res/xml-mcc604-mnc2/mms_config.xml b/app/src/main/res/xml-mcc604-mnc002/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc604-mnc2/mms_config.xml
rename to app/src/main/res/xml-mcc604-mnc002/mms_config.xml
diff --git a/app/src/main/res/xml-mcc647-mnc10/mms_config.xml b/app/src/main/res/xml-mcc647-mnc010/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc647-mnc10/mms_config.xml
rename to app/src/main/res/xml-mcc647-mnc010/mms_config.xml
diff --git a/app/src/main/res/xml-mcc655-mnc1/mms_config.xml b/app/src/main/res/xml-mcc655-mnc001/mms_config.xml
similarity index 100%
rename from app/src/main/res/xml-mcc655-mnc1/mms_config.xml
rename to app/src/main/res/xml-mcc655-mnc001/mms_config.xml
diff --git a/build.gradle b/build.gradle
index 2eb3759a5..edc28f21a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9a05f3eb7..b3396d71d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
-# Note: Check https://gradle.org/release-checksums/ before updating wrapper or distribution
+#Wed Jul 21 15:41:52 ADT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 distributionPath=wrapper/dists
-distributionSha256Sum=c9910513d0eed63cd8f5c7fec4cb4a05731144770104a0871234a4edc3ba3cef
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=22449f5231796abd892c98b2a07c9ceebe4688d192cd2d6763f8e3bf8acbedeb
+zipStoreBase=GRADLE_USER_HOME