From 7c41cf7974c6a5ec76f7560f8bd411d94e4e7fe1 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Apr 2019 21:10:53 +0200 Subject: [PATCH] Changes of com.discord v870 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 27548 -> 27548 bytes .../drawable-xxxhdpi/ic_file_large_code.png | Bin 6747 -> 6752 bytes com.discord/res/values-bg/plurals.xml | 5 - com.discord/res/values-bg/strings.xml | 3 - com.discord/res/values-cs/plurals.xml | 6 - com.discord/res/values-cs/strings.xml | 3 - com.discord/res/values-da/plurals.xml | 5 - com.discord/res/values-da/strings.xml | 3 - com.discord/res/values-de/plurals.xml | 5 - com.discord/res/values-de/strings.xml | 3 - com.discord/res/values-el/plurals.xml | 5 - com.discord/res/values-el/strings.xml | 3 - com.discord/res/values-es-rES/plurals.xml | 5 - com.discord/res/values-es-rES/strings.xml | 3 - com.discord/res/values-fi/plurals.xml | 5 - com.discord/res/values-fi/strings.xml | 3 - com.discord/res/values-fr/plurals.xml | 5 - com.discord/res/values-fr/strings.xml | 3 - com.discord/res/values-hr/plurals.xml | 5 - com.discord/res/values-hr/strings.xml | 3 - com.discord/res/values-hu/strings.xml | 3 - com.discord/res/values-it/plurals.xml | 5 - com.discord/res/values-it/strings.xml | 3 - com.discord/res/values-ja/plurals.xml | 5 - com.discord/res/values-ja/strings.xml | 3 - com.discord/res/values-ko/plurals.xml | 5 - com.discord/res/values-ko/strings.xml | 3 - com.discord/res/values-lt/plurals.xml | 5 - com.discord/res/values-lt/strings.xml | 3 - com.discord/res/values-nl/plurals.xml | 5 - com.discord/res/values-nl/strings.xml | 3 - com.discord/res/values-no/plurals.xml | 5 - com.discord/res/values-no/strings.xml | 3 - com.discord/res/values-pl/plurals.xml | 5 - com.discord/res/values-pl/strings.xml | 3 - com.discord/res/values-pt-rBR/plurals.xml | 5 - com.discord/res/values-pt-rBR/strings.xml | 3 - com.discord/res/values-ro/plurals.xml | 6 - com.discord/res/values-ro/strings.xml | 3 - com.discord/res/values-ru/plurals.xml | 6 - com.discord/res/values-ru/strings.xml | 3 - com.discord/res/values-sv-rSE/plurals.xml | 5 - com.discord/res/values-sv-rSE/strings.xml | 3 - com.discord/res/values-th/plurals.xml | 5 - com.discord/res/values-th/strings.xml | 3 - com.discord/res/values-tr/plurals.xml | 5 - com.discord/res/values-tr/strings.xml | 3 - com.discord/res/values-uk/plurals.xml | 6 - com.discord/res/values-uk/strings.xml | 3 - com.discord/res/values-vi/plurals.xml | 5 - com.discord/res/values-vi/strings.xml | 3 - com.discord/res/values-zh-rCN/plurals.xml | 5 - com.discord/res/values-zh-rCN/strings.xml | 3 - com.discord/res/values-zh-rTW/plurals.xml | 5 - com.discord/res/values-zh-rTW/strings.xml | 3 - com.discord/res/values/plurals.xml | 8 +- com.discord/res/values/public.xml | 140 ++--- com.discord/res/values/strings.xml | 14 +- com.discord/smali/b/j$h.smali | 2 +- com.discord/smali/b/l.smali | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../smali/com/discord/app/AppActivity$d.smali | 20 + .../smali/com/discord/app/AppActivity.smali | 536 ++++++++++-------- .../discord/stores/StoreClientVersion.smali | 2 +- .../analytics/AnalyticSuperProperties.smali | 6 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../channels/WidgetTextChannelSettings.smali | 2 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- ...ewHolder$CategoryOverridesViewHolder.smali | 2 +- ...iewHolder$ChannelOverridesViewHolder.smali | 2 +- ...ficationsOverridesAdapter$ViewHolder.smali | 4 +- .../servers/WidgetServerNotifications.smali | 4 +- .../WidgetServerSettingsEditRole.smali | 4 +- .../widgets/settings/WidgetSettings.smali | 2 +- .../settings/WidgetSettingsBehavior.smali | 2 +- .../smali/com/facebook/common/d/h$a.smali | 2 +- .../controller/AbstractDraweeController.smali | 6 +- .../smali/com/facebook/drawee/view/b.smali | 6 +- .../persistence/SerializableCookie.smali | 4 +- .../com/google/android/gms/common/a/a.smali | 2 +- com.discord/smali/okhttp3/internal/c.smali | 2 +- com.discord/smali/okhttp3/internal/j/a.smali | 2 +- com.discord/smali/okhttp3/l$a.smali | 2 +- com.discord/smali/okhttp3/n.smali | 2 +- com.discord/smali/okhttp3/s.smali | 10 +- .../android/gms/internal/measurement/ar.smali | 2 +- .../android/gms/internal/measurement/as.smali | 2 +- .../android/gms/internal/measurement/ax.smali | 2 +- .../android/gms/internal/measurement/bc.smali | 2 +- .../android/gms/internal/measurement/be.smali | 2 +- .../android/gms/internal/measurement/bm.smali | 2 +- .../android/gms/internal/measurement/bx.smali | 130 ++--- .../android/gms/measurement/internal/aw.smali | 16 +- .../smali_classes2/okhttp3/internal/c$2.smali | 2 +- .../smali_classes2/okhttp3/internal/e/g.smali | 6 +- com.discord/smali_classes2/okhttp3/j.smali | 2 +- com.discord/smali_classes2/org/a/a/e.smali | 12 +- com.discord/smali_classes2/org/a/a/g.smali | 4 +- com.discord/smali_classes2/org/a/a/h.smali | 2 +- com.discord/smali_classes2/org/a/a/m.smali | 4 +- com.discord/smali_classes2/org/a/a/n.smali | 2 +- com.discord/smali_classes2/org/a/a/t.smali | 38 +- com.discord/smali_classes2/org/a/a/u.smali | 98 ++-- 105 files changed, 600 insertions(+), 757 deletions(-) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 8ecee29704..5a27c7221e 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-869.apk +apkFileName: com.discord-870.apk compressionType: false doNotCompress: - arsc @@ -469,5 +469,5 @@ usesFramework: tag: null version: 2.4.1-cc194d-SNAPSHOT versionInfo: - versionCode: '869' - versionName: 8.6.9 + versionCode: '870' + versionName: 8.7.0 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index c797d3cee4..e85f10cfd5 100644 --- a/com.discord/assets/crashlytics-build.properties +++ b/com.discord/assets/crashlytics-build.properties @@ -3,9 +3,9 @@ # #Do NOT modify, delete, or commit to source control! # -#Tue Apr 02 22:52:59 UTC 2019 -version_name=8.6.9 +#Wed Apr 03 17:32:26 UTC 2019 +version_name=8.7.0 package_name=com.discord -build_id=fc4a9c89-45a6-43b2-b764-00fe06b57526 -version_code=869 +build_id=c7e185c3-a9a0-4145-8a6e-7166ccc81872 +version_code=870 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 8b4676c557202f2351ffb19cdaa5165bb2ea9620..01506174d1394906c7ea3ddd86205172a245e1e2 100644 GIT binary patch delta 27 jcmbPpopH`}#tla7tmX`Q3BjF`fmXMf13#n delta 27 jcmbPpopH`}#tla7tY!>)43?YC*;BO{Q#a2w`fmXMfB6X% diff --git a/com.discord/res/drawable-xxxhdpi/ic_file_large_code.png b/com.discord/res/drawable-xxxhdpi/ic_file_large_code.png index ae523a2a6b655dcd9af5bbd31897a495a1d2fc82..966451cc382daf60bda26a6386aae6e5044e2464 100644 GIT binary patch delta 5042 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 BV>|!= delta 5052 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 BSI7VW diff --git a/com.discord/res/values-bg/plurals.xml b/com.discord/res/values-bg/plurals.xml index 0271f84704..db87761a78 100644 --- a/com.discord/res/values-bg/plurals.xml +++ b/com.discord/res/values-bg/plurals.xml @@ -105,11 +105,6 @@ %d дни един ден - - **%d** спонсора - **0** спонсора - **1** спонсор - **%d** абонати **0** абонати diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml index 7b16d02cd7..49569382b4 100644 --- a/com.discord/res/values-bg/strings.xml +++ b/com.discord/res/values-bg/strings.xml @@ -735,12 +735,10 @@ Настройки на сървъра Пряк път Анимация за покана на заден план - Изтекъл абонамент При изтичане на абонамент Аудио подсистема Подтискане на**@everyone** и **@here** Синхронизирана роля - Синхронизирани спонсори Синхронизирани абонати Временно членство Ограничение за потребители @@ -1094,7 +1092,6 @@ Известия От сега нататък нещата стават само по-добри с приятели. Нека отделим минута за настройване на **Вашия сървър**? Добре дошли в Discord, %1$s - %1$s %1$s %1$s Свързване с Discord diff --git a/com.discord/res/values-cs/plurals.xml b/com.discord/res/values-cs/plurals.xml index 5004e5d686..9fc36d78b4 100644 --- a/com.discord/res/values-cs/plurals.xml +++ b/com.discord/res/values-cs/plurals.xml @@ -321,12 +321,6 @@ %d přítel %d přátelé - - **%d** sponzorů - **0** sponzorů - **1** sponzor - **%d** sponzoři - **%d** odběratelů **0** odběratelů diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml index fd42777c2c..3868a05012 100644 --- a/com.discord/res/values-cs/strings.xml +++ b/com.discord/res/values-cs/strings.xml @@ -715,12 +715,10 @@ Zaškrtni toto políčko pro vrácení na starší zvukový podsystém."Nastavení serveru Zkratka Úvodní obrázek pozvánky - Co dělat v případě prošlého sponzora Chování při vypršení předplatného Zvukový Subsystém Potlačit **@everyone** a **@here** Synchronizovaná Role - Synchronizovaní sponzoři Synchronizovaní odběratelé Dočasné členství Převod textu na řeč @@ -1077,7 +1075,6 @@ do %3$s" Vítej v Discordu, %1$s %1$s %1$s - %1$s %1$s %1$s OK diff --git a/com.discord/res/values-da/plurals.xml b/com.discord/res/values-da/plurals.xml index 126abacff0..6903653275 100644 --- a/com.discord/res/values-da/plurals.xml +++ b/com.discord/res/values-da/plurals.xml @@ -100,11 +100,6 @@ 0 Venner %d Ven - - **%d** sponsorer - **0** sponsorer - **1** sponsor - %d brugere 1 bruger diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml index 52aa61e16f..d16db2e087 100644 --- a/com.discord/res/values-da/strings.xml +++ b/com.discord/res/values-da/strings.xml @@ -641,10 +641,8 @@ Nogle routere eller internet-udbydere kan agere uregelmæssigt, når dette er in Server Notifikationsinstillinger Genvej Øjeblikkelig invitations splash baggrund - Udløbet Sponsor adfærd Udløbet Sub-adfærd Synkroniseret rolle - Synkroniserede sponsorer Synkroniserede Subs Midlertidigt Medlemskab Tekst-til-Tale @@ -922,7 +920,6 @@ ingen fastgjorte beskeder… endnu." NSFW kanal Fra nu af vil det kun blive bedre med venner. Lad os bruge et øjeblik på at opsætte **your server**, okay? %1$s - %1$s %1$s %1$s besked kan kun ses af dig — [slet %1$s](handleDelete). Åbn i Browser diff --git a/com.discord/res/values-de/plurals.xml b/com.discord/res/values-de/plurals.xml index ac87b199d8..2376a539ec 100644 --- a/com.discord/res/values-de/plurals.xml +++ b/com.discord/res/values-de/plurals.xml @@ -276,11 +276,6 @@ 0 Freunde %d Freund - - **%d** Sponsoren - **0** Sponsoren - **1** Sponsor - **%d** Abonnenten **0** Abonnenten diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml index a3f38a6403..9fd4c9b7b8 100644 --- a/com.discord/res/values-de/strings.xml +++ b/com.discord/res/values-de/strings.xml @@ -1011,12 +1011,10 @@ NSFW-Kanäle sind von dem Filter für anstößige Nachrichten ausgenommen."Servereinstellungen Tastenkürzel Soforteinladungs-Splash-Hintergrund - Aktion bei Ablauf eines Abonnements Verhalten abgelaufener Abonnements Audio-Subsystem Unterdrückt **@everyone** und **@here** Synchronisierte Rolle - Synchronisierte Sponsoren Synchronisierte Abonnenten Willkommens-Nachrichten-Kanal Temporäre Mitgliedschaft @@ -1912,7 +1910,6 @@ Hast du einen Einladungslink von einem Freund bekommen? Gib deinen Einladungslin Willkommen bei Discord %1$s %1$s - %1$s %1$s %1$s "Hol' das Meiste aus Discord heraus, indem du einem Server beitrittst." diff --git a/com.discord/res/values-el/plurals.xml b/com.discord/res/values-el/plurals.xml index 0726e6aab1..c800d20ede 100644 --- a/com.discord/res/values-el/plurals.xml +++ b/com.discord/res/values-el/plurals.xml @@ -230,11 +230,6 @@ %d κανάλια %d κανάλι - - **%d** χορηγοί - **0** χορηγοί - **1** χορηγός - **%d** συνδρομητές **0** συνδρομητές diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml index e2d10b8179..b31e952b1b 100644 --- a/com.discord/res/values-el/strings.xml +++ b/com.discord/res/values-el/strings.xml @@ -1012,12 +1012,10 @@ Avatar" Ρυθμίσεις Διακομιστή Συντόμευση Splash παρασκηνίου άμεσης πρόσκλησης - Συμπεριφορά ληγμένων χορηγών Συμπεριφορά ληγμένων συνδρομών Υποσύστημα ήχου Καταστείλετε **@όλους** και **@εδώ** Συγχρονισμένος ρόλος - Συγχρονισμένοι χορηγοί Συγχρονισμένοι συνδρομητές Κανάλι Για Μηνύματα Νέων Μελών Προσωρινό μέλος @@ -1852,7 +1850,6 @@ Avatar" Καλώς όρισες στο Discord, %1$s Καλως ήρθατε στο Discord %1$s - %1$s %1$s %1$s Αξιοποιήστε το Discord συμμετέχοντας σε έναν διακομιστή. diff --git a/com.discord/res/values-es-rES/plurals.xml b/com.discord/res/values-es-rES/plurals.xml index 3d36a80a1e..77e7a45909 100644 --- a/com.discord/res/values-es-rES/plurals.xml +++ b/com.discord/res/values-es-rES/plurals.xml @@ -280,11 +280,6 @@ 0 amigos %d amigo - - **%d** patrocinadores - **0** patrocinadores - **1** patrocinador - **%d** suscriptores **0** suscriptores diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml index ef62802ec8..5f47fbb510 100644 --- a/com.discord/res/values-es-rES/strings.xml +++ b/com.discord/res/values-es-rES/strings.xml @@ -1052,12 +1052,10 @@ Los canales NSFW están exentos del filtro de contenido explícito." Ajustes del servidor Acceso directo Splash de Fondo para Invitaciones Instantáneas - Estado de Patrocinador Expirado Comportamiento de sub expirado Subsistema de audio Suprimir **@everyone** y **@here** Rol Sincronizado - Patrocinadores Sincronizados Suscriptores sincronizados Canal de mensajes para nuevos miembros Membresía temporal @@ -2000,7 +1998,6 @@ Inicia un servidor de Discord para ti y tus amigos. Nosotros proporcionaremos el Bienvenido a Discord %1$s %1$s - %1$s %1$s %1$s Saca el máximo provecho a Discord al unirte a un servidor. diff --git a/com.discord/res/values-fi/plurals.xml b/com.discord/res/values-fi/plurals.xml index c01b588af7..faab5acf9c 100644 --- a/com.discord/res/values-fi/plurals.xml +++ b/com.discord/res/values-fi/plurals.xml @@ -260,11 +260,6 @@ 0 kaveria %d kaveri - - **%d** sponsoria - **0** sponsoria - **1** sponsori - **%d** tilaajaa **0** tilaajaa diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml index 55c2482624..15894262ce 100644 --- a/com.discord/res/values-fi/strings.xml +++ b/com.discord/res/values-fi/strings.xml @@ -1113,12 +1113,10 @@ Jotkin reitittimet tai internet-palveluntarjoajat saattavat käyttäytyä huonos Palvelimen asetukset Pikanäppäin Pikakutsun taustakuva - Vanhentuneet sponsorioikeudet Vanhentunut Twitch-tilaus Äänialijärjestelmä Hiljennä **@everyone** ja **@here** Synkronoitu rooli - Synkronoidut sponsorit Synkronoidut tilaajat Tervetuloilmoituskanava Väliaikainen jäsenyys @@ -2061,7 +2059,6 @@ Saitko kutsulinkin kaveriltasi? Syötä kutsulinkki tai -koodi alle liittyäkses Tervetuloa Discordiin %1$s %1$s - %1$s %1$s %1$s Saa Discordista kaikki irti liittymällä palvelimelle. diff --git a/com.discord/res/values-fr/plurals.xml b/com.discord/res/values-fr/plurals.xml index 0ec217626b..a7bd01c15d 100644 --- a/com.discord/res/values-fr/plurals.xml +++ b/com.discord/res/values-fr/plurals.xml @@ -276,11 +276,6 @@ 0 ami %d ami - - **%d** donateurs - **0** donateurs - **1** donateur - **%d** abonnés **0** abonné diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml index 91d580a562..873b83c786 100644 --- a/com.discord/res/values-fr/strings.xml +++ b/com.discord/res/values-fr/strings.xml @@ -1093,12 +1093,10 @@ Certains routeurs et fournisseurs de services internet agissent bizarrement quan Paramètres du serveur Raccourci "Image d'arrière-plan des invitations instantanées" - "Comportement après l'expiration d'un sponsor" "Comportement après expiration d'un abonnement" Sous-système audio Désactiver **@everyone** et **@here** Rôle synchronisé - Sponsors Synchronisés Abonnés synchronisés Salon de messages de bienvenue Membre temporaire @@ -2031,7 +2029,6 @@ Avez-vous reçu un lien d'invitation d'un ami ? Entrez votre lien d'invitation o Bienvenue sur Discord %1$s %1$s - %1$s %1$s %1$s Profitez au maximum de Discord en rejoignant un serveur. diff --git a/com.discord/res/values-hr/plurals.xml b/com.discord/res/values-hr/plurals.xml index fc0d597d41..64f6fe17ab 100644 --- a/com.discord/res/values-hr/plurals.xml +++ b/com.discord/res/values-hr/plurals.xml @@ -373,11 +373,6 @@ 0 prijatelja %d prijatelj - - **%d** sponzora - **0** sponzora - **%d** sponzor - **%d** pretplatnika **0** pretplatnika diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml index 7518e3f2c1..953cbc464d 100644 --- a/com.discord/res/values-hr/strings.xml +++ b/com.discord/res/values-hr/strings.xml @@ -1046,12 +1046,10 @@ Neki ruteri ili davatelji internet usluga bi se mogli čudno ponašati kada je o Postavke servera Prečac Pozdravna slika instant pozivnica - Pravila za istekle sponzore Pravila za istekle pretplatnike Audio podsustav Utišaj **@everyone** i **@here** Sinkronizirana uloga - Sinkronizirani sponzori Sinkronizirani pretplatnici Kanal za poruke o dolasku novih članova Privremeno članstvo @@ -1979,7 +1977,6 @@ Jesi li primio/la link pozivnice od prijatelja? Unesi svoj link pozivnice ili k Dobrodošao/la na Discord %1$s %1$s - %1$s %1$s %1$s Dobij najviše od Discorda pridruživanjem na server. diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml index eefe88abca..9319a86e37 100644 --- a/com.discord/res/values-hu/strings.xml +++ b/com.discord/res/values-hu/strings.xml @@ -1105,12 +1105,10 @@ Ez nem érvényes olyan tagokra, akik már kaptak egy rangot. Szerver beállítások Gyorsgomb Azonnali meghívó háttere - Szponzorság-lejárati viselkedés Lejárt előfizetői jogok Hangalrendszer **@everyone** és **@here** némítása Szinkronizált rang - Szinkronizált szponzorok Szinkronizált előfizetők Értesítési csatorna az új tagokról Ideiglenes tagság @@ -2050,7 +2048,6 @@ Kaptál egy meghívó linket egy barátodtól? Írd be a linket vagy kódot, hog Üdvözöl a Discord %1$s %1$s barát - **%1$s** szponzor **%1$s** előfizető %1$s Hozd ki a legtöbbet a Discordból egy szerverhez való csatlakozással. diff --git a/com.discord/res/values-it/plurals.xml b/com.discord/res/values-it/plurals.xml index fa9fab4f97..42f54e3339 100644 --- a/com.discord/res/values-it/plurals.xml +++ b/com.discord/res/values-it/plurals.xml @@ -280,11 +280,6 @@ 0 amici %d amico - - **%d** sponsor - **0** sponsor - **1** sponsor - **%d** utenti abbonati **0** utenti abbonati diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml index d06eaa569e..123d529237 100644 --- a/com.discord/res/values-it/strings.xml +++ b/com.discord/res/values-it/strings.xml @@ -1099,12 +1099,10 @@ o messaggi diretti agli utenti. La cosa non conta per i membri a cui viene asseg Impostazioni del server Scorciatoia Sfondo degli inviti - Azione per le sponsorizzazioni scadute Azione per gli abbonamenti scaduti Sottosistema audio Disattiva **@everyone** e **@here** Ruolo sincronizzato - Sponsor sincronizzati Abbonati sincronizzati Canale per i messaggi di benvenuto Unione temporanea al server @@ -2050,7 +2048,6 @@ Hai ricevuto un link di invito da un amico? Inserisci il tuo link o codice di in Benvenuto su Discord %1$s %1$s - %1$s %1$s %1$s Ottieni il massimo da Discord entrando in un server. diff --git a/com.discord/res/values-ja/plurals.xml b/com.discord/res/values-ja/plurals.xml index ab44216669..cf86d87846 100644 --- a/com.discord/res/values-ja/plurals.xml +++ b/com.discord/res/values-ja/plurals.xml @@ -148,11 +148,6 @@ 0 人 %d 人 - - **%d** 人のスポンサー - スポンサーがいません - **1** 人のスポンサー - **%d** 人 **0** 人 diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml index 15d42a3025..377cd14b15 100644 --- a/com.discord/res/values-ja/strings.xml +++ b/com.discord/res/values-ja/strings.xml @@ -970,12 +970,10 @@ Vanity URL には半角英数字とハイフンのみ含めることができま サーバー設定 ショートカット 招待画面の背景画像 - スポンサーの有効期間が切れています 購読期限切れ オーディオのサブシステム **@everyone** と **@here** の通知を行わない 同期された役職 - 同期しているスポンサー 購読者を同期しました 新しいメンバー参加時の通知チャンネル 仮メンバー @@ -1678,7 +1676,6 @@ Discordについて詳しい情報が必要ですか？" Discord へようこそ %1$s %1$s - %1$s %1$s %1$s 持っていません diff --git a/com.discord/res/values-ko/plurals.xml b/com.discord/res/values-ko/plurals.xml index afad1fb0c0..dde6c092ce 100644 --- a/com.discord/res/values-ko/plurals.xml +++ b/com.discord/res/values-ko/plurals.xml @@ -150,11 +150,6 @@ 친구 없음 친구 %d 명 - - **%d** 스폰서 - **0** 스폰서 - **1** 스폰서 - 구독자 **%d**명 구독자 **없음** diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml index 0f0d52adb7..fefc533155 100644 --- a/com.discord/res/values-ko/strings.xml +++ b/com.discord/res/values-ko/strings.xml @@ -878,12 +878,10 @@ 서버 설정 단축키 초대 화면 배경 - 스폰서가 만료되었습니다 구독 기한 만료 오디오 하위 시스템 **@everyone** 와 **@here** 알림 음소거 시키기 동기화된 역할 - 스폰서 동기화 동기화된 구독자 임시 멤버 텍스트 음성 변환(TTS) @@ -1491,7 +1489,6 @@ Discord에 오신 걸 환영해요 %1$s 님. %1$s %1$s - %1$s %1$s %1$s Discord에 접속 diff --git a/com.discord/res/values-lt/plurals.xml b/com.discord/res/values-lt/plurals.xml index 44ecde46a1..7b6adafcaf 100644 --- a/com.discord/res/values-lt/plurals.xml +++ b/com.discord/res/values-lt/plurals.xml @@ -280,11 +280,6 @@ 0 Draugų %d Draugas - - **%d** rėmėjai - **0** rėmėjų - **1** rėmėjas - **%d** prenumeratoriai **0** prenumeratorių diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml index af2f1e2478..4de4f90da7 100644 --- a/com.discord/res/values-lt/strings.xml +++ b/com.discord/res/values-lt/strings.xml @@ -1081,12 +1081,10 @@ nepaisyk šios ribos ir galima perkelti kitus vartotojus į kanalą." Serverio nustatymai Spartusis klavišas Greitojo Pakvietimo Lango Fonas - Rėmėjo laikas baigėsi Prenumeratos laikas baigėsi Garso posistemė Neleisti naudoti **@everyone** ir **@here** Sinchronizuota Rolė - Sinchronizuoti rėmėjai Sinchronizuoti prenumeratoriai Naujų Narysčių Pranešimų Kanalas Laikina narystė @@ -2006,7 +2004,6 @@ Ar gavote pakvietimo nuorodą iš draugo? Įveskite savo pakvietimo nuorodą arb Sveiki atvykę į Discord %1$s %1$s - %1$s %1$s %1$s Išnaudokite visas Discord funkcijas prisijungus į serverį. diff --git a/com.discord/res/values-nl/plurals.xml b/com.discord/res/values-nl/plurals.xml index f22678de75..0382f77fda 100644 --- a/com.discord/res/values-nl/plurals.xml +++ b/com.discord/res/values-nl/plurals.xml @@ -143,11 +143,6 @@ %d kanalen %d kanaal - - **%d** sponsoren - **0** sponsoren - **1** sponsor - **%d** abonnees **0** abonnees diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml index c7cd0ddcad..9167384327 100644 --- a/com.discord/res/values-nl/strings.xml +++ b/com.discord/res/values-nl/strings.xml @@ -833,12 +833,10 @@ Sommige routers en internetproviders kunnen zich misdragen als deze optie is ing Serverinstellingen Sneltoets Splash-achtergond voor directe uitnodigingen - Verlopen sponsorgedrag Verlopen subgedrag Audiosubsysteem Negeer **@everyone** en **@here** Rol gesynchroniseerd - Gesynchroniseerde sponsors Gesynchroniseerde subs Kanaal voor welkomstberichten Tijdelijk lidmaatschap @@ -1401,7 +1399,6 @@ Haal een paar vrienden hierheen door een directe uitnodiging te maken!" Welkom bij Discord, %1$s Welkom bij Discord %1$s - %1$s %1$s %1$s Ik heb er geen diff --git a/com.discord/res/values-no/plurals.xml b/com.discord/res/values-no/plurals.xml index 8285e647ad..4a3b72f0b6 100644 --- a/com.discord/res/values-no/plurals.xml +++ b/com.discord/res/values-no/plurals.xml @@ -114,11 +114,6 @@ 0 Venner %d Venn - - **%d** sponsorer - **0** sponsorer - **1** sponsor - **%d** abonnenter **0** abonnenter diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml index f28639ae0b..8d45d2ac51 100644 --- a/com.discord/res/values-no/strings.xml +++ b/com.discord/res/values-no/strings.xml @@ -656,11 +656,9 @@ Noen rutere eller internettleverandører kan oppføre seg dårlig når dette er Serverinnstillinger Snarvei Direkteinvitasjonsbilde - Handling når sponsingen utløper Tiltak ved utløpt abonnement Demp **@alle** og **@her** Synkronisert rolle - Synkroniserte sponsorer Synkroniserte abonnenter Meldingskanal for nye medlemmer Midlertidig Medlemskap @@ -1003,7 +1001,6 @@ for å kunne observere inndatafølsomheten." Fra nå av blir ting bare bedre med venner. La oss ta et minutt å sette opp **serveren din**, eller hva? Velkommen til Discord, %1$s %1$s - %1$s %1$s %1$s Koble til Discord diff --git a/com.discord/res/values-pl/plurals.xml b/com.discord/res/values-pl/plurals.xml index 7cbd5c0eb6..0133a39caa 100644 --- a/com.discord/res/values-pl/plurals.xml +++ b/com.discord/res/values-pl/plurals.xml @@ -369,11 +369,6 @@ 0 znajomych %d znajomy - - **%d** sponsorów - **0** sponsorów - **1** sponsor - **%d** subskrybentów **0** subskrybentów diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml index ea80c6a75c..1e6f3f94ac 100644 --- a/com.discord/res/values-pl/strings.xml +++ b/com.discord/res/values-pl/strings.xml @@ -1091,12 +1091,10 @@ Nie dotyczy użytkowników mających przypisaną rolę. Ustawienia serwera Skrót Tło ekranu powitania zaproszenia - Akcja wygaśnięcia sponsoringu Zachowanie wygasłej subskrypcji Podsystem dźwiękowy Ignoruj **@everyone** i **@here** Zsynchronizowana rola - Zsynchronizowani sponsorzy Zsynchronizowani subskrybenci Kanał wysyłania wiadomości dla nowych członków Tymczasowe członkostwo @@ -2045,7 +2043,6 @@ Otrzymałeś zaproszenie od kogoś znajomego? Podaj link zaproszenia lub kod pon Witaj na Discordzie %1$s %1$s - %1$s %1$s %1$s Skorzystaj z zalet Discorda dołączając na serwer. diff --git a/com.discord/res/values-pt-rBR/plurals.xml b/com.discord/res/values-pt-rBR/plurals.xml index 70b47497df..0b0c2f9aa4 100644 --- a/com.discord/res/values-pt-rBR/plurals.xml +++ b/com.discord/res/values-pt-rBR/plurals.xml @@ -280,11 +280,6 @@ nenhum amigo %d amigo - - **%d** patrocinadores - **0** patrocinadores - **1** patrocinador - **%d** inscritos **0** inscritos diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml index 543aff588c..1293900972 100644 --- a/com.discord/res/values-pt-rBR/strings.xml +++ b/com.discord/res/values-pt-rBR/strings.xml @@ -1105,12 +1105,10 @@ Isso não se aplica a membros que recebem um cargo. Configurações do servidor Atalho Fundo do convite instantâneo - Comportamento para patrocinador expirado Comportamento para inscritos expirados Subsistema de áudio Silenciar **@everyone** e **@here** Cargo sincronizado - Patrocinadores sincronizados Inscritos sincronizados Canal de mensagens de boas-vindas Associação temporária @@ -2055,7 +2053,6 @@ Você recebeu um link de convite de um amigo? Insira seu link ou código de conv Boas-vindas ao Discord %1$s %1$s - %1$s %1$s %1$s Tenha o máximo do Discord entrando em um servidor. diff --git a/com.discord/res/values-ro/plurals.xml b/com.discord/res/values-ro/plurals.xml index b8e1db5dfa..906b9d827f 100644 --- a/com.discord/res/values-ro/plurals.xml +++ b/com.discord/res/values-ro/plurals.xml @@ -331,12 +331,6 @@ %d prieten %d prieteni - - **%d** de sponsori - **0** sponsori - **1** sponsor - **%d** sponsori - **%d** de abonați **0** abonați diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml index d4c85ad563..7eb524c9f3 100644 --- a/com.discord/res/values-ro/strings.xml +++ b/com.discord/res/values-ro/strings.xml @@ -1093,12 +1093,10 @@ mesaje directe. Dacă un membru are un rol atribuit atunci aceasta nu se aplică Setările server-ului Scurtătură Fundalul pentru ecranul de invitații instante - Comportamentul sponsorului a expirat Comportamentul abonaților a expirat Subsistem Audio Dezactivează **@everyone** și **@here** Rol sincronizat - Sponsori sincronizaţi Abonați sincronizați Canal de mesaje pentru membri noi Membru temporar @@ -2042,7 +2040,6 @@ Ai primit vreun link de invitație de la un prieten? Introdu codul sau link-ul m Bun venit pe Discord %1$s %1$s - %1$s %1$s %1$s Bucură-te la maximum de Discord alăturându-te la un server. diff --git a/com.discord/res/values-ru/plurals.xml b/com.discord/res/values-ru/plurals.xml index 316a321058..a0c6dd5b41 100644 --- a/com.discord/res/values-ru/plurals.xml +++ b/com.discord/res/values-ru/plurals.xml @@ -380,12 +380,6 @@ %d друг %d друга - - **%d** спонсоров - нет спонсоров - **%d** спонсор - **%d** спонсора - **%d** подписчиков нет подписчиков diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml index 81f28282f8..e3431ab7c0 100644 --- a/com.discord/res/values-ru/strings.xml +++ b/com.discord/res/values-ru/strings.xml @@ -1128,12 +1128,10 @@ Настройки сервера Сочетание клавиш Фон экспресс-приглашения - Действие при истечении подписки Истёк срок действия подписки Звуковая подсистема Игнорировать **@everyone** и **@here** Привязана роль - Синхронизированные спонсоры Синхронизированные подписки Канал для сообщений о новых участниках Временное членство @@ -2090,7 +2088,6 @@ Добро пожаловать в Discord %1$s %1$s - %1$s %1$s %1$s Используйте Discord на полную, присоединившись к серверу. diff --git a/com.discord/res/values-sv-rSE/plurals.xml b/com.discord/res/values-sv-rSE/plurals.xml index 1cf17ff717..92dad8724d 100644 --- a/com.discord/res/values-sv-rSE/plurals.xml +++ b/com.discord/res/values-sv-rSE/plurals.xml @@ -280,11 +280,6 @@ Inga vänner %d vän - - **%d** prenumeranter - **0** prenumeranter - **1** prenumerant - **%d** prenumeranter **0** prenumeranter diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml index 4fa1dc7faf..915dac93db 100644 --- a/com.discord/res/values-sv-rSE/strings.xml +++ b/com.discord/res/values-sv-rSE/strings.xml @@ -1041,12 +1041,10 @@ Vissa routrar eller internetleverantörer kan agera märkligt när detta använd Serverinställningar Genväg Bildbakgrund vid inbjudningar - Beteende vid utgång av sponsorstatus Hantering av utgången prenumeration Subsystem för ljud Tysta **@everyone** och **@here** Synkroniserade roll - Synkroniserade sponsorer Synkade prenumeranter Kanal för välkomstmeddelanden Tillfälligt medlemskap @@ -1984,7 +1982,6 @@ Fick du inbjudningslänken av en vän? Ange inbjudningslänken eller koden nedan Välkommen till Discord %1$s %1$s - %1$s %1$s %1$s Få ut så mycket som möjligt av Discord genom att ansluta till en server. diff --git a/com.discord/res/values-th/plurals.xml b/com.discord/res/values-th/plurals.xml index 9f55f91f6d..a1e5e827ec 100644 --- a/com.discord/res/values-th/plurals.xml +++ b/com.discord/res/values-th/plurals.xml @@ -362,11 +362,6 @@ เพื่อน 0 คน เพื่อน %d คน - - **%d** ผู้สนับสนุน - **0** ผู้สนับสนุน - **1** ผู้สนับสนุน - **%d** สมาชิก **0** สมาชิก diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml index ce8dadb82e..b0a406ab57 100644 --- a/com.discord/res/values-th/strings.xml +++ b/com.discord/res/values-th/strings.xml @@ -1243,12 +1243,10 @@ nคนที่ใช้งานผ่านมือถือ หรือค ช่วงคูลดาวน์โหมดช้า โหมดช้าถูกปิด ภาพพื้นหลังในคำเชิญทันที - สปอนเซอร์ได้หมดอายุแล้ว การสมัครสมาชิกหมดอายุแล้ว ระบบย่อยด้านเสียง ระงับ **@everyone** และ **@here** ซิงค์บทบาท - ซิงค์ผู้สนับสนุน ซิงค์สมาชิก มีข้อความใหม่จากสมาชิกในเเชนเเนล สมาชิกแบบชั่วคราว @@ -2394,7 +2392,6 @@ nคนที่ใช้งานผ่านมือถือ หรือค ยินดีต้อนรับสู่ Discord %1$s %1$s - %1$s %1$s %1$s สนุกกับ Discord ด้วยการเข้าร่วมเซิร์ฟเวอร์สิ diff --git a/com.discord/res/values-tr/plurals.xml b/com.discord/res/values-tr/plurals.xml index b89856474e..a57039037a 100644 --- a/com.discord/res/values-tr/plurals.xml +++ b/com.discord/res/values-tr/plurals.xml @@ -232,11 +232,6 @@ 0 Arkadaş %d Arkadaş - - **%d** sponsorlar - **0** sponsorlar - **1** sponsor - **%d** aboneler **0** aboneler diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml index 026dcfb482..4a2e4482e3 100644 --- a/com.discord/res/values-tr/strings.xml +++ b/com.discord/res/values-tr/strings.xml @@ -1050,12 +1050,10 @@ Bu ayarlandığında bazı yönlendiriciler veya internet hizmet sağlayıcılar Sunucu Ayarları Kısayol Anlık Davet Splash Arkaplanı - Süresi Dolmuş Sponsor Hareketi Süresi Geçmiş Abone Davranışı Ses Altsistemi "**@everyone** ve **@here** 'ı bastır" Senkronize Edilmiş Rol - Sponsorlar Eşitlendi Senkronize Edilmiş Aboneler Yeni Üye Mesaj Kanalı Geçici Üyelik @@ -1921,7 +1919,6 @@ Bir arkadaşından davet bağlantısı aldın mı? Davet bağlantısını veya k "Discord'a Hoş Geldin" %1$s %1$s - %1$s %1$s %1$s "Bir sunucuya katılarak Discord'dan en iyi şekilde yararlan." diff --git a/com.discord/res/values-uk/plurals.xml b/com.discord/res/values-uk/plurals.xml index 9faa941338..f405845c6f 100644 --- a/com.discord/res/values-uk/plurals.xml +++ b/com.discord/res/values-uk/plurals.xml @@ -348,12 +348,6 @@ %d друг %d друга - - **%d** спонсорів - **0** спонсорів - **%d** спонсор - **%d** спонсори - **%d** підписники/-ів **0** підписників diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml index e713fc147c..be47333c61 100644 --- a/com.discord/res/values-uk/strings.xml +++ b/com.discord/res/values-uk/strings.xml @@ -949,12 +949,10 @@ Налаштування сервера Поєднання клавіш Фон миттєвого запрошення - Термін спонсорської підтримки закінчився Термін дії підписки закінчився Звукова підсистема Ігнорувати **@everyone** та **@here** Синхронізована роль - Синхронізовані спонсори Синхронізовані підписки Канал для повідомлень про нових користувачів Тимчасова участь @@ -1690,7 +1688,6 @@ Ласкаво просимо до Discord %1$s %1$s - %1$s %1$s %1$s Використовуй Discord на повну, приєднавшись до сервера. diff --git a/com.discord/res/values-vi/plurals.xml b/com.discord/res/values-vi/plurals.xml index 3b76bc3c74..73265d9c1e 100644 --- a/com.discord/res/values-vi/plurals.xml +++ b/com.discord/res/values-vi/plurals.xml @@ -357,11 +357,6 @@ 0 bạn bè %d Bạn bè - - **%d** nhà tài trợ - **0** nhà tài trợ - **1** nhà tài trợ - **%d** người theo dõi **0** người theo dõi diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml index 4ff8fffa82..24ec882982 100644 --- a/com.discord/res/values-vi/strings.xml +++ b/com.discord/res/values-vi/strings.xml @@ -1228,12 +1228,10 @@ cuộc trò chuyện bằng tin nhắn trực tiếp. Nếu thành viên đã đ Đếm Ngược Chế Độ Chậm Chế độ chậm đã tắt. Màn hình mời nhanh - Hoạt Động Tài Trợ Đã Hết Hạn Hoạt Động Theo Dõi Đã Hết Hạn Hệ Thống Loa Phụ Cấm **@everyone** và **@here** Đã Đồng Bộ Vai Trò - Đã Đồng Bộ Tài Trợ Đã Đồng Bộ Theo Dõi Kênh Tin Nhắn Của Thành Viên Mới Thành Viên Tạm Thời @@ -2371,7 +2369,6 @@ Bạn đã nhận được liên kết mời từ bạn bè chưa? Hãy nhập l Chào mừng bạn đến với Discord %1$s %1$s - %1$s %1$s %1$s Tận dụng tối đa Discord bằng cách tham gia máy chủ. diff --git a/com.discord/res/values-zh-rCN/plurals.xml b/com.discord/res/values-zh-rCN/plurals.xml index c9d0b5fd73..f02db38fc3 100644 --- a/com.discord/res/values-zh-rCN/plurals.xml +++ b/com.discord/res/values-zh-rCN/plurals.xml @@ -248,11 +248,6 @@ 0 个朋友 %d 朋友 - - **%d** 赞助商 - **0** 赞助商 - **1** 赞助商 - **%d** 位订阅者 **0** 位订阅者 diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml index acb9890abe..034b18389d 100644 --- a/com.discord/res/values-zh-rCN/strings.xml +++ b/com.discord/res/values-zh-rCN/strings.xml @@ -1003,12 +1003,10 @@ NSFW频道将不会受到内容过滤器的限制。" 服务器设定 快捷键 即时邀请图片背景 - 已过期的赞助 已过期的订阅 音频子系统 禁用 **@everyone** 和 **@here** 已同步用户组 - 已同步的赞助 已同步订阅者 新成员讯息频道 临时成员 @@ -1825,7 +1823,6 @@ NSFW频道将不会受到内容过滤器的限制。" 欢迎使用Discord %1$s %1$s - %1$s %1$s %1$s 想感受discord的魅力吗？先加入一个服务器吧！ diff --git a/com.discord/res/values-zh-rTW/plurals.xml b/com.discord/res/values-zh-rTW/plurals.xml index 1ffe273d30..8934e8da07 100644 --- a/com.discord/res/values-zh-rTW/plurals.xml +++ b/com.discord/res/values-zh-rTW/plurals.xml @@ -184,11 +184,6 @@ 0 位好友 %d 位好友 - - **%d** 位贊助商 - **0** 位贊助商 - **1** 位贊助商 - **%d** 位訂閱者 **0** 位訂閱者 diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml index 4fc91e2155..38d221402b 100644 --- a/com.discord/res/values-zh-rTW/strings.xml +++ b/com.discord/res/values-zh-rTW/strings.xml @@ -916,12 +916,10 @@ 伺服器設定 捷徑 即時邀請背景圖片 - 逾期贊助者的行為 過期的訂閱行為 音訊子系統 禁用 **@everyone** 和 **@here** 已同步身分組 - 已同步贊助者 已同步訂閱者 新成員訊息頻道 臨時成員身分 @@ -1634,7 +1632,6 @@ 歡迎來到 Discord。 %1$s 歡迎來到 Discord %1$s - %1$s %1$s %1$s 我一個都沒有 diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index 3825bbece8..9c1248ec4a 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -487,10 +487,10 @@ 0 Friends %d Friend - - **%d** sponsors - **0** sponsors - **1** sponsor + + **%d** members + **0** members + **1** member **%d** subscribers diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index a7c389b4eb..7ab706c6d0 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -5237,7 +5237,7 @@ - + @@ -8567,77 +8567,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -9985,7 +9985,7 @@ - + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 38bfecf6a5..2bff8d3df3 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -964,7 +964,7 @@ HERE ARE MORE THINGS {progress} Unable to sync cloud saves OR Collapse Category - fc4a9c89-45a6-43b2-b764-00fe06b57526 + c7e185c3-a9a0-4145-8a6e-7166ccc81872 Coming Soon Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. COMING SOON! @@ -1226,7 +1226,7 @@ HERE ARE MORE THINGS {progress} E-mail notifications may already be disabled, or this e-mail may no longer be associated with a Discord account. Disable Sync Disabling sync will perform the selected expired sub behavior as if all subs have expired. - Disabling sync will perform the selected expired sponsor behavior as if all sponsors have expired. + Disabling sync will perform the selected expired membership behavior as if all members have expired. All desktop notifications will be disabled. Disable Notifications All sound effects will be disabled. @@ -1471,6 +1471,7 @@ HERE ARE MORE THINGS {progress} Expire After Max Uses Add member + Expired Membership Behavior Allow anyone to **@mention** this role Mentions Behavior @@ -1536,12 +1537,11 @@ HERE ARE MORE THINGS {progress} Slowmode Cooldown Slowmode is off. Instant Invite Splash Background - Expired Sponsor Behavior Expired Sub Behavior Audio Subsystem Suppress **@everyone** and **@here** + Synced Members Synced Role - Synced Sponsors Synced Subs New Member Messages Channel Temporary Membership @@ -2316,7 +2316,7 @@ HERE ARE MORE THINGS {progress} Instant Invites Integration Settings Integrations - Connected Twitch/YouTube Gaming Accounts + Connected Twitch/YouTube Accounts "For more integrations check out [Discord's StreamKit](%1$s)." Browsers require user interaction before they will play audio. Just click okay to continue. Interaction Required @@ -2745,7 +2745,7 @@ Want to know more about Discord?" No Input Devices No input devices could be detected, please plug one in and try again. No Instant Invite - [Connect](onConnect) your partnered Twitch or YouTube Gaming account to sync your subscribers/sponsors to a role + [Connect](onConnect) your partnered Twitch or YouTube account to sync your subscribers/memberships to a role Protocol FR13NDSH1P can only be executed from the Discord client No Integrations Feeling aimless? Like a paper plane drifting through the skies? Get some friends in here by creating an instant invite link! @@ -2893,7 +2893,7 @@ Want to know more about Discord?" Check Who’s Gaming %1$s %1$s - %1$s + %1$s %1$s %1$s Get the most out of Discord by joining a server. diff --git a/com.discord/smali/b/j$h.smali b/com.discord/smali/b/j$h.smali index 80f608028f..4cbe83878f 100644 --- a/com.discord/smali/b/j$h.smali +++ b/com.discord/smali/b/j$h.smali @@ -132,7 +132,7 @@ move-result-object v0 - invoke-static {p2, v1}, Lb/l;->j(Ljava/lang/String;Z)Ljava/lang/String; + invoke-static {p2, v1}, Lb/l;->k(Ljava/lang/String;Z)Ljava/lang/String; move-result-object p2 diff --git a/com.discord/smali/b/l.smali b/com.discord/smali/b/l.smali index 8ee4e7fad7..fdd29d9603 100644 --- a/com.discord/smali/b/l.smali +++ b/com.discord/smali/b/l.smali @@ -200,7 +200,7 @@ return-void .end method -.method static j(Ljava/lang/String;Z)Ljava/lang/String; +.method static k(Ljava/lang/String;Z)Ljava/lang/String; .locals 13 invoke-virtual {p0}, Ljava/lang/String;->length()I diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index cbb45af700..de0bcb6d58 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -30,11 +30,11 @@ .field public static final LOCAL_VOICE:Ljava/lang/String; = "" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/869" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/870" -.field public static final VERSION_CODE:I = 0x365 +.field public static final VERSION_CODE:I = 0x366 -.field public static final VERSION_NAME:Ljava/lang/String; = "8.6.9" +.field public static final VERSION_NAME:Ljava/lang/String; = "8.7.0" # direct methods diff --git a/com.discord/smali/com/discord/app/AppActivity$d.smali b/com.discord/smali/com/discord/app/AppActivity$d.smali index 1fc28406e0..46d8b3297f 100644 --- a/com.discord/smali/com/discord/app/AppActivity$d.smali +++ b/com.discord/smali/com/discord/app/AppActivity$d.smali @@ -84,6 +84,26 @@ iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity; + invoke-static {v0}, Lcom/discord/app/AppActivity;->a(Lcom/discord/app/AppActivity;)Lcom/discord/stores/StoreUserSettings; + + move-result-object v1 + + const-string v2, "userSettings" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v1}, Lcom/discord/stores/StoreUserSettings;->getLocale()Ljava/lang/String; + + move-result-object v1 + + const-string v2, "userSettings.locale" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {v0, v1}, Lcom/discord/app/AppActivity;->c(Lcom/discord/app/AppActivity;Ljava/lang/String;)V + + iget-object v0, p0, Lcom/discord/app/AppActivity$d;->this$0:Lcom/discord/app/AppActivity; + const-class v1, Lcom/discord/widgets/main/WidgetMain; invoke-static {v1}, Lkotlin/jvm/internal/v;->N(Ljava/lang/Class;)Lkotlin/reflect/b; diff --git a/com.discord/smali/com/discord/app/AppActivity.smali b/com.discord/smali/com/discord/app/AppActivity.smali index 2489430051..599e071b0a 100644 --- a/com.discord/smali/com/discord/app/AppActivity.smali +++ b/com.discord/smali/com/discord/app/AppActivity.smali @@ -351,7 +351,7 @@ .end method .method public static final synthetic a(Lcom/discord/app/AppActivity;Lcom/discord/app/AppActivity$b;)Z - .locals 6 + .locals 5 iget-object v0, p1, Lcom/discord/app/AppActivity$b;->sI:Ljava/lang/String; @@ -363,264 +363,62 @@ invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - sget v1, Landroid/os/Build$VERSION;->SDK_INT:I - - const/16 v2, 0x18 - - const/4 v3, 0x0 - - const/4 v4, 0x1 - - if-lt v1, v2, :cond_2 - - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object v1 - - const-string v5, "resources" - - invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; - - move-result-object v1 - - const-string v5, "resources.configuration" - - invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v1}, Landroid/content/res/Configuration;->getLocales()Landroid/os/LocaleList; - - move-result-object v1 - - const-string v5, "resources.configuration.locales" - - invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v1}, Landroid/os/LocaleList;->isEmpty()Z - - move-result v1 - - if-nez v1, :cond_1 - - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object v1 - - const-string v5, "resources" - - invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; - - move-result-object v1 - - const-string v5, "resources.configuration" - - invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v1}, Landroid/content/res/Configuration;->getLocales()Landroid/os/LocaleList; - - move-result-object v1 - - invoke-virtual {v1, v3}, Landroid/os/LocaleList;->get(I)Ljava/util/Locale; - - move-result-object v1 - - invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-direct {p0, v0}, Lcom/discord/app/AppActivity;->a(Ljava/util/Locale;)Z move-result v0 - xor-int/2addr v0, v4 + const/4 v1, 0x1 if-eqz v0, :cond_0 - goto :goto_0 - - :cond_0 - const/4 v0, 0x0 - - goto :goto_2 - - :cond_1 - :goto_0 - const/4 v0, 0x1 - - goto :goto_2 - - :cond_2 - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object v1 - - const-string v5, "resources" - - invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; - - move-result-object v1 - - iget-object v1, v1, Landroid/content/res/Configuration;->locale:Ljava/util/Locale; - - if-eqz v1, :cond_4 - - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object v1 - - const-string v5, "resources" - - invoke-static {v1, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v1}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; - - move-result-object v1 - - iget-object v1, v1, Landroid/content/res/Configuration;->locale:Ljava/util/Locale; - - invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z - - move-result v0 - - xor-int/2addr v0, v4 - - if-eqz v0, :cond_3 - - goto :goto_1 - - :cond_3 - const/4 v0, 0x0 - - goto :goto_2 - - :cond_4 - :goto_1 - const/4 v0, 0x1 - - :goto_2 - if-eqz v0, :cond_6 - iget-object p1, p1, Lcom/discord/app/AppActivity$b;->sI:Ljava/lang/String; - invoke-static {p1}, Lcom/discord/models/domain/ModelUserSettings;->getLocaleObject(Ljava/lang/String;)Ljava/util/Locale; + invoke-direct {p0, p1, v1}, Lcom/discord/app/AppActivity;->b(Ljava/lang/String;Z)V - move-result-object p1 + return v1 - const-string v0, "targetLocale" - - invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-static {p1}, Ljava/util/Locale;->setDefault(Ljava/util/Locale;)V - - sget v0, Landroid/os/Build$VERSION;->SDK_INT:I - - if-lt v0, v2, :cond_5 - - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object v0 - - const-string v1, "resources" - - invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; - - move-result-object v0 - - invoke-virtual {v0, p1}, Landroid/content/res/Configuration;->setLocale(Ljava/util/Locale;)V - - goto :goto_3 - - :cond_5 - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object v0 - - const-string v1, "resources" - - invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; - - move-result-object v0 - - iput-object p1, v0, Landroid/content/res/Configuration;->locale:Ljava/util/Locale; - - :goto_3 - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object p1 - - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object v0 - - const-string v1, "resources" - - invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; - - move-result-object v0 - - invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; - - move-result-object p0 - - const-string v1, "resources" - - invoke-static {p0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {p0}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; - - move-result-object p0 - - invoke-virtual {p1, v0, p0}, Landroid/content/res/Resources;->updateConfiguration(Landroid/content/res/Configuration;Landroid/util/DisplayMetrics;)V - - return v4 - - :cond_6 + :cond_0 iget-object v0, p1, Lcom/discord/app/AppActivity$b;->sH:Ljava/lang/String; - sget-object v1, Lcom/discord/app/f;->tv:Lcom/discord/app/f; + sget-object v2, Lcom/discord/app/f;->tv:Lcom/discord/app/f; invoke-static {}, Lcom/discord/app/f;->ds()Ljava/util/List; - move-result-object v1 + move-result-object v2 - invoke-virtual {p0, v1}, Lcom/discord/app/AppActivity;->i(Ljava/util/List;)Z + invoke-virtual {p0, v2}, Lcom/discord/app/AppActivity;->i(Ljava/util/List;)Z - move-result v1 + move-result v2 - if-eqz v1, :cond_7 + const/4 v3, 0x0 + + if-eqz v2, :cond_1 const/4 v0, 0x0 - goto :goto_4 + goto :goto_0 - :cond_7 - new-instance v1, Lcom/discord/app/AppActivity$j; + :cond_1 + new-instance v2, Lcom/discord/app/AppActivity$j; - invoke-direct {v1, p0}, Lcom/discord/app/AppActivity$j;->(Lcom/discord/app/AppActivity;)V + invoke-direct {v2, p0}, Lcom/discord/app/AppActivity$j;->(Lcom/discord/app/AppActivity;)V - const v2, 0x7f040380 + const v4, 0x7f040380 - invoke-virtual {v1, v2, v4}, Lcom/discord/app/AppActivity$j;->b(IZ)Landroid/util/TypedValue; + invoke-virtual {v2, v4, v1}, Lcom/discord/app/AppActivity$j;->b(IZ)Landroid/util/TypedValue; - move-result-object v1 + move-result-object v2 - iget-object v1, v1, Landroid/util/TypedValue;->string:Ljava/lang/CharSequence; + iget-object v2, v2, Landroid/util/TypedValue;->string:Ljava/lang/CharSequence; - invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z move-result v0 - xor-int/2addr v0, v4 + xor-int/2addr v0, v1 - :goto_4 - if-nez v0, :cond_c + :goto_0 + if-nez v0, :cond_6 iget p1, p1, Lcom/discord/app/AppActivity$b;->fontScale:I @@ -628,54 +426,187 @@ move-result-object v0 - const-string v1, "font_scale" + const-string v2, "font_scale" - const/high16 v2, 0x3f800000 # 1.0f + const/high16 v4, 0x3f800000 # 1.0f - invoke-static {v0, v1, v2}, Landroid/provider/Settings$System;->getFloat(Landroid/content/ContentResolver;Ljava/lang/String;F)F + invoke-static {v0, v2, v4}, Landroid/provider/Settings$System;->getFloat(Landroid/content/ContentResolver;Ljava/lang/String;F)F move-result v0 - const/high16 v1, 0x42c80000 # 100.0f + const/high16 v2, 0x42c80000 # 100.0f - mul-float v0, v0, v1 + mul-float v0, v0, v2 float-to-int v0, v0 - const/4 v1, -0x1 + const/4 v2, -0x1 - if-ne p1, v1, :cond_8 + if-ne p1, v2, :cond_2 - iget v2, p0, Lcom/discord/app/AppActivity;->sy:I + iget v4, p0, Lcom/discord/app/AppActivity;->sy:I - if-ne v2, v0, :cond_9 + if-ne v4, v0, :cond_3 - :cond_8 - if-eq p1, v1, :cond_a + :cond_2 + if-eq p1, v2, :cond_4 iget p0, p0, Lcom/discord/app/AppActivity;->sy:I - if-eq p0, p1, :cond_a + if-eq p0, p1, :cond_4 - :cond_9 + :cond_3 const/4 p0, 0x1 - goto :goto_5 + goto :goto_1 - :cond_a + :cond_4 const/4 p0, 0x0 - :goto_5 - if-eqz p0, :cond_b + :goto_1 + if-eqz p0, :cond_5 - goto :goto_6 + goto :goto_2 - :cond_b + :cond_5 return v3 - :cond_c - :goto_6 - return v4 + :cond_6 + :goto_2 + return v1 +.end method + +.method private final a(Ljava/util/Locale;)Z + .locals 4 + + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I + + const/4 v1, 0x0 + + const/4 v2, 0x1 + + const/16 v3, 0x18 + + if-lt v0, v3, :cond_2 + + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const-string v3, "resources" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; + + move-result-object v0 + + const-string v3, "resources.configuration" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Configuration;->getLocales()Landroid/os/LocaleList; + + move-result-object v0 + + const-string v3, "resources.configuration.locales" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/os/LocaleList;->isEmpty()Z + + move-result v0 + + if-nez v0, :cond_1 + + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const-string v3, "resources" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; + + move-result-object v0 + + const-string v3, "resources.configuration" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Configuration;->getLocales()Landroid/os/LocaleList; + + move-result-object v0 + + invoke-virtual {v0, v1}, Landroid/os/LocaleList;->get(I)Ljava/util/Locale; + + move-result-object v0 + + invoke-static {v0, p1}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + xor-int/2addr p1, v2 + + if-eqz p1, :cond_0 + + goto :goto_0 + + :cond_0 + return v1 + + :cond_1 + :goto_0 + return v2 + + :cond_2 + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const-string v3, "resources" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; + + move-result-object v0 + + iget-object v0, v0, Landroid/content/res/Configuration;->locale:Ljava/util/Locale; + + if-eqz v0, :cond_4 + + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const-string v3, "resources" + + invoke-static {v0, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; + + move-result-object v0 + + iget-object v0, v0, Landroid/content/res/Configuration;->locale:Ljava/util/Locale; + + invoke-static {v0, p1}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + xor-int/2addr p1, v2 + + if-eqz p1, :cond_3 + + goto :goto_1 + + :cond_3 + return v1 + + :cond_4 + :goto_1 + return v2 .end method .method public static final synthetic b(Lcom/discord/app/AppActivity;Landroid/content/Intent;)Lcom/discord/app/i$a; @@ -788,6 +719,113 @@ return-void .end method +.method private final b(Ljava/lang/String;Z)V + .locals 3 + + invoke-static {p1}, Lcom/discord/models/domain/ModelUserSettings;->getLocaleObject(Ljava/lang/String;)Ljava/util/Locale; + + move-result-object p1 + + const-string v0, "locale" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0, p1}, Lcom/discord/app/AppActivity;->a(Ljava/util/Locale;)Z + + move-result v0 + + if-eqz v0, :cond_1 + + invoke-static {p1}, Ljava/util/Locale;->setDefault(Ljava/util/Locale;)V + + sget v0, Landroid/os/Build$VERSION;->SDK_INT:I + + const/16 v1, 0x18 + + if-lt v0, v1, :cond_0 + + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const-string v1, "resources" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; + + move-result-object v0 + + invoke-virtual {v0, p1}, Landroid/content/res/Configuration;->setLocale(Ljava/util/Locale;)V + + goto :goto_0 + + :cond_0 + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const-string v1, "resources" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; + + move-result-object v0 + + iput-object p1, v0, Landroid/content/res/Configuration;->locale:Ljava/util/Locale; + + :goto_0 + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object p1 + + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const-string v1, "resources" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0}, Landroid/content/res/Resources;->getConfiguration()Landroid/content/res/Configuration; + + move-result-object v0 + + invoke-virtual {p0}, Lcom/discord/app/AppActivity;->getResources()Landroid/content/res/Resources; + + move-result-object v1 + + const-string v2, "resources" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v1}, Landroid/content/res/Resources;->getDisplayMetrics()Landroid/util/DisplayMetrics; + + move-result-object v1 + + invoke-virtual {p1, v0, v1}, Landroid/content/res/Resources;->updateConfiguration(Landroid/content/res/Configuration;Landroid/util/DisplayMetrics;)V + + if-eqz p2, :cond_1 + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lcom/discord/app/AppActivity;->o(Z)V + + :cond_1 + return-void +.end method + +.method public static final synthetic c(Lcom/discord/app/AppActivity;Ljava/lang/String;)V + .locals 1 + + const/4 v0, 0x0 + + invoke-direct {p0, p1, v0}, Lcom/discord/app/AppActivity;->b(Ljava/lang/String;Z)V + + return-void +.end method + .method public static final synthetic dj()Z .locals 1 diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 87e3dfaefb..46a924575e 100644 --- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali +++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali @@ -28,7 +28,7 @@ invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/16 v0, 0x365 + const/16 v0, 0x366 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index 8a3f5c9c00..7d8d3d7269 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali @@ -181,7 +181,7 @@ const-string v1, "browser_user_agent" - const-string v2, "Discord-Android/869" + const-string v2, "Discord-Android/870" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; @@ -193,7 +193,7 @@ const-string v1, "client_build_number" - const/16 v2, 0x365 + const/16 v2, 0x366 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -209,7 +209,7 @@ const-string v1, "client_version" - const-string v2, "8.6.9" + const-string v2, "8.7.0" invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali index 0a0814d271..9c0c8a9be4 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -167,7 +167,7 @@ .method public final getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/869" + const-string v0, "Discord-Android/870" return-object v0 .end method diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali index a72d17be92..bd32af106d 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali @@ -1983,7 +1983,7 @@ move-result-object p1 - const v0, 0x7f1205f0 + const v0, 0x7f1205f1 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 5617d332b7..bb54a96fff 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -512,7 +512,7 @@ new-array v2, v0, [Ljava/lang/Object; - const-string v4, "8.6.9" + const-string v4, "8.7.0" aput-object v4, v2, v3 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali index 39a64ba03b..7c8c42c668 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali @@ -115,7 +115,7 @@ if-eqz v0, :cond_0 - const p1, 0x7f1205c6 + const p1, 0x7f1205c7 goto :goto_0 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali index dbefbb80a8..166d89319f 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali @@ -153,7 +153,7 @@ if-eqz v0, :cond_1 - const p1, 0x7f1205c6 + const p1, 0x7f1205c7 goto :goto_1 diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali index e7d2ce2328..5c7208c407 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali @@ -105,7 +105,7 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f1205d0 + const p1, 0x7f1205d1 return p1 @@ -114,7 +114,7 @@ if-ne p1, v0, :cond_2 - const p1, 0x7f1205ca + const p1, 0x7f1205cb return p1 diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali index 51d361851a..7714150a4c 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali @@ -544,7 +544,7 @@ move-result-object v0 - const v3, 0x7f1205c4 + const v3, 0x7f1205c5 new-array v6, v4, [Ljava/lang/Object; @@ -686,7 +686,7 @@ move-result-object v0 - const v1, 0x7f1205d0 + const v1, 0x7f1205d1 invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali index 31a1a4087a..3385362c16 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali @@ -640,7 +640,7 @@ return-void :cond_0 - const p1, 0x7f1205e0 + const p1, 0x7f1205e1 invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V @@ -1135,7 +1135,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const v2, 0x7f1205e2 + const v2, 0x7f1205e3 invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index eb195d0613..6d553b00d7 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1429,7 +1429,7 @@ invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v2, " - 8.6.9 (869)" + const-string v2, " - 8.7.0 (870)" invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali index 9af318cdb5..84253a3bde 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali @@ -295,7 +295,7 @@ invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f1205b3 + const p1, 0x7f1205b4 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/facebook/common/d/h$a.smali b/com.discord/smali/com/facebook/common/d/h$a.smali index 3fd585f3c6..89d869a4c0 100644 --- a/com.discord/smali/com/facebook/common/d/h$a.smali +++ b/com.discord/smali/com/facebook/common/d/h$a.smali @@ -89,7 +89,7 @@ # virtual methods -.method public final b(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; +.method public final c(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; .locals 0 invoke-static {p2}, Ljava/lang/String;->valueOf(Z)Ljava/lang/String; diff --git a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali index 8055c7eeb8..0b44dfb6ed 100644 --- a/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali +++ b/com.discord/smali/com/facebook/drawee/controller/AbstractDraweeController.smali @@ -1987,7 +1987,7 @@ iget-boolean v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->mIsAttached:Z - invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->b(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; + invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->c(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; move-result-object v0 @@ -1995,7 +1995,7 @@ iget-boolean v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->HB:Z - invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->b(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; + invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->c(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; move-result-object v0 @@ -2003,7 +2003,7 @@ iget-boolean v2, p0, Lcom/facebook/drawee/controller/AbstractDraweeController;->HD:Z - invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->b(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; + invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->c(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; move-result-object v0 diff --git a/com.discord/smali/com/facebook/drawee/view/b.smali b/com.discord/smali/com/facebook/drawee/view/b.smali index 17bd88bc31..c587e59fd6 100644 --- a/com.discord/smali/com/facebook/drawee/view/b.smali +++ b/com.discord/smali/com/facebook/drawee/view/b.smali @@ -548,7 +548,7 @@ iget-boolean v2, p0, Lcom/facebook/drawee/view/b;->KX:Z - invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->b(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; + invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->c(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; move-result-object v0 @@ -556,7 +556,7 @@ iget-boolean v2, p0, Lcom/facebook/drawee/view/b;->KY:Z - invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->b(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; + invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->c(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; move-result-object v0 @@ -564,7 +564,7 @@ iget-boolean v2, p0, Lcom/facebook/drawee/view/b;->KZ:Z - invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->b(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; + invoke-virtual {v0, v1, v2}, Lcom/facebook/common/d/h$a;->c(Ljava/lang/String;Z)Lcom/facebook/common/d/h$a; move-result-object v0 diff --git a/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali b/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali index 0193a4ef7e..5687f0a400 100644 --- a/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali +++ b/com.discord/smali/com/franmontiel/persistentcookiejar/persistence/SerializableCookie.smali @@ -371,7 +371,7 @@ const/4 v2, 0x0 - invoke-virtual {v0, v1, v2}, Lokhttp3/l$a;->f(Ljava/lang/String;Z)Lokhttp3/l$a; + invoke-virtual {v0, v1, v2}, Lokhttp3/l$a;->g(Ljava/lang/String;Z)Lokhttp3/l$a; invoke-virtual {p1}, Ljava/io/ObjectInputStream;->readObject()Ljava/lang/Object; @@ -413,7 +413,7 @@ if-eqz p1, :cond_5 - invoke-virtual {v0, v1, v5}, Lokhttp3/l$a;->f(Ljava/lang/String;Z)Lokhttp3/l$a; + invoke-virtual {v0, v1, v5}, Lokhttp3/l$a;->g(Ljava/lang/String;Z)Lokhttp3/l$a; :cond_5 new-instance p1, Lokhttp3/l; diff --git a/com.discord/smali/com/google/android/gms/common/a/a.smali b/com.discord/smali/com/google/android/gms/common/a/a.smali index bae683ed83..b7da9b0797 100644 --- a/com.discord/smali/com/google/android/gms/common/a/a.smali +++ b/com.discord/smali/com/google/android/gms/common/a/a.smali @@ -154,7 +154,7 @@ return-object v0 .end method -.method public static c(Ljava/lang/String;Z)Lcom/google/android/gms/common/a/a; +.method public static d(Ljava/lang/String;Z)Lcom/google/android/gms/common/a/a; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { diff --git a/com.discord/smali/okhttp3/internal/c.smali b/com.discord/smali/okhttp3/internal/c.smali index 62c22bee53..0778683335 100644 --- a/com.discord/smali/okhttp3/internal/c.smali +++ b/com.discord/smali/okhttp3/internal/c.smali @@ -1770,7 +1770,7 @@ return-object p0 .end method -.method public static h(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; +.method public static i(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; .locals 1 new-instance v0, Lokhttp3/internal/c$2; diff --git a/com.discord/smali/okhttp3/internal/j/a.smali b/com.discord/smali/okhttp3/internal/j/a.smali index dfb5c21e32..c23376f7bb 100644 --- a/com.discord/smali/okhttp3/internal/j/a.smali +++ b/com.discord/smali/okhttp3/internal/j/a.smali @@ -972,7 +972,7 @@ const/4 v2, 0x0 - invoke-static {p1, v2}, Lokhttp3/internal/c;->h(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; + invoke-static {p1, v2}, Lokhttp3/internal/c;->i(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; move-result-object p1 diff --git a/com.discord/smali/okhttp3/l$a.smali b/com.discord/smali/okhttp3/l$a.smali index a0409cf693..2a9269bc6a 100644 --- a/com.discord/smali/okhttp3/l$a.smali +++ b/com.discord/smali/okhttp3/l$a.smali @@ -62,7 +62,7 @@ # virtual methods -.method public final f(Ljava/lang/String;Z)Lokhttp3/l$a; +.method public final g(Ljava/lang/String;Z)Lokhttp3/l$a; .locals 1 if-eqz p1, :cond_1 diff --git a/com.discord/smali/okhttp3/n.smali b/com.discord/smali/okhttp3/n.smali index d58ff2ec83..91f47d4989 100644 --- a/com.discord/smali/okhttp3/n.smali +++ b/com.discord/smali/okhttp3/n.smali @@ -122,7 +122,7 @@ const/4 v8, 0x0 - invoke-static {v1, v8}, Lokhttp3/internal/c;->h(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; + invoke-static {v1, v8}, Lokhttp3/internal/c;->i(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; move-result-object v8 diff --git a/com.discord/smali/okhttp3/s.smali b/com.discord/smali/okhttp3/s.smali index 6289c3986c..ff1d7d781f 100644 --- a/com.discord/smali/okhttp3/s.smali +++ b/com.discord/smali/okhttp3/s.smali @@ -105,7 +105,7 @@ const/4 v1, 0x0 - invoke-static {v0, v1}, Lokhttp3/s;->g(Ljava/lang/String;Z)Ljava/lang/String; + invoke-static {v0, v1}, Lokhttp3/s;->h(Ljava/lang/String;Z)Ljava/lang/String; move-result-object v0 @@ -113,7 +113,7 @@ iget-object v0, p1, Lokhttp3/s$a;->bnh:Ljava/lang/String; - invoke-static {v0, v1}, Lokhttp3/s;->g(Ljava/lang/String;Z)Ljava/lang/String; + invoke-static {v0, v1}, Lokhttp3/s;->h(Ljava/lang/String;Z)Ljava/lang/String; move-result-object v0 @@ -165,7 +165,7 @@ iget-object v0, p1, Lokhttp3/s$a;->bnk:Ljava/lang/String; - invoke-static {v0, v1}, Lokhttp3/s;->g(Ljava/lang/String;Z)Ljava/lang/String; + invoke-static {v0, v1}, Lokhttp3/s;->h(Ljava/lang/String;Z)Ljava/lang/String; move-result-object v2 @@ -845,7 +845,7 @@ if-eqz v3, :cond_0 - invoke-static {v3, p1}, Lokhttp3/s;->g(Ljava/lang/String;Z)Ljava/lang/String; + invoke-static {v3, p1}, Lokhttp3/s;->h(Ljava/lang/String;Z)Ljava/lang/String; move-result-object v3 @@ -1144,7 +1144,7 @@ return p0 .end method -.method private static g(Ljava/lang/String;Z)Ljava/lang/String; +.method private static h(Ljava/lang/String;Z)Ljava/lang/String; .locals 2 invoke-virtual {p0}, Ljava/lang/String;->length()I diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ar.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ar.smali index b7f49c3a0c..95378105b2 100644 --- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ar.smali +++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ar.smali @@ -199,7 +199,7 @@ iget-object v3, p0, Lcom/google/android/gms/internal/measurement/ar;->ala:Lcom/google/android/gms/internal/measurement/as; - invoke-interface {v3, v0, v2}, Lcom/google/android/gms/internal/measurement/as;->d(Ljava/lang/String;Z)V + invoke-interface {v3, v0, v2}, Lcom/google/android/gms/internal/measurement/as;->e(Ljava/lang/String;Z)V :try_end_1 .catch Ljava/lang/NumberFormatException; {:try_start_1 .. :try_end_1} :catch_0 .catch Lorg/xmlpull/v1/XmlPullParserException; {:try_start_1 .. :try_end_1} :catch_3 diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali index 8d7d64b9f8..b47ccf39b3 100644 --- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali +++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/as.smali @@ -14,7 +14,7 @@ # virtual methods -.method public abstract d(Ljava/lang/String;Z)V +.method public abstract e(Ljava/lang/String;Z)V .end method .method public abstract i(Ljava/lang/String;I)V diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ax.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ax.smali index cd154a43b7..2d97fd8d45 100644 --- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ax.smali +++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/ax.smali @@ -48,7 +48,7 @@ move-result-object v2 - invoke-static {v2}, Lcom/google/android/gms/internal/measurement/bx;->a(Ljava/util/Locale;)Ljava/lang/String; + invoke-static {v2}, Lcom/google/android/gms/internal/measurement/bx;->b(Ljava/util/Locale;)Ljava/lang/String; move-result-object v2 diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bc.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bc.smali index af07f8e75b..d42abf3793 100644 --- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bc.smali +++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bc.smali @@ -133,7 +133,7 @@ new-instance v0, Lcom/google/android/gms/internal/measurement/bc; - invoke-static {p0, p2}, Lcom/google/android/gms/common/a/a;->c(Ljava/lang/String;Z)Lcom/google/android/gms/common/a/a; + invoke-static {p0, p2}, Lcom/google/android/gms/common/a/a;->d(Ljava/lang/String;Z)Lcom/google/android/gms/common/a/a; move-result-object p0 diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/be.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/be.smali index a2d6dfe858..9bf6f039c1 100644 --- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/be.smali +++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/be.smali @@ -41,7 +41,7 @@ # virtual methods -.method public final d(Ljava/lang/String;Z)V +.method public final e(Ljava/lang/String;Z)V .locals 1 const-string v0, "ga_dryRun" diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bm.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bm.smali index da71ce145a..e58ae850ef 100644 --- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bm.smali +++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bm.smali @@ -42,7 +42,7 @@ move-result-object v3 - invoke-static {v3}, Lcom/google/android/gms/internal/measurement/bx;->a(Ljava/util/Locale;)Ljava/lang/String; + invoke-static {v3}, Lcom/google/android/gms/internal/measurement/bx;->b(Ljava/util/Locale;)Ljava/lang/String; move-result-object v3 diff --git a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bx.smali b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bx.smali index 6f28365ef0..5f5dc2edc8 100644 --- a/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bx.smali +++ b/com.discord/smali_classes2/com/google/android/gms/internal/measurement/bx.smali @@ -214,71 +214,6 @@ return-object v1 .end method -.method public static a(Ljava/util/Locale;)Ljava/lang/String; - .locals 3 - - const/4 v0, 0x0 - - if-nez p0, :cond_0 - - return-object v0 - - :cond_0 - invoke-virtual {p0}, Ljava/util/Locale;->getLanguage()Ljava/lang/String; - - move-result-object v1 - - invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z - - move-result v2 - - if-eqz v2, :cond_1 - - return-object v0 - - :cond_1 - new-instance v0, Ljava/lang/StringBuilder; - - invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - - invoke-virtual {v1, p0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String; - - move-result-object v1 - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {p0}, Ljava/util/Locale;->getCountry()Ljava/lang/String; - - move-result-object v1 - - invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z - - move-result v1 - - if-nez v1, :cond_2 - - const-string v1, "-" - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {p0}, Ljava/util/Locale;->getCountry()Ljava/lang/String; - - move-result-object v1 - - invoke-virtual {v1, p0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String; - - move-result-object p0 - - invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - :cond_2 - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object p0 - - return-object p0 -.end method - .method public static a(DLjava/lang/String;)Z .locals 8 @@ -373,6 +308,71 @@ return v0 .end method +.method public static b(Ljava/util/Locale;)Ljava/lang/String; + .locals 3 + + const/4 v0, 0x0 + + if-nez p0, :cond_0 + + return-object v0 + + :cond_0 + invoke-virtual {p0}, Ljava/util/Locale;->getLanguage()Ljava/lang/String; + + move-result-object v1 + + invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z + + move-result v2 + + if-eqz v2, :cond_1 + + return-object v0 + + :cond_1 + new-instance v0, Ljava/lang/StringBuilder; + + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + + invoke-virtual {v1, p0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p0}, Ljava/util/Locale;->getCountry()Ljava/lang/String; + + move-result-object v1 + + invoke-static {v1}, Landroid/text/TextUtils;->isEmpty(Ljava/lang/CharSequence;)Z + + move-result v1 + + if-nez v1, :cond_2 + + const-string v1, "-" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p0}, Ljava/util/Locale;->getCountry()Ljava/lang/String; + + move-result-object v1 + + invoke-virtual {v1, p0}, Ljava/lang/String;->toLowerCase(Ljava/util/Locale;)Ljava/lang/String; + + move-result-object p0 + + invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + :cond_2 + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object p0 + + return-object p0 +.end method + .method public static bp(Ljava/lang/String;)J .locals 2 diff --git a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aw.smali b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aw.smali index 9dfcc02fdc..266877cda5 100644 --- a/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aw.smali +++ b/com.discord/smali_classes2/com/google/android/gms/measurement/internal/aw.smali @@ -59,7 +59,7 @@ const/4 v1, 0x0 - invoke-direct {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/aw;->e(Ljava/lang/String;Z)V + invoke-direct {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/aw;->f(Ljava/lang/String;Z)V iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aw;->aAT:Lcom/google/android/gms/measurement/internal/dy; @@ -78,7 +78,7 @@ return-void .end method -.method private final e(Ljava/lang/String;Z)V +.method private final f(Ljava/lang/String;Z)V .locals 3 .annotation build Landroidx/annotation/BinderThread; .end annotation @@ -535,7 +535,7 @@ const/4 v0, 0x1 - invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/aw;->e(Ljava/lang/String;Z)V + invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/aw;->f(Ljava/lang/String;Z)V iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aw;->aAT:Lcom/google/android/gms/measurement/internal/dy; @@ -823,7 +823,7 @@ const/4 p3, 0x1 - invoke-direct {p0, p2, p3}, Lcom/google/android/gms/measurement/internal/aw;->e(Ljava/lang/String;Z)V + invoke-direct {p0, p2, p3}, Lcom/google/android/gms/measurement/internal/aw;->f(Ljava/lang/String;Z)V new-instance p3, Lcom/google/android/gms/measurement/internal/bj; @@ -898,7 +898,7 @@ const/4 v1, 0x1 - invoke-direct {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/aw;->e(Ljava/lang/String;Z)V + invoke-direct {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/aw;->f(Ljava/lang/String;Z)V new-instance v0, Lcom/google/android/gms/measurement/internal/zzo; @@ -988,7 +988,7 @@ const/4 v0, 0x1 - invoke-direct {p0, p2, v0}, Lcom/google/android/gms/measurement/internal/aw;->e(Ljava/lang/String;Z)V + invoke-direct {p0, p2, v0}, Lcom/google/android/gms/measurement/internal/aw;->f(Ljava/lang/String;Z)V iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aw;->aAT:Lcom/google/android/gms/measurement/internal/dy; @@ -1214,7 +1214,7 @@ const/4 v1, 0x0 - invoke-direct {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/aw;->e(Ljava/lang/String;Z)V + invoke-direct {p0, v0, v1}, Lcom/google/android/gms/measurement/internal/aw;->f(Ljava/lang/String;Z)V new-instance v0, Lcom/google/android/gms/measurement/internal/bh; @@ -1245,7 +1245,7 @@ const/4 v0, 0x1 - invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/aw;->e(Ljava/lang/String;Z)V + invoke-direct {p0, p1, v0}, Lcom/google/android/gms/measurement/internal/aw;->f(Ljava/lang/String;Z)V iget-object v0, p0, Lcom/google/android/gms/measurement/internal/aw;->aAT:Lcom/google/android/gms/measurement/internal/dy; diff --git a/com.discord/smali_classes2/okhttp3/internal/c$2.smali b/com.discord/smali_classes2/okhttp3/internal/c$2.smali index 8438634bce..85818cfc9d 100644 --- a/com.discord/smali_classes2/okhttp3/internal/c$2.smali +++ b/com.discord/smali_classes2/okhttp3/internal/c$2.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lokhttp3/internal/c;->h(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; + value = Lokhttp3/internal/c;->i(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali_classes2/okhttp3/internal/e/g.smali b/com.discord/smali_classes2/okhttp3/internal/e/g.smali index b53ba9d828..8300143b46 100644 --- a/com.discord/smali_classes2/okhttp3/internal/e/g.smali +++ b/com.discord/smali_classes2/okhttp3/internal/e/g.smali @@ -104,7 +104,7 @@ const/4 v7, 0x1 - invoke-static {v0, v7}, Lokhttp3/internal/c;->h(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; + invoke-static {v0, v7}, Lokhttp3/internal/c;->i(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; move-result-object v7 @@ -230,7 +230,7 @@ move-result-object v6 - invoke-static {v6, v2}, Lokhttp3/internal/c;->h(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; + invoke-static {v6, v2}, Lokhttp3/internal/c;->i(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; move-result-object v6 @@ -287,7 +287,7 @@ move-result-object v2 - invoke-static {v2, v5}, Lokhttp3/internal/c;->h(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; + invoke-static {v2, v5}, Lokhttp3/internal/c;->i(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; move-result-object v20 diff --git a/com.discord/smali_classes2/okhttp3/j.smali b/com.discord/smali_classes2/okhttp3/j.smali index b6f44b0900..ce34a2615f 100644 --- a/com.discord/smali_classes2/okhttp3/j.smali +++ b/com.discord/smali_classes2/okhttp3/j.smali @@ -53,7 +53,7 @@ const/4 v7, 0x1 - invoke-static {v0, v7}, Lokhttp3/internal/c;->h(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; + invoke-static {v0, v7}, Lokhttp3/internal/c;->i(Ljava/lang/String;Z)Ljava/util/concurrent/ThreadFactory; move-result-object v7 diff --git a/com.discord/smali_classes2/org/a/a/e.smali b/com.discord/smali_classes2/org/a/a/e.smali index aa24c21fc2..f08ba6fe62 100644 --- a/com.discord/smali_classes2/org/a/a/e.smali +++ b/com.discord/smali_classes2/org/a/a/e.smali @@ -7250,7 +7250,7 @@ add-int/lit8 v1, v1, 0x2 - invoke-virtual {v7, v2, v12}, Lorg/a/a/g;->i(Ljava/lang/String;Z)Lorg/a/a/a; + invoke-virtual {v7, v2, v12}, Lorg/a/a/g;->j(Ljava/lang/String;Z)Lorg/a/a/a; move-result-object v2 @@ -7294,7 +7294,7 @@ const/4 v4, 0x0 - invoke-virtual {v7, v2, v4}, Lorg/a/a/g;->i(Ljava/lang/String;Z)Lorg/a/a/a; + invoke-virtual {v7, v2, v4}, Lorg/a/a/g;->j(Ljava/lang/String;Z)Lorg/a/a/a; move-result-object v2 @@ -7786,7 +7786,7 @@ const/4 v4, 0x1 - invoke-virtual {v1, v2, v4}, Lorg/a/a/m;->i(Ljava/lang/String;Z)Lorg/a/a/a; + invoke-virtual {v1, v2, v4}, Lorg/a/a/m;->j(Ljava/lang/String;Z)Lorg/a/a/a; move-result-object v2 @@ -7820,7 +7820,7 @@ const/4 v4, 0x0 - invoke-virtual {v1, v2, v4}, Lorg/a/a/m;->i(Ljava/lang/String;Z)Lorg/a/a/a; + invoke-virtual {v1, v2, v4}, Lorg/a/a/m;->j(Ljava/lang/String;Z)Lorg/a/a/a; move-result-object v2 @@ -8626,7 +8626,7 @@ const/4 v5, 0x1 - invoke-virtual {v1, v2, v5}, Lorg/a/a/t;->i(Ljava/lang/String;Z)Lorg/a/a/a; + invoke-virtual {v1, v2, v5}, Lorg/a/a/t;->j(Ljava/lang/String;Z)Lorg/a/a/a; move-result-object v2 @@ -8668,7 +8668,7 @@ const/4 v5, 0x0 - invoke-virtual {v1, v2, v5}, Lorg/a/a/t;->i(Ljava/lang/String;Z)Lorg/a/a/a; + invoke-virtual {v1, v2, v5}, Lorg/a/a/t;->j(Ljava/lang/String;Z)Lorg/a/a/a; move-result-object v2 diff --git a/com.discord/smali_classes2/org/a/a/g.smali b/com.discord/smali_classes2/org/a/a/g.smali index b06a17395a..d7bbd95b35 100644 --- a/com.discord/smali_classes2/org/a/a/g.smali +++ b/com.discord/smali_classes2/org/a/a/g.smali @@ -284,14 +284,14 @@ throw p1 .end method -.method public i(Ljava/lang/String;Z)Lorg/a/a/a; +.method public j(Ljava/lang/String;Z)Lorg/a/a/a; .locals 1 iget-object v0, p0, Lorg/a/a/g;->bvY:Lorg/a/a/g; if-eqz v0, :cond_0 - invoke-virtual {v0, p1, p2}, Lorg/a/a/g;->i(Ljava/lang/String;Z)Lorg/a/a/a; + invoke-virtual {v0, p1, p2}, Lorg/a/a/g;->j(Ljava/lang/String;Z)Lorg/a/a/a; move-result-object p1 diff --git a/com.discord/smali_classes2/org/a/a/h.smali b/com.discord/smali_classes2/org/a/a/h.smali index e7ee7bcbc6..4d7a073241 100644 --- a/com.discord/smali_classes2/org/a/a/h.smali +++ b/com.discord/smali_classes2/org/a/a/h.smali @@ -709,7 +709,7 @@ return-void .end method -.method public final i(Ljava/lang/String;Z)Lorg/a/a/a; +.method public final j(Ljava/lang/String;Z)Lorg/a/a/a; .locals 2 new-instance v0, Lorg/a/a/d; diff --git a/com.discord/smali_classes2/org/a/a/m.smali b/com.discord/smali_classes2/org/a/a/m.smali index f77ebef6b3..05437f76e9 100644 --- a/com.discord/smali_classes2/org/a/a/m.smali +++ b/com.discord/smali_classes2/org/a/a/m.smali @@ -85,14 +85,14 @@ return-void .end method -.method public i(Ljava/lang/String;Z)Lorg/a/a/a; +.method public j(Ljava/lang/String;Z)Lorg/a/a/a; .locals 1 iget-object v0, p0, Lorg/a/a/m;->bwW:Lorg/a/a/m; if-eqz v0, :cond_0 - invoke-virtual {v0, p1, p2}, Lorg/a/a/m;->i(Ljava/lang/String;Z)Lorg/a/a/a; + invoke-virtual {v0, p1, p2}, Lorg/a/a/m;->j(Ljava/lang/String;Z)Lorg/a/a/a; move-result-object p1 diff --git a/com.discord/smali_classes2/org/a/a/n.smali b/com.discord/smali_classes2/org/a/a/n.smali index 2cc17c45fc..bf6c7ef631 100644 --- a/com.discord/smali_classes2/org/a/a/n.smali +++ b/com.discord/smali_classes2/org/a/a/n.smali @@ -139,7 +139,7 @@ return-void .end method -.method public final i(Ljava/lang/String;Z)Lorg/a/a/a; +.method public final j(Ljava/lang/String;Z)Lorg/a/a/a; .locals 2 new-instance v0, Lorg/a/a/d; diff --git a/com.discord/smali_classes2/org/a/a/t.smali b/com.discord/smali_classes2/org/a/a/t.smali index a64d564f76..8c04214ebb 100644 --- a/com.discord/smali_classes2/org/a/a/t.smali +++ b/com.discord/smali_classes2/org/a/a/t.smali @@ -671,25 +671,6 @@ return-void .end method -.method public i(Ljava/lang/String;Z)Lorg/a/a/a; - .locals 1 - - iget-object v0, p0, Lorg/a/a/t;->bxF:Lorg/a/a/t; - - if-eqz v0, :cond_0 - - invoke-virtual {v0, p1, p2}, Lorg/a/a/t;->i(Ljava/lang/String;Z)Lorg/a/a/a; - - move-result-object p1 - - return-object p1 - - :cond_0 - const/4 p1, 0x0 - - return-object p1 -.end method - .method public i(ILjava/lang/String;)V .locals 1 @@ -703,6 +684,25 @@ return-void .end method +.method public j(Ljava/lang/String;Z)Lorg/a/a/a; + .locals 1 + + iget-object v0, p0, Lorg/a/a/t;->bxF:Lorg/a/a/t; + + if-eqz v0, :cond_0 + + invoke-virtual {v0, p1, p2}, Lorg/a/a/t;->j(Ljava/lang/String;Z)Lorg/a/a/a; + + move-result-object p1 + + return-object p1 + + :cond_0 + const/4 p1, 0x0 + + return-object p1 +.end method + .method public m(Ljava/lang/String;I)V .locals 2 diff --git a/com.discord/smali_classes2/org/a/a/u.smali b/com.discord/smali_classes2/org/a/a/u.smali index 46df00a501..dc1f901d3e 100644 --- a/com.discord/smali_classes2/org/a/a/u.smali +++ b/com.discord/smali_classes2/org/a/a/u.smali @@ -4625,55 +4625,6 @@ return-void .end method -.method public final i(Ljava/lang/String;Z)Lorg/a/a/a; - .locals 2 - - new-instance v0, Lorg/a/a/d; - - invoke-direct {v0}, Lorg/a/a/d;->()V - - iget-object v1, p0, Lorg/a/a/u;->bvJ:Lorg/a/a/z; - - invoke-virtual {v1, p1}, Lorg/a/a/z;->es(Ljava/lang/String;)I - - move-result p1 - - invoke-virtual {v0, p1}, Lorg/a/a/d;->du(I)Lorg/a/a/d; - - move-result-object p1 - - const/4 v1, 0x0 - - invoke-virtual {p1, v1}, Lorg/a/a/d;->du(I)Lorg/a/a/d; - - if-eqz p2, :cond_0 - - new-instance p1, Lorg/a/a/b; - - iget-object p2, p0, Lorg/a/a/u;->bvJ:Lorg/a/a/z; - - iget-object v1, p0, Lorg/a/a/u;->bwp:Lorg/a/a/b; - - invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;->(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V - - iput-object p1, p0, Lorg/a/a/u;->bwp:Lorg/a/a/b; - - return-object p1 - - :cond_0 - new-instance p1, Lorg/a/a/b; - - iget-object p2, p0, Lorg/a/a/u;->bvJ:Lorg/a/a/z; - - iget-object v1, p0, Lorg/a/a/u;->bwq:Lorg/a/a/b; - - invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;->(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V - - iput-object p1, p0, Lorg/a/a/u;->bwq:Lorg/a/a/b; - - return-object p1 -.end method - .method public final i(ILjava/lang/String;)V .locals 3 @@ -4752,6 +4703,55 @@ return-void .end method +.method public final j(Ljava/lang/String;Z)Lorg/a/a/a; + .locals 2 + + new-instance v0, Lorg/a/a/d; + + invoke-direct {v0}, Lorg/a/a/d;->()V + + iget-object v1, p0, Lorg/a/a/u;->bvJ:Lorg/a/a/z; + + invoke-virtual {v1, p1}, Lorg/a/a/z;->es(Ljava/lang/String;)I + + move-result p1 + + invoke-virtual {v0, p1}, Lorg/a/a/d;->du(I)Lorg/a/a/d; + + move-result-object p1 + + const/4 v1, 0x0 + + invoke-virtual {p1, v1}, Lorg/a/a/d;->du(I)Lorg/a/a/d; + + if-eqz p2, :cond_0 + + new-instance p1, Lorg/a/a/b; + + iget-object p2, p0, Lorg/a/a/u;->bvJ:Lorg/a/a/z; + + iget-object v1, p0, Lorg/a/a/u;->bwp:Lorg/a/a/b; + + invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;->(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V + + iput-object p1, p0, Lorg/a/a/u;->bwp:Lorg/a/a/b; + + return-object p1 + + :cond_0 + new-instance p1, Lorg/a/a/b; + + iget-object p2, p0, Lorg/a/a/u;->bvJ:Lorg/a/a/z; + + iget-object v1, p0, Lorg/a/a/u;->bwq:Lorg/a/a/b; + + invoke-direct {p1, p2, v0, v1}, Lorg/a/a/b;->(Lorg/a/a/z;Lorg/a/a/d;Lorg/a/a/b;)V + + iput-object p1, p0, Lorg/a/a/u;->bwq:Lorg/a/a/b; + + return-object p1 +.end method + .method public final m(Ljava/lang/String;I)V .locals 2