diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index ff5a3d1a18..c10a4f7754 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1221.apk
+apkFileName: com.discord-1222.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -3106,5 +3106,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1221'
- versionName: '35.0'
+ versionCode: '1222'
+ versionName: '34.5'
diff --git a/com.discord/assets/thz/VAD_weight.thw b/com.discord/assets/thz/VAD_weight.thw
deleted file mode 100644
index af08d72252..0000000000
Binary files a/com.discord/assets/thz/VAD_weight.thw and /dev/null differ
diff --git a/com.discord/lib/arm64-v8a/libdiscord.so b/com.discord/lib/arm64-v8a/libdiscord.so
index b47a1b23a5..111c94a72b 100644
Binary files a/com.discord/lib/arm64-v8a/libdiscord.so and b/com.discord/lib/arm64-v8a/libdiscord.so differ
diff --git a/com.discord/lib/arm64-v8a/libkrisp_wrapper.so b/com.discord/lib/arm64-v8a/libkrisp_wrapper.so
index 932c9487c6..13b9944272 100644
Binary files a/com.discord/lib/arm64-v8a/libkrisp_wrapper.so and b/com.discord/lib/arm64-v8a/libkrisp_wrapper.so differ
diff --git a/com.discord/lib/armeabi-v7a/libdiscord.so b/com.discord/lib/armeabi-v7a/libdiscord.so
index 84f30d8816..cf67436fd4 100644
Binary files a/com.discord/lib/armeabi-v7a/libdiscord.so and b/com.discord/lib/armeabi-v7a/libdiscord.so differ
diff --git a/com.discord/lib/armeabi-v7a/libkrisp_wrapper.so b/com.discord/lib/armeabi-v7a/libkrisp_wrapper.so
index b3e30bdcc8..a861f7beb3 100644
Binary files a/com.discord/lib/armeabi-v7a/libkrisp_wrapper.so and b/com.discord/lib/armeabi-v7a/libkrisp_wrapper.so differ
diff --git a/com.discord/lib/x86/libdiscord.so b/com.discord/lib/x86/libdiscord.so
index 3bf77dda62..98d5b5a87f 100644
Binary files a/com.discord/lib/x86/libdiscord.so and b/com.discord/lib/x86/libdiscord.so differ
diff --git a/com.discord/lib/x86/libkrisp_wrapper.so b/com.discord/lib/x86/libkrisp_wrapper.so
index b32454f553..56233cb40d 100644
Binary files a/com.discord/lib/x86/libkrisp_wrapper.so and b/com.discord/lib/x86/libkrisp_wrapper.so differ
diff --git a/com.discord/lib/x86_64/libdiscord.so b/com.discord/lib/x86_64/libdiscord.so
index 26b159a149..f943a7fd02 100644
Binary files a/com.discord/lib/x86_64/libdiscord.so and b/com.discord/lib/x86_64/libdiscord.so differ
diff --git a/com.discord/lib/x86_64/libkrisp_wrapper.so b/com.discord/lib/x86_64/libkrisp_wrapper.so
index 5b0f580a0d..b3c5c44507 100644
Binary files a/com.discord/lib/x86_64/libkrisp_wrapper.so and b/com.discord/lib/x86_64/libkrisp_wrapper.so differ
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index c7b82cba8f..2b970cc780 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable/drawable_voice_user_background_muted.xml b/com.discord/res/drawable/drawable_voice_user_background_muted.xml
new file mode 100644
index 0000000000..864aa7665e
--- /dev/null
+++ b/com.discord/res/drawable/drawable_voice_user_background_muted.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable/ic_alert_circle_16dp.xml b/com.discord/res/drawable/ic_alert_circle_16dp.xml
deleted file mode 100644
index e154ff160d..0000000000
--- a/com.discord/res/drawable/ic_alert_circle_16dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/view_chat_upload.xml b/com.discord/res/layout-v22/view_chat_upload.xml
deleted file mode 100644
index 9298e92a1d..0000000000
--- a/com.discord/res/layout-v22/view_chat_upload.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/layout-v22/view_upload_progress.xml b/com.discord/res/layout-v22/view_upload_progress.xml
deleted file mode 100644
index 1cb6385108..0000000000
--- a/com.discord/res/layout-v22/view_upload_progress.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/layout/view_chat_upload.xml b/com.discord/res/layout/view_chat_upload.xml
deleted file mode 100644
index c7a3a43a3f..0000000000
--- a/com.discord/res/layout/view_chat_upload.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/layout/view_chat_upload_list.xml b/com.discord/res/layout/view_chat_upload_list.xml
deleted file mode 100644
index 531e5ff85f..0000000000
--- a/com.discord/res/layout/view_chat_upload_list.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/layout/view_upload_progress.xml b/com.discord/res/layout/view_upload_progress.xml
index d260cbdea1..12991ac003 100644
--- a/com.discord/res/layout/view_upload_progress.xml
+++ b/com.discord/res/layout/view_upload_progress.xml
@@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml b/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml
index 853bd19249..3a30f67799 100644
--- a/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml
+++ b/com.discord/res/layout/widget_chat_list_adapter_item_failed.xml
@@ -1,11 +1,12 @@
-
+
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml
index 42bcb44124..c4ecaba7e4 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -1354,6 +1354,7 @@
Само когато се говори
Показване на предупреждение, когато Discord не открива звук от микрофона.
Директно съобщение
+ %1$s (директно съобщение)
Намери или започни разговор
%1$s %2$s
Не можеш да изпращаш съобщения до потребител, който си блокирал.
@@ -2663,6 +2664,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
Ако имаш достъп до потребителите на твоя сайт, можеш да добавяш динамично &username= към низа за запитване."
Активиране на изпълним модул на сървър
%1$s (сървър)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (гласов канал)
%1$s (Гласов канал), %2$s от %3$s потребителя
%1$s (гласов канал), %2$s
@@ -3803,6 +3805,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
Имаш ли връзка за покана?
Добре дошли в Discord!
Засега само ще разгледам
+ Добре дошли в Discord, %1$s
Добре дошли в Discord
Няма звънене или обаждане. Влез в гласов канал и приятелите ти може да се включат да говорят с теб, да използват видео и дори да споделят екрана си.
Гласовите канали са местата, където хората се събират, за да говорят.
@@ -4375,6 +4378,7 @@ NSFW каналите нямат филтър за нецензурно съдъ
Канал за правила
Избери канал за правила
Канал само за модератори
+ Избери канал само за модератори
Това съобщение ще бъде изпратено до всички сървъри, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър.
Това съобщение ще бъде изпратено до **%1$s сървъри**, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър.
Виж повече статистики в настройките на сървъра.
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index d66d0d1d91..588ef7bf6a 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -1335,6 +1335,7 @@ kliknutím na ten malinkaťoulinkatý text dole."
Pouze když mluvíte
Upozornit, pokud Discord nedetekuje zvuk z tvého mikrofonu.
Přímá zpráva
+ %1$s (přímá zpráva)
Najít nebo začít konverzaci
%1$s %2$s
Nemůžeš posílat zprávy uživateli, kterého sis zablokoval.
@@ -2645,6 +2646,7 @@ Servery s uvítací obrazovkou zaznamenávají zlepšení v počtu lidí, kte
Pokud máš přístup k uživatelům na tvém webu, pak lze do řetězce dotazu dynamicky přidat &username=."
Zapnout widget serveru
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (hlasový kanál)
%1$s (hlasový kanál), Počet uživatelů: %2$s z %3$s
%1$s (hlasový kanál), %2$s
@@ -3783,6 +3785,7 @@ Dostal/a jsi od kamaráda odkaz s pozvánkou? V tom případě zadej svůj zvac
Máš odkaz s pozvánkou?
Vítejte v aplikaci Discord!
Zatím se tu porozhlédnu
+ Vítej v Discordu, %1$s
Vítej v Discordu
Žádné prozvánění ani volání. Prostě naskoč do hlasového kanálu a přátelé se k tobě mohou přidat, povídat, spustit video nebo dokonce sdílet obrazovku.
V hlasových kanálech si lidé povídají.
@@ -4349,6 +4352,7 @@ stažení desktopové aplikace."
Kanál s pravidly
Vyber kanál s pravidly
Kanál pouze pro moderátory
+ Vyber kanál pouze pro moderátory
Tato zpráva bude odeslána na všechny servery sledující tento kanál. Později můžeš tuto zprávu upravit nebo odstranit – aktualizuje se také na všech sledujících serverech.
Tato zpráva bude odeslána na **%1$s serverů** sledujících tento kanál. Později můžeš tuto zprávu upravit nebo odstranit – aktualizuje se také na všech sledujících serverech.
Další statistiky najdeš v části Nastavení serveru.
diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml
index 1317a9b0ea..4dd3ffca4e 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -1324,6 +1324,7 @@ på den lille bitte tekst nedenfor."
Kun mens du taler
Vis en advarsel, når Discord ikke registrerer lyden fra din mikrofon.
Direkte besked
+ %1$s (direkte besked)
Find eller start en samtale
%1$s %2$s
Du kan ikke sende beskeder til en bruger, du har blokeret.
@@ -2626,6 +2627,7 @@ Servere, der har opsat en velkomstskærm, ser større fremgang, ved at flere fol
Hvis du har adgang til dit websteds brugere, kan du dynamisk tilføje &username= til en spørgestreng."
Aktivér server-widget
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (talekanal)
%1$s (talekanal), %2$s af %3$s brugere
%1$s (talekanal), %2$s
@@ -3751,6 +3753,7 @@ Modtog du et invitationslink fra en ven? Indtast dit invitationslink eller kode
Har du et invitationslink?
Velkommen til Discord!
Jeg vil lige se mig omkring først
+ Velkommen til Discord, %1$s
Velkommen til Discord
Der er ingen larm fra ringetoner eller opkald. Pop ind i en talekanal og vennerne kan hoppe ind for at tale med dig, bruge video eller endda dele deres skærm.
Talekanaler er steder, hvor folk mødes for at tale.
@@ -4318,6 +4321,7 @@ mens spillet er i fokus."
Regelkanal
Vælg en kanal med regler
Kanal er kun for moderatorer
+ Vælg en kanal kun for moderator
Denne besked vil blive sendt til alle servere, der følger denne kanal. Du kan redigere eller slette denne besked senere, og den vil blive opdateret på hver af følgende servere.
Denne besked bliver sendt til **%1$s servere** følger denne kanal. Du kan redigere eller slette denne besked senere, og den vil blive opdateret på hver af følgende servere.
Se mere statistik i serverindstillinger.
diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml
index d70c5ae47e..9939740ab9 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -1331,6 +1331,7 @@ indem du auf den winzig kleinen Text unten klickst."
Nur beim Sprechen
Warnung anzeigen, wenn Discord keinen Ton von deinem Mikrofon erkennt.
Direktnachricht
+ %1$s (Direktnachricht)
Finde oder starte ein Gespräch
%1$s %2$s
Du kannst einem von dir geblockten Nutzer keine Nachrichten senden.
@@ -2635,6 +2636,7 @@ Auf Servern mit einem Willkommensbildschirm sind mehr Leute aktiv."
Falls du Zugriff auf die Benutzernamen deiner Seite hast, kannst du dynamisch &username= zum Querystring hinzufügen."
Serverwidget aktivieren
%1$s (Server)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (Sprachkanal)
%1$s (Sprachkanal) %2$s von %3$s Benutzern
%1$s (Sprachkanal), %2$s
@@ -3762,6 +3764,7 @@ Hast du einen Einladungslink von einem Freund bekommen? Gib deinen Einladungslin
Hast du einen Einladungslink?
Willkommen bei Discord!
Ich sehe mich erst einmal um
+ Willkommen bei Discord, %1$s
Willkommen bei Discord
Es gibt kein Klingeln oder Anrufen. Begib dich einfach in einen Sprachkanal. Deine Freunde können jederzeit dazukommen und mit dir reden, die Videofunktion aktivieren oder sogar ihren Bildschirm teilen.
Sprachkanäle sind Orte, wo Leute sich treffen und miteinander sprechen können.
@@ -4327,6 +4330,7 @@ Push-to-Talk-Erkennung zu ermöglichen, während du dich im Spiel befindest."Regelkanal
Regelkanal auswählen
Kanal nur für Moderatoren
+ Wähle einen Kanal nur für Moderatoren
Diese Nachricht wird an alle Server, die diesem Kanal folgen, geschickt. Du kannst sie später noch bearbeiten oder löschen. Sie wird dann auf den Servern entsprechend aktualisiert.
Diese Nachricht wird an **%1$s Server**, die diesem Kanal folgen, geschickt. Du kannst sie später noch bearbeiten oder löschen. Sie wird dann auf den Servern entsprechend aktualisiert.
In den Servereinstellungen findest du noch mehr Statistiken.
diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml
index a1a8b503bf..efc83105b1 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -1353,6 +1353,7 @@ Avatar"
Μόνο όταν μιλάνε
Εμφάνιση ειδοποίησης όταν το Discord δεν ανιχνεύει ήχο από το μικρόφωνο.
Άμεσο μήνυμα
+ %1$s (άμεσο μήνυμα)
Βρες ή ξεκίνησε μια συνομιλία
%1$s %2$s
Δεν μπορείς να στείλεις μηνύματα σε έναν χρήστη που έχεις αποκλείσει.
@@ -2659,6 +2660,7 @@ Avatar"
Αν έχεις πρόσβαση στα μέλη της σελίδας σου, τότε μπορείς να προσθέσεις χειροκίνητα τον όρο &username= στη διεύθυνση URL."
Ενεργοποίηση widget διακομιστή
%1$s (διακομιστής)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (κανάλι ομιλίας)
%1$s (κανάλι ομιλίας), %2$s από %3$s χρήστες
%1$s (κανάλι ομιλίας), %2$s
@@ -3795,6 +3797,7 @@ Avatar"
Έχεις σύνδεσμο πρόσκλησης;
Καλώς ήρθες στο Discord!
Για την ώρα, θα ρίξω μια ματιά
+ Καλώς όρισες στο Discord, %1$s
Καλώς όρισες στο Discord
Χωρίς κλήσεις. Απλά μπες σε ένα κανάλι ομιλίας όποτε θέλεις και οι φίλοι σου μπορούν να μπουν για να μιλήσουν μαζί σου με βίντεο ή ακόμα και να μοιραστούν την οθόνη τους.
Στα κανάλια ομιλίας συγκεντρώνονται άτομα για να συζητήσουν.
@@ -4366,6 +4369,7 @@ Avatar"
Κανόνες καναλιού
Επίλεξε ένα κανάλι κανόνων
Κανάλι μόνο για συντονιστές
+ Επίλεξε ένα κανάλι μόνο για συντονιστές
Αυτό το μήνυμα θα σταλεί σε όλους τους διακομιστές που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί.
Αυτό το μήνυμα θα σταλεί σε **%1$s διακομιστές** που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί.
Δείτε περισσότερα στατιστικά στις Ρυθμίσεις διακομιστή.
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index 97bb9733b4..fba2b8b6fa 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -868,7 +868,7 @@ icono"
Black Lives Matter {fixed}
======================
- * **Como parte de nuestro esfuerzo constante para apoyar el movimiento Black Lives Matter,** vamos a destacar más organizaciones a las que consideramos que es importante apoyar como sea posible. Lee, aprende y mantente al tanto de nuestros esfuerzos [en nuestro blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
+* **Como parte de nuestro esfuerzo constante para apoyar el movimiento Black Lives Matter,** vamos a destacar más organizaciones a las que consideramos que es importante apoyar como sea posible. Lee, aprende y mantente al tanto de nuestros esfuerzos [en nuestro blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
"
@@ -1314,6 +1314,7 @@ pulsando el minúsculo texto que hay a continuación."
Solo al hablar
Mostrar una advertencia cuando Discord no esté detectando audio del micrófono.
Mensaje directo
+ %1$s (mensaje directo)
Busca o inicia una conversación
%1$s %2$s
No puedes enviar mensajes a un usuario al que tienes bloqueado.
@@ -2577,6 +2578,7 @@ Los servidores con pantalla de bienvenida notan un aumento en la participación
Si dispones de acceso a los usuarios de tu página, puedes añadir dinámicamente &username= a la cadena de consulta."
Habilitar widget del servidor
%1$s (servidor)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (canal de voz)
%1$s (canal de voz), %2$s de %3$s usuarios
%1$s (canal de voz), %2$s
@@ -3709,6 +3711,7 @@ Crea un servidor de Discord donde tus amigos y tú podáis hablar y pasar el rat
¿Tienes un enlace de invitación?
¡Te damos la bienvenida a Discord!
Solo quiero echar un vistazo
+ Te damos la bienvenida a Discord, %1$s
Te damos la bienvenida a Discord
No hay tonos ni llamadas. Entra en un canal de voz y tus amigos se pueden unir para hablar contigo, hacer videollamada y hasta compartir la pantalla.
En los canales de voz, la gente se reúne para charlar.
@@ -4279,6 +4282,7 @@ la detección de Pulsar para hablar mientras el juego está activo."
Canal de normas
Selecciona un canal de normas
Canal solo de moderadores
+ Selecciona un canal solo de moderadores
Se enviará este mensaje a todos los servidores que sigan a este canal. Puedes editar o eliminar este mensaje más tarde, y se actualizará en todos los servidores que sigan al canal.
Se enviará este mensaje a los **%1$s servidores** que sigan a este canal. Puedes editar o eliminar este mensaje más tarde, y se actualizará en todos los servidores que sigan al canal.
Ve más estadísticas en los Ajustes del servidor.
diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml
index d9674a730f..ee7d30b717 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -1348,6 +1348,7 @@ punaisen varoitusviestin käytöstä klikkaamalla alla näkyvää pikkuruista te
Vain puhuessa
Näytä varoitus, kun Discord ei havaitse ääntä mikrofonistasi.
Yksityisviesti
+ %1$s (yksityisviesti)
Etsi tai aloita keskustelu
%1$s %2$s
Et voi lähettää viestejä käyttäjälle, jonka olet estänyt.
@@ -2665,6 +2666,7 @@ Tervetuloruutua käyttävät palvelimet ovat yleensä muita tehokkaampia ihmiste
Jos hallinnoit myös sivustosi käyttäjiä, voit dynaamisesti lisätä &username= -merkkijonon koodiisi."
Ota palvelimen pienoisohjelma käyttöön
%1$s (palvelin)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (puhekanava)
%1$s (puhekanava), %2$s/%3$s käyttäjää
%1$s (puhekanava), %2$s
@@ -3806,6 +3808,7 @@ Saitko kutsulinkin kaveriltasi? Syötä kutsulinkki tai -koodi alle, niin pääs
Onko sinulla kutsulinkki?
Tervetuloa Discordiin!
Tarkkailen tilannetta toistaiseksi
+ Tervetuloa Discordiin, %1$s
Tervetuloa Discordiin
Puheluja ja soittoääniä ei tarvita. Siirry vain puhekanavalle, niin voit rupatella muiden kanavalla olevien ja sinne ilmaantuvien kanssa ja käyttää vaikkapa videokuvaa tai ruudunjakoa.
Puhekanavilla ihmiset voivat puhua toisilleen.
@@ -4377,6 +4380,7 @@ jotta radiopuhelintila toimii, kun pelin ikkuna on aktiivisena."
Sääntökanava
Valitse sääntökanava
Vain valvojille -kanava
+ Valitse vain valvojille tarkoitettu kanava
Tämä viesti lähetetään kaikille tätä kanavaa seuraaville palvelimille. Voit muokata viestiä myöhemmin tai poistaa sen. Viesti päivittyy vastaavasti kaikille seuraaville palvelimille.
Tämä viesti lähetetään **%1$s palvelimelle**, jotka seuraavat tätä kanavaa. Voit muokata viestiä myöhemmin tai poistaa sen. Viesti päivittyy vastaavasti kaikille seuraaville palvelimille.
Katso tarkemmat tilastot palvelinasetuksista.
diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml
index 3f0bda9bd4..cb31b9cbe4 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -896,7 +896,7 @@ l'icône"
Black Lives Matter {fixed}
======================
- * **Dans le cadre de nos efforts pour soutenir le mouvement Black Lives Matter,** nous mettons en avant davantage d'organisations qu'il est, selon nous, important d'aider de toutes les façons possibles. Lis, renseigne-toi et tiens-toi au courant de nos contributions [sur notre blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
+* **Dans le cadre de nos efforts pour soutenir le mouvement Black Lives Matter,** nous mettons en avant davantage d'organisations qu'il est, selon nous, important d'aider de toutes les façons possibles. Lis, renseigne-toi et tiens-toi au courant de nos contributions [sur notre blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
"
@@ -1357,6 +1357,7 @@ en cliquant sur le petit texte tout riquiqui ci-dessous."
Seulement en parlant
Afficher un avertissement lorsque Discord ne détecte pas de son venant de ton micro.
Message privé
+ %1$s (message privé)
Rechercher/lancer une conversation
%1$s %2$s
Tu ne peux pas envoyer de message à un utilisateur que tu as bloqué.
@@ -2665,6 +2666,7 @@ Les serveurs qui configurent leur écran d'accueil perçoivent une amélioration
Si tu as accès aux utilisateurs de ton site, tu peux ajouter dynamiquement la balise &username= dans la chaîne de requête."
Activer le widget du serveur
%1$s (serveur)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (salon vocal)
%1$s (salon vocal), %2$s sur %3$s utilisateurs
%1$s (salon vocal), %2$s
@@ -3793,6 +3795,7 @@ Tu as reçu un lien d'invitation d'un de tes amis ? Entre ton lien d'invitation
"Tu as un lien d'invitation ?"
Bienvenue sur Discord !
"Je vais juste jeter un coup d'œil"
+ Bienvenue sur Discord, %1$s
Bienvenue sur Discord
"Il n'y a ni sonnerie ni appel. Intègre un salon vocal, et les autres peuvent t'y rejoindre pour discuter avec toi, se voir en vidéo ou même partager leur écran."
Les salons vocaux sont des lieux où les gens se retrouvent pour parler.
@@ -4361,6 +4364,7 @@ puisse être utilisée même quand le jeu est à l'avant-plan."
Salon des règles
Sélectionne un salon des règles
Salon réservé aux modérateurs
+ Sélectionner un salon réservé aux modérateurs
Ce message va être envoyé à tous les serveurs qui suivent ce salon. Tu pourras toujours modifier ou supprimer ce message plus tard, et il sera mis à jour sur tous les serveurs abonnés.
Ce message va être envoyé aux **%1$s serveurs** qui suivent ce salon. Tu pourras toujours modifier ou supprimer ce message plus tard, et il sera mis à jour sur tous les serveurs abonnés.
Voir plus de statistiques dans les Paramètres du serveur.
diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml
index f378845fa9..f829e5d57e 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -1305,6 +1305,7 @@ Možeš se pouzdati u nas da ćemo ostaviti dobar dojam."
Samo dok govore
Prikaži upozorenje kada Discord ne detektira glas iz mog mikrofona.
Izravna poruka
+ %1$s (izravna poruka)
Pronađi ili započni razgovor
%1$s %2$s
Ne možeš slati poruke korisniku kojeg si blokirao/la.
@@ -2598,6 +2599,7 @@ Kod onih servera koji imaju Pozdravni zaslon uočeno je da se ljudi više zadrž
Ukoliko imaš pristup članovima svoje stranice, tada možeš dinamički dodati &username= nizu upita."
Omogući server widget
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (glasovni kanal)
%1$s (glasovni kanal), %2$s od %3$s korisnika
%1$s (glasovni kanal), %2$s
@@ -3729,6 +3731,7 @@ Jesi li primio/la link pozivnice od prijatelja? Unesi svoj link pozivnice ili k
Imaš li pozivnicu?
Dobrodošao/la na Discord!
Za sada ću samo malo razgledati okolo
+ Dobrodošao/la u Discord, %1$s
Dobrodošao/la na Discord
Nema zvonjave ni pozivanja. Ubaciš se u glasovni kanal kad si slobodan i prijatelji jednostavno dođu i pričaju s tobom, koriste video ili čak i podijele svoj zaslon.
Glasovni kanali u kojima se ljudi okupe da bi popričali.
@@ -4297,6 +4300,7 @@ aktivira se tipkama **%1$s**."
Kanal za pravila
Odaberi Kanal za pravila
Kanal samo za modove
+ Odaberi neki kanal koji je samo za modove
Ova će poruka biti poslana svim serverima koji prate ovaj kanal. Kasnije možeš urediti ili izbrisati ovu poruku i ona će se ažurirati na svakom serveru koji prati.
Ova će poruka biti poslana **%1$s serverima** koji prate ovaj kanal. Kasnije možete urediti ili izbrisati ovu poruku i ona će se ažurirati na svakom sljedećem serveru.
Pogledajte više statističkih podataka u Postavkama servera.
diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml
index 6b13e7f565..fc623ca3b8 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -1343,6 +1343,7 @@ a lenti, egészen aprócska szövegre kattintva."
Csak ha beszélek
Figyelmeztessen, amikor a Discord nem érzékel hangot a mikrofonból.
Közvetlen üzenet
+ %1$s (közvetlen üzenet)
Keress, vagy indíts új beszélgetést
%1$s %2$s
Nem tudsz üzenetet küldeni azoknak, akiket letiltottál.
@@ -2654,6 +2655,7 @@ Az üdvözlő képernyőt beállító szerverek esetében többen térnek vissza
Ha eléred az oldalad felhasználóit, akkor hozzáadhatod a &username= részletet a querystring-hez."
Szerver widget engedélyezése
%1$s (szerver)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (hangcsatorna)
%1$s (hangcsatorna), %2$s / %3$s felhasználó
%1$s (hangcsatorna), %2$s
@@ -3792,6 +3794,7 @@ Meghívó linket kaptál egy barátodtól? Írd be a linket vagy kódot, hogy cs
Van meghívó linked?
Üdv a Discordon!
Egyelőre csak körülnézek
+ Üdv a Discordon, %1$s
Üdvözöl a Discord
Nincs csörgetés vagy hívás. Csatlakozz egy hangcsatornához, ahová barátaid is beugorhatnak, hogy beszélgessetek, videózzatok vagy megosszátok képernyőtöket!
A hangcsatornák lehetővé teszik a beszélgetést.
@@ -4366,6 +4369,7 @@ miközben a játékablak aktív."
Szabályok csatorna
Válassz Szabályok csatornát!
Moderátoroknak fenntartott csatorna
+ Moderátoroknak fenntartott csatorna választása
Ez az üzenet elküldésre kerül minden a csatornát követő szerverre. Később szerkesztheted vagy törölheted ezt az üzenetet, és ez minden követő szerveren megfelelően frissítve lesz.
Ez az üzenet elküldésre kerül a csatornát követő **%1$s szerverre**. Később szerkesztheted vagy törölheted ezt az üzenetet, és ez minden követő szerveren megfelelően frissítve lesz.
Több statisztika megtekintése a Szerver beállításokban.
diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml
index 6a5c3d3e71..3b8474382d 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -888,7 +888,7 @@ icona"
Black Lives Matter {fixed}
======================
- * **Come parte del nostro continuo sforzo a supporto del movimento Black Lives Matter,** vogliamo menzionare ulteriori organizzazioni che riteniamo importante supportare in ogni modo possibile. Leggi, informati e resta aggiornato su ciò che facciamo [sul nostro blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
+* **Come parte del nostro continuo sforzo a supporto del movimento Black Lives Matter,** vogliamo menzionare ulteriori organizzazioni che riteniamo importante supportare in ogni modo possibile. Leggi, informati e resta aggiornato su ciò che facciamo [sul nostro blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
"
@@ -1351,6 +1351,7 @@ sul piccolo testo in fondo."
Solo mentre parlano
Mostra un avviso quando Discord non rileva suoni dal tuo microfono.
Messaggio diretto
+ %1$s (messaggio diretto)
Trova o avvia una conversazione
%1$s %2$s
Non puoi inviare messaggi a qualcuno che hai bloccato.
@@ -2646,6 +2647,7 @@ La gente è più presente e coinvolta nei server che hanno impostato una Scherma
Se hai accesso agli utenti del sito, puoi anche aggiungere dinamicamente il parametro &username= alla stringa di richiesta."
Attiva il widget del server
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (canale vocale)
%1$s (canale vocale), %2$s di %3$s utenti
%1$s (canale vocale), %2$s
@@ -3775,6 +3777,7 @@ Hai ricevuto un link d'invito da un amico? Inserisci il tuo link o codice di inv
"Hai un link d'invito?"
Benvenuto su Discord!
Mi farò un giretto per ora
+ Benvenuto su Discord, %1$s
Benvenuto su Discord
Non è necessario chiamare. Entra in un canale vocale e gli amici potranno fare un salto a chiacchierare con te, fare una videochiamata o anche condividere il proprio schermo.
I canali vocali sono posti in cui gli utenti possono riunirsi per parlare.
@@ -4347,6 +4350,7 @@ quando il gioco è in primo piano."
Canale delle regole
Seleziona un canale delle regole
Canale esclusivo per i moderatori
+ Seleziona un canale esclusivo per i moderatori
Questo messaggio verrà inviato a tutti server che seguono questo canale. Puoi modificare o cancellare il messaggio più tardi, esso verrà poi aggiornato di conseguenza su tutti i server che seguono.
Questo messaggio verrà inviato ai **%1$s server** che seguono questo canale. Puoi modificare o cancellare il messaggio più tardi, verrà poi aggiornato di conseguenza su ognuno dei server che seguono.
Visualizza più statistiche su Impostazioni del server.
diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml
index 56d6112d6c..a820be5625 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -911,7 +911,7 @@
Black Lives Matter(黒人の命を粗末にするな) {fixed}
======================
- * **Black Lives Matter運動を引き続き支持してまいります。** その一環として、今後可能な限りサポートしてゆくべき組織・団体をさらにご紹介いたします。 [Discordのブログ](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)もお読みいただき、学び、本件に関するDiscordの最新の取り組みをご覧ください。
+* **Black Lives Matter運動を引き続き支持してまいります。** その一環として、今後可能な限りサポートしてゆくべき組織・団体をさらにご紹介いたします。 [Discordのブログ](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)もお読みいただき、学び、本件に関するDiscordの最新の取り組みをご覧ください。
"
@@ -1382,6 +1382,7 @@ Black Lives Matter(黒人の命を粗末にするな) {fixed}
話している間のみ
Discordがマイクからの音声を検知できない場合に警告を表示する。
ダイレクトメッセージ
+ %1$s (ダイレクトメッセージ)
会話に参加または作成する
%1$s %2$s
ブロック済みのユーザーにはメッセージを送信できません。
@@ -2693,6 +2694,7 @@ Black Lives Matter(黒人の命を粗末にするな) {fixed}
あなたのサイトを閲覧することができるユーザーにアクセスできる場合、&username=の形でクエリを渡すことで、動的にメンバーを追加することができます。"
サーバーウィジェットを有効化
%1$s (サーバー)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (ボイスチャンネル)
%1$s (ボイスチャンネル), ユーザー数%2$s人(上限%3$s人)
%1$s (ボイスチャンネル), %2$s
@@ -3835,6 +3837,7 @@ Discordについて詳しい情報が必要ですか?"
招待リンクをお持ちですか?
DISCORDへようこそ!
今は見るだけで
+ %1$s様、Discordへようこそ!
Discordへようこそ
電話を鳴らしたり、通話発信したりする必要はありません。ボイスチャンネルにふらっと足を運ぶだけで、フレンドが立ち寄って会話したり、ビデオを使ったり、または画面を共有したりできます。
ボイスチャンネルは、みんなが集まっておしゃべりできる場所です。
@@ -4407,6 +4410,7 @@ Discordについて詳しい情報が必要ですか?"
ルールチャンネル
ルールチャンネルの選択
モデレーター専用チャンネル
+ モデレーター専用チャンネルを選択
このチャンネルをフォローしている全てのサーバーにこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。
このチャンネルをフォローしている**%1$sサーバー**にこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。
サーバー設定でさらに統計を見ることができます。
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index a373698f71..57722c273d 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -910,7 +910,7 @@ PC 앱을 [다운로드](onDownloadClick)하세요."
Black Lives Matter 흑인의 생명은 소중하다 {fixed}
======================
- * **Black Lives Matter 운동을 지원하고자 하는 저희의 노력의 일환으로,** 어떤 방식으로든 지원이 필요하다고 여겨지는 기관들을 추가로 하이라이팅하고 있어요. [블로그](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)에서 저희가 지금까지 어떤 노력을 기울였는지 확인해보세요.
+* **Black Lives Matter 운동을 지원하고자 하는 저희의 노력의 일환으로,** 어떤 방식으로든 지원이 필요하다고 여겨지는 기관들을 추가로 하이라이팅하고 있어요. [블로그](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)에서 저희가 지금까지 어떤 노력을 기울였는지 확인해보세요.
"
@@ -1375,6 +1375,7 @@ Black Lives Matter 흑인의 생명은 소중하다 {fixed}
말하는 동안만
Discord가 마이크에서 음성을 감지할 수 없을 때 경고 표시하기.
개인 메시지
+ %1$s (개인 메시지)
대화 찾기 또는 시작하기
%1$s%2$s
차단한 사용자에게 메시지를 보낼 수 없어요.
@@ -2684,6 +2685,7 @@ Discord가 [마이크를 사용할 수 있도록 허용](onEnableClick)해 주
사이트 사용자에 대한 액세스 권한이 있다면 쿼리스트링에 &username=을 동적으로 추가할 수 있어요."
서버 widget 활성화
%1$s (서버)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (음성 채널)
%1$s (음성 채널), %2$s 중 %3$s명
%1$s (음성 채널), %2$s
@@ -3822,6 +3824,7 @@ Discord에 대해 더 알고 싶으신가요?"
초대 링크를 받았나요?
Discord에 오신 걸 환영합니다!
일단 둘러볼게요.
+ Discord에 오신 걸 환영해요, %1$s 님.
Discord에 오신 걸 환영합니다
벨소리도, 통화 대기도 없답니다. 음성 채널에 들어오기만 하면 언제든 친구들과 이야기를 나눌 수 있어요. 동영상은 물론 화면 공유까지 가능하답니다.
음성 채널은 사람들이 모여 이야기를 나누는 곳이에요.
@@ -4394,6 +4397,7 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"
규칙 채널
규칙 채널 선택하기
모드 전용 채널
+ 모드 전용 채널 선택하기
이 채널을 팔로우하는 모든 서버에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요.
이 채널을 팔로우하는 서버 **%1$s개**에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요.
서버 설정에서 다른 통계도 살펴보세요.
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index 27b5ef891f..c6a20c99c6 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -1347,6 +1347,7 @@ mažytį užrašą apačioje."
Tik Kalbant
Rodyti perspėjimą, kai Discord negali aptikti garso iš tavo mikrofono.
Asmeninė žinutė
+ %1$s (asmeninė žinutė)
Rasti arba pradėti pokalbį
%1$s %2$s
Tu negali siųsti pranešimų užblokuotam naudotojui.
@@ -2661,6 +2662,7 @@ Serveriuose, kuriuose nustatytas pasveikinimo ekranas, žmonės dažniau pasilie
Jei turi priėjimą prie savo svetainės naudotojų, gali dinamiškai pridėti &username= prie užklausos."
Įgalinti Serverio Valdiklį
%1$s (serveris)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (balso kanalas)
%1$s (balso kanalas), naudotojų: %2$s iš %3$s
%1$s (balso kanalas), %2$s
@@ -3800,6 +3802,7 @@ Ar gavai pakvietimo nuorodą iš draugo? Įvesk savo pakvietimo nuorodą arba ko
Ar turi pakvietimą?
Sveikas atvykęs į Discord!
Kol kas tik apsižvalgysiu
+ Sveikas atvykęs į Discord, %1$s
Sveikiname pradėjus naudotis „Discord“
Nereikia niekam skambinti. Prisijunk prie balso kanalo ir draugai galės prisijungti, kad pabendrautų su tavimi, naudotų vaizdo transliaciją ar net bendrintų savo ekraną.
Balso kanalai – tai vietos, kuriose žmonės renkasi pabendrauti.
@@ -4378,6 +4381,7 @@ galėtum Kalbėti visoje sistemoje."
Taisyklių kanalas
Pasirinkti taisyklių kanalą
Tik moderatoriams skirtas kanalas
+ Pasirinkti tik moderatoriams skirtą kanalą
Šis pranešimas bus išsiųstas į visus šį kanalą sekančius serverius. Šį pranešimą gali redaguoti arba pašalinti vėliau. Atitinkamai jis bus atnaujintas kiekviename sekančiame serveryje.
Šis pranešimas bus išsiųstas **%1$s serverius (-ių)**, sekančius (-ių) šį kanalą. Šį pranešimą gali redaguoti arba pašalinti vėliau. Atitinkamai jis bus atnaujintas kiekviename sekančiame serveryje.
Daugiau statistikos žiūrėk Serverio nustatymuose.
diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml
index 273ea32b5f..226518ba89 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -872,7 +872,7 @@ aanpassen"
Black Lives Matter {fixed}
======================
- * **Als onderdeel van onze aanhoudende steun aan Black Lives Matter** richten we de schijnwerpers op een aantal organisaties waarvan wij vinden dat het belangrijk is om ze op welke manier dan ook te steunen. Lees, steek iets op en blijf op de hoogte [op onze blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
+* **Als onderdeel van onze aanhoudende steun aan Black Lives Matter** richten we de schijnwerpers op een aantal organisaties waarvan wij vinden dat het belangrijk is om ze op welke manier dan ook te steunen. Lees, steek iets op en blijf op de hoogte [op onze blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
"
@@ -1333,6 +1333,7 @@ de pietepeuterige tekst hieronder."
Alleen als gesproken wordt
Laat een waarschuwing zien als Discord geen audio van je microfoon detecteert.
Direct bericht
+ %1$s (direct bericht)
Zoek of start een gesprek
%1$s %2$s
Je kunt geen berichten verzenden naar een gebruiker die je hebt geblokkeerd.
@@ -2631,6 +2632,7 @@ Bij servers met een welkomstscherm blijven gewoonlijk meer mensen hangen en doen
Als je toegang hebt tot de gebruikers van jesite, kun je dynamisch &username= aan de querystring toevoegen."
Widget server inschakelen
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (spraakkanaal)
%1$s (spraakkanaal), %2$s van %3$s gebruikers
%1$s (spraakkanaal), %2$s
@@ -3750,6 +3752,7 @@ Ontving je een uitnodigingslink van een vriend? Voer je uitnodigingslink of -cod
Heb je een uitnodigingslink?
Welkom bij Discord!
Ik kijk even rond
+ Welkom bij Discord, %1$s
Welkom bij Discord
Geen gerinkel of gebel. Ga naar een spraakkanaal zodat je vrienden langs kunnen wippen om met je te praten, video te gebruiken of zelfs hun scherm te delen.
Spraakkanalen zijn plekken waar mensen samen kunnen komen om te kletsen.
@@ -4322,6 +4325,7 @@ detectie in te schakelen terwijl de game focus heeft."
Regelskanaal
Selecteer een regelskanaal
Kanaal alleen voor moderators
+ Selecteer een kanaal alleen voor moderators
Dit bericht wordt gestuurd naar alle servers die dit kanaal volgen. Je kunt dit bericht later bewerken of verwijderen, waarna het wordt bijgewerkt/verwijderd in elke volgende server.
Dit bericht wordt gestuurd naar **%1$s servers** die dit kanaal volgen. Je kunt dit bericht later bewerken of verwijderen, waarna het wordt bijgewerkt/verwijderd in elke volgende server.
Bekijk meer statistieken in de serverinstellingen.
diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml
index 290a792612..c0ee840c40 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -1273,6 +1273,7 @@ bittelille teksten nedenfor."
Bare mens du snakker
Vis en advarsel når Discord ikke tar opp lyd fra mikrofonen din.
Direktemelding
+ %1$s (direktemelding)
Finn eller start en samtale
%1$s %2$s
Du kan ikke sende meldinger til en bruker du har blokkert.
@@ -2530,6 +2531,7 @@ Servere som har angitt en velkomstskjerm ser forbedringer i hvor mange som blir
Hvis du har tilgang til brukerne på nettsiden din, kan du dynamisk legge til &username= i spørrestrengen."
Aktiver servermodul
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (talekanal)
%1$s (talekanal), %2$s av %3$s brukere
%1$s (talekanal), %2$s
@@ -3661,6 +3663,7 @@ Har du mottatt en invitasjonslenke fra en venn? Skriv inn invitasjonslenken elle
Har du en invitasjonslenke?
Velkommen til Discord!
Jeg bare kikker foreløpig
+ Velkommen til Discord, %1$s
Velkommen til Discord
Ingen oppringninger eller anrop å tenke på. Stikk innom en kanal, så kan venner ta en tur og snakke med deg via tale eller video, eller de kan dele skjermen sin.
Talekanaler er steder der folk møtes for å snakke.
@@ -4229,6 +4232,7 @@ til datamaskinen din hvis du ønsker å bruke denne funksjonen uten å ha nettle
Regelkanal
Velg en regelkanal
Kanal med kun moderatorer
+ Velg en kanal kun for moderatorer
Denne meldingen blir sendt til alle serverne som følger denne kanalen. Du kan redigere eller slette denne meldingen senere, og den oppdateres tilsvarende på hver server som følger.
Denne meldingen blir sendt til **%1$s servere** som følger denne kanalen. Du kan redigere eller slette denne meldingen senere, og den oppdateres tilsvarende på hver server som følger.
Se mer statistikk i Serverinnstillinger.
diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml
index ddd4cb561e..1609c232ce 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -1358,6 +1358,7 @@ malutki tekst poniżej."
Tylko podczas mówienia
Pokaż ostrzeżenie, gdy Discord nie wykrywa dźwięku z Twojego mikrofonu.
Prywatna wiadomość
+ %1$s (prywatna wiadomość)
Znajdź lub rozpocznij rozmowę
%1$s %2$s
Nie możesz wysyłać wiadomości do zablokowanych użytkowników.
@@ -2664,6 +2665,7 @@ Serwery mające skonfigurowany ekran powitalny notują zazwyczaj większą liczb
Jeżeli masz dostęp do loginów swoich użytkowników, możesz dynamicznie dodać &username= do zapytania."
Włącz widget serwera
%1$s (serwer)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (kanał głosowy)
%1$s (kanał głosowy), %2$s na %3$s użytkowników
%1$s (kanał głosowy), %2$s
@@ -3802,6 +3804,7 @@ Znajomy wysłał Ci zaproszenie? Podaj link z zaproszeniem lub kod poniżej, aby
Posiadasz link z zaproszeniem?
Witaj w Discordzie!
Póki co tylko się rozglądam
+ Witamy w Discordzie, %1$s
Witaj w Discordzie
Nie ma tu żadnego dzwonienia. Wpadnij na kanał głosowy, a inni mogą wskoczyć i z Tobą porozmawiać, włączyć wideo albo nawet współdzielić ekran.
Kanały głosowe to miejsca, gdzie użytkownicy zbierają się, by porozmawiać.
@@ -4374,6 +4377,7 @@ podczas rozgrywki."
Kanał zasad
Wybierz kanał zasad
Kanał tylko dla moderatorów
+ Wybierz kanał tylko dla moderatorów
Ta wiadomość zostanie wysłana na wszystkie serwery śledzące ten kanał. Możesz ją później edytować lub usunąć – zostanie odpowiednio zaktualizowana na każdym śledzącym serwerze.
Ta wiadomość zostanie wysłana na **%1$s serwery(-ów)** śledzące(-ych) ten kanał. Możesz ją później edytować lub usunąć – zostanie odpowiednio zaktualizowana na każdym śledzącym serwerze.
Sprawdź więcej statystyk w ustawieniach serwera.
diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml
index 58d3c121fb..cdab252f0b 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -893,7 +893,7 @@ avatar"
Black Lives Matter {fixed}
======================
- * **Como parte de nossos esforços para apoiar o Black Lives Matter,** vamos destacar outras organizações que consideramos dignas de todo o apoio possível. Leia sobre, descubra e fique a par de nossos esforços [no nosso blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
+* **Como parte de nossos esforços para apoiar o Black Lives Matter,** vamos destacar outras organizações que consideramos dignas de todo o apoio possível. Leia sobre, descubra e fique a par de nossos esforços [no nosso blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
"
@@ -1360,6 +1360,7 @@ Crie o seu e comece a interagir."
Apenas ao falar
Mostrar um aviso quando o Discord não detectar o áudio do seu microfone.
Mensagem direta
+ %1$s (mensagem direta)
Encontre ou comece uma conversa
%1$s %2$s
Você não pode enviar mensagens a um usuário que bloqueou.
@@ -2622,6 +2623,7 @@ Os servidores que configuraram uma Tela de boas-vindas tiveram melhorias, como m
Caso você tenha acesso aos usuários do seu site, pode adicionar dinamicamente &username= aos parâmetros do URL."
Ativar o widget do servidor
%1$s (servidor)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (canal de voz)
%1$s (canal de voz), %2$s de %3$s usuários
%1$s (canal de voz), %2$s
@@ -3753,6 +3755,7 @@ Você recebeu um link de convite de um amigo? Insira seu link ou código de conv
Tem um link de convite?
Bem-vindo (ou vinda) ao Discord!
Estou só dando uma olhadinha
+ Bem-vindo (ou vinda), %1$s
Bem-vindo(a) ao Discord
Não há toque ou chamada. Entre em um canal de voz, e seus amigos poderão entrar para falar com você, abrir o vídeo ou até compartilhar as telas deles.
Os canais de voz são lugares onde as pessoas se reúnem para falar.
@@ -4325,6 +4328,7 @@ Aperte para Falar possa ser usado enquanto o jogo estiver em primeiro plano."Canal de regras
Selecionar um canal de regras
Canal apenas para moderadores
+ Selecionar um canal apenas para moderadores
Essa mensagem será enviada a todos os servidores que seguem esse canal. Você poderá editar ou excluir essa mensagem posteriormente e ela será atualizada de acordo em cada servidor seguindo esse canal.
Essa mensagem será enviada para **%1$s servidores** seguindo esse canal. Você poderá editar ou excluir essa mensagem posteriormente, e ela será atualizada de acordo em cada servidor seguindo esse canal.
Veja mais estatísticas nas configurações do servidor.
diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml
index d55526cc67..4e3f70cc83 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -1321,6 +1321,7 @@ textul extra-minuscul de mai jos."
Doar în timpul vorbirii
Afișează un avertisment atunci când Discord nu detectează audio din microfonul tău.
Mesaj direct
+ %1$s (mesaj direct)
Găsește sau începe o conversație
%1$s %2$s
Nu poți trimite mesaje unui utilizator pe care l-ai blocat.
@@ -2619,6 +2620,7 @@ Severele care au ecran de bun venit au în general mai multe persoane active și
Dacă ai acces la utilizatorii site-ului tău, atunci poți adăuga în mod dinamic &username= la querystring."
Activează widget-ul server-ului
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (canal de voce)
%1$s (canal de voce), %2$s din %3$s utilizatori
%1$s (canal de voce), %2$s
@@ -3754,6 +3756,7 @@ Ai primit link-ul de invitație de la un prieten? Introdu codul sau link-ul mai
Ai un link de invitație?
Bun venit pe Discord!
Deocamdată doar mă uit pe aici
+ Bun venit pe Discord, %1$s
Bun venit pe Discord
Nu e nevoie să apelezi pe nimeni și nu sună nimic nicăieri. Intră pur și simplu pe un canal de voce, iar prietenii tăi vor putea să stea de vorbă cu tine, să-și folosească camera video sau chiar să-și partajeze ecranul.
Canalele de voce sunt locurile în care se reunesc oamenii pentru a sta de vorbă.
@@ -4326,6 +4329,7 @@ detectarea modului Push-to-talk în timpul jocului."
Canal cu regulamentul
Alege un canal cu regulament
Canal exclusiv pentru moderatori
+ Selectează un canal exclusiv pentru moderatori
Acest mesaj va fi trimis la toate serverele care urmăresc acest canal. Îl poți edita sau șterge mai târziu și mesajul va fi actualizat în mod corespunzător pe fiecare server urmăritor.
Acest mesaj va fi trimis la **serverele%1$s** care urmăresc acest canal. Îl poți edita sau șterge mai târziu și mesajul va fi actualizat în mod corespunzător pe fiecare server urmăritor.
Vezi mai multe statistici în Setări server.
diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml
index 7fbd683769..41482ee4d9 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -918,7 +918,7 @@
Black Lives Matter {fixed}
======================
- * **В рамках нашей поддержки движения Black Lives Matter** мы хотим обратить ваше внимание на организации, которые, по нашему мнению, заслуживают вашей поддержки. Читайте, учитесь и следите за нашими стараниями [в нашем блоге.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
+* **В рамках нашей поддержки движения Black Lives Matter** мы хотим обратить ваше внимание на организации, которые, по нашему мнению, заслуживают вашей поддержки. Читайте, учитесь и следите за нашими стараниями [в нашем блоге.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
"
@@ -1389,6 +1389,7 @@ Black Lives Matter {fixed}
Только во время разговора
Показывать предупреждение, если Discord не обнаруживает звук из вашего микрофона.
Личное сообщение
+ %1$s (личное сообщение)
Найти или начать беседу
%1$s %2$s
Вы не можете отправлять сообщения пользователю, которого вы заблокировали.
@@ -2708,6 +2709,7 @@ Black Lives Matter {fixed}
Если у вас есть доступ к пользователям сайта, то вы также можете добавить &username= к строке запроса."
Включить виджет сервера
%1$s (сервер)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (голосовой канал)
%1$s (голосовой канал), %2$s из %3$s пользователей
%1$s (голосовой канал), %2$s
@@ -3847,6 +3849,7 @@ Black Lives Matter {fixed}
У Вас есть ссылка-приглашение?
Добро пожаловать в Discord!
Я пока тут осмотрюсь
+ Добро пожаловать в Discord, %1$s
Добро пожаловать в Discord
Вам не нужно никому звонить. Просто подключитесь к голосовому каналу, и ваши друзья смогут присоединиться, чтобы поболтать, включить видеочат или даже показать свой экран.
На голосовых каналах пользователи сервера могут пообщаться друг с другом через микрофон.
@@ -4420,6 +4423,7 @@ Black Lives Matter {fixed}
Канал с правилами
Выберите канал с правилами
Канал для модераторов
+ Выберите канал для модераторов
Это сообщение будет отправлено на все сервера, подписанные на этот канал. Если вы удалите или отредактируете это сообщение, оно будет автоматически изменено на всех подписанных серверах.
Это сообщение будет отправлено на все сервера (**%1$s**), подписанные на этот канал. Если вы удалите или отредактируете это сообщение, оно будет автоматически изменено на всех подписанных серверах.
Подробную статистику можно найти в настройках сервера.
diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml
index 051f4e4bc0..e210cf72a1 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -854,7 +854,7 @@ ikon"
Black Lives Matter {fixed}
======================
- * **Som en del av vårt fortsatta stöd för Black Lives Matter** vill vi uppmärksamma ytterligare organisationer som vi tycker det är viktigt att stödja på alla möjliga vis. Läs, bilda dig och ta reda på mer om våra ansträngningar [på vår blogg.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
+* **Som en del av vårt fortsatta stöd för Black Lives Matter** vill vi uppmärksamma ytterligare organisationer som vi tycker det är viktigt att stödja på alla möjliga vis. Läs, bilda dig och ta reda på mer om våra ansträngningar [på vår blogg.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
"
2020-08-10
sv-SE
@@ -1298,6 +1298,7 @@ den pyttelilla texten nederst."
Endast vid tal
Visa en varning när Discord inte hör ljud från din mikrofon.
Direktmeddelande
+ %1$s (direktmeddelande)
Hitta eller starta en konversation
%1$s %2$s
Du kan inte skicka meddelanden till en användare du har blockerat.
@@ -2556,6 +2557,7 @@ Servrar med välkomstskärm har fler som stannar kvar och engagerar sig."
Aktivera server-widget
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (röstkanal)
%1$s (röstkanal), %2$s av %3$s användare
%1$s (röstkanal), %2$s
@@ -3686,6 +3688,7 @@ Fick du inbjudningslänken av en vän? Ange inbjudningslänken eller koden nedan
Har du en inbjudningslänk?
Välkommen till Discord!
Jag ska bara se mig omkring lite
+ Välkommen till Discord, %1$s
Välkommen till Discord
Man behöver inte ringa. Dyk in i en röstkanal när du har tid över, så kan kompisar hoppa in för att prata med dig, använda video eller dela sin skärm.
Till röstkanalerna kommer människor för att prata.
@@ -4255,6 +4258,7 @@ medan spelet är i fokus."
Regelkanal
Välj en regelkanal
Moderatorkanal
+ Välj en moderatorkanal
Det här meddelandet skickas till alla servrar som följer den här kanalen. Du kan redigera eller radera det här meddelandet senare och det kommer att uppdateras på motsvarande sätt på de följande servrarna.
Det här meddelandet skickas till **%1$s servrar** som följer den här kanalen. Du kan redigera eller radera det här meddelandet senare och det kommer att uppdateras på motsvarande sätt på de följande servrarna.
Se mer statistik i serverinställningarna.
diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml
index f5e9ba383a..5b51212225 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -1350,6 +1350,7 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
เฉพาะตอนพูด
แสดงการแจ้งเตือนเมื่อ Discord ไม่ตรวจพบเสียงจากไมโครโฟนของคุณ
ข้อความส่วนตัว
+ %1$s (ข้อความส่วนตัว)
ค้นหา หรือเริ่มการสนทนา
%1$s %2$s
คุณไม่สามารถส่งข้อความไปยังผู้ใช้ที่คุณบล็อกได้
@@ -2662,6 +2663,7 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
หากคุณมีสิทธิ์เข้าถึงผู้ใช้เว็บไซต์ของคุณได้ คุณสามารถเพิ่ม &username= ใน querystring ได้โดยตรง"
เปิดใช้งาน widget ของเซิร์ฟเวอร์
%1$s (เซิร์ฟเวอร์)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (ช่องสำหรับพูด)
%1$s (ช่องสำหรับพูด), ผู้ใช้ %2$s คนจาก %3$s คน
%1$s (ช่องสำหรับพูด), ผู้ใช้%2$s
@@ -3801,6 +3803,7 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
คุณมีลิงก์เชิญหรือไม่
ยินดีต้อนรับสู่ Discord!
ตอนนี้ขอนั่งดูไปก่อนแล้วกัน
+ ยินดีต้อนรับสู่ Discord, %1$s
ยินดีต้อนรับสู่ Discord
ไม่ต้องรอสายหรือโทรออกอะไรทั้งนั้น เข้าไปในช่องสำหรับพูดแล้วเพื่อนจะได้พูดคุยกับคุณ ใช้วิดีโอ หรือแชร์หน้าจอของตัวเองได้เลย
ช่องสำหรับพูดคุยคือสถานที่สำหรับให้ผู้คนมาพูดคุยกัน
@@ -4372,6 +4375,7 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
ช่องกฎระเบียบ
เลือกช่องกฎระเบียบ
ช่องสำหรับผู้ดูแลเท่านั้น
+ เลือกช่องสำหรับผู้ดูแลเท่านั้น
ข้อความเหล่านี้จะถูกส่งถึงเซิร์ฟเวอร์ทั้งหมดที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป
ข้อความเหล่านี้จะถูกส่งถึง **%1$s เซิร์ฟเวอร์** ที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป
ดูสถิติในตั้งค่าเซิร์ฟเวอร์
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index 45d9b5950a..ef0916a23b 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -1345,6 +1345,7 @@ tıklayarak kırmızı alarmı kapatabilirsin."
Sadece Konuşurken
Discord mikrofonundan ses algılamadığında uyar.
Direkt Mesaj
+ %1$s (direkt mesaj)
Sohbet bul ya da başlat
%1$s %2$s
Engellediğin bir kullanıcıya mesaj gönderemezsin.
@@ -2653,6 +2654,7 @@ Hoş Geldin Ekranı'na sahip olan sunucularda genellikle daha fazla insanın sun
Sitenin kullanıcılarına erişimin varsa sorgu dizesine etkin bir şekilde &kullanıcı adı= ekleyebilirsin."
"Sunucu Widget'ını Etkinleştir"
%1$s (sunucu)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (ses kanalı)
%1$s (ses kanalı), %2$s/%3$s kullanıcı
%1$s (ses kanalı), %2$s
@@ -3793,6 +3795,7 @@ Bir arkadaşından davet bağlantısı aldın mı? Davet bağlantısını veya k
Bir Davet Bağlantın var mı?
"Discord'a Hoş Geldin!"
Şimdilik etrafa bakınacağım
+ "Discord'a hoş geldin, %1$s"
"Discord'a Hoş Geldin"
Çaldırmaya veya aramaya falan gerek yok. Bir ses kanalına gir; arkadaşların da seni görünce gelip seninle konuşmaya, video kullanmaya, hatta ekranlarını paylaşmaya başlayabilirler.
Ses kanalları insanların konuşmak için bir araya geldikleri yerlerdir.
@@ -4364,6 +4367,7 @@ algılamasını etkinleştirmek için lütfen oyun odakta iken Discord'u yöneti
Kurallar Kanalı
Bir Kurallar Kanalı seç
Moderatörlere Özel Kanal
+ Bir Modlara Özel Kanal seç
Bu mesaj, bu kanalı takip eden tüm sunuculara gönderilecektir. Bu mesajı daha sonra düzenleyebilir veya silebilirsin ve ilgili mesaj her sunucuda gerekli şekilde güncellenir.
Bu mesaj, bu kanalı takip eden **%1$s sunucuya gönderilecektir. Bu mesajı daha sonra düzenleyebilir veya silebilirsin ve ilgili mesaj her sunucuda gerekli şekilde güncellenir.
"Sunucu Ayarları'ndan daha fazla istatistiğe bak."
diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml
index 8fef662196..c561538184 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -1359,6 +1359,7 @@
Тільки під час розмови
Показати сповіщення, якщо Discord не виявить сигналу твого мікрофона.
Приватне повідомлення
+ %1$s (приватне повідомлення)
Знайди або розпочни бесіду
%1$s %2$s
Ти не можеш надсилати повідомлення користувачу, якого ти заблокував.
@@ -2675,6 +2676,7 @@
Якщо в тебе є доступ до користувачів свого сайту, то ти також можеш динамічно додати &username= до запиту."
Увімкнути віджет серверу
%1$s (сервер)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (голосовий канал)
%1$s (голосовий канал), %2$s із %3$s користувачів
%1$s (голосовий канал), %2$s
@@ -3816,6 +3818,7 @@
У тебе є посилання з запрошенням?
Вітаємо в Discord!
Я поки що пороздивляюся навколо
+ Ласкаво просимо у Discord, %1$s
Ласкаво просимо до Discord
Жодних дзвінків або викликів. Заходь до голосового каналу, коли є час, і друзі можуть приєднатися, щоб поговорити з тобою, скористатися відеочатом або навіть продемонструвати свої екрани.
Голосові канали — це місця, де люди збираються, щоб побалакати.
@@ -4390,6 +4393,7 @@
Канал із правилами
Вибрати канал із правилами
Канал тільки для модераторів
+ Вибери канал тільки для модераторів
Це повідомлення буде відправлено на всі сервери, які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах.
Це повідомлення буде відправлено на всі сервери (**%1$s), які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах.
Докладнішу статистику дивись у налаштуваннях сервера.
diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml
index 8b0fd8f2d3..992488bd53 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -1338,6 +1338,7 @@ dòng chữ bé ở dưới."
Chỉ Khi Đang Nói
Hiển thị cảnh báo khi Discord phát hiện giọng nói từ mic của bạn.
Tin nhắn trực tiếp
+ %1$s (tin nhắn trực tiếp)
Tìm hoặc bắt đầu cuộc trò chuyện
%1$s %2$s
Bạn không thể gửi tin nhắn cho người dùng đã chặn.
@@ -2642,6 +2643,7 @@ Những máy chủ có Màn Hình Chào Mừng có lượng người truy cập
Nếu bạn có quyền truy cập vào người dùng của trang thì bạn có thể linh động trong việc thêm &tên người dùng= vào chuỗi yêu cầu."
Bật Công Cụ Máy Chủ
%1$s (máy chủ)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (kênh thoại)
%1$s (kênh thoại), %2$s/%3$s người dùng
%1$s (kênh thoại), %2$s
@@ -3770,6 +3772,7 @@ Bạn đã nhận được liên kết mời từ bạn bè chưa? Hãy nhập l
Bạn có Link Mời không?
Chào mừng bạn đến với Discord!
Tôi chỉ đi dạo quanh thôi
+ Chào mừng bạn đến với Discord, %1$s
Chào mừng bạn đến với Discord
Không cần phải gọi hay hò hét nhau. Cứ vào kênh thoại và bạn bè của bạn có thể nhảy thẳng vào trò chuyện, gọi video hay chia sẻ màn hình với bạn.
Kênh thoại là nơi mọi người nói chuyện cùng nhau.
@@ -4339,6 +4342,7 @@ phát hiện Nhấn để Nói trong khi chơi game."
Kênh Nội Quy
Chọn một Kênh Nội Quy
Kênh dành riêng cho Điều Phối Viên
+ Chọn Kênh dành riêng cho Điều Phối Viên
Tin nhắn này sẽ được gửi đến tất cả các máy chủ đang theo dõi kênh này. Bạn có thể sửa hoặc xóa tin nhắn này sau, và nó cũng sẽ được cập nhật tương ứng trên từng máy chủ theo dõi kênh.
Tin nhắn này sẽ được gửi đến **%1$s máy chủ** đang theo dõi kênh này. Bạn có thể sửa hoặc xóa những tin nhắn này sau, và nó cũng sẽ được cập nhật tương ứng trên từng máy chủ theo dõi kênh.
Xem thêm các thông số khác trong Cài đặt Máy chủ.
diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml
index bf8bd10f91..a07b01f97c 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -1360,6 +1360,7 @@
只在说话的时候
在当Discord检测不到您的麦克风发出声音时显示警告。
私信
+ %1$s (私信)
寻找或开始新的对话
%1$s %2$s
您不能向被您屏蔽的用户发送信息。
@@ -2671,6 +2672,7 @@
如果您拥有网站的用户权限的话,您还可以添加 &username= 至查询字符串中。"
开启服务器小工具
%1$s (服务器)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (语音频道)
%1$s (语音频道),共 %2$s 位用户,最多限 %3$s 位用户
%1$s (语音频道),%2$s
@@ -3812,6 +3814,7 @@
您有邀请链接吗?
欢迎来到 DISCORD!
我就是随便逛逛
+ 欢迎加入 Discord,%1$s
欢迎来到 Discord
没有来电的铃声,也没有拨出的电话。请移步语音频道,与好友语音聊天、视频通话或分享屏幕。
语音频道是人们聚首畅谈的地方。
@@ -4384,6 +4387,7 @@
规则频道
选择一个规则频道
仅限管理员频道
+ 选择仅限管理员频道
该消息会发送至所有关注此频道的服务器中。您可以在晚些时候编辑或删除此消息,随后每个关注的服务器中都会进行相应的更新。
该消息会发送至所有关注此频道的 **%1$s 个服务器** 中。您可以在晚些时候编辑或删除此消息,随后每个关注的服务器中都会进行相应的更新。
在服务器设置中查看更多数据。
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index 879aa9b358..3ddd51fddf 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -1360,6 +1360,7 @@
只有在發話中
當 Discord 無法從您的麥克風中偵測到音訊時顯示警告。
私人訊息
+ %1$s (私人訊息)
搜尋或開始一個對話
%1$s %2$s
您無法傳送訊息給您已封鎖的使用者。
@@ -2674,6 +2675,7 @@
如果您擁有存取個人網站的權限,您便可以變動增加 &username= 到查詢字串中。"
啟用伺服器小工具
%1$s (伺服器)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (語音頻道)
%1$s (語音頻道),%2$s 位使用者,上限 %3$s 位
%1$s (語音頻道),%2$s
@@ -3813,6 +3815,7 @@
您有邀請連結嗎?
歡迎使用 Discord!
我現在只想四處看看
+ 歡迎來到 Discord。 %1$s
歡迎來到 Discord
沒有鈴響或來電。加入語音頻道,好友就能隨時透過影片、甚至分享畫面,進來與您聊天。
語音頻道這個地方能讓大家聚在一起交談。
@@ -4384,6 +4387,7 @@
規則頻道
選擇一個規則頻道
版主限定頻道
+ 選擇一個版主限定頻道
系統將傳送此訊息至所有追蹤此頻道的伺服器。您之後可以編輯或刪除此訊息,在追蹤的所有伺服器中,訊息也將隨之更新。
系統將傳送此訊息至追蹤此頻道的 **%1$s 個伺服器**。您之後可以編輯或刪除此訊息,在追蹤的所有伺服器中,訊息也將隨之更新。
至伺服器設定查看更多統計資料。
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index 543f0b9702..2ead49c227 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -493,11 +493,9 @@
-
-
@@ -565,9 +563,6 @@
-
-
-
@@ -696,7 +691,6 @@
-
@@ -832,7 +826,6 @@
-
@@ -851,7 +844,6 @@
-
@@ -2184,7 +2176,6 @@
-
diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml
index 362a86a2c9..3d801e1bdc 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -576,11 +576,7 @@
- %s Server Boosts
- %s Server Boost
-
- - %s mentions
- - %s mention
-
-
+
- %s mentions
- %s mention
@@ -1037,9 +1033,6 @@
- Uploading %s Files
-
- - %s Files Uploading Failed
-
- %s:
@@ -1089,5 +1082,5 @@
- %s People
- %s Person
- - false
+ - false
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 52f307f536..301a41861b 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -3136,46 +3136,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3733,39 +3733,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4007,8 +4007,8 @@
-
-
+
+
@@ -4027,9 +4027,9 @@
-
-
-
+
+
+
@@ -4719,2218 +4719,2209 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7231,420 +7222,418 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7825,133 +7814,131 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11885,5305 +11872,5287 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 021153fbf5..31a76941f8 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -890,8 +890,6 @@
Augment Complete
Burgundy
Call
- Call Ended
- %1$s — %2$s
Thanks for the feedback!
Choose your main issue
Audio cut in and out
@@ -1004,7 +1002,7 @@ Icon"
Black Lives Matter {fixed}
======================
- * **As part of our continued efforts to support Black Lives Matter,** we're highlighting additional organizations we think are important to support in any way possible. Read, educate, and catch up on our efforts [on our blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
+* **As part of our continued efforts to support Black Lives Matter,** we're highlighting additional organizations we think are important to support in any way possible. Read, educate, and catch up on our efforts [on our blog.](https://blog.discord.com/resources-for-empowering-black-communities-835866b250ca)
"
@@ -1127,7 +1125,7 @@ We’re here to make a good impression."
Presets
Select a color
Transparency
- 9f29a2aada114f919d761595231b0fbd
+ ec75a9246d4c4dab8d7e4595b6739b07
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
@@ -1297,7 +1295,6 @@ We’re here to make a good impression."
Create DM
Create Group DM
**Create** a new server and invite your friends.
- Create a server
Create Invite
Create Link
Create Announcement Channel
@@ -1450,8 +1447,6 @@ We’re here to make a good impression."
Developer Options
Device Settings
Direct Message
- %1$s (direct message)
- unread, %1$s (direct message)
Direct Messages
Disable
Disable Account
@@ -1498,6 +1493,7 @@ We’re here to make a good impression."
Only While Speaking
Show a warning when Discord is not detecting audio from your mic.
Direct Message
+ %1$s (direct message)
Find or start a conversation
%1$s %2$s
You cannot send messages to a user you have blocked.
@@ -2337,8 +2333,6 @@ We’re here to make a good impression."
Invite friends to %1$s
Type the username of a friend
Group Settings
- %1$s (group message)
- unread, %1$s (group message)
Group Name
Group Owner
Groups
@@ -2638,7 +2632,6 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
This helps Discord customize features for you and your members.
This is the channel where Discord will send relevant updates for Community admins and moderators. As some info might be sensitive, we recommend selecting your private staff channel.
This is the channel where Discord will send updates for Community admins and moderators.
- Select a Community Updates channel
Community Updates Channel
Community servers must have clearly posted server rules or guidelines for members. Please select the channel that hosts this.
Community servers must have clearly posted server rules or guidelines.
@@ -2877,13 +2870,9 @@ Servers that have set up a Welcome Screen see improvements in more people sticki
"Embed this HTML on your website to use Discord's beautiful pre-made widget. If you have access to your site's users then you can dynamically add &username= to the querystring."
Enable Server Widget
%1$s (server)
- %1$s (announcement channel)
- %1$s, %2$s (announcement channel)
- unread, %1$s (announcement channel)
- %1$s (text channel)
- %1$s, %2$s (text channel)
- unread, %1$s (text channel)
- %1$s (store channel)
+ %1$s (%2$s store %3$s announcement %4$s other %5$s})
+ , %1$s, %2$s (%3$s store %4$s announcement %5$s other %6$s})
+ unread, %1$s (%2$s store %3$s announcement %4$s other %5$s})
%1$s (voice channel)
%1$s (voice channel), %2$s of %3$s users
%1$s (voice channel), %2$s
@@ -3355,7 +3344,6 @@ Want to know more about Discord?"
An internal server error has occurred, please try again.
"This emoji doesn't work because it's animated. Upgrade to Discord Nitro to fulfill all your animated emoji dreams"
"This emoji doesn't work because it's animated. Discord Nitro can solve all of that, check User Settings > Nitro for details"
- Attachments you trying to send are unavailable.
"This emoji doesn't work here because it's from a different server. Upgrade to Discord Nitro to use emoji from other servers"
"This emoji doesn't work here because it's from a different server. Discord Nitro can solve all of that, check User Settings > Nitro for details"
Please enter a valid invite link or invite code.
@@ -3502,7 +3490,6 @@ Want to know more about Discord?"
iOS Conversation Suggestions
Participants without video are currently hidden. Would you like to show them?
Show participants without video
- — Tap to join
View all
IP Address Secured
IP Address Authorized
@@ -3616,7 +3603,7 @@ Want to know more about Discord?"
Whoops… %1$s could not be kicked. Please try again!
"Kick '%1$s'"
Korean
- thz-2020-04-20-plus-vad
+ thz-2020-04-20
%1$s, %2$s
Language
Language Not Found
@@ -3730,9 +3717,9 @@ Want to know more about Discord?"
Lithuanian
Join Server
Join this server to add it to your list and start talking!
- You are in preview mode. Join this server to talk.
+ You are in browsing mode, join this server to talk.
Join %1$s
- You are currently in preview mode. Join this server to start chatting!
+ You are currently lurking. Join this Discord to start chatting!
"I'm not ready yet"
"You can't chat here yet!"
Join this server
@@ -3831,7 +3818,6 @@ Want to know more about Discord?"
Notify users with this role who have permission to view this channel.
Mentions
%1$s mentions
- Reply
Message Actions
%1$s
%1$s
@@ -3839,7 +3825,6 @@ Want to know more about Discord?"
50+ messages
Message Display
edited
- $[](currentAuthor) $[replied to](replyHook) $[](originalAuthor)
More Options
Message pinned.
Message Preview
@@ -3874,7 +3859,6 @@ Want to know more about Discord?"
"You'll be muted and deafened in your voice session during Mic Testing."
Minimum Size: **%1$sx%1$s**
Missed an update? [Check out our previous change logs](%1$s)
- Missed Call
"Discord cannot launch **%1$s** for you because you've lost entitlement to it. This can be for a variety of reasons, such as a lapsed Nitro subscription, a refund, or if **%1$s** has been removed from the Discord store. [Please see this help article for more information or support.](%2$s)"
"Discord cannot launch this game for you because you've lost entitlement to it. This can be for a variety of reasons, such as a lapsed Nitro subscription, a refund, or if the game has been removed from the Discord store. [Please see this help article for more information or support.](%1$s)"
Unable to launch %1$s
@@ -4047,8 +4031,6 @@ Want to know more about Discord?"
No thanks
No Limit
No Video Devices
- To turn on your video in this voice channel, ask your server admins to change your video permissions.
- No Video Permission
Noise Suppression Off
Noise Suppression On
Enable Krisp noise suppression! Make some noise—like clapping your hands—while speaking. Your friends will hear nothing but your beautiful voice.
@@ -4122,6 +4104,7 @@ Want to know more about Discord?"
Accepted your friend request.
Uploaded %1$s
%1$s started playing %2$s!
+ Started streaming %1$s in %2$s. Come hang out!
Dismiss notification
%1$s invited you to play %2$s
%1$s invited you to listen on Spotify
@@ -4202,6 +4185,7 @@ Want to know more about Discord?"
Do you have an Invite Link?
Welcome to Discord!
"I'll just look around for now"
+ Welcome to Discord, %1$s
Welcome to Discord
"There's no ringing or calling. Pop into a voice channel and friends can jump in to talk with you, use video, or even share their screen."
Voice channels are where people come together to talk.
@@ -4852,6 +4836,7 @@ The changes to your subscription are reflected below:"
Rules Channel
Select a Rules Channel
Mod-only Channel
+ Select a Mod-only Channel
This message will be sent to all servers following this channel. You can edit or delete this message later, and it will update correspondingly in each following server.
This message will be sent to **%1$s servers** following this channel. You can edit or delete this message later, and it will update correspondingly in each following server.
See more stats in Server Settings.
@@ -4961,7 +4946,6 @@ The changes to your subscription are reflected below:"
Show website preview info from links pasted into chat.
Link Preview
Show emoji reactions on messages.
- Replying to $[](userHook)
Report
Report Message Posted by %1$s
Report Message
@@ -5233,8 +5217,6 @@ Good news though, it does work on your mobile web browser! So please open it the
Members with this permission can send text-to-speech messages by starting a message with /tts. These messages can be heard by everyone focused on the channel.
Server Deafen
Server Deafened
- To listen in this channel, ask your server admins to undeafen you.
- Server Deafened
Tell the world a bit about this server.
Server Emoji
Mark Folder As Read
@@ -5243,8 +5225,6 @@ Good news though, it does work on your mobile web browser! So please open it the
Server Insights
Server Mute
Server Muted
- To speak in this channel, ask your server admins to unmute you.
- Server Muted
Server name is required.
Server Options
Server Overview
@@ -5768,6 +5748,9 @@ You cannot take any moderation actions until you enable it."
Sorry, no applications on your device were found to handle this link:
Unhandled Link
Navigate to unicode emoji categories
+ Sign up
+ Sign up for your account!
+ Welcome to Discord
Unknown Region
Unknown User
Unmute
@@ -5841,7 +5824,6 @@ You cannot take any moderation actions until you enable it."
Too Many Uploads
Uploaded By
%1$s
- %1$s
Usage Access
By turning this off you will lose access to new experimental features and usage-based improvements to features like voice chat. Your old data will be anonymized, which will make Discord dumber.
No, take me back!
diff --git a/com.discord/smali_classes2/WidgetFriendsAddUserRequestsModel.smali b/com.discord/smali/WidgetFriendsAddUserRequestsModel.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetFriendsAddUserRequestsModel.smali
rename to com.discord/smali/WidgetFriendsAddUserRequestsModel.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState$a.smali b/com.discord/smali/WidgetRemoteAuthViewModel$ViewState$a.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState$a.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel$ViewState$a.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState$b.smali b/com.discord/smali/WidgetRemoteAuthViewModel$ViewState$b.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState$b.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel$ViewState$b.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState$c.smali b/com.discord/smali/WidgetRemoteAuthViewModel$ViewState$c.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState$c.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel$ViewState$c.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState$d.smali b/com.discord/smali/WidgetRemoteAuthViewModel$ViewState$d.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState$d.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel$ViewState$d.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState.smali b/com.discord/smali/WidgetRemoteAuthViewModel$ViewState.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel$ViewState.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel$ViewState.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel$a.smali b/com.discord/smali/WidgetRemoteAuthViewModel$a.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel$a.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel$a.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel$b.smali b/com.discord/smali/WidgetRemoteAuthViewModel$b.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel$b.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel$b.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel$c.smali b/com.discord/smali/WidgetRemoteAuthViewModel$c.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel$c.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel$c.smali
diff --git a/com.discord/smali_classes2/WidgetRemoteAuthViewModel.smali b/com.discord/smali/WidgetRemoteAuthViewModel.smali
similarity index 100%
rename from com.discord/smali_classes2/WidgetRemoteAuthViewModel.smali
rename to com.discord/smali/WidgetRemoteAuthViewModel.smali
diff --git a/com.discord/smali_classes2/a0.smali b/com.discord/smali/a0.smali
similarity index 100%
rename from com.discord/smali_classes2/a0.smali
rename to com.discord/smali/a0.smali
diff --git a/com.discord/smali/androidx/activity/R$id.smali b/com.discord/smali/androidx/activity/R$id.smali
index 98949abe38..1e8bef0bc8 100644
--- a/com.discord/smali/androidx/activity/R$id.smali
+++ b/com.discord/smali/androidx/activity/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index d02a739303..167a5d6bdb 100644
--- a/com.discord/smali/androidx/activity/R$string.smali
+++ b/com.discord/smali/androidx/activity/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$id.smali b/com.discord/smali/androidx/activity/ktx/R$id.smali
index 1abedf9978..4de6137c29 100644
--- a/com.discord/smali/androidx/activity/ktx/R$id.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$string.smali b/com.discord/smali/androidx/activity/ktx/R$string.smali
index e9d4d9fd27..3c48337328 100644
--- a/com.discord/smali/androidx/activity/ktx/R$string.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index 0ed34ad822..4461ba2c1a 100644
--- a/com.discord/smali/androidx/appcompat/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/R$id.smali
@@ -128,175 +128,175 @@
.field public static final buttonPanel:I = 0x7f0a0124
-.field public static final checkbox:I = 0x7f0a025f
+.field public static final checkbox:I = 0x7f0a025a
-.field public static final checked:I = 0x7f0a0261
+.field public static final checked:I = 0x7f0a025c
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final content:I = 0x7f0a0289
+.field public static final content:I = 0x7f0a0284
-.field public static final contentPanel:I = 0x7f0a028a
+.field public static final contentPanel:I = 0x7f0a0285
-.field public static final custom:I = 0x7f0a02b4
+.field public static final custom:I = 0x7f0a02af
-.field public static final customPanel:I = 0x7f0a02b5
+.field public static final customPanel:I = 0x7f0a02b0
-.field public static final decor_content_parent:I = 0x7f0a02bd
+.field public static final decor_content_parent:I = 0x7f0a02b8
-.field public static final default_activity_button:I = 0x7f0a02be
+.field public static final default_activity_button:I = 0x7f0a02b9
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final edit_query:I = 0x7f0a031d
+.field public static final edit_query:I = 0x7f0a0317
-.field public static final expand_activities_button:I = 0x7f0a0367
+.field public static final expand_activities_button:I = 0x7f0a0361
-.field public static final expanded_menu:I = 0x7f0a0368
+.field public static final expanded_menu:I = 0x7f0a0362
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final group_divider:I = 0x7f0a0411
+.field public static final group_divider:I = 0x7f0a0409
-.field public static final home:I = 0x7f0a04c0
+.field public static final home:I = 0x7f0a04b8
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final image:I = 0x7f0a04de
+.field public static final image:I = 0x7f0a04d6
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final listMode:I = 0x7f0a0588
+.field public static final listMode:I = 0x7f0a0580
-.field public static final list_item:I = 0x7f0a0589
+.field public static final list_item:I = 0x7f0a0581
-.field public static final message:I = 0x7f0a05dc
+.field public static final message:I = 0x7f0a05d4
-.field public static final multiply:I = 0x7f0a05fe
+.field public static final multiply:I = 0x7f0a05f6
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final off:I = 0x7f0a0666
+.field public static final off:I = 0x7f0a065e
-.field public static final on:I = 0x7f0a066a
+.field public static final on:I = 0x7f0a0662
-.field public static final parentPanel:I = 0x7f0a067f
+.field public static final parentPanel:I = 0x7f0a0677
-.field public static final progress_circular:I = 0x7f0a072a
+.field public static final progress_circular:I = 0x7f0a0722
-.field public static final progress_horizontal:I = 0x7f0a072d
+.field public static final progress_horizontal:I = 0x7f0a0725
-.field public static final radio:I = 0x7f0a073b
+.field public static final radio:I = 0x7f0a0733
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final screen:I = 0x7f0a078f
+.field public static final screen:I = 0x7f0a0787
-.field public static final scrollIndicatorDown:I = 0x7f0a0793
+.field public static final scrollIndicatorDown:I = 0x7f0a078b
-.field public static final scrollIndicatorUp:I = 0x7f0a0794
+.field public static final scrollIndicatorUp:I = 0x7f0a078c
-.field public static final scrollView:I = 0x7f0a0795
+.field public static final scrollView:I = 0x7f0a078d
-.field public static final search_badge:I = 0x7f0a0798
+.field public static final search_badge:I = 0x7f0a0790
-.field public static final search_bar:I = 0x7f0a0799
+.field public static final search_bar:I = 0x7f0a0791
-.field public static final search_button:I = 0x7f0a079a
+.field public static final search_button:I = 0x7f0a0792
-.field public static final search_close_btn:I = 0x7f0a079b
+.field public static final search_close_btn:I = 0x7f0a0793
-.field public static final search_edit_frame:I = 0x7f0a079c
+.field public static final search_edit_frame:I = 0x7f0a0794
-.field public static final search_go_btn:I = 0x7f0a079e
+.field public static final search_go_btn:I = 0x7f0a0796
-.field public static final search_mag_icon:I = 0x7f0a079f
+.field public static final search_mag_icon:I = 0x7f0a0797
-.field public static final search_plate:I = 0x7f0a07a0
+.field public static final search_plate:I = 0x7f0a0798
-.field public static final search_src_text:I = 0x7f0a07a3
+.field public static final search_src_text:I = 0x7f0a079b
-.field public static final search_voice_btn:I = 0x7f0a07af
+.field public static final search_voice_btn:I = 0x7f0a07a7
-.field public static final select_dialog_listview:I = 0x7f0a07b2
+.field public static final select_dialog_listview:I = 0x7f0a07aa
-.field public static final shortcut:I = 0x7f0a090e
+.field public static final shortcut:I = 0x7f0a0906
-.field public static final spacer:I = 0x7f0a091d
+.field public static final spacer:I = 0x7f0a0915
-.field public static final split_action_bar:I = 0x7f0a0921
+.field public static final split_action_bar:I = 0x7f0a0919
-.field public static final src_atop:I = 0x7f0a0925
+.field public static final src_atop:I = 0x7f0a091d
-.field public static final src_in:I = 0x7f0a0926
+.field public static final src_in:I = 0x7f0a091e
-.field public static final src_over:I = 0x7f0a0927
+.field public static final src_over:I = 0x7f0a091f
-.field public static final submenuarrow:I = 0x7f0a0944
+.field public static final submenuarrow:I = 0x7f0a093c
-.field public static final submit_area:I = 0x7f0a0945
+.field public static final submit_area:I = 0x7f0a093d
-.field public static final tabMode:I = 0x7f0a0955
+.field public static final tabMode:I = 0x7f0a094c
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final textSpacerNoButtons:I = 0x7f0a0979
+.field public static final textSpacerNoButtons:I = 0x7f0a0970
-.field public static final textSpacerNoTitle:I = 0x7f0a097a
+.field public static final textSpacerNoTitle:I = 0x7f0a0971
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final titleDividerNoCustom:I = 0x7f0a098d
+.field public static final titleDividerNoCustom:I = 0x7f0a0984
-.field public static final title_template:I = 0x7f0a098e
+.field public static final title_template:I = 0x7f0a0985
-.field public static final topPanel:I = 0x7f0a0994
+.field public static final topPanel:I = 0x7f0a098b
-.field public static final unchecked:I = 0x7f0a09aa
+.field public static final unchecked:I = 0x7f0a09a1
-.field public static final uniform:I = 0x7f0a09ad
+.field public static final uniform:I = 0x7f0a09a4
-.field public static final up:I = 0x7f0a09af
+.field public static final up:I = 0x7f0a09a6
-.field public static final wrap_content:I = 0x7f0a0aae
+.field public static final wrap_content:I = 0x7f0a0aa5
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index d97249abeb..e9a0dc311d 100644
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@@ -68,9 +68,9 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f1213f4
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$id.smali b/com.discord/smali/androidx/appcompat/resources/R$id.smali
index 88dc2be611..23cc0966f6 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$id.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$string.smali b/com.discord/smali/androidx/appcompat/resources/R$string.smali
index b5014ec53a..613c3bda87 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index 0003725ede..06db3bd515 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
@@ -28,47 +28,47 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index 5a6201ec42..4837abd0c0 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index 2d8f60b91b..3f8bc7b247 100644
--- a/com.discord/smali/androidx/browser/R$id.smali
+++ b/com.discord/smali/androidx/browser/R$id.smali
@@ -104,59 +104,59 @@
.field public static final browser_actions_menu_view:I = 0x7f0a0123
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index 20a9843134..0b7b224630 100644
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@@ -14,15 +14,15 @@
# static fields
-.field public static final copy_toast_msg:I = 0x7f1204da
+.field public static final copy_toast_msg:I = 0x7f1204d8
-.field public static final fallback_menu_item_copy_link:I = 0x7f120699
+.field public static final fallback_menu_item_copy_link:I = 0x7f120695
-.field public static final fallback_menu_item_open_in_browser:I = 0x7f12069a
+.field public static final fallback_menu_item_open_in_browser:I = 0x7f120696
-.field public static final fallback_menu_item_share_link:I = 0x7f12069b
+.field public static final fallback_menu_item_share_link:I = 0x7f120697
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
index efc5e61378..1199aa05f5 100644
--- a/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
+++ b/com.discord/smali/androidx/constraintlayout/widget/R$id.smali
@@ -16,31 +16,31 @@
# static fields
.field public static final bottom:I = 0x7f0a011d
-.field public static final end:I = 0x7f0a034a
+.field public static final end:I = 0x7f0a0344
-.field public static final gone:I = 0x7f0a040f
+.field public static final gone:I = 0x7f0a0407
-.field public static final invisible:I = 0x7f0a050f
+.field public static final invisible:I = 0x7f0a0507
-.field public static final left:I = 0x7f0a0582
+.field public static final left:I = 0x7f0a057a
-.field public static final packed:I = 0x7f0a067b
+.field public static final packed:I = 0x7f0a0673
-.field public static final parent:I = 0x7f0a067e
+.field public static final parent:I = 0x7f0a0676
-.field public static final percent:I = 0x7f0a06ac
+.field public static final percent:I = 0x7f0a06a4
-.field public static final right:I = 0x7f0a075d
+.field public static final right:I = 0x7f0a0755
-.field public static final spread:I = 0x7f0a0922
+.field public static final spread:I = 0x7f0a091a
-.field public static final spread_inside:I = 0x7f0a0923
+.field public static final spread_inside:I = 0x7f0a091b
-.field public static final start:I = 0x7f0a092a
+.field public static final start:I = 0x7f0a0922
-.field public static final top:I = 0x7f0a0993
+.field public static final top:I = 0x7f0a098a
-.field public static final wrap:I = 0x7f0a0aad
+.field public static final wrap:I = 0x7f0a0aa4
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index 84416f97de..63677107b7 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$id.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
@@ -96,71 +96,71 @@
.field public static final bottom:I = 0x7f0a011d
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final end:I = 0x7f0a034a
+.field public static final end:I = 0x7f0a0344
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final left:I = 0x7f0a0582
+.field public static final left:I = 0x7f0a057a
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right:I = 0x7f0a075d
+.field public static final right:I = 0x7f0a0755
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final start:I = 0x7f0a092a
+.field public static final start:I = 0x7f0a0922
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final top:I = 0x7f0a0993
+.field public static final top:I = 0x7f0a098a
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index d67f1b3c94..d5594ad340 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index 9d8138ebed..f5c6b158f0 100644
--- a/com.discord/smali/androidx/core/R$id.smali
+++ b/com.discord/smali/androidx/core/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index dc11e93c81..f67d0d09bc 100644
--- a/com.discord/smali/androidx/core/R$string.smali
+++ b/com.discord/smali/androidx/core/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$id.smali b/com.discord/smali/androidx/core/ktx/R$id.smali
index 38fe8f336f..d0362c23d5 100644
--- a/com.discord/smali/androidx/core/ktx/R$id.smali
+++ b/com.discord/smali/androidx/core/ktx/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$string.smali b/com.discord/smali/androidx/core/ktx/R$string.smali
index 16876b85d9..8e64ca1763 100644
--- a/com.discord/smali/androidx/core/ktx/R$string.smali
+++ b/com.discord/smali/androidx/core/ktx/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index acdcd4ebb6..dd51f5a768 100644
--- a/com.discord/smali/androidx/customview/R$id.smali
+++ b/com.discord/smali/androidx/customview/R$id.smali
@@ -28,47 +28,47 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 950ae8d710..0149224d2c 100644
--- a/com.discord/smali/androidx/customview/R$string.smali
+++ b/com.discord/smali/androidx/customview/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index 723bba99ea..f36bac01c2 100644
--- a/com.discord/smali/androidx/drawerlayout/R$id.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$id.smali
@@ -28,47 +28,47 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index b8e5d532d1..c6b8e9de8c 100644
--- a/com.discord/smali/androidx/drawerlayout/R$string.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$id.smali b/com.discord/smali/androidx/dynamicanimation/R$id.smali
index 2cbe981684..b7f6daf0ed 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$id.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index 3cdc02d83e..4c61d7a1ff 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$string.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index 5c2d20e563..9107b5c50b 100644
--- a/com.discord/smali/androidx/fragment/R$id.smali
+++ b/com.discord/smali/androidx/fragment/R$id.smali
@@ -94,63 +94,63 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final fragment_container_view_tag:I = 0x7f0a03c7
+.field public static final fragment_container_view_tag:I = 0x7f0a03bf
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a47
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index 053d114d3b..88b19dda1e 100644
--- a/com.discord/smali/androidx/fragment/R$string.smali
+++ b/com.discord/smali/androidx/fragment/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$id.smali b/com.discord/smali/androidx/fragment/ktx/R$id.smali
index eebea5d037..9d2bbc7a90 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$id.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$id.smali
@@ -94,63 +94,63 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final fragment_container_view_tag:I = 0x7f0a03c7
+.field public static final fragment_container_view_tag:I = 0x7f0a03bf
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a47
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
# direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$string.smali b/com.discord/smali/androidx/fragment/ktx/R$string.smali
index b693cb76ff..1253dc135b 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$string.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$id.smali b/com.discord/smali/androidx/legacy/coreui/R$id.smali
index 4ad09e24b5..892765337d 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$id.smali
@@ -30,59 +30,59 @@
.field public static final bottom:I = 0x7f0a011d
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final end:I = 0x7f0a034a
+.field public static final end:I = 0x7f0a0344
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final left:I = 0x7f0a0582
+.field public static final left:I = 0x7f0a057a
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right:I = 0x7f0a075d
+.field public static final right:I = 0x7f0a0755
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final start:I = 0x7f0a092a
+.field public static final start:I = 0x7f0a0922
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final top:I = 0x7f0a0993
+.field public static final top:I = 0x7f0a098a
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$string.smali b/com.discord/smali/androidx/legacy/coreui/R$string.smali
index a6b168628f..e974983a30 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$id.smali b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
index 1572a59591..1b90342012 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$id.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$id.smali
@@ -28,47 +28,47 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$string.smali b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
index c5d600f7a9..7cb1875df2 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$id.smali b/com.discord/smali/androidx/legacy/v4/R$id.smali
index ef49383385..ad39b339e1 100644
--- a/com.discord/smali/androidx/legacy/v4/R$id.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$id.smali
@@ -34,65 +34,65 @@
.field public static final cancel_action:I = 0x7f0a0139
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final end:I = 0x7f0a034a
+.field public static final end:I = 0x7f0a0344
-.field public static final end_padder:I = 0x7f0a034b
+.field public static final end_padder:I = 0x7f0a0345
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final left:I = 0x7f0a0582
+.field public static final left:I = 0x7f0a057a
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final media_actions:I = 0x7f0a059f
+.field public static final media_actions:I = 0x7f0a0597
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right:I = 0x7f0a075d
+.field public static final right:I = 0x7f0a0755
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final start:I = 0x7f0a092a
+.field public static final start:I = 0x7f0a0922
-.field public static final status_bar_latest_event_content:I = 0x7f0a092e
+.field public static final status_bar_latest_event_content:I = 0x7f0a0926
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final top:I = 0x7f0a0993
+.field public static final top:I = 0x7f0a098a
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$string.smali b/com.discord/smali/androidx/legacy/v4/R$string.smali
index 2af3fb9ba7..3cf8fefea0 100644
--- a/com.discord/smali/androidx/legacy/v4/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali b/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali
index 59d8253f5a..cad1d3197d 100644
--- a/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali
+++ b/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali
@@ -46,7 +46,7 @@
const/4 v2, 0x1
- invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->p(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
return-void
.end method
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleController$observer$1.smali b/com.discord/smali/androidx/lifecycle/LifecycleController$observer$1.smali
index fb2b7a8559..c388329705 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleController$observer$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleController$observer$1.smali
@@ -69,7 +69,7 @@
const/4 v1, 0x1
- invoke-static {p2, v0, v1, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p2, v0, v1, v0}, Lf/n/a/k/a;->q(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
invoke-virtual {p1}, Landroidx/lifecycle/LifecycleController;->finish()V
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleController.smali b/com.discord/smali/androidx/lifecycle/LifecycleController.smali
index 69cb22be5d..899ace1e5e 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleController.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleController.smali
@@ -58,7 +58,7 @@
const/4 p1, 0x1
- invoke-static {p4, v0, p1, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p4, v0, p1, v0}, Lf/n/a/k/a;->q(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
invoke-virtual {p0}, Landroidx/lifecycle/LifecycleController;->finish()V
@@ -134,7 +134,7 @@
const/4 v1, 0x1
- invoke-static {p1, v0, v1, v0}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p1, v0, v1, v0}, Lf/n/a/k/a;->q(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
invoke-virtual {p0}, Landroidx/lifecycle/LifecycleController;->finish()V
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope.smali
index 720c00a550..29f49213e5 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScope.smali
@@ -60,7 +60,7 @@
move-object v1, p0
- invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->L(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
move-result-object p1
@@ -111,7 +111,7 @@
move-object v1, p0
- invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->L(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
move-result-object p1
@@ -162,7 +162,7 @@
move-object v1, p0
- invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->L(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
move-result-object p1
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.smali
index b7258718c4..5e24ae9208 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl$register$1.smali
@@ -169,7 +169,7 @@
const/4 v1, 0x0
- invoke-static {p1, v1, v0, v1}, Lf/n/a/k/a;->q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p1, v1, v0, v1}, Lf/n/a/k/a;->p(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
:goto_0
sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
diff --git a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl.smali b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl.smali
index 48b6fd529e..a152d96591 100644
--- a/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl.smali
+++ b/com.discord/smali/androidx/lifecycle/LifecycleCoroutineScopeImpl.smali
@@ -46,7 +46,7 @@
const/4 p2, 0x1
- invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->p(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
:cond_0
return-void
@@ -121,7 +121,7 @@
const/4 p2, 0x1
- invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->q(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->p(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
:cond_0
return-void
@@ -166,7 +166,7 @@
move-object v1, p0
- invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->L(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
return-void
.end method
diff --git a/com.discord/smali/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.smali b/com.discord/smali/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.smali
index 568a3062ea..7f8408e705 100644
--- a/com.discord/smali/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.smali
+++ b/com.discord/smali/androidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2.smali
@@ -235,7 +235,7 @@
iput v2, p0, Landroidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2;->label:I
- invoke-static {v3, v5, p0}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ invoke-static {v3, v5, p0}, Lf/n/a/k/a;->n0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
move-result-object p1
:try_end_1
diff --git a/com.discord/smali/androidx/lifecycle/PausingDispatcherKt.smali b/com.discord/smali/androidx/lifecycle/PausingDispatcherKt.smali
index c7a2d698a6..beb04f7526 100644
--- a/com.discord/smali/androidx/lifecycle/PausingDispatcherKt.smali
+++ b/com.discord/smali/androidx/lifecycle/PausingDispatcherKt.smali
@@ -245,7 +245,7 @@
invoke-direct {v1, p0, p1, p2, v2}, Landroidx/lifecycle/PausingDispatcherKt$whenStateAtLeast$2;->(Landroidx/lifecycle/Lifecycle;Landroidx/lifecycle/Lifecycle$State;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)V
- invoke-static {v0, v1, p3}, Lf/n/a/k/a;->o0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ invoke-static {v0, v1, p3}, Lf/n/a/k/a;->n0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
move-result-object p0
diff --git a/com.discord/smali/androidx/loader/R$id.smali b/com.discord/smali/androidx/loader/R$id.smali
index 104805cd9d..532b073a94 100644
--- a/com.discord/smali/androidx/loader/R$id.smali
+++ b/com.discord/smali/androidx/loader/R$id.smali
@@ -28,47 +28,47 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index 4ca28ae495..ed837ea13b 100644
--- a/com.discord/smali/androidx/loader/R$string.smali
+++ b/com.discord/smali/androidx/loader/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/media/R$id.smali b/com.discord/smali/androidx/media/R$id.smali
index d3aa5a0eaf..4d77549249 100644
--- a/com.discord/smali/androidx/media/R$id.smali
+++ b/com.discord/smali/androidx/media/R$id.smali
@@ -32,53 +32,53 @@
.field public static final cancel_action:I = 0x7f0a0139
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final end_padder:I = 0x7f0a034b
+.field public static final end_padder:I = 0x7f0a0345
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final media_actions:I = 0x7f0a059f
+.field public static final media_actions:I = 0x7f0a0597
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final status_bar_latest_event_content:I = 0x7f0a092e
+.field public static final status_bar_latest_event_content:I = 0x7f0a0926
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index 2f435c58ee..e97534ff80 100644
--- a/com.discord/smali/androidx/media/R$string.smali
+++ b/com.discord/smali/androidx/media/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$id.smali b/com.discord/smali/androidx/preference/R$id.smali
index a3fffe3c34..e44a4aff1c 100644
--- a/com.discord/smali/androidx/preference/R$id.smali
+++ b/com.discord/smali/androidx/preference/R$id.smali
@@ -130,203 +130,203 @@
.field public static final buttonPanel:I = 0x7f0a0124
-.field public static final checkbox:I = 0x7f0a025f
+.field public static final checkbox:I = 0x7f0a025a
-.field public static final checked:I = 0x7f0a0261
+.field public static final checked:I = 0x7f0a025c
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final content:I = 0x7f0a0289
+.field public static final content:I = 0x7f0a0284
-.field public static final contentPanel:I = 0x7f0a028a
+.field public static final contentPanel:I = 0x7f0a0285
-.field public static final custom:I = 0x7f0a02b4
+.field public static final custom:I = 0x7f0a02af
-.field public static final customPanel:I = 0x7f0a02b5
+.field public static final customPanel:I = 0x7f0a02b0
-.field public static final decor_content_parent:I = 0x7f0a02bd
+.field public static final decor_content_parent:I = 0x7f0a02b8
-.field public static final default_activity_button:I = 0x7f0a02be
+.field public static final default_activity_button:I = 0x7f0a02b9
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final edit_query:I = 0x7f0a031d
+.field public static final edit_query:I = 0x7f0a0317
-.field public static final end:I = 0x7f0a034a
+.field public static final end:I = 0x7f0a0344
-.field public static final expand_activities_button:I = 0x7f0a0367
+.field public static final expand_activities_button:I = 0x7f0a0361
-.field public static final expanded_menu:I = 0x7f0a0368
+.field public static final expanded_menu:I = 0x7f0a0362
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final fragment_container_view_tag:I = 0x7f0a03c7
+.field public static final fragment_container_view_tag:I = 0x7f0a03bf
-.field public static final group_divider:I = 0x7f0a0411
+.field public static final group_divider:I = 0x7f0a0409
-.field public static final home:I = 0x7f0a04c0
+.field public static final home:I = 0x7f0a04b8
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_frame:I = 0x7f0a04d3
+.field public static final icon_frame:I = 0x7f0a04cb
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final image:I = 0x7f0a04de
+.field public static final image:I = 0x7f0a04d6
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
-.field public static final left:I = 0x7f0a0582
+.field public static final left:I = 0x7f0a057a
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final listMode:I = 0x7f0a0588
+.field public static final listMode:I = 0x7f0a0580
-.field public static final list_item:I = 0x7f0a0589
+.field public static final list_item:I = 0x7f0a0581
-.field public static final message:I = 0x7f0a05dc
+.field public static final message:I = 0x7f0a05d4
-.field public static final multiply:I = 0x7f0a05fe
+.field public static final multiply:I = 0x7f0a05f6
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final off:I = 0x7f0a0666
+.field public static final off:I = 0x7f0a065e
-.field public static final on:I = 0x7f0a066a
+.field public static final on:I = 0x7f0a0662
-.field public static final parentPanel:I = 0x7f0a067f
+.field public static final parentPanel:I = 0x7f0a0677
-.field public static final progress_circular:I = 0x7f0a072a
+.field public static final progress_circular:I = 0x7f0a0722
-.field public static final progress_horizontal:I = 0x7f0a072d
+.field public static final progress_horizontal:I = 0x7f0a0725
-.field public static final radio:I = 0x7f0a073b
+.field public static final radio:I = 0x7f0a0733
-.field public static final recycler_view:I = 0x7f0a0741
+.field public static final recycler_view:I = 0x7f0a0739
-.field public static final right:I = 0x7f0a075d
+.field public static final right:I = 0x7f0a0755
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final screen:I = 0x7f0a078f
+.field public static final screen:I = 0x7f0a0787
-.field public static final scrollIndicatorDown:I = 0x7f0a0793
+.field public static final scrollIndicatorDown:I = 0x7f0a078b
-.field public static final scrollIndicatorUp:I = 0x7f0a0794
+.field public static final scrollIndicatorUp:I = 0x7f0a078c
-.field public static final scrollView:I = 0x7f0a0795
+.field public static final scrollView:I = 0x7f0a078d
-.field public static final search_badge:I = 0x7f0a0798
+.field public static final search_badge:I = 0x7f0a0790
-.field public static final search_bar:I = 0x7f0a0799
+.field public static final search_bar:I = 0x7f0a0791
-.field public static final search_button:I = 0x7f0a079a
+.field public static final search_button:I = 0x7f0a0792
-.field public static final search_close_btn:I = 0x7f0a079b
+.field public static final search_close_btn:I = 0x7f0a0793
-.field public static final search_edit_frame:I = 0x7f0a079c
+.field public static final search_edit_frame:I = 0x7f0a0794
-.field public static final search_go_btn:I = 0x7f0a079e
+.field public static final search_go_btn:I = 0x7f0a0796
-.field public static final search_mag_icon:I = 0x7f0a079f
+.field public static final search_mag_icon:I = 0x7f0a0797
-.field public static final search_plate:I = 0x7f0a07a0
+.field public static final search_plate:I = 0x7f0a0798
-.field public static final search_src_text:I = 0x7f0a07a3
+.field public static final search_src_text:I = 0x7f0a079b
-.field public static final search_voice_btn:I = 0x7f0a07af
+.field public static final search_voice_btn:I = 0x7f0a07a7
-.field public static final seekbar:I = 0x7f0a07b0
+.field public static final seekbar:I = 0x7f0a07a8
-.field public static final seekbar_value:I = 0x7f0a07b1
+.field public static final seekbar_value:I = 0x7f0a07a9
-.field public static final select_dialog_listview:I = 0x7f0a07b2
+.field public static final select_dialog_listview:I = 0x7f0a07aa
-.field public static final shortcut:I = 0x7f0a090e
+.field public static final shortcut:I = 0x7f0a0906
-.field public static final spacer:I = 0x7f0a091d
+.field public static final spacer:I = 0x7f0a0915
-.field public static final spinner:I = 0x7f0a0920
+.field public static final spinner:I = 0x7f0a0918
-.field public static final split_action_bar:I = 0x7f0a0921
+.field public static final split_action_bar:I = 0x7f0a0919
-.field public static final src_atop:I = 0x7f0a0925
+.field public static final src_atop:I = 0x7f0a091d
-.field public static final src_in:I = 0x7f0a0926
+.field public static final src_in:I = 0x7f0a091e
-.field public static final src_over:I = 0x7f0a0927
+.field public static final src_over:I = 0x7f0a091f
-.field public static final start:I = 0x7f0a092a
+.field public static final start:I = 0x7f0a0922
-.field public static final submenuarrow:I = 0x7f0a0944
+.field public static final submenuarrow:I = 0x7f0a093c
-.field public static final submit_area:I = 0x7f0a0945
+.field public static final submit_area:I = 0x7f0a093d
-.field public static final switchWidget:I = 0x7f0a0953
+.field public static final switchWidget:I = 0x7f0a094a
-.field public static final tabMode:I = 0x7f0a0955
+.field public static final tabMode:I = 0x7f0a094c
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final textSpacerNoButtons:I = 0x7f0a0979
+.field public static final textSpacerNoButtons:I = 0x7f0a0970
-.field public static final textSpacerNoTitle:I = 0x7f0a097a
+.field public static final textSpacerNoTitle:I = 0x7f0a0971
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final titleDividerNoCustom:I = 0x7f0a098d
+.field public static final titleDividerNoCustom:I = 0x7f0a0984
-.field public static final title_template:I = 0x7f0a098e
+.field public static final title_template:I = 0x7f0a0985
-.field public static final top:I = 0x7f0a0993
+.field public static final top:I = 0x7f0a098a
-.field public static final topPanel:I = 0x7f0a0994
+.field public static final topPanel:I = 0x7f0a098b
-.field public static final unchecked:I = 0x7f0a09aa
+.field public static final unchecked:I = 0x7f0a09a1
-.field public static final uniform:I = 0x7f0a09ad
+.field public static final uniform:I = 0x7f0a09a4
-.field public static final up:I = 0x7f0a09af
+.field public static final up:I = 0x7f0a09a6
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a47
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
-.field public static final wrap_content:I = 0x7f0a0aae
+.field public static final wrap_content:I = 0x7f0a0aa5
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index 12e588cbca..8c396460cf 100644
--- a/com.discord/smali/androidx/preference/R$string.smali
+++ b/com.discord/smali/androidx/preference/R$string.smali
@@ -68,23 +68,23 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final copy:I = 0x7f1204d0
+.field public static final copy:I = 0x7f1204ce
-.field public static final expand_button_title:I = 0x7f12067e
+.field public static final expand_button_title:I = 0x7f12067a
-.field public static final not_set:I = 0x7f120fa7
+.field public static final not_set:I = 0x7f120f95
-.field public static final preference_copied:I = 0x7f121141
+.field public static final preference_copied:I = 0x7f121131
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f1213f4
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
-.field public static final summary_collapsed_preference_list:I = 0x7f121529
+.field public static final summary_collapsed_preference_list:I = 0x7f121515
-.field public static final v7_preference_off:I = 0x7f121753
+.field public static final v7_preference_off:I = 0x7f121741
-.field public static final v7_preference_on:I = 0x7f121754
+.field public static final v7_preference_on:I = 0x7f121742
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$id.smali b/com.discord/smali/androidx/preference/ktx/R$id.smali
index 74ca63bffd..87b4823546 100644
--- a/com.discord/smali/androidx/preference/ktx/R$id.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$id.smali
@@ -130,203 +130,203 @@
.field public static final buttonPanel:I = 0x7f0a0124
-.field public static final checkbox:I = 0x7f0a025f
+.field public static final checkbox:I = 0x7f0a025a
-.field public static final checked:I = 0x7f0a0261
+.field public static final checked:I = 0x7f0a025c
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final content:I = 0x7f0a0289
+.field public static final content:I = 0x7f0a0284
-.field public static final contentPanel:I = 0x7f0a028a
+.field public static final contentPanel:I = 0x7f0a0285
-.field public static final custom:I = 0x7f0a02b4
+.field public static final custom:I = 0x7f0a02af
-.field public static final customPanel:I = 0x7f0a02b5
+.field public static final customPanel:I = 0x7f0a02b0
-.field public static final decor_content_parent:I = 0x7f0a02bd
+.field public static final decor_content_parent:I = 0x7f0a02b8
-.field public static final default_activity_button:I = 0x7f0a02be
+.field public static final default_activity_button:I = 0x7f0a02b9
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final edit_query:I = 0x7f0a031d
+.field public static final edit_query:I = 0x7f0a0317
-.field public static final end:I = 0x7f0a034a
+.field public static final end:I = 0x7f0a0344
-.field public static final expand_activities_button:I = 0x7f0a0367
+.field public static final expand_activities_button:I = 0x7f0a0361
-.field public static final expanded_menu:I = 0x7f0a0368
+.field public static final expanded_menu:I = 0x7f0a0362
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final fragment_container_view_tag:I = 0x7f0a03c7
+.field public static final fragment_container_view_tag:I = 0x7f0a03bf
-.field public static final group_divider:I = 0x7f0a0411
+.field public static final group_divider:I = 0x7f0a0409
-.field public static final home:I = 0x7f0a04c0
+.field public static final home:I = 0x7f0a04b8
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_frame:I = 0x7f0a04d3
+.field public static final icon_frame:I = 0x7f0a04cb
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final image:I = 0x7f0a04de
+.field public static final image:I = 0x7f0a04d6
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
-.field public static final left:I = 0x7f0a0582
+.field public static final left:I = 0x7f0a057a
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final listMode:I = 0x7f0a0588
+.field public static final listMode:I = 0x7f0a0580
-.field public static final list_item:I = 0x7f0a0589
+.field public static final list_item:I = 0x7f0a0581
-.field public static final message:I = 0x7f0a05dc
+.field public static final message:I = 0x7f0a05d4
-.field public static final multiply:I = 0x7f0a05fe
+.field public static final multiply:I = 0x7f0a05f6
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final off:I = 0x7f0a0666
+.field public static final off:I = 0x7f0a065e
-.field public static final on:I = 0x7f0a066a
+.field public static final on:I = 0x7f0a0662
-.field public static final parentPanel:I = 0x7f0a067f
+.field public static final parentPanel:I = 0x7f0a0677
-.field public static final progress_circular:I = 0x7f0a072a
+.field public static final progress_circular:I = 0x7f0a0722
-.field public static final progress_horizontal:I = 0x7f0a072d
+.field public static final progress_horizontal:I = 0x7f0a0725
-.field public static final radio:I = 0x7f0a073b
+.field public static final radio:I = 0x7f0a0733
-.field public static final recycler_view:I = 0x7f0a0741
+.field public static final recycler_view:I = 0x7f0a0739
-.field public static final right:I = 0x7f0a075d
+.field public static final right:I = 0x7f0a0755
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final screen:I = 0x7f0a078f
+.field public static final screen:I = 0x7f0a0787
-.field public static final scrollIndicatorDown:I = 0x7f0a0793
+.field public static final scrollIndicatorDown:I = 0x7f0a078b
-.field public static final scrollIndicatorUp:I = 0x7f0a0794
+.field public static final scrollIndicatorUp:I = 0x7f0a078c
-.field public static final scrollView:I = 0x7f0a0795
+.field public static final scrollView:I = 0x7f0a078d
-.field public static final search_badge:I = 0x7f0a0798
+.field public static final search_badge:I = 0x7f0a0790
-.field public static final search_bar:I = 0x7f0a0799
+.field public static final search_bar:I = 0x7f0a0791
-.field public static final search_button:I = 0x7f0a079a
+.field public static final search_button:I = 0x7f0a0792
-.field public static final search_close_btn:I = 0x7f0a079b
+.field public static final search_close_btn:I = 0x7f0a0793
-.field public static final search_edit_frame:I = 0x7f0a079c
+.field public static final search_edit_frame:I = 0x7f0a0794
-.field public static final search_go_btn:I = 0x7f0a079e
+.field public static final search_go_btn:I = 0x7f0a0796
-.field public static final search_mag_icon:I = 0x7f0a079f
+.field public static final search_mag_icon:I = 0x7f0a0797
-.field public static final search_plate:I = 0x7f0a07a0
+.field public static final search_plate:I = 0x7f0a0798
-.field public static final search_src_text:I = 0x7f0a07a3
+.field public static final search_src_text:I = 0x7f0a079b
-.field public static final search_voice_btn:I = 0x7f0a07af
+.field public static final search_voice_btn:I = 0x7f0a07a7
-.field public static final seekbar:I = 0x7f0a07b0
+.field public static final seekbar:I = 0x7f0a07a8
-.field public static final seekbar_value:I = 0x7f0a07b1
+.field public static final seekbar_value:I = 0x7f0a07a9
-.field public static final select_dialog_listview:I = 0x7f0a07b2
+.field public static final select_dialog_listview:I = 0x7f0a07aa
-.field public static final shortcut:I = 0x7f0a090e
+.field public static final shortcut:I = 0x7f0a0906
-.field public static final spacer:I = 0x7f0a091d
+.field public static final spacer:I = 0x7f0a0915
-.field public static final spinner:I = 0x7f0a0920
+.field public static final spinner:I = 0x7f0a0918
-.field public static final split_action_bar:I = 0x7f0a0921
+.field public static final split_action_bar:I = 0x7f0a0919
-.field public static final src_atop:I = 0x7f0a0925
+.field public static final src_atop:I = 0x7f0a091d
-.field public static final src_in:I = 0x7f0a0926
+.field public static final src_in:I = 0x7f0a091e
-.field public static final src_over:I = 0x7f0a0927
+.field public static final src_over:I = 0x7f0a091f
-.field public static final start:I = 0x7f0a092a
+.field public static final start:I = 0x7f0a0922
-.field public static final submenuarrow:I = 0x7f0a0944
+.field public static final submenuarrow:I = 0x7f0a093c
-.field public static final submit_area:I = 0x7f0a0945
+.field public static final submit_area:I = 0x7f0a093d
-.field public static final switchWidget:I = 0x7f0a0953
+.field public static final switchWidget:I = 0x7f0a094a
-.field public static final tabMode:I = 0x7f0a0955
+.field public static final tabMode:I = 0x7f0a094c
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final textSpacerNoButtons:I = 0x7f0a0979
+.field public static final textSpacerNoButtons:I = 0x7f0a0970
-.field public static final textSpacerNoTitle:I = 0x7f0a097a
+.field public static final textSpacerNoTitle:I = 0x7f0a0971
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final titleDividerNoCustom:I = 0x7f0a098d
+.field public static final titleDividerNoCustom:I = 0x7f0a0984
-.field public static final title_template:I = 0x7f0a098e
+.field public static final title_template:I = 0x7f0a0985
-.field public static final top:I = 0x7f0a0993
+.field public static final top:I = 0x7f0a098a
-.field public static final topPanel:I = 0x7f0a0994
+.field public static final topPanel:I = 0x7f0a098b
-.field public static final unchecked:I = 0x7f0a09aa
+.field public static final unchecked:I = 0x7f0a09a1
-.field public static final uniform:I = 0x7f0a09ad
+.field public static final uniform:I = 0x7f0a09a4
-.field public static final up:I = 0x7f0a09af
+.field public static final up:I = 0x7f0a09a6
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a47
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
-.field public static final wrap_content:I = 0x7f0a0aae
+.field public static final wrap_content:I = 0x7f0a0aa5
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$string.smali b/com.discord/smali/androidx/preference/ktx/R$string.smali
index c871ee7d2e..c2d76750e5 100644
--- a/com.discord/smali/androidx/preference/ktx/R$string.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$string.smali
@@ -68,23 +68,23 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final copy:I = 0x7f1204d0
+.field public static final copy:I = 0x7f1204ce
-.field public static final expand_button_title:I = 0x7f12067e
+.field public static final expand_button_title:I = 0x7f12067a
-.field public static final not_set:I = 0x7f120fa7
+.field public static final not_set:I = 0x7f120f95
-.field public static final preference_copied:I = 0x7f121141
+.field public static final preference_copied:I = 0x7f121131
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f1213f4
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
-.field public static final summary_collapsed_preference_list:I = 0x7f121529
+.field public static final summary_collapsed_preference_list:I = 0x7f121515
-.field public static final v7_preference_off:I = 0x7f121753
+.field public static final v7_preference_off:I = 0x7f121741
-.field public static final v7_preference_on:I = 0x7f121754
+.field public static final v7_preference_on:I = 0x7f121742
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index 0e8aefc4ae..29a1bcc6a5 100644
--- a/com.discord/smali/androidx/recyclerview/R$id.smali
+++ b/com.discord/smali/androidx/recyclerview/R$id.smali
@@ -94,61 +94,61 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 36129ac290..1808fbfebe 100644
--- a/com.discord/smali/androidx/recyclerview/R$string.smali
+++ b/com.discord/smali/androidx/recyclerview/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$id.smali b/com.discord/smali/androidx/sharetarget/R$id.smali
index 7dc01b4034..f325f56b8a 100644
--- a/com.discord/smali/androidx/sharetarget/R$id.smali
+++ b/com.discord/smali/androidx/sharetarget/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$string.smali b/com.discord/smali/androidx/sharetarget/R$string.smali
index 18475a3a77..6667d2669b 100644
--- a/com.discord/smali/androidx/sharetarget/R$string.smali
+++ b/com.discord/smali/androidx/sharetarget/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index d37d2a969b..9df1b525f9 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$id.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
@@ -28,47 +28,47 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index c86d92e94c..09f9e75c91 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index 56986c4668..87f1ce6e87 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 01fc6cdbaf..bce4bf837b 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index 014d673159..9eb0711004 100644
--- a/com.discord/smali/androidx/transition/R$id.smali
+++ b/com.discord/smali/androidx/transition/R$id.smali
@@ -28,67 +28,67 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final ghost_view:I = 0x7f0a03e2
+.field public static final ghost_view:I = 0x7f0a03da
-.field public static final ghost_view_holder:I = 0x7f0a03e3
+.field public static final ghost_view_holder:I = 0x7f0a03db
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final parent_matrix:I = 0x7f0a0680
+.field public static final parent_matrix:I = 0x7f0a0678
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final save_non_transition_alpha:I = 0x7f0a078b
+.field public static final save_non_transition_alpha:I = 0x7f0a0783
-.field public static final save_overlay_view:I = 0x7f0a078c
+.field public static final save_overlay_view:I = 0x7f0a0784
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final transition_current_scene:I = 0x7f0a0997
+.field public static final transition_current_scene:I = 0x7f0a098e
-.field public static final transition_layout_save:I = 0x7f0a0998
+.field public static final transition_layout_save:I = 0x7f0a098f
-.field public static final transition_position:I = 0x7f0a0999
+.field public static final transition_position:I = 0x7f0a0990
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a099a
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0991
-.field public static final transition_transform:I = 0x7f0a099b
+.field public static final transition_transform:I = 0x7f0a0992
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index 99c8b0436e..9f30fa0725 100644
--- a/com.discord/smali/androidx/transition/R$string.smali
+++ b/com.discord/smali/androidx/transition/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index 475d6baf03..9d510c618d 100644
--- a/com.discord/smali/androidx/vectordrawable/R$id.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index c93252892a..881eeaac5b 100644
--- a/com.discord/smali/androidx/vectordrawable/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$id.smali b/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
index 53b7580964..5c17de021d 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
index 31626d6b48..12b0add746 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index 0724967b3e..a40327a091 100644
--- a/com.discord/smali/androidx/viewpager/R$id.smali
+++ b/com.discord/smali/androidx/viewpager/R$id.smali
@@ -28,47 +28,47 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index 76376f6aa4..f017333361 100644
--- a/com.discord/smali/androidx/viewpager/R$string.smali
+++ b/com.discord/smali/androidx/viewpager/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$id.smali b/com.discord/smali/androidx/viewpager2/R$id.smali
index 5acac8f1aa..95ff1b7a83 100644
--- a/com.discord/smali/androidx/viewpager2/R$id.smali
+++ b/com.discord/smali/androidx/viewpager2/R$id.smali
@@ -94,61 +94,61 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$string.smali b/com.discord/smali/androidx/viewpager2/R$string.smali
index d85c151c3b..6f730100eb 100644
--- a/com.discord/smali/androidx/viewpager2/R$string.smali
+++ b/com.discord/smali/androidx/viewpager2/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$1.smali
index f7609b119e..9e936e45f8 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker$1.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker$1.smali
@@ -59,7 +59,7 @@
const/4 v2, 0x0
- invoke-static {v0, v2, v1, v2}, Lf/n/a/k/a;->r(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {v0, v2, v1, v2}, Lf/n/a/k/a;->q(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
:cond_0
return-void
diff --git a/com.discord/smali/androidx/work/CoroutineWorker.smali b/com.discord/smali/androidx/work/CoroutineWorker.smali
index af0f77ffe7..9c451f76e5 100644
--- a/com.discord/smali/androidx/work/CoroutineWorker.smali
+++ b/com.discord/smali/androidx/work/CoroutineWorker.smali
@@ -366,7 +366,7 @@
const/4 v6, 0x0
- invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->L(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
iget-object v0, p0, Landroidx/work/CoroutineWorker;->future:Landroidx/work/impl/utils/futures/SettableFuture;
diff --git a/com.discord/smali/androidx/work/R$id.smali b/com.discord/smali/androidx/work/R$id.smali
index ea513cfe20..1ccb3e52c1 100644
--- a/com.discord/smali/androidx/work/R$id.smali
+++ b/com.discord/smali/androidx/work/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index ddaf1cc02e..4d0c99b823 100644
--- a/com.discord/smali/androidx/work/R$string.smali
+++ b/com.discord/smali/androidx/work/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$id.smali b/com.discord/smali/androidx/work/ktx/R$id.smali
index 790e673283..b9a6ce76df 100644
--- a/com.discord/smali/androidx/work/ktx/R$id.smali
+++ b/com.discord/smali/androidx/work/ktx/R$id.smali
@@ -94,59 +94,59 @@
.field public static final blocking:I = 0x7f0a00f3
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
# direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$string.smali b/com.discord/smali/androidx/work/ktx/R$string.smali
index 31627f87e3..38435f098f 100644
--- a/com.discord/smali/androidx/work/ktx/R$string.smali
+++ b/com.discord/smali/androidx/work/ktx/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
# direct methods
diff --git a/com.discord/smali_classes2/b0.smali b/com.discord/smali/b0.smali
similarity index 100%
rename from com.discord/smali_classes2/b0.smali
rename to com.discord/smali/b0.smali
diff --git a/com.discord/smali_classes2/c0.smali b/com.discord/smali/c0.smali
similarity index 100%
rename from com.discord/smali_classes2/c0.smali
rename to com.discord/smali/c0.smali
diff --git a/com.discord/smali/co/discord/media_engine/Connection.smali b/com.discord/smali/co/discord/media_engine/Connection.smali
index dfb286ab50..c8d0126ee1 100644
--- a/com.discord/smali/co/discord/media_engine/Connection.smali
+++ b/com.discord/smali/co/discord/media_engine/Connection.smali
@@ -179,9 +179,6 @@
.method public final native setVADTriggerThreshold(F)V
.end method
-.method public final native setVADUseKrisp(Z)V
-.end method
-
.method public final native setVideoBroadcast(Z)V
.end method
diff --git a/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali b/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
index 99b3142731..f33e78d732 100644
--- a/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
@@ -14,12 +14,6 @@
.field public final fractionLost:F
-.field public final framesCaptured:J
-
-.field public final framesRendered:J
-
-.field public final noiseCancellerProcessTime:J
-
.field public final packetsLost:I
.field public final packetsSent:I
@@ -28,98 +22,60 @@
.field public final type:Ljava/lang/String;
-.field public final voiceActivityDetectorProcessTime:J
-
# direct methods
-.method public constructor (Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)V
- .locals 4
+.method public constructor (Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZ)V
+ .locals 1
- move-object v0, p0
+ const/4 v0, 0x0
- move-object v1, p1
+ if-eqz p1, :cond_1
- move-object v2, p3
-
- const/4 v3, 0x0
-
- if-eqz v1, :cond_1
-
- if-eqz v2, :cond_0
+ if-eqz p3, :cond_0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->type:Ljava/lang/String;
+ iput-object p1, p0, Lco/discord/media_engine/OutboundRtpAudio;->type:Ljava/lang/String;
- move v1, p2
+ iput p2, p0, Lco/discord/media_engine/OutboundRtpAudio;->ssrc:I
- iput v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->ssrc:I
+ iput-object p3, p0, Lco/discord/media_engine/OutboundRtpAudio;->codec:Lco/discord/media_engine/StatsCodec;
- iput-object v2, v0, Lco/discord/media_engine/OutboundRtpAudio;->codec:Lco/discord/media_engine/StatsCodec;
+ iput-wide p4, p0, Lco/discord/media_engine/OutboundRtpAudio;->bytesSent:J
- move-wide v1, p4
+ iput p6, p0, Lco/discord/media_engine/OutboundRtpAudio;->packetsSent:I
- iput-wide v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->bytesSent:J
+ iput p7, p0, Lco/discord/media_engine/OutboundRtpAudio;->packetsLost:I
- move v1, p6
+ iput p8, p0, Lco/discord/media_engine/OutboundRtpAudio;->fractionLost:F
- iput v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->packetsSent:I
+ iput p9, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioLevel:F
- move v1, p7
-
- iput v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->packetsLost:I
-
- move v1, p8
-
- iput v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->fractionLost:F
-
- move v1, p9
-
- iput v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->audioLevel:F
-
- move v1, p10
-
- iput-boolean v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
-
- move-wide v1, p11
-
- iput-wide v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
-
- move-wide/from16 v1, p13
-
- iput-wide v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->framesRendered:J
-
- move-wide/from16 v1, p15
-
- iput-wide v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->noiseCancellerProcessTime:J
-
- move-wide/from16 v1, p17
-
- iput-wide v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
+ iput-boolean p10, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
return-void
:cond_0
- const-string v1, "codec"
+ const-string p1, "codec"
- invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- throw v3
+ throw v0
:cond_1
- const-string v1, "type"
+ const-string p1, "type"
- invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- throw v3
+ throw v0
.end method
-.method public static synthetic copy$default(Lco/discord/media_engine/OutboundRtpAudio;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJILjava/lang/Object;)Lco/discord/media_engine/OutboundRtpAudio;
- .locals 16
+.method public static synthetic copy$default(Lco/discord/media_engine/OutboundRtpAudio;Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZILjava/lang/Object;)Lco/discord/media_engine/OutboundRtpAudio;
+ .locals 11
- move-object/from16 v0, p0
+ move-object v0, p0
- move/from16 v1, p19
+ move/from16 v1, p11
and-int/lit8 v2, v1, 0x1
@@ -130,7 +86,7 @@
goto :goto_0
:cond_0
- move-object/from16 v2, p1
+ move-object v2, p1
:goto_0
and-int/lit8 v3, v1, 0x2
@@ -142,7 +98,7 @@
goto :goto_1
:cond_1
- move/from16 v3, p2
+ move v3, p2
:goto_1
and-int/lit8 v4, v1, 0x4
@@ -154,7 +110,7 @@
goto :goto_2
:cond_2
- move-object/from16 v4, p3
+ move-object v4, p3
:goto_2
and-int/lit8 v5, v1, 0x8
@@ -166,7 +122,7 @@
goto :goto_3
:cond_3
- move-wide/from16 v5, p4
+ move-wide v5, p4
:goto_3
and-int/lit8 v7, v1, 0x10
@@ -217,77 +173,25 @@
move/from16 v10, p9
:goto_7
- and-int/lit16 v11, v1, 0x100
+ and-int/lit16 v1, v1, 0x100
- if-eqz v11, :cond_8
+ if-eqz v1, :cond_8
- iget-boolean v11, v0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
+ iget-boolean v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
goto :goto_8
:cond_8
- move/from16 v11, p10
+ move/from16 v1, p10
:goto_8
- and-int/lit16 v12, v1, 0x200
+ move-object p1, v2
- if-eqz v12, :cond_9
+ move p2, v3
- iget-wide v12, v0, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
+ move-object p3, v4
- goto :goto_9
-
- :cond_9
- move-wide/from16 v12, p11
-
- :goto_9
- and-int/lit16 v14, v1, 0x400
-
- if-eqz v14, :cond_a
-
- iget-wide v14, v0, Lco/discord/media_engine/OutboundRtpAudio;->framesRendered:J
-
- goto :goto_a
-
- :cond_a
- move-wide/from16 v14, p13
-
- :goto_a
- move-wide/from16 p13, v14
-
- and-int/lit16 v14, v1, 0x800
-
- if-eqz v14, :cond_b
-
- iget-wide v14, v0, Lco/discord/media_engine/OutboundRtpAudio;->noiseCancellerProcessTime:J
-
- goto :goto_b
-
- :cond_b
- move-wide/from16 v14, p15
-
- :goto_b
- and-int/lit16 v1, v1, 0x1000
-
- move-wide/from16 p15, v14
-
- if-eqz v1, :cond_c
-
- iget-wide v14, v0, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
-
- goto :goto_c
-
- :cond_c
- move-wide/from16 v14, p17
-
- :goto_c
- move-object/from16 p1, v2
-
- move/from16 p2, v3
-
- move-object/from16 p3, v4
-
- move-wide/from16 p4, v5
+ move-wide p4, v5
move/from16 p6, v7
@@ -297,13 +201,9 @@
move/from16 p9, v10
- move/from16 p10, v11
+ move/from16 p10, v1
- move-wide/from16 p11, v12
-
- move-wide/from16 p17, v14
-
- invoke-virtual/range {p0 .. p18}, Lco/discord/media_engine/OutboundRtpAudio;->copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)Lco/discord/media_engine/OutboundRtpAudio;
+ invoke-virtual/range {p0 .. p10}, Lco/discord/media_engine/OutboundRtpAudio;->copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZ)Lco/discord/media_engine/OutboundRtpAudio;
move-result-object v0
@@ -320,38 +220,6 @@
return-object v0
.end method
-.method public final component10()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
-
- return-wide v0
-.end method
-
-.method public final component11()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesRendered:J
-
- return-wide v0
-.end method
-
-.method public final component12()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->noiseCancellerProcessTime:J
-
- return-wide v0
-.end method
-
-.method public final component13()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
-
- return-wide v0
-.end method
-
.method public final component2()I
.locals 1
@@ -416,8 +284,8 @@
return v0
.end method
-.method public final copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)Lco/discord/media_engine/OutboundRtpAudio;
- .locals 20
+.method public final copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZ)Lco/discord/media_engine/OutboundRtpAudio;
+ .locals 12
const/4 v0, 0x0
@@ -429,11 +297,11 @@
move-object v1, v0
- move-object/from16 v2, p1
+ move-object v2, p1
- move/from16 v3, p2
+ move v3, p2
- move-object/from16 v4, p3
+ move-object v4, p3
move-wide/from16 v5, p4
@@ -447,15 +315,7 @@
move/from16 v11, p10
- move-wide/from16 v12, p11
-
- move-wide/from16 v14, p13
-
- move-wide/from16 v16, p15
-
- move-wide/from16 v18, p17
-
- invoke-direct/range {v1 .. v19}, Lco/discord/media_engine/OutboundRtpAudio;->(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)V
+ invoke-direct/range {v1 .. v11}, Lco/discord/media_engine/OutboundRtpAudio;->(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZ)V
return-object v0
@@ -479,13 +339,13 @@
const/4 v0, 0x1
- if-eq p0, p1, :cond_a
+ if-eq p0, p1, :cond_6
instance-of v1, p1, Lco/discord/media_engine/OutboundRtpAudio;
const/4 v2, 0x0
- if-eqz v1, :cond_9
+ if-eqz v1, :cond_5
check-cast p1, Lco/discord/media_engine/OutboundRtpAudio;
@@ -497,7 +357,7 @@
move-result v1
- if-eqz v1, :cond_9
+ if-eqz v1, :cond_5
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->ssrc:I
@@ -513,7 +373,7 @@
const/4 v1, 0x0
:goto_0
- if-eqz v1, :cond_9
+ if-eqz v1, :cond_5
iget-object v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->codec:Lco/discord/media_engine/StatsCodec;
@@ -523,7 +383,7 @@
move-result v1
- if-eqz v1, :cond_9
+ if-eqz v1, :cond_5
iget-wide v3, p0, Lco/discord/media_engine/OutboundRtpAudio;->bytesSent:J
@@ -541,7 +401,7 @@
const/4 v1, 0x0
:goto_1
- if-eqz v1, :cond_9
+ if-eqz v1, :cond_5
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->packetsSent:I
@@ -557,7 +417,7 @@
const/4 v1, 0x0
:goto_2
- if-eqz v1, :cond_9
+ if-eqz v1, :cond_5
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->packetsLost:I
@@ -573,7 +433,7 @@
const/4 v1, 0x0
:goto_3
- if-eqz v1, :cond_9
+ if-eqz v1, :cond_5
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->fractionLost:F
@@ -583,7 +443,7 @@
move-result v1
- if-nez v1, :cond_9
+ if-nez v1, :cond_5
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioLevel:F
@@ -593,103 +453,31 @@
move-result v1
- if-nez v1, :cond_9
+ if-nez v1, :cond_5
iget-boolean v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
- iget-boolean v3, p1, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
+ iget-boolean p1, p1, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
- if-ne v1, v3, :cond_4
+ if-ne v1, p1, :cond_4
- const/4 v1, 0x1
+ const/4 p1, 0x1
goto :goto_4
:cond_4
- const/4 v1, 0x0
+ const/4 p1, 0x0
:goto_4
- if-eqz v1, :cond_9
-
- iget-wide v3, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
-
- iget-wide v5, p1, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
-
- cmp-long v1, v3, v5
-
- if-nez v1, :cond_5
-
- const/4 v1, 0x1
+ if-eqz p1, :cond_5
goto :goto_5
:cond_5
- const/4 v1, 0x0
-
- :goto_5
- if-eqz v1, :cond_9
-
- iget-wide v3, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesRendered:J
-
- iget-wide v5, p1, Lco/discord/media_engine/OutboundRtpAudio;->framesRendered:J
-
- cmp-long v1, v3, v5
-
- if-nez v1, :cond_6
-
- const/4 v1, 0x1
-
- goto :goto_6
-
- :cond_6
- const/4 v1, 0x0
-
- :goto_6
- if-eqz v1, :cond_9
-
- iget-wide v3, p0, Lco/discord/media_engine/OutboundRtpAudio;->noiseCancellerProcessTime:J
-
- iget-wide v5, p1, Lco/discord/media_engine/OutboundRtpAudio;->noiseCancellerProcessTime:J
-
- cmp-long v1, v3, v5
-
- if-nez v1, :cond_7
-
- const/4 v1, 0x1
-
- goto :goto_7
-
- :cond_7
- const/4 v1, 0x0
-
- :goto_7
- if-eqz v1, :cond_9
-
- iget-wide v3, p0, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
-
- iget-wide v5, p1, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
-
- cmp-long p1, v3, v5
-
- if-nez p1, :cond_8
-
- const/4 p1, 0x1
-
- goto :goto_8
-
- :cond_8
- const/4 p1, 0x0
-
- :goto_8
- if-eqz p1, :cond_9
-
- goto :goto_9
-
- :cond_9
return v2
- :cond_a
- :goto_9
+ :cond_6
+ :goto_5
return v0
.end method
@@ -733,30 +521,6 @@
return v0
.end method
-.method public final getFramesCaptured()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
-
- return-wide v0
-.end method
-
-.method public final getFramesRendered()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesRendered:J
-
- return-wide v0
-.end method
-
-.method public final getNoiseCancellerProcessTime()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->noiseCancellerProcessTime:J
-
- return-wide v0
-.end method
-
.method public final getPacketsLost()I
.locals 1
@@ -789,16 +553,8 @@
return-object v0
.end method
-.method public final getVoiceActivityDetectorProcessTime()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
-
- return-wide v0
-.end method
-
.method public hashCode()I
- .locals 4
+ .locals 3
iget-object v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->type:Ljava/lang/String;
@@ -882,51 +638,11 @@
:cond_2
add-int/2addr v0, v1
- mul-int/lit8 v0, v0, 0x1f
-
- iget-wide v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
-
- invoke-static {v1, v2}, Ld;->a(J)I
-
- move-result v1
-
- add-int/2addr v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- iget-wide v2, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesRendered:J
-
- invoke-static {v2, v3}, Ld;->a(J)I
-
- move-result v0
-
- add-int/2addr v0, v1
-
- mul-int/lit8 v0, v0, 0x1f
-
- iget-wide v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->noiseCancellerProcessTime:J
-
- invoke-static {v1, v2}, Ld;->a(J)I
-
- move-result v1
-
- add-int/2addr v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- iget-wide v2, p0, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
-
- invoke-static {v2, v3}, Ld;->a(J)I
-
- move-result v0
-
- add-int/2addr v0, v1
-
return v0
.end method
.method public toString()Ljava/lang/String;
- .locals 4
+ .locals 3
const-string v0, "OutboundRtpAudio(type="
@@ -1000,41 +716,9 @@
iget-boolean v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+ const-string v2, ")"
- const-string v1, ", framesCaptured="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-wide v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
-
- invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
- const-string v1, ", framesRendered="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-wide v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->framesRendered:J
-
- invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
- const-string v1, ", noiseCancellerProcessTime="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-wide v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->noiseCancellerProcessTime:J
-
- invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
- const-string v1, ", voiceActivityDetectorProcessTime="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-wide v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->voiceActivityDetectorProcessTime:J
-
- const-string v3, ")"
-
- invoke-static {v0, v1, v2, v3}, Lf/e/b/a/a;->t(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
+ invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
move-result-object v0
diff --git a/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali b/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali
index 7bc537f7c0..d019bc1136 100644
--- a/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali
@@ -199,10 +199,6 @@
goto :goto_0
:cond_0
- invoke-virtual {v0}, Ljava/io/InputStream;->close()V
-
- invoke-virtual {v1}, Ljava/io/FileOutputStream;->close()V
-
return-void
.end method
diff --git a/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali b/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
index 4d1b5fcb10..be946739a7 100644
--- a/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
@@ -24,14 +24,8 @@
.field public final fractionLost:F
-.field public final framesCaptured:J
-
-.field public final framesRendered:J
-
.field public final jitter:F
-.field public final noiseCancellerProcessTime:J
-
.field public final packetsLost:I
.field public final packetsSent:I
@@ -48,11 +42,9 @@
.field public final typingNoiseDetected:Z
-.field public final voiceActivityDetectorProcessTime:J
-
# direct methods
-.method public constructor (IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)V
+.method public constructor (IILjava/lang/String;IFFFFIFFIIFFIIIZ)V
.locals 3
move-object v0, p0
@@ -137,22 +129,6 @@
iput-boolean v1, v0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
- move-wide/from16 v1, p20
-
- iput-wide v1, v0, Lco/discord/media_engine/internal/OutboundAudio;->framesCaptured:J
-
- move-wide/from16 v1, p22
-
- iput-wide v1, v0, Lco/discord/media_engine/internal/OutboundAudio;->framesRendered:J
-
- move-wide/from16 v1, p24
-
- iput-wide v1, v0, Lco/discord/media_engine/internal/OutboundAudio;->noiseCancellerProcessTime:J
-
- move-wide/from16 v1, p26
-
- iput-wide v1, v0, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
-
return-void
:cond_0
@@ -165,12 +141,12 @@
throw v1
.end method
-.method public static synthetic copy$default(Lco/discord/media_engine/internal/OutboundAudio;IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJILjava/lang/Object;)Lco/discord/media_engine/internal/OutboundAudio;
+.method public static synthetic copy$default(Lco/discord/media_engine/internal/OutboundAudio;IILjava/lang/String;IFFFFIFFIIFFIIIZILjava/lang/Object;)Lco/discord/media_engine/internal/OutboundAudio;
.locals 17
move-object/from16 v0, p0
- move/from16 v1, p28
+ move/from16 v1, p20
and-int/lit8 v2, v1, 0x1
@@ -404,86 +380,18 @@
:goto_11
const/high16 v16, 0x40000
- and-int v16, v1, v16
+ and-int v1, v1, v16
- move/from16 p18, v15
+ if-eqz v1, :cond_12
- if-eqz v16, :cond_12
-
- iget-boolean v15, v0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
+ iget-boolean v1, v0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
goto :goto_12
:cond_12
- move/from16 v15, p19
+ move/from16 v1, p19
:goto_12
- const/high16 v16, 0x80000
-
- and-int v16, v1, v16
-
- move/from16 p13, v14
-
- move/from16 p19, v15
-
- if-eqz v16, :cond_13
-
- iget-wide v14, v0, Lco/discord/media_engine/internal/OutboundAudio;->framesCaptured:J
-
- goto :goto_13
-
- :cond_13
- move-wide/from16 v14, p20
-
- :goto_13
- const/high16 v16, 0x100000
-
- and-int v16, v1, v16
-
- move-wide/from16 p20, v14
-
- if-eqz v16, :cond_14
-
- iget-wide v14, v0, Lco/discord/media_engine/internal/OutboundAudio;->framesRendered:J
-
- goto :goto_14
-
- :cond_14
- move-wide/from16 v14, p22
-
- :goto_14
- const/high16 v16, 0x200000
-
- and-int v16, v1, v16
-
- move-wide/from16 p22, v14
-
- if-eqz v16, :cond_15
-
- iget-wide v14, v0, Lco/discord/media_engine/internal/OutboundAudio;->noiseCancellerProcessTime:J
-
- goto :goto_15
-
- :cond_15
- move-wide/from16 v14, p24
-
- :goto_15
- const/high16 v16, 0x400000
-
- and-int v1, v1, v16
-
- move-wide/from16 p24, v14
-
- if-eqz v1, :cond_16
-
- iget-wide v14, v0, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
-
- goto :goto_16
-
- :cond_16
- move-wide/from16 v14, p26
-
- :goto_16
move/from16 p1, v2
move/from16 p2, v3
@@ -508,9 +416,13 @@
move/from16 p12, v13
- move-wide/from16 p26, v14
+ move/from16 p13, v14
- invoke-virtual/range {p0 .. p27}, Lco/discord/media_engine/internal/OutboundAudio;->copy(IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)Lco/discord/media_engine/internal/OutboundAudio;
+ move/from16 p18, v15
+
+ move/from16 p19, v1
+
+ invoke-virtual/range {p0 .. p19}, Lco/discord/media_engine/internal/OutboundAudio;->copy(IILjava/lang/String;IFFFFIFFIIFFIIIZ)Lco/discord/media_engine/internal/OutboundAudio;
move-result-object v0
@@ -615,38 +527,6 @@
return v0
.end method
-.method public final component20()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesCaptured:J
-
- return-wide v0
-.end method
-
-.method public final component21()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesRendered:J
-
- return-wide v0
-.end method
-
-.method public final component22()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->noiseCancellerProcessTime:J
-
- return-wide v0
-.end method
-
-.method public final component23()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
-
- return-wide v0
-.end method
-
.method public final component3()Ljava/lang/String;
.locals 1
@@ -703,14 +583,14 @@
return v0
.end method
-.method public final copy(IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)Lco/discord/media_engine/internal/OutboundAudio;
- .locals 29
+.method public final copy(IILjava/lang/String;IFFFFIFFIIFFIIIZ)Lco/discord/media_engine/internal/OutboundAudio;
+ .locals 21
if-eqz p3, :cond_0
- new-instance v28, Lco/discord/media_engine/internal/OutboundAudio;
+ new-instance v20, Lco/discord/media_engine/internal/OutboundAudio;
- move-object/from16 v0, v28
+ move-object/from16 v0, v20
move/from16 v1, p1
@@ -750,17 +630,9 @@
move/from16 v19, p19
- move-wide/from16 v20, p20
+ invoke-direct/range {v0 .. v19}, Lco/discord/media_engine/internal/OutboundAudio;->(IILjava/lang/String;IFFFFIFFIIFFIIIZ)V
- move-wide/from16 v22, p22
-
- move-wide/from16 v24, p24
-
- move-wide/from16 v26, p26
-
- invoke-direct/range {v0 .. v27}, Lco/discord/media_engine/internal/OutboundAudio;->(IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)V
-
- return-object v28
+ return-object v20
:cond_0
const-string v0, "codecName"
@@ -773,17 +645,17 @@
.end method
.method public equals(Ljava/lang/Object;)Z
- .locals 7
+ .locals 4
const/4 v0, 0x1
- if-eq p0, p1, :cond_f
+ if-eq p0, p1, :cond_b
instance-of v1, p1, Lco/discord/media_engine/internal/OutboundAudio;
const/4 v2, 0x0
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
check-cast p1, Lco/discord/media_engine/internal/OutboundAudio;
@@ -801,7 +673,7 @@
const/4 v1, 0x0
:goto_0
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->bytesSent:I
@@ -817,7 +689,7 @@
const/4 v1, 0x0
:goto_1
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget-object v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->codecName:Ljava/lang/String;
@@ -827,7 +699,7 @@
move-result v1
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->codecPayloadType:I
@@ -843,7 +715,7 @@
const/4 v1, 0x0
:goto_2
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->delayMedian:F
@@ -853,7 +725,7 @@
move-result v1
- if-nez v1, :cond_e
+ if-nez v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->delayStd:F
@@ -863,7 +735,7 @@
move-result v1
- if-nez v1, :cond_e
+ if-nez v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->echoReturnLoss:F
@@ -873,7 +745,7 @@
move-result v1
- if-nez v1, :cond_e
+ if-nez v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->echoReturnLossEnchancement:F
@@ -883,7 +755,7 @@
move-result v1
- if-nez v1, :cond_e
+ if-nez v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->extSeqNum:I
@@ -899,7 +771,7 @@
const/4 v1, 0x0
:goto_3
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->fractionLost:F
@@ -909,7 +781,7 @@
move-result v1
- if-nez v1, :cond_e
+ if-nez v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->jitter:F
@@ -919,7 +791,7 @@
move-result v1
- if-nez v1, :cond_e
+ if-nez v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->packetsLost:I
@@ -935,7 +807,7 @@
const/4 v1, 0x0
:goto_4
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->packetsSent:I
@@ -951,7 +823,7 @@
const/4 v1, 0x0
:goto_5
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->residualEchoLikelihood:F
@@ -961,7 +833,7 @@
move-result v1
- if-nez v1, :cond_e
+ if-nez v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->residualEchoLikelihoodRecentMax:F
@@ -971,7 +843,7 @@
move-result v1
- if-nez v1, :cond_e
+ if-nez v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->rtt:I
@@ -987,7 +859,7 @@
const/4 v1, 0x0
:goto_6
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->speaking:I
@@ -1003,7 +875,7 @@
const/4 v1, 0x0
:goto_7
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->ssrc:I
@@ -1019,103 +891,31 @@
const/4 v1, 0x0
:goto_8
- if-eqz v1, :cond_e
+ if-eqz v1, :cond_a
iget-boolean v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
- iget-boolean v3, p1, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
+ iget-boolean p1, p1, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
- if-ne v1, v3, :cond_9
+ if-ne v1, p1, :cond_9
- const/4 v1, 0x1
+ const/4 p1, 0x1
goto :goto_9
:cond_9
- const/4 v1, 0x0
+ const/4 p1, 0x0
:goto_9
- if-eqz v1, :cond_e
-
- iget-wide v3, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesCaptured:J
-
- iget-wide v5, p1, Lco/discord/media_engine/internal/OutboundAudio;->framesCaptured:J
-
- cmp-long v1, v3, v5
-
- if-nez v1, :cond_a
-
- const/4 v1, 0x1
+ if-eqz p1, :cond_a
goto :goto_a
:cond_a
- const/4 v1, 0x0
-
- :goto_a
- if-eqz v1, :cond_e
-
- iget-wide v3, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesRendered:J
-
- iget-wide v5, p1, Lco/discord/media_engine/internal/OutboundAudio;->framesRendered:J
-
- cmp-long v1, v3, v5
-
- if-nez v1, :cond_b
-
- const/4 v1, 0x1
-
- goto :goto_b
-
- :cond_b
- const/4 v1, 0x0
-
- :goto_b
- if-eqz v1, :cond_e
-
- iget-wide v3, p0, Lco/discord/media_engine/internal/OutboundAudio;->noiseCancellerProcessTime:J
-
- iget-wide v5, p1, Lco/discord/media_engine/internal/OutboundAudio;->noiseCancellerProcessTime:J
-
- cmp-long v1, v3, v5
-
- if-nez v1, :cond_c
-
- const/4 v1, 0x1
-
- goto :goto_c
-
- :cond_c
- const/4 v1, 0x0
-
- :goto_c
- if-eqz v1, :cond_e
-
- iget-wide v3, p0, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
-
- iget-wide v5, p1, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
-
- cmp-long p1, v3, v5
-
- if-nez p1, :cond_d
-
- const/4 p1, 0x1
-
- goto :goto_d
-
- :cond_d
- const/4 p1, 0x0
-
- :goto_d
- if-eqz p1, :cond_e
-
- goto :goto_e
-
- :cond_e
return v2
- :cond_f
- :goto_e
+ :cond_b
+ :goto_a
return v0
.end method
@@ -1199,22 +999,6 @@
return v0
.end method
-.method public final getFramesCaptured()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesCaptured:J
-
- return-wide v0
-.end method
-
-.method public final getFramesRendered()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesRendered:J
-
- return-wide v0
-.end method
-
.method public final getJitter()F
.locals 1
@@ -1223,14 +1007,6 @@
return v0
.end method
-.method public final getNoiseCancellerProcessTime()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->noiseCancellerProcessTime:J
-
- return-wide v0
-.end method
-
.method public final getPacketsLost()I
.locals 1
@@ -1295,16 +1071,8 @@
return v0
.end method
-.method public final getVoiceActivityDetectorProcessTime()J
- .locals 2
-
- iget-wide v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
-
- return-wide v0
-.end method
-
.method public hashCode()I
- .locals 4
+ .locals 3
iget v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->audioLevel:I
@@ -1435,51 +1203,11 @@
:cond_1
add-int/2addr v0, v1
- mul-int/lit8 v0, v0, 0x1f
-
- iget-wide v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesCaptured:J
-
- invoke-static {v1, v2}, Ld;->a(J)I
-
- move-result v1
-
- add-int/2addr v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- iget-wide v2, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesRendered:J
-
- invoke-static {v2, v3}, Ld;->a(J)I
-
- move-result v0
-
- add-int/2addr v0, v1
-
- mul-int/lit8 v0, v0, 0x1f
-
- iget-wide v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->noiseCancellerProcessTime:J
-
- invoke-static {v1, v2}, Ld;->a(J)I
-
- move-result v1
-
- add-int/2addr v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- iget-wide v2, p0, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
-
- invoke-static {v2, v3}, Ld;->a(J)I
-
- move-result v0
-
- add-int/2addr v0, v1
-
return v0
.end method
.method public toString()Ljava/lang/String;
- .locals 4
+ .locals 3
const-string v0, "OutboundAudio(audioLevel="
@@ -1633,41 +1361,9 @@
iget-boolean v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+ const-string v2, ")"
- const-string v1, ", framesCaptured="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-wide v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesCaptured:J
-
- invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
- const-string v1, ", framesRendered="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-wide v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->framesRendered:J
-
- invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
- const-string v1, ", noiseCancellerProcessTime="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-wide v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->noiseCancellerProcessTime:J
-
- invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
- const-string v1, ", voiceActivityDetectorProcessTime="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-wide v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->voiceActivityDetectorProcessTime:J
-
- const-string v3, ")"
-
- invoke-static {v0, v1, v2, v3}, Lf/e/b/a/a;->t(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
+ invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
move-result-object v0
diff --git a/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali b/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
index 4c26657dd6..2c2a6d8bbc 100644
--- a/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/TransformStats.smali
@@ -309,7 +309,7 @@
move-result-object v2
- new-instance v29, Lco/discord/media_engine/OutboundRtpAudio;
+ new-instance v21, Lco/discord/media_engine/OutboundRtpAudio;
invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getSsrc()I
@@ -359,9 +359,9 @@
invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getSpeaking()I
- move-result v10
+ move-result v2
- if-lez v10, :cond_0
+ if-lez v2, :cond_0
const/16 v20, 0x1
@@ -371,31 +371,15 @@
const/16 v20, 0x0
:goto_0
- invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getFramesCaptured()J
-
- move-result-wide v21
-
- invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getFramesRendered()J
-
- move-result-wide v23
-
- invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getNoiseCancellerProcessTime()J
-
- move-result-wide v25
-
- invoke-virtual {v2}, Lco/discord/media_engine/internal/OutboundAudio;->getVoiceActivityDetectorProcessTime()J
-
- move-result-wide v27
-
const-string v11, "audio"
- move-object/from16 v10, v29
+ move-object/from16 v10, v21
move-wide v14, v8
- invoke-direct/range {v10 .. v28}, Lco/discord/media_engine/OutboundRtpAudio;->(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)V
+ invoke-direct/range {v10 .. v20}, Lco/discord/media_engine/OutboundRtpAudio;->(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZ)V
- move-object/from16 v12, v29
+ move-object/from16 v12, v21
goto :goto_1
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
index 95e31e0377..8375165f7b 100644
--- a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
+++ b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
@@ -1253,11 +1253,11 @@
invoke-direct {v0, p1}, Ljava/io/ByteArrayInputStream;->([B)V
- invoke-static {v0}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
+ invoke-static {v0}, Lf/n/a/k/a;->W(Ljava/io/InputStream;)Lo0/w;
move-result-object p1
- invoke-static {p1}, Lf/n/a/k/a;->p(Lo0/w;)Lo0/g;
+ invoke-static {p1}, Lf/n/a/k/a;->o(Lo0/w;)Lo0/g;
move-result-object p1
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 25a8b3a191..f23eb08923 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -42,11 +42,11 @@
.field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1221"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1222"
-.field public static final VERSION_CODE:I = 0x4c5
+.field public static final VERSION_CODE:I = 0x4c6
-.field public static final VERSION_NAME:Ljava/lang/String; = "35.0"
+.field public static final VERSION_NAME:Ljava/lang/String; = "34.5"
# direct methods
diff --git a/com.discord/smali/com/discord/app/App.smali b/com.discord/smali/com/discord/app/App.smali
index 4a2d0db006..bcb137f42a 100644
--- a/com.discord/smali/com/discord/app/App.smali
+++ b/com.discord/smali/com/discord/app/App.smali
@@ -41,7 +41,7 @@
# virtual methods
.method public onCreate()V
- .locals 12
+ .locals 11
invoke-super {p0}, Landroid/app/Application;->onCreate()V
@@ -146,9 +146,7 @@
:try_start_0
const-string v2, "logger"
- const/4 v10, 0x0
-
- if-eqz v9, :cond_5
+ if-eqz v9, :cond_3
sget-boolean v2, Lf/a/b/s0;->c:Z
:try_end_0
@@ -166,16 +164,16 @@
invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
- move-result-object v11
+ move-result-object v10
:goto_0
- invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z
move-result v2
if-eqz v2, :cond_1
- invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object;
move-result-object v2
@@ -303,37 +301,17 @@
invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
- sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
-
- if-eqz v0, :cond_4
-
- invoke-static {}, Lcom/google/firebase/crashlytics/FirebaseCrashlytics;->getInstance()Lcom/google/firebase/crashlytics/FirebaseCrashlytics;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/google/firebase/crashlytics/FirebaseCrashlytics;->didCrashOnPreviousExecution()Z
-
- move-result v0
-
- if-eqz v0, :cond_3
-
- sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
-
- invoke-virtual {v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->appCrashed()V
-
- :cond_3
return-void
- :cond_4
- throw v10
-
- :cond_5
+ :cond_3
:try_start_4
invoke-static {v2}, Lj0/n/c/h;->c(Ljava/lang/String;)V
:try_end_4
.catchall {:try_start_4 .. :try_end_4} :catchall_0
- throw v10
+ const/4 v0, 0x0
+
+ throw v0
:catchall_0
move-exception v0
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet.smali b/com.discord/smali/com/discord/app/AppBottomSheet.smali
index 1c552da6a3..6a28eba99b 100644
--- a/com.discord/smali/com/discord/app/AppBottomSheet.smali
+++ b/com.discord/smali/com/discord/app/AppBottomSheet.smali
@@ -76,7 +76,7 @@
move-result-object v1
- const v2, 0x7f0a0288
+ const v2, 0x7f0a0283
invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -92,7 +92,7 @@
move-result-object v1
- const v2, 0x7f0a02c2
+ const v2, 0x7f0a02bd
invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali
index e53952a00b..d9136afa7c 100644
--- a/com.discord/smali/com/discord/app/AppFragment$c.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$c.smali
@@ -56,7 +56,7 @@
iget-object v1, p0, Lcom/discord/app/AppFragment$c;->a:Lcom/discord/app/AppFragment;
- const v2, 0x7f12168b
+ const v2, 0x7f12167a
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/app/AppLog$b.smali b/com.discord/smali/com/discord/app/AppLog$b.smali
index f06aef936f..4c592d93a8 100644
--- a/com.discord/smali/com/discord/app/AppLog$b.smali
+++ b/com.discord/smali/com/discord/app/AppLog$b.smali
@@ -63,9 +63,9 @@
.end method
.method public final invoke(Ljava/lang/String;)V
- .locals 10
+ .locals 6
- if-eqz p1, :cond_4
+ if-eqz p1, :cond_3
:try_start_0
iget-object v0, p0, Lcom/discord/app/AppLog$b;->$throwable:Ljava/lang/Throwable;
@@ -227,87 +227,9 @@
invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
:goto_1
- iget-object p1, p0, Lcom/discord/app/AppLog$b;->$throwable:Ljava/lang/Throwable;
-
- if-eqz p1, :cond_3
-
- :try_start_2
- sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
-
- new-instance v0, Ljava/lang/StringBuilder;
-
- invoke-direct {v0}, Ljava/lang/StringBuilder;->()V
-
- iget-object v1, p0, Lcom/discord/app/AppLog$b;->$throwable:Ljava/lang/Throwable;
-
- invoke-virtual {v1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
-
- move-result-object v1
-
- invoke-virtual {v1}, Ljava/lang/Class;->toString()Ljava/lang/String;
-
- move-result-object v1
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- const-string v1, ":\n"
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/app/AppLog$b;->$throwable:Ljava/lang/Throwable;
-
- invoke-virtual {v1}, Ljava/lang/Throwable;->getStackTrace()[Ljava/lang/StackTraceElement;
-
- move-result-object v2
-
- const-string v1, "throwable.stackTrace"
-
- invoke-static {v2, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- const-string v3, "\n"
-
- const/4 v4, 0x0
-
- const/4 v5, 0x0
-
- const/4 v6, 0x0
-
- const/4 v7, 0x0
-
- const/4 v8, 0x0
-
- const/16 v9, 0x3e
-
- invoke-static/range {v2 .. v9}, Lf/n/a/k/a;->joinToString$default([Ljava/lang/Object;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-
- move-result-object v1
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
- move-result-object v0
-
- invoke-virtual {p1, v0}, Lcom/discord/utilities/analytics/AnalyticsTracker;->appExceptionThrown(Ljava/lang/String;)V
- :try_end_2
- .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1
-
- goto :goto_2
-
- :catch_1
- move-exception p1
-
- sget-object v0, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
-
- const-string v1, "Unable to report to analytics."
-
- invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
-
- :cond_3
- :goto_2
return-void
- :cond_4
+ :cond_3
const-string p1, "message"
invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/app/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali
index dba45114aa..2db254280b 100644
--- a/com.discord/smali/com/discord/app/AppPermissions.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions.smali
@@ -256,7 +256,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f121110
+ const p1, 0x7f121100
new-instance v0, Lf/a/b/i;
@@ -265,7 +265,7 @@
goto :goto_0
:cond_1
- const p1, 0x7f121117
+ const p1, 0x7f121107
new-instance v0, Lf/a/b/i;
@@ -274,7 +274,7 @@
goto :goto_0
:cond_2
- const p1, 0x7f121111
+ const p1, 0x7f121101
new-instance v0, Lf/a/b/i;
@@ -283,7 +283,7 @@
goto :goto_0
:cond_3
- const p1, 0x7f121112
+ const p1, 0x7f121102
new-instance v0, Lf/a/b/i;
@@ -292,7 +292,7 @@
goto :goto_0
:cond_4
- const p1, 0x7f120f6b
+ const p1, 0x7f120f5b
new-instance v0, Lf/a/b/i;
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService.smali b/com.discord/smali/com/discord/app/DiscordConnectService.smali
index e26f73444f..3078d59238 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService.smali
@@ -119,7 +119,7 @@
move-result-object v0
- const v1, 0x7f12049d
+ const v1, 0x7f12049b
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -129,7 +129,7 @@
move-result-object v0
- const v1, 0x7f1204a4
+ const v1, 0x7f1204a2
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -301,7 +301,7 @@
if-eqz v6, :cond_3
- const v2, 0x7f12109e
+ const v2, 0x7f12108e
invoke-static {v0, v2, v7, v3, v8}, Lf/a/b/n;->j(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;I)V
@@ -412,7 +412,7 @@
if-eqz v4, :cond_8
- const v2, 0x7f121112
+ const v2, 0x7f121102
const/4 v3, 0x0
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
index 55e71368d0..29d30570f5 100644
--- a/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
+++ b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
@@ -152,7 +152,7 @@
invoke-direct {p0}, Lcom/discord/app/AppDialog;->()V
- const v0, 0x7f0a062f
+ const v0, 0x7f0a0627
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -160,7 +160,7 @@
iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->d:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a062a
+ const v0, 0x7f0a0622
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -168,7 +168,7 @@
iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->e:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0629
+ const v0, 0x7f0a0621
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -176,7 +176,7 @@
iput-object v0, p0, Lcom/discord/dialogs/ImageUploadDialog;->f:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a062d
+ const v0, 0x7f0a0625
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket.smali b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
index 0f2df27d00..aa9bb514a5 100644
--- a/com.discord/smali/com/discord/gateway/GatewaySocket.smali
+++ b/com.discord/smali/com/discord/gateway/GatewaySocket.smali
@@ -51,7 +51,7 @@
.field public static final GATEWAY_URL_RESET_THRESHOLD:I = 0x4
-.field public static final GATEWAY_VERSION:I = 0x8
+.field public static final GATEWAY_VERSION:I = 0x6
.field public static final HEARTBEAT_MAX_RESUME_THRESHOLD:I = 0x2bf20
@@ -1115,7 +1115,7 @@
const-string v0, "Connect to: "
- const-string v4, ", encoding: json, version 8."
+ const-string v4, ", encoding: json, version 6."
invoke-static {v0, p1, v4}, Lf/e/b/a/a;->q(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
@@ -1226,7 +1226,7 @@
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string p1, "/?encoding=json&v=8&compress=zlib-stream"
+ const-string p1, "/?encoding=json&v=6&compress=zlib-stream"
invoke-virtual {v1, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/gateway/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali
index b415fe3ecd..e2123cd27f 100644
--- a/com.discord/smali/com/discord/gateway/R$drawable.smali
+++ b/com.discord/smali/com/discord/gateway/R$drawable.smali
@@ -262,9 +262,9 @@
.field public static final drawable_chip_delete:I = 0x7f08012c
-.field public static final googleg_disabled_color_18:I = 0x7f0801f8
+.field public static final googleg_disabled_color_18:I = 0x7f0801f9
-.field public static final googleg_standard_color_18:I = 0x7f0801f9
+.field public static final googleg_standard_color_18:I = 0x7f0801fa
.field public static final ic_arrow_down_24dp:I = 0x7f080221
diff --git a/com.discord/smali/com/discord/gateway/R$id.smali b/com.discord/smali/com/discord/gateway/R$id.smali
index c78cb96a49..82fadf3973 100644
--- a/com.discord/smali/com/discord/gateway/R$id.smali
+++ b/com.discord/smali/com/discord/gateway/R$id.smali
@@ -160,461 +160,461 @@
.field public static final centerInside:I = 0x7f0a0140
-.field public static final checkbox:I = 0x7f0a025f
+.field public static final checkbox:I = 0x7f0a025a
-.field public static final checked:I = 0x7f0a0261
+.field public static final checked:I = 0x7f0a025c
-.field public static final chip:I = 0x7f0a0262
+.field public static final chip:I = 0x7f0a025d
-.field public static final chip1:I = 0x7f0a0263
+.field public static final chip1:I = 0x7f0a025e
-.field public static final chip2:I = 0x7f0a0264
+.field public static final chip2:I = 0x7f0a025f
-.field public static final chip3:I = 0x7f0a0265
+.field public static final chip3:I = 0x7f0a0260
-.field public static final chip_group:I = 0x7f0a0266
+.field public static final chip_group:I = 0x7f0a0261
-.field public static final chip_image:I = 0x7f0a0267
+.field public static final chip_image:I = 0x7f0a0262
-.field public static final chip_text:I = 0x7f0a0268
+.field public static final chip_text:I = 0x7f0a0263
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final circular:I = 0x7f0a026b
+.field public static final circular:I = 0x7f0a0266
-.field public static final clear_text:I = 0x7f0a026c
+.field public static final clear_text:I = 0x7f0a0267
-.field public static final column:I = 0x7f0a0275
+.field public static final column:I = 0x7f0a0270
-.field public static final column_reverse:I = 0x7f0a0276
+.field public static final column_reverse:I = 0x7f0a0271
-.field public static final confirm_button:I = 0x7f0a0277
+.field public static final confirm_button:I = 0x7f0a0272
-.field public static final container:I = 0x7f0a0288
+.field public static final container:I = 0x7f0a0283
-.field public static final content:I = 0x7f0a0289
+.field public static final content:I = 0x7f0a0284
-.field public static final contentPanel:I = 0x7f0a028a
+.field public static final contentPanel:I = 0x7f0a0285
-.field public static final coordinator:I = 0x7f0a028e
+.field public static final coordinator:I = 0x7f0a0289
-.field public static final custom:I = 0x7f0a02b4
+.field public static final custom:I = 0x7f0a02af
-.field public static final customPanel:I = 0x7f0a02b5
+.field public static final customPanel:I = 0x7f0a02b0
-.field public static final cut:I = 0x7f0a02b6
+.field public static final cut:I = 0x7f0a02b1
-.field public static final dark:I = 0x7f0a02b7
+.field public static final dark:I = 0x7f0a02b2
-.field public static final date_picker_actions:I = 0x7f0a02b9
+.field public static final date_picker_actions:I = 0x7f0a02b4
-.field public static final decor_content_parent:I = 0x7f0a02bd
+.field public static final decor_content_parent:I = 0x7f0a02b8
-.field public static final default_activity_button:I = 0x7f0a02be
+.field public static final default_activity_button:I = 0x7f0a02b9
-.field public static final design_bottom_sheet:I = 0x7f0a02c2
+.field public static final design_bottom_sheet:I = 0x7f0a02bd
-.field public static final design_menu_item_action_area:I = 0x7f0a02c3
+.field public static final design_menu_item_action_area:I = 0x7f0a02be
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02bf
-.field public static final design_menu_item_text:I = 0x7f0a02c5
+.field public static final design_menu_item_text:I = 0x7f0a02c0
-.field public static final design_navigation_view:I = 0x7f0a02c6
+.field public static final design_navigation_view:I = 0x7f0a02c1
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final dropdown_menu:I = 0x7f0a02f8
+.field public static final dropdown_menu:I = 0x7f0a02f2
-.field public static final edit_query:I = 0x7f0a031d
+.field public static final edit_query:I = 0x7f0a0317
-.field public static final end:I = 0x7f0a034a
+.field public static final end:I = 0x7f0a0344
-.field public static final end_padder:I = 0x7f0a034b
+.field public static final end_padder:I = 0x7f0a0345
-.field public static final expand_activities_button:I = 0x7f0a0367
+.field public static final expand_activities_button:I = 0x7f0a0361
-.field public static final expanded_menu:I = 0x7f0a0368
+.field public static final expanded_menu:I = 0x7f0a0362
-.field public static final fade:I = 0x7f0a0386
+.field public static final fade:I = 0x7f0a0380
-.field public static final fill:I = 0x7f0a039d
+.field public static final fill:I = 0x7f0a0395
-.field public static final filled:I = 0x7f0a03a0
+.field public static final filled:I = 0x7f0a0398
-.field public static final fitBottomStart:I = 0x7f0a03a4
+.field public static final fitBottomStart:I = 0x7f0a039c
-.field public static final fitCenter:I = 0x7f0a03a5
+.field public static final fitCenter:I = 0x7f0a039d
-.field public static final fitEnd:I = 0x7f0a03a6
+.field public static final fitEnd:I = 0x7f0a039e
-.field public static final fitStart:I = 0x7f0a03a7
+.field public static final fitStart:I = 0x7f0a039f
-.field public static final fitXY:I = 0x7f0a03a9
+.field public static final fitXY:I = 0x7f0a03a1
-.field public static final fixed:I = 0x7f0a03aa
+.field public static final fixed:I = 0x7f0a03a2
-.field public static final flex_end:I = 0x7f0a03ad
+.field public static final flex_end:I = 0x7f0a03a5
-.field public static final flex_start:I = 0x7f0a03be
+.field public static final flex_start:I = 0x7f0a03b6
-.field public static final floating:I = 0x7f0a03bf
+.field public static final floating:I = 0x7f0a03b7
-.field public static final focusCrop:I = 0x7f0a03c1
+.field public static final focusCrop:I = 0x7f0a03b9
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final fragment_container_view_tag:I = 0x7f0a03c7
+.field public static final fragment_container_view_tag:I = 0x7f0a03bf
-.field public static final ghost_view:I = 0x7f0a03e2
+.field public static final ghost_view:I = 0x7f0a03da
-.field public static final ghost_view_holder:I = 0x7f0a03e3
+.field public static final ghost_view_holder:I = 0x7f0a03db
-.field public static final gone:I = 0x7f0a040f
+.field public static final gone:I = 0x7f0a0407
-.field public static final group_divider:I = 0x7f0a0411
+.field public static final group_divider:I = 0x7f0a0409
-.field public static final home:I = 0x7f0a04c0
+.field public static final home:I = 0x7f0a04b8
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_frame:I = 0x7f0a04d3
+.field public static final icon_frame:I = 0x7f0a04cb
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final icon_only:I = 0x7f0a04d5
+.field public static final icon_only:I = 0x7f0a04cd
-.field public static final image:I = 0x7f0a04de
+.field public static final image:I = 0x7f0a04d6
-.field public static final incoming:I = 0x7f0a04e6
+.field public static final incoming:I = 0x7f0a04de
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
-.field public static final labeled:I = 0x7f0a0575
+.field public static final labeled:I = 0x7f0a056d
-.field public static final largeLabel:I = 0x7f0a0577
+.field public static final largeLabel:I = 0x7f0a056f
-.field public static final left:I = 0x7f0a0582
+.field public static final left:I = 0x7f0a057a
-.field public static final light:I = 0x7f0a0583
+.field public static final light:I = 0x7f0a057b
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final linear:I = 0x7f0a0586
+.field public static final linear:I = 0x7f0a057e
-.field public static final listMode:I = 0x7f0a0588
+.field public static final listMode:I = 0x7f0a0580
-.field public static final list_item:I = 0x7f0a0589
+.field public static final list_item:I = 0x7f0a0581
-.field public static final masked:I = 0x7f0a0599
+.field public static final masked:I = 0x7f0a0591
-.field public static final media_actions:I = 0x7f0a059f
+.field public static final media_actions:I = 0x7f0a0597
-.field public static final message:I = 0x7f0a05dc
+.field public static final message:I = 0x7f0a05d4
-.field public static final mini:I = 0x7f0a05e1
+.field public static final mini:I = 0x7f0a05d9
-.field public static final month_grid:I = 0x7f0a05e3
+.field public static final month_grid:I = 0x7f0a05db
-.field public static final month_navigation_bar:I = 0x7f0a05e4
+.field public static final month_navigation_bar:I = 0x7f0a05dc
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e5
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05dd
-.field public static final month_navigation_next:I = 0x7f0a05e6
+.field public static final month_navigation_next:I = 0x7f0a05de
-.field public static final month_navigation_previous:I = 0x7f0a05e7
+.field public static final month_navigation_previous:I = 0x7f0a05df
-.field public static final month_title:I = 0x7f0a05e8
+.field public static final month_title:I = 0x7f0a05e0
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e9
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e1
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ea
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e2
-.field public static final mtrl_calendar_frame:I = 0x7f0a05eb
+.field public static final mtrl_calendar_frame:I = 0x7f0a05e3
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ec
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05e4
-.field public static final mtrl_calendar_months:I = 0x7f0a05ed
+.field public static final mtrl_calendar_months:I = 0x7f0a05e5
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ee
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05e6
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ef
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05e7
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f0
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05e8
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f1
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05e9
-.field public static final mtrl_child_content_container:I = 0x7f0a05f2
+.field public static final mtrl_child_content_container:I = 0x7f0a05ea
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f3
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05eb
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f4
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05ec
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f5
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05ed
-.field public static final mtrl_picker_header:I = 0x7f0a05f6
+.field public static final mtrl_picker_header:I = 0x7f0a05ee
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f7
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05ef
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f8
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f0
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f9
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f1
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fa
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f2
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fb
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f3
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fc
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05f4
-.field public static final mtrl_picker_title_text:I = 0x7f0a05fd
+.field public static final mtrl_picker_title_text:I = 0x7f0a05f5
-.field public static final multiply:I = 0x7f0a05fe
+.field public static final multiply:I = 0x7f0a05f6
-.field public static final navigation_header_container:I = 0x7f0a0610
+.field public static final navigation_header_container:I = 0x7f0a0608
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final nowrap:I = 0x7f0a0636
+.field public static final nowrap:I = 0x7f0a062e
-.field public static final off:I = 0x7f0a0666
+.field public static final off:I = 0x7f0a065e
-.field public static final on:I = 0x7f0a066a
+.field public static final on:I = 0x7f0a0662
-.field public static final outgoing:I = 0x7f0a066c
+.field public static final outgoing:I = 0x7f0a0664
-.field public static final outline:I = 0x7f0a066d
+.field public static final outline:I = 0x7f0a0665
-.field public static final parallax:I = 0x7f0a067d
+.field public static final parallax:I = 0x7f0a0675
-.field public static final parentPanel:I = 0x7f0a067f
+.field public static final parentPanel:I = 0x7f0a0677
-.field public static final parent_matrix:I = 0x7f0a0680
+.field public static final parent_matrix:I = 0x7f0a0678
-.field public static final password_toggle:I = 0x7f0a068e
+.field public static final password_toggle:I = 0x7f0a0686
-.field public static final pin:I = 0x7f0a06bb
+.field public static final pin:I = 0x7f0a06b3
-.field public static final progress_circular:I = 0x7f0a072a
+.field public static final progress_circular:I = 0x7f0a0722
-.field public static final progress_horizontal:I = 0x7f0a072d
+.field public static final progress_horizontal:I = 0x7f0a0725
-.field public static final radio:I = 0x7f0a073b
+.field public static final radio:I = 0x7f0a0733
-.field public static final recycler_view:I = 0x7f0a0741
+.field public static final recycler_view:I = 0x7f0a0739
-.field public static final right:I = 0x7f0a075d
+.field public static final right:I = 0x7f0a0755
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final rounded:I = 0x7f0a0787
+.field public static final rounded:I = 0x7f0a077f
-.field public static final row:I = 0x7f0a0788
+.field public static final row:I = 0x7f0a0780
-.field public static final row_index_key:I = 0x7f0a0789
+.field public static final row_index_key:I = 0x7f0a0781
-.field public static final row_reverse:I = 0x7f0a078a
+.field public static final row_reverse:I = 0x7f0a0782
-.field public static final save_non_transition_alpha:I = 0x7f0a078b
+.field public static final save_non_transition_alpha:I = 0x7f0a0783
-.field public static final save_overlay_view:I = 0x7f0a078c
+.field public static final save_overlay_view:I = 0x7f0a0784
-.field public static final scale:I = 0x7f0a078d
+.field public static final scale:I = 0x7f0a0785
-.field public static final screen:I = 0x7f0a078f
+.field public static final screen:I = 0x7f0a0787
-.field public static final scrollIndicatorDown:I = 0x7f0a0793
+.field public static final scrollIndicatorDown:I = 0x7f0a078b
-.field public static final scrollIndicatorUp:I = 0x7f0a0794
+.field public static final scrollIndicatorUp:I = 0x7f0a078c
-.field public static final scrollView:I = 0x7f0a0795
+.field public static final scrollView:I = 0x7f0a078d
-.field public static final scrollable:I = 0x7f0a0797
+.field public static final scrollable:I = 0x7f0a078f
-.field public static final search_badge:I = 0x7f0a0798
+.field public static final search_badge:I = 0x7f0a0790
-.field public static final search_bar:I = 0x7f0a0799
+.field public static final search_bar:I = 0x7f0a0791
-.field public static final search_button:I = 0x7f0a079a
+.field public static final search_button:I = 0x7f0a0792
-.field public static final search_close_btn:I = 0x7f0a079b
+.field public static final search_close_btn:I = 0x7f0a0793
-.field public static final search_edit_frame:I = 0x7f0a079c
+.field public static final search_edit_frame:I = 0x7f0a0794
-.field public static final search_go_btn:I = 0x7f0a079e
+.field public static final search_go_btn:I = 0x7f0a0796
-.field public static final search_mag_icon:I = 0x7f0a079f
+.field public static final search_mag_icon:I = 0x7f0a0797
-.field public static final search_plate:I = 0x7f0a07a0
+.field public static final search_plate:I = 0x7f0a0798
-.field public static final search_src_text:I = 0x7f0a07a3
+.field public static final search_src_text:I = 0x7f0a079b
-.field public static final search_voice_btn:I = 0x7f0a07af
+.field public static final search_voice_btn:I = 0x7f0a07a7
-.field public static final seekbar:I = 0x7f0a07b0
+.field public static final seekbar:I = 0x7f0a07a8
-.field public static final seekbar_value:I = 0x7f0a07b1
+.field public static final seekbar_value:I = 0x7f0a07a9
-.field public static final select_dialog_listview:I = 0x7f0a07b2
+.field public static final select_dialog_listview:I = 0x7f0a07aa
-.field public static final selected:I = 0x7f0a07b3
+.field public static final selected:I = 0x7f0a07ab
-.field public static final shortcut:I = 0x7f0a090e
+.field public static final shortcut:I = 0x7f0a0906
-.field public static final slide:I = 0x7f0a0913
+.field public static final slide:I = 0x7f0a090b
-.field public static final smallLabel:I = 0x7f0a0914
+.field public static final smallLabel:I = 0x7f0a090c
-.field public static final snackbar_action:I = 0x7f0a0915
+.field public static final snackbar_action:I = 0x7f0a090d
-.field public static final snackbar_text:I = 0x7f0a0916
+.field public static final snackbar_text:I = 0x7f0a090e
-.field public static final space_around:I = 0x7f0a091a
+.field public static final space_around:I = 0x7f0a0912
-.field public static final space_between:I = 0x7f0a091b
+.field public static final space_between:I = 0x7f0a0913
-.field public static final space_evenly:I = 0x7f0a091c
+.field public static final space_evenly:I = 0x7f0a0914
-.field public static final spacer:I = 0x7f0a091d
+.field public static final spacer:I = 0x7f0a0915
-.field public static final spinner:I = 0x7f0a0920
+.field public static final spinner:I = 0x7f0a0918
-.field public static final split_action_bar:I = 0x7f0a0921
+.field public static final split_action_bar:I = 0x7f0a0919
-.field public static final src_atop:I = 0x7f0a0925
+.field public static final src_atop:I = 0x7f0a091d
-.field public static final src_in:I = 0x7f0a0926
+.field public static final src_in:I = 0x7f0a091e
-.field public static final src_over:I = 0x7f0a0927
+.field public static final src_over:I = 0x7f0a091f
-.field public static final standard:I = 0x7f0a0929
+.field public static final standard:I = 0x7f0a0921
-.field public static final start:I = 0x7f0a092a
+.field public static final start:I = 0x7f0a0922
-.field public static final status_bar_latest_event_content:I = 0x7f0a092e
+.field public static final status_bar_latest_event_content:I = 0x7f0a0926
-.field public static final stretch:I = 0x7f0a0943
+.field public static final stretch:I = 0x7f0a093b
-.field public static final submenuarrow:I = 0x7f0a0944
+.field public static final submenuarrow:I = 0x7f0a093c
-.field public static final submit_area:I = 0x7f0a0945
+.field public static final submit_area:I = 0x7f0a093d
-.field public static final switchWidget:I = 0x7f0a0953
+.field public static final switchWidget:I = 0x7f0a094a
-.field public static final tabMode:I = 0x7f0a0955
+.field public static final tabMode:I = 0x7f0a094c
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0971
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a0968
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0972
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a0969
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0973
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a096a
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0974
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a096b
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final textSpacerNoButtons:I = 0x7f0a0979
+.field public static final textSpacerNoButtons:I = 0x7f0a0970
-.field public static final textSpacerNoTitle:I = 0x7f0a097a
+.field public static final textSpacerNoTitle:I = 0x7f0a0971
-.field public static final text_input_end_icon:I = 0x7f0a097c
+.field public static final text_input_end_icon:I = 0x7f0a0973
-.field public static final text_input_start_icon:I = 0x7f0a097d
+.field public static final text_input_start_icon:I = 0x7f0a0974
-.field public static final textinput_counter:I = 0x7f0a0980
+.field public static final textinput_counter:I = 0x7f0a0977
-.field public static final textinput_error:I = 0x7f0a0981
+.field public static final textinput_error:I = 0x7f0a0978
-.field public static final textinput_helper_text:I = 0x7f0a0982
+.field public static final textinput_helper_text:I = 0x7f0a0979
-.field public static final textinput_placeholder:I = 0x7f0a0983
+.field public static final textinput_placeholder:I = 0x7f0a097a
-.field public static final textinput_prefix_text:I = 0x7f0a0984
+.field public static final textinput_prefix_text:I = 0x7f0a097b
-.field public static final textinput_suffix_text:I = 0x7f0a0985
+.field public static final textinput_suffix_text:I = 0x7f0a097c
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final titleDividerNoCustom:I = 0x7f0a098d
+.field public static final titleDividerNoCustom:I = 0x7f0a0984
-.field public static final title_template:I = 0x7f0a098e
+.field public static final title_template:I = 0x7f0a0985
-.field public static final top:I = 0x7f0a0993
+.field public static final top:I = 0x7f0a098a
-.field public static final topPanel:I = 0x7f0a0994
+.field public static final topPanel:I = 0x7f0a098b
-.field public static final touch_outside:I = 0x7f0a0996
+.field public static final touch_outside:I = 0x7f0a098d
-.field public static final transition_current_scene:I = 0x7f0a0997
+.field public static final transition_current_scene:I = 0x7f0a098e
-.field public static final transition_layout_save:I = 0x7f0a0998
+.field public static final transition_layout_save:I = 0x7f0a098f
-.field public static final transition_position:I = 0x7f0a0999
+.field public static final transition_position:I = 0x7f0a0990
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a099a
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0991
-.field public static final transition_transform:I = 0x7f0a099b
+.field public static final transition_transform:I = 0x7f0a0992
-.field public static final unchecked:I = 0x7f0a09aa
+.field public static final unchecked:I = 0x7f0a09a1
-.field public static final uniform:I = 0x7f0a09ad
+.field public static final uniform:I = 0x7f0a09a4
-.field public static final unlabeled:I = 0x7f0a09ae
+.field public static final unlabeled:I = 0x7f0a09a5
-.field public static final up:I = 0x7f0a09af
+.field public static final up:I = 0x7f0a09a6
-.field public static final view_offset_helper:I = 0x7f0a0a32
+.field public static final view_offset_helper:I = 0x7f0a0a29
-.field public static final visible:I = 0x7f0a0a46
+.field public static final visible:I = 0x7f0a0a3d
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a47
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
-.field public static final wide:I = 0x7f0a0a75
+.field public static final wide:I = 0x7f0a0a6c
-.field public static final withinBounds:I = 0x7f0a0aac
+.field public static final withinBounds:I = 0x7f0a0aa3
-.field public static final wrap:I = 0x7f0a0aad
+.field public static final wrap:I = 0x7f0a0aa4
-.field public static final wrap_content:I = 0x7f0a0aae
+.field public static final wrap_content:I = 0x7f0a0aa5
-.field public static final wrap_reverse:I = 0x7f0a0aaf
+.field public static final wrap_reverse:I = 0x7f0a0aa6
-.field public static final zero_corner_chip:I = 0x7f0a0ab4
+.field public static final zero_corner_chip:I = 0x7f0a0aab
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$layout.smali b/com.discord/smali/com/discord/gateway/R$layout.smali
index 1c8633468d..d8a988a030 100644
--- a/com.discord/smali/com/discord/gateway/R$layout.smali
+++ b/com.discord/smali/com/discord/gateway/R$layout.smali
@@ -260,7 +260,7 @@
.field public static final text_view_without_line_height:I = 0x7f0d00e0
-.field public static final view_chip_default:I = 0x7f0d0104
+.field public static final view_chip_default:I = 0x7f0d0102
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$plurals.smali b/com.discord/smali/com/discord/gateway/R$plurals.smali
index c5b5bd7808..b3afb83dea 100644
--- a/com.discord/smali/com/discord/gateway/R$plurals.smali
+++ b/com.discord/smali/com/discord/gateway/R$plurals.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final mtrl_badge_content_description:I = 0x7f1000b3
+.field public static final mtrl_badge_content_description:I = 0x7f1000b2
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali
index d27faf4a92..790e412a79 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -74,165 +74,165 @@
.field public static final bottom_sheet_behavior:I = 0x7f120354
-.field public static final character_counter_content_description:I = 0x7f120419
+.field public static final character_counter_content_description:I = 0x7f120417
-.field public static final character_counter_overflowed_content_description:I = 0x7f12041a
+.field public static final character_counter_overflowed_content_description:I = 0x7f120418
-.field public static final character_counter_pattern:I = 0x7f12041b
+.field public static final character_counter_pattern:I = 0x7f120419
-.field public static final chip_text:I = 0x7f120425
+.field public static final chip_text:I = 0x7f120423
-.field public static final clear_text_end_icon_content_description:I = 0x7f120432
+.field public static final clear_text_end_icon_content_description:I = 0x7f120430
-.field public static final common_google_play_services_enable_button:I = 0x7f120461
+.field public static final common_google_play_services_enable_button:I = 0x7f12045f
-.field public static final common_google_play_services_enable_text:I = 0x7f120462
+.field public static final common_google_play_services_enable_text:I = 0x7f120460
-.field public static final common_google_play_services_enable_title:I = 0x7f120463
+.field public static final common_google_play_services_enable_title:I = 0x7f120461
-.field public static final common_google_play_services_install_button:I = 0x7f120464
+.field public static final common_google_play_services_install_button:I = 0x7f120462
-.field public static final common_google_play_services_install_text:I = 0x7f120465
+.field public static final common_google_play_services_install_text:I = 0x7f120463
-.field public static final common_google_play_services_install_title:I = 0x7f120466
+.field public static final common_google_play_services_install_title:I = 0x7f120464
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120467
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120465
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120468
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120466
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120469
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120467
-.field public static final common_google_play_services_unsupported_text:I = 0x7f12046a
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120468
-.field public static final common_google_play_services_update_button:I = 0x7f12046b
+.field public static final common_google_play_services_update_button:I = 0x7f120469
-.field public static final common_google_play_services_update_text:I = 0x7f12046c
+.field public static final common_google_play_services_update_text:I = 0x7f12046a
-.field public static final common_google_play_services_update_title:I = 0x7f12046d
+.field public static final common_google_play_services_update_title:I = 0x7f12046b
-.field public static final common_google_play_services_updating_text:I = 0x7f12046e
+.field public static final common_google_play_services_updating_text:I = 0x7f12046c
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12046f
+.field public static final common_google_play_services_wear_update_text:I = 0x7f12046d
-.field public static final common_open_on_phone:I = 0x7f120470
+.field public static final common_open_on_phone:I = 0x7f12046e
-.field public static final common_signin_button_text:I = 0x7f120471
+.field public static final common_signin_button_text:I = 0x7f12046f
-.field public static final common_signin_button_text_long:I = 0x7f120472
+.field public static final common_signin_button_text_long:I = 0x7f120470
-.field public static final copy:I = 0x7f1204d0
+.field public static final copy:I = 0x7f1204ce
-.field public static final error_icon_content_description:I = 0x7f120647
+.field public static final error_icon_content_description:I = 0x7f120643
-.field public static final expand_button_title:I = 0x7f12067e
+.field public static final expand_button_title:I = 0x7f12067a
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068c
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f120688
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120695
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120691
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120696
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120692
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bcb
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bc0
-.field public static final icon_content_description:I = 0x7f120c58
+.field public static final icon_content_description:I = 0x7f120c4d
-.field public static final item_view_role_description:I = 0x7f120d7c
+.field public static final item_view_role_description:I = 0x7f120d6f
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120eff
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120eef
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f00
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120ef0
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f01
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120ef1
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f02
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120ef2
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f03
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120ef3
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f04
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120ef4
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f05
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120ef5
-.field public static final mtrl_picker_cancel:I = 0x7f120f06
+.field public static final mtrl_picker_cancel:I = 0x7f120ef6
-.field public static final mtrl_picker_confirm:I = 0x7f120f07
+.field public static final mtrl_picker_confirm:I = 0x7f120ef7
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120f08
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120ef8
-.field public static final mtrl_picker_date_header_title:I = 0x7f120f09
+.field public static final mtrl_picker_date_header_title:I = 0x7f120ef9
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f0a
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120efa
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f0b
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120efb
-.field public static final mtrl_picker_invalid_format:I = 0x7f120f0c
+.field public static final mtrl_picker_invalid_format:I = 0x7f120efc
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f0d
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120efd
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f0e
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120efe
-.field public static final mtrl_picker_invalid_range:I = 0x7f120f0f
+.field public static final mtrl_picker_invalid_range:I = 0x7f120eff
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f10
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f00
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f11
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f01
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f12
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f02
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f13
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f03
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f14
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f04
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f15
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f05
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f16
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f06
-.field public static final mtrl_picker_save:I = 0x7f120f17
+.field public static final mtrl_picker_save:I = 0x7f120f07
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f18
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f08
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f19
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f09
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f1a
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f0a
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f1b
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f0b
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f1c
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f0c
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f1d
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f0d
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f1e
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f0e
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f1f
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f0f
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f20
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f10
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f21
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f11
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f22
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f12
-.field public static final not_set:I = 0x7f120fa7
+.field public static final not_set:I = 0x7f120f95
-.field public static final password_toggle_content_description:I = 0x7f1210cc
+.field public static final password_toggle_content_description:I = 0x7f1210bc
-.field public static final path_password_eye:I = 0x7f1210ce
+.field public static final path_password_eye:I = 0x7f1210be
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210cf
+.field public static final path_password_eye_mask_strike_through:I = 0x7f1210bf
-.field public static final path_password_eye_mask_visible:I = 0x7f1210d0
+.field public static final path_password_eye_mask_visible:I = 0x7f1210c0
-.field public static final path_password_strike_through:I = 0x7f1210d1
+.field public static final path_password_strike_through:I = 0x7f1210c1
-.field public static final preference_copied:I = 0x7f121141
+.field public static final preference_copied:I = 0x7f121131
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f1213f4
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
-.field public static final summary_collapsed_preference_list:I = 0x7f121529
+.field public static final summary_collapsed_preference_list:I = 0x7f121515
-.field public static final v7_preference_off:I = 0x7f121753
+.field public static final v7_preference_off:I = 0x7f121741
-.field public static final v7_preference_on:I = 0x7f121754
+.field public static final v7_preference_on:I = 0x7f121742
# direct methods
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali
new file mode 100644
index 0000000000..979d9ddadf
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali
@@ -0,0 +1,111 @@
+.class public final enum Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+.super Ljava/lang/Enum;
+.source "ModelAuditLogEntry.java"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/models/domain/ModelAuditLogEntry;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x4019
+ name = "OptionType"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/lang/Enum<",
+ "Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final synthetic $VALUES:[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+.field public static final enum MEMBER:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+.field public static final enum ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 5
+
+ new-instance v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ const-string v1, "MEMBER"
+
+ const/4 v2, 0x0
+
+ invoke-direct {v0, v1, v2}, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->(Ljava/lang/String;I)V
+
+ sput-object v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->MEMBER:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ new-instance v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ const-string v1, "ROLE"
+
+ const/4 v3, 0x1
+
+ invoke-direct {v0, v1, v3}, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->(Ljava/lang/String;I)V
+
+ sput-object v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ const/4 v1, 0x2
+
+ new-array v1, v1, [Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->MEMBER:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ aput-object v4, v1, v2
+
+ aput-object v0, v1, v3
+
+ sput-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->$VALUES:[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ return-void
+.end method
+
+.method public constructor (Ljava/lang/String;I)V
+ .locals 0
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()V"
+ }
+ .end annotation
+
+ invoke-direct {p0, p1, p2}, Ljava/lang/Enum;->(Ljava/lang/String;I)V
+
+ return-void
+.end method
+
+.method public static valueOf(Ljava/lang/String;)Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+ .locals 1
+
+ const-class v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
+
+ move-result-object p0
+
+ check-cast p0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ return-object p0
+.end method
+
+.method public static values()[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+ .locals 1
+
+ sget-object v0, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->$VALUES:[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ invoke-virtual {v0}, [Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->clone()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, [Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
index 367ca01a98..33907209ea 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$Options.smali
@@ -32,7 +32,7 @@
.field public final synthetic this$0:Lcom/discord/models/domain/ModelAuditLogEntry;
-.field public type:I
+.field public type:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
# direct methods
@@ -182,13 +182,25 @@
goto :goto_2
:pswitch_1
- iget v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
+ const/4 v0, 0x0
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
+ invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
- move-result p1
+ move-result-object p1
- iput p1, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
+ invoke-static {}, Ljava/util/Locale;->getDefault()Ljava/util/Locale;
+
+ move-result-object v0
+
+ invoke-virtual {p1, v0}, Ljava/lang/String;->toUpperCase(Ljava/util/Locale;)Ljava/lang/String;
+
+ move-result-object p1
+
+ invoke-static {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->valueOf(Ljava/lang/String;)Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
goto :goto_2
@@ -248,8 +260,6 @@
:goto_2
return-void
- nop
-
:sswitch_data_0
.sparse-switch
-0x7315ce29 -> :sswitch_6
@@ -390,19 +400,31 @@
return v2
:cond_8
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object v3
+
+ if-nez v1, :cond_9
+
+ if-eqz v3, :cond_a
+
+ goto :goto_1
+
+ :cond_9
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result v1
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
-
- move-result v3
-
- if-eq v1, v3, :cond_9
+ if-nez v1, :cond_a
+ :goto_1
return v2
- :cond_9
+ :cond_a
invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
move-result-wide v3
@@ -413,11 +435,11 @@
cmp-long p1, v3, v5
- if-eqz p1, :cond_a
+ if-eqz p1, :cond_b
return v2
- :cond_a
+ :cond_b
return v0
.end method
@@ -469,12 +491,12 @@
return-object v0
.end method
-.method public getType()I
+.method public getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
.locals 1
- iget v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
+ iget-object v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
- return v0
+ return-object v0
.end method
.method public hashCode()I
@@ -508,6 +530,8 @@
mul-int/lit8 v0, v0, 0x3b
+ const/16 v2, 0x2b
+
if-nez v1, :cond_0
const/16 v1, 0x2b
@@ -538,29 +562,39 @@
add-int/2addr v0, v1
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object v1
+
mul-int/lit8 v0, v0, 0x3b
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
+ if-nez v1, :cond_1
- move-result v1
+ goto :goto_1
- add-int/2addr v1, v0
+ :cond_1
+ invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+
+ move-result v2
+
+ :goto_1
+ add-int/2addr v0, v2
invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
- move-result-wide v4
+ move-result-wide v1
- mul-int/lit8 v1, v1, 0x3b
+ mul-int/lit8 v0, v0, 0x3b
- ushr-long v2, v4, v3
+ ushr-long v3, v1, v3
- xor-long/2addr v2, v4
+ xor-long/2addr v1, v3
- long-to-int v0, v2
+ long-to-int v2, v1
- add-int/2addr v1, v0
+ add-int/2addr v0, v2
- return v1
+ return v0
.end method
.method public toString()Ljava/lang/String;
@@ -622,11 +656,11 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
- move-result v1
+ move-result-object v1
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
const-string v1, ", id="
diff --git a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
index db78774054..0d5d799538 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
@@ -9,6 +9,7 @@
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
value = {
+ Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;,
Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;,
Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;,
Lcom/discord/models/domain/ModelAuditLogEntry$ChangeNameId;,
diff --git a/com.discord/smali/com/discord/models/domain/ModelExperiment.smali b/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
index 4a61cc4935..8685dcff08 100644
--- a/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelExperiment.smali
@@ -72,7 +72,7 @@
const/4 v1, 0x0
- invoke-static {p0, v1, v0, v1}, Lf/n/a/k/a;->P(Ljava/lang/CharSequence;III)I
+ invoke-static {p0, v1, v0, v1}, Lf/n/a/k/a;->O(Ljava/lang/CharSequence;III)I
move-result p0
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali b/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
index 5f44a8a6b9..07f284d6dd 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
@@ -401,19 +401,6 @@
goto :goto_0
:sswitch_0
- const-string v1, "permissions"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
- const/4 v0, 0x5
-
- goto :goto_1
-
- :sswitch_1
const-string v1, "managed"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -426,7 +413,7 @@
goto :goto_1
- :sswitch_2
+ :sswitch_1
const-string v1, "position"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -439,7 +426,7 @@
goto :goto_1
- :sswitch_3
+ :sswitch_2
const-string v1, "hoist"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -452,7 +439,7 @@
goto :goto_1
- :sswitch_4
+ :sswitch_3
const-string v1, "color"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -465,7 +452,7 @@
goto :goto_1
- :sswitch_5
+ :sswitch_4
const-string v1, "mentionable"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -478,7 +465,7 @@
goto :goto_1
- :sswitch_6
+ :sswitch_5
const-string v1, "name"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -491,7 +478,7 @@
goto :goto_1
- :sswitch_7
+ :sswitch_6
const-string v1, "id"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -504,6 +491,19 @@
goto :goto_1
+ :sswitch_7
+ const-string v1, "permissions_new"
+
+ invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ const/4 v0, 0x5
+
+ goto :goto_1
+
:cond_0
:goto_0
const/4 v0, -0x1
@@ -610,14 +610,14 @@
:sswitch_data_0
.sparse-switch
- 0xd1b -> :sswitch_7
- 0x337a8b -> :sswitch_6
- 0x3ddae44 -> :sswitch_5
- 0x5a72f63 -> :sswitch_4
- 0x5ed9a23 -> :sswitch_3
- 0x2c929929 -> :sswitch_2
- 0x31c90f9f -> :sswitch_1
- 0x4392f484 -> :sswitch_0
+ -0x5f96149b -> :sswitch_7
+ 0xd1b -> :sswitch_6
+ 0x337a8b -> :sswitch_5
+ 0x3ddae44 -> :sswitch_4
+ 0x5a72f63 -> :sswitch_3
+ 0x5ed9a23 -> :sswitch_2
+ 0x2c929929 -> :sswitch_1
+ 0x31c90f9f -> :sswitch_0
.end sparse-switch
:pswitch_data_0
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage.smali b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
index 09a6589a43..79f51200ea 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
@@ -99,8 +99,6 @@
.field public static final TYPE_LOCAL:I = -0x1
-.field public static final TYPE_LOCAL_INVALID_ATTACHMENTS:I = -0x3
-
.field public static final TYPE_LOCAL_SEND_FAILED:I = -0x2
.field public static final TYPE_RECIPIENT_ADD:I = 0x1
@@ -183,16 +181,6 @@
.field public id:J
-.field public localAttachments:Ljava/util/List;
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/util/List<",
- "Lcom/discord/models/messages/LocalAttachment;",
- ">;"
- }
- .end annotation
-.end field
-
.field public transient member:Lcom/discord/models/domain/ModelGuildMember;
.field public mentionEveryone:Z
@@ -324,7 +312,7 @@
return-void
.end method
-.method public constructor (JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;Ljava/util/List;)V
+.method public constructor (JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;)V
.locals 4
.param p8 # Lcom/discord/models/domain/ModelUser;
.annotation build Llombok/NonNull;
@@ -366,9 +354,6 @@
"Lcom/discord/models/domain/ModelMessage$MessageReference;",
"Ljava/util/List<",
"Lcom/discord/models/dsti/dto/ModelDsti;",
- ">;",
- "Ljava/util/List<",
- "Lcom/discord/models/messages/LocalAttachment;",
">;)V"
}
.end annotation
@@ -495,10 +480,6 @@
iput-object v1, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
- move-object/from16 v1, p28
-
- iput-object v1, v0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
-
return-void
:cond_0
@@ -512,7 +493,7 @@
.end method
.method public constructor (Lcom/discord/models/domain/ModelMessage;)V
- .locals 31
+ .locals 30
.param p1 # Lcom/discord/models/domain/ModelMessage;
.annotation build Llombok/NonNull;
.end annotation
@@ -546,7 +527,7 @@
iget-boolean v15, v0, Lcom/discord/models/domain/ModelMessage;->tts:Z
- move-object/from16 v30, v1
+ move-object/from16 v29, v1
iget-object v1, v0, Lcom/discord/models/domain/ModelMessage;->call:Lcom/discord/models/domain/ModelMessage$Call;
@@ -596,23 +577,19 @@
move-object/from16 v27, v1
- iget-object v1, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
+ iget-object v0, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
- move-object/from16 v28, v1
+ move-object/from16 v28, v0
- iget-object v0, v0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
+ move-object/from16 v1, v29
- move-object/from16 v29, v0
-
- move-object/from16 v1, v30
-
- invoke-direct/range {v1 .. v29}, Lcom/discord/models/domain/ModelMessage;->(JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;Ljava/util/List;)V
+ invoke-direct/range {v1 .. v28}, Lcom/discord/models/domain/ModelMessage;->(JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;)V
return-void
.end method
.method public constructor (Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelMessage;)V
- .locals 35
+ .locals 34
.param p1 # Lcom/discord/models/domain/ModelMessage;
.annotation build Llombok/NonNull;
.end annotation
@@ -958,39 +935,27 @@
:goto_1b
move-object/from16 v32, v2
- iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
+ iget-object v1, v1, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
- if-eqz v2, :cond_1c
+ if-eqz v1, :cond_1c
goto :goto_1c
:cond_1c
- iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
+ iget-object v1, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
:goto_1c
- move-object/from16 v33, v2
-
- iget-object v1, v1, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
-
- if-eqz v1, :cond_1d
-
- goto :goto_1d
-
- :cond_1d
- iget-object v1, v0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
-
- :goto_1d
- move-object/from16 v34, v1
+ move-object/from16 v33, v1
move-object/from16 v6, p0
- invoke-direct/range {v6 .. v34}, Lcom/discord/models/domain/ModelMessage;->(JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;Ljava/util/List;)V
+ invoke-direct/range {v6 .. v33}, Lcom/discord/models/domain/ModelMessage;->(JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;)V
- if-eqz v0, :cond_1e
+ if-eqz v0, :cond_1d
return-void
- :cond_1e
+ :cond_1d
new-instance v0, Ljava/lang/NullPointerException;
const-string v1, "other is marked @NonNull but is null"
@@ -1148,106 +1113,8 @@
return-wide v0
.end method
-.method public static createInvalidAttachmentsMessage(JLcom/discord/models/domain/ModelUser;Lcom/discord/utilities/time/Clock;Ljava/util/List;)Lcom/discord/models/domain/ModelMessage;
- .locals 30
- .param p2 # Lcom/discord/models/domain/ModelUser;
- .annotation build Llombok/NonNull;
- .end annotation
- .end param
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(J",
- "Lcom/discord/models/domain/ModelUser;",
- "Lcom/discord/utilities/time/Clock;",
- "Ljava/util/List<",
- "Lcom/discord/models/messages/LocalAttachment;",
- ">;)",
- "Lcom/discord/models/domain/ModelMessage;"
- }
- .end annotation
-
- if-eqz p2, :cond_0
-
- invoke-static {}, Lcom/discord/models/domain/ModelMessage;->computeNonce()J
-
- move-result-wide v3
-
- move-wide v1, v3
-
- invoke-static/range {p3 .. p3}, Lcom/discord/utilities/time/TimeUtils;->currentTimeUTCDateString(Lcom/discord/utilities/time/Clock;)Ljava/lang/String;
-
- move-result-object v10
-
- new-instance v29, Lcom/discord/models/domain/ModelMessage;
-
- move-object/from16 v0, v29
-
- invoke-static {v3, v4}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
-
- move-result-object v3
-
- const/4 v6, -0x3
-
- const/4 v7, 0x0
-
- const/4 v9, 0x0
-
- const/4 v11, 0x0
-
- const/4 v12, 0x0
-
- const/4 v13, 0x0
-
- const/4 v14, 0x0
-
- const/4 v15, 0x0
-
- const/16 v16, 0x0
-
- const/16 v17, 0x0
-
- const/16 v18, 0x0
-
- const/16 v19, 0x0
-
- const/16 v20, 0x0
-
- const/16 v21, 0x0
-
- const/16 v22, 0x0
-
- const/16 v23, 0x0
-
- const/16 v24, 0x1
-
- const/16 v25, 0x0
-
- const/16 v26, 0x0
-
- const/16 v27, 0x0
-
- move-wide/from16 v4, p0
-
- move-object/from16 v8, p2
-
- move-object/from16 v28, p4
-
- invoke-direct/range {v0 .. v28}, Lcom/discord/models/domain/ModelMessage;->(JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;Ljava/util/List;)V
-
- return-object v29
-
- :cond_0
- new-instance v0, Ljava/lang/NullPointerException;
-
- const-string v1, "author is marked @NonNull but is null"
-
- invoke-direct {v0, v1}, Ljava/lang/NullPointerException;->(Ljava/lang/String;)V
-
- throw v0
-.end method
-
-.method public static createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;Ljava/util/List;)Lcom/discord/models/domain/ModelMessage;
- .locals 30
+.method public static createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;)Lcom/discord/models/domain/ModelMessage;
+ .locals 29
.param p3 # Lcom/discord/models/domain/ModelUser;
.annotation build Llombok/NonNull;
.end annotation
@@ -1264,9 +1131,7 @@
"Lcom/discord/models/domain/ModelApplication;",
"Lcom/discord/models/domain/ModelMessage$Activity;",
"Lcom/discord/utilities/time/Clock;",
- "Ljava/util/List<",
- "Lcom/discord/models/messages/LocalAttachment;",
- ">;)",
+ ")",
"Lcom/discord/models/domain/ModelMessage;"
}
.end annotation
@@ -1295,9 +1160,9 @@
move-result-object v10
- new-instance v29, Lcom/discord/models/domain/ModelMessage;
+ new-instance v28, Lcom/discord/models/domain/ModelMessage;
- move-object/from16 v0, v29
+ move-object/from16 v0, v28
invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
@@ -1345,11 +1210,9 @@
move/from16 v24, p6
- move-object/from16 v28, p10
+ invoke-direct/range {v0 .. v27}, Lcom/discord/models/domain/ModelMessage;->(JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;)V
- invoke-direct/range {v0 .. v28}, Lcom/discord/models/domain/ModelMessage;->(JLjava/lang/String;JILjava/lang/String;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;Ljava/util/List;Ljava/util/List;ZLcom/discord/models/domain/ModelMessage$Call;ZLjava/util/LinkedHashMap;Ljava/lang/Boolean;Ljava/lang/Long;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;ZLjava/util/List;ZLjava/lang/Long;Lcom/discord/models/domain/ModelMessage$MessageReference;Ljava/util/List;Ljava/util/List;)V
-
- return-object v29
+ return-object v28
:cond_1
new-instance v0, Ljava/lang/NullPointerException;
@@ -2267,26 +2130,6 @@
return p1
.end method
-.method public canResend()Z
- .locals 2
-
- iget v0, p0, Lcom/discord/models/domain/ModelMessage;->type:I
-
- const/4 v1, -0x2
-
- if-ne v0, v1, :cond_0
-
- const/4 v0, 0x1
-
- goto :goto_0
-
- :cond_0
- const/4 v0, 0x0
-
- :goto_0
- return v0
-.end method
-
.method public equals(Ljava/lang/Object;)Z
.locals 7
@@ -2839,38 +2682,13 @@
move-result-wide v5
- cmp-long v1, v3, v5
+ cmp-long p1, v3, v5
- if-eqz v1, :cond_2b
+ if-eqz p1, :cond_2b
return v2
:cond_2b
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getLocalAttachments()Ljava/util/List;
-
- move-result-object v1
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getLocalAttachments()Ljava/util/List;
-
- move-result-object p1
-
- if-nez v1, :cond_2c
-
- if-eqz p1, :cond_2d
-
- goto :goto_10
-
- :cond_2c
- invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result p1
-
- if-nez p1, :cond_2d
-
- :goto_10
- return v2
-
- :cond_2d
return v0
.end method
@@ -3101,22 +2919,6 @@
return-wide v0
.end method
-.method public getLocalAttachments()Ljava/util/List;
- .locals 1
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "()",
- "Ljava/util/List<",
- "Lcom/discord/models/messages/LocalAttachment;",
- ">;"
- }
- .end annotation
-
- iget-object v0, p0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
-
- return-object v0
-.end method
-
.method public getMember()Lcom/discord/models/domain/ModelGuildMember;
.locals 1
@@ -3830,95 +3632,47 @@
if-nez v1, :cond_11
- const/16 v1, 0x2b
-
goto :goto_11
:cond_11
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
- move-result v1
+ move-result v4
:goto_11
- add-int/2addr v3, v1
+ add-int/2addr v3, v4
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
- move-result-wide v5
+ move-result-wide v4
mul-int/lit8 v3, v3, 0x3b
- ushr-long v7, v5, v2
+ ushr-long v6, v4, v2
- xor-long/2addr v5, v7
+ xor-long/2addr v4, v6
- long-to-int v1, v5
+ long-to-int v1, v4
add-int/2addr v3, v1
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestampMilliseconds()J
- move-result-wide v5
+ move-result-wide v4
mul-int/lit8 v3, v3, 0x3b
- ushr-long v1, v5, v2
+ ushr-long v0, v4, v2
- xor-long/2addr v1, v5
+ xor-long/2addr v0, v4
- long-to-int v2, v1
+ long-to-int v1, v0
- add-int/2addr v3, v2
-
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getLocalAttachments()Ljava/util/List;
-
- move-result-object v1
-
- mul-int/lit8 v3, v3, 0x3b
-
- if-nez v1, :cond_12
-
- goto :goto_12
-
- :cond_12
- invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
- move-result v4
-
- :goto_12
- add-int/2addr v3, v4
+ add-int/2addr v3, v1
return v3
.end method
-.method public isFailed()Z
- .locals 2
-
- iget v0, p0, Lcom/discord/models/domain/ModelMessage;->type:I
-
- const/4 v1, -0x3
-
- if-eq v0, v1, :cond_1
-
- const/4 v1, -0x2
-
- if-ne v0, v1, :cond_0
-
- goto :goto_0
-
- :cond_0
- const/4 v0, 0x0
-
- goto :goto_1
-
- :cond_1
- :goto_0
- const/4 v0, 0x1
-
- :goto_1
- return v0
-.end method
-
.method public isHasLocalUploads()Z
.locals 1
@@ -3946,10 +3700,6 @@
const/4 v1, -0x2
- if-eq v0, v1, :cond_1
-
- const/4 v1, -0x3
-
if-ne v0, v1, :cond_0
goto :goto_0
@@ -4352,16 +4102,6 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
- const-string v1, ", localAttachments="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getLocalAttachments()Ljava/util/List;
-
- move-result-object v1
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
const-string v1, ", guildId="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali b/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
index 25c044a3f5..00cd92700c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
@@ -99,6 +99,79 @@
return p0
.end method
+.method public static getType(Ljava/lang/String;)I
+ .locals 5
+
+ const/4 v0, -0x1
+
+ if-eqz p0, :cond_5
+
+ invoke-virtual {p0}, Ljava/lang/String;->hashCode()I
+
+ move-result v1
+
+ const v2, -0x403d7566
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x1
+
+ if-eq v1, v2, :cond_1
+
+ const v2, 0x358076
+
+ if-eq v1, v2, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ const-string v1, "role"
+
+ invoke-virtual {p0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p0
+
+ if-eqz p0, :cond_2
+
+ const/4 p0, 0x0
+
+ goto :goto_1
+
+ :cond_1
+ const-string v1, "member"
+
+ invoke-virtual {p0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p0
+
+ if-eqz p0, :cond_2
+
+ const/4 p0, 0x1
+
+ goto :goto_1
+
+ :cond_2
+ :goto_0
+ const/4 p0, -0x1
+
+ :goto_1
+ if-eqz p0, :cond_4
+
+ if-eq p0, v4, :cond_3
+
+ goto :goto_2
+
+ :cond_3
+ return v4
+
+ :cond_4
+ return v3
+
+ :cond_5
+ :goto_2
+ return v0
+.end method
+
# virtual methods
.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -127,22 +200,35 @@
if-eq v1, v2, :cond_3
- const v2, 0x2efe0c
+ const v2, 0x368f3a
if-eq v1, v2, :cond_2
- const v2, 0x368f3a
+ const v2, 0x1631afaa
if-eq v1, v2, :cond_1
- const v2, 0x589a349
+ const v2, 0x3555f0ed
if-eq v1, v2, :cond_0
goto :goto_0
:cond_0
- const-string v1, "allow"
+ const-string v1, "deny_new"
+
+ invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_4
+
+ const/4 v0, 0x3
+
+ goto :goto_1
+
+ :cond_1
+ const-string v1, "allow_new"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -154,7 +240,7 @@
goto :goto_1
- :cond_1
+ :cond_2
const-string v1, "type"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -167,19 +253,6 @@
goto :goto_1
- :cond_2
- const-string v1, "deny"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_4
-
- const/4 v0, 0x3
-
- goto :goto_1
-
:cond_3
const-string v1, "id"
@@ -250,9 +323,13 @@
goto :goto_2
:cond_8
- iget v0, p0, Lcom/discord/models/domain/ModelPermissionOverwrite;->type:I
+ const/4 v0, 0x0
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
+ invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
+
+ move-result-object p1
+
+ invoke-static {p1}, Lcom/discord/models/domain/ModelPermissionOverwrite;->getType(Ljava/lang/String;)I
move-result p1
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1$2.smali
new file mode 100644
index 0000000000..eb603f34a7
--- /dev/null
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1$2.smali
@@ -0,0 +1,71 @@
+.class public final Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;
+.super Ljava/lang/Object;
+.source "ModelPresence.kt"
+
+# interfaces
+.implements Lcom/discord/models/domain/Model$JsonReader$ItemFactory;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->call(Ljava/lang/String;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lcom/discord/models/domain/Model$JsonReader$ItemFactory<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+
+
+# direct methods
+.method public constructor (Lcom/discord/models/domain/ModelPresence$Parser$parse$1;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;->this$0:Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final get()Ljava/lang/Long;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;->this$0:Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+
+ iget-object v0, v0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+ invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextLongOrNull()Ljava/lang/Long;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+.method public bridge synthetic get()Ljava/lang/Object;
+ .locals 1
+
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;->get()Ljava/lang/Long;
+
+ move-result-object v0
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
index aaecb9259d..6f0f535ab9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1.smali
@@ -36,15 +36,19 @@
.field public final synthetic $guildId:Lkotlin/jvm/internal/Ref$LongRef;
+.field public final synthetic $nick:Lkotlin/jvm/internal/Ref$ObjectRef;
+
.field public final synthetic $reader:Lcom/discord/models/domain/Model$JsonReader;
+.field public final synthetic $roles:Lkotlin/jvm/internal/Ref$ObjectRef;
+
.field public final synthetic $status:Lkotlin/jvm/internal/Ref$ObjectRef;
.field public final synthetic $user:Lkotlin/jvm/internal/Ref$ObjectRef;
# direct methods
-.method public constructor (Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;)V
+.method public constructor (Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
.locals 0
iput-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$status:Lkotlin/jvm/internal/Ref$ObjectRef;
@@ -59,6 +63,10 @@
iput-object p6, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$guildId:Lkotlin/jvm/internal/Ref$LongRef;
+ iput-object p7, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$nick:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+ iput-object p8, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$roles:Lkotlin/jvm/internal/Ref$ObjectRef;
+
invoke-direct {p0}, Ljava/lang/Object;->()V
return-void
@@ -115,7 +123,7 @@
iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- goto :goto_1
+ goto/16 :goto_1
:sswitch_1
const-string v0, "client_status"
@@ -138,9 +146,34 @@
iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- goto :goto_1
+ goto/16 :goto_1
:sswitch_2
+ const-string v0, "roles"
+
+ invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_1
+
+ iget-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$roles:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+ new-instance v1, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;
+
+ invoke-direct {v1, p0}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1$2;->(Lcom/discord/models/domain/ModelPresence$Parser$parse$1;)V
+
+ invoke-virtual {v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
+
+ move-result-object v0
+
+ iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ goto :goto_1
+
+ :sswitch_3
const-string v0, "user"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -167,7 +200,28 @@
goto :goto_1
- :sswitch_3
+ :sswitch_4
+ const-string v0, "nick"
+
+ invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_1
+
+ iget-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$nick:Lkotlin/jvm/internal/Ref$ObjectRef;
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$reader:Lcom/discord/models/domain/Model$JsonReader;
+
+ invoke-virtual {v0}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+ move-result-object v0
+
+ iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ goto :goto_1
+
+ :sswitch_5
const-string v0, "status"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -194,7 +248,7 @@
goto :goto_1
- :sswitch_4
+ :sswitch_6
const-string v0, "guild_id"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -232,13 +286,13 @@
:goto_1
return-void
- nop
-
:sswitch_data_0
.sparse-switch
- -0x4de03319 -> :sswitch_4
- -0x3532300e -> :sswitch_3
- 0x36ebcb -> :sswitch_2
+ -0x4de03319 -> :sswitch_6
+ -0x3532300e -> :sswitch_5
+ 0x339763 -> :sswitch_4
+ 0x36ebcb -> :sswitch_3
+ 0x67a8ebd -> :sswitch_2
0x22120ee6 -> :sswitch_1
0x7a1b3bed -> :sswitch_0
.end sparse-switch
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
index e553b2ed8c..b830d862c0 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
@@ -54,121 +54,167 @@
# virtual methods
.method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
- .locals 14
+ .locals 27
- const/4 v0, 0x0
+ move-object/from16 v9, p1
- if-eqz p1, :cond_2
+ const/4 v10, 0x0
- new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ if-eqz v9, :cond_2
new-instance v11, Lkotlin/jvm/internal/Ref$ObjectRef;
invoke-direct {v11}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- iput-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iput-object v10, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- new-instance v12, Lkotlin/jvm/internal/Ref$LongRef;
+ new-instance v12, Lkotlin/jvm/internal/Ref$ObjectRef;
- invoke-direct {v12}, Lkotlin/jvm/internal/Ref$LongRef;->()V
+ invoke-direct {v12}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- const-wide/16 v1, 0x0
+ iput-object v10, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- iput-wide v1, v12, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+ new-instance v13, Lkotlin/jvm/internal/Ref$ObjectRef;
- new-instance v13, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+ invoke-direct {v13}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- move-object v1, v13
+ iput-object v10, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v2, v8
+ new-instance v14, Lkotlin/jvm/internal/Ref$ObjectRef;
- move-object v3, p1
+ invoke-direct {v14}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- move-object v4, v9
+ iput-object v10, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v5, v10
+ new-instance v15, Lkotlin/jvm/internal/Ref$LongRef;
- move-object v6, v11
+ invoke-direct {v15}, Lkotlin/jvm/internal/Ref$LongRef;->()V
- move-object v7, v12
+ const-wide/16 v0, 0x0
- invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;)V
+ iput-wide v0, v15, Lkotlin/jvm/internal/Ref$LongRef;->element:J
- invoke-virtual {p1, v13}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+ new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
- new-instance p1, Lcom/discord/models/domain/ModelPresence;
+ invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iput-object v10, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v2, v1
+ new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
- check-cast v2, Lcom/discord/models/domain/ModelPresence$Status;
+ invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- if-eqz v2, :cond_1
+ iput-object v10, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ new-instance v6, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
- move-object v3, v0
+ move-object v0, v6
- check-cast v3, Ljava/util/List;
+ move-object v1, v11
- iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ move-object/from16 v2, p1
- check-cast v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ move-object v3, v12
- if-eqz v0, :cond_0
+ move-object v4, v13
+
+ move-object v5, v14
+
+ move-object v10, v6
+
+ move-object v6, v15
+
+ move-object/from16 v16, v7
+
+ move-object v7, v8
+
+ move-object/from16 v17, v8
+
+ move-object/from16 v8, v16
+
+ invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->(Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/Model$JsonReader;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$LongRef;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)V
+
+ invoke-virtual {v9, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+
+ new-instance v0, Lcom/discord/models/domain/ModelPresence;
+
+ iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ move-object/from16 v19, v1
+
+ check-cast v19, Lcom/discord/models/domain/ModelPresence$Status;
+
+ if-eqz v19, :cond_1
+
+ iget-object v1, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ move-object/from16 v20, v1
+
+ check-cast v20, Ljava/util/List;
+
+ iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ check-cast v1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+
+ if-eqz v1, :cond_0
goto :goto_0
:cond_0
- sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+ sget-object v1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v0
+ move-result-object v1
:goto_0
- move-object v4, v0
+ move-object/from16 v21, v1
- iget-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iget-object v1, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v5, v0
+ move-object/from16 v22, v1
- check-cast v5, Lcom/discord/models/domain/ModelUser;
+ check-cast v22, Lcom/discord/models/domain/ModelUser;
- iget-wide v6, v12, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+ iget-wide v1, v15, Lkotlin/jvm/internal/Ref$LongRef;->element:J
- move-object v1, p1
+ move-object/from16 v3, v17
- invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ iget-object v3, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- return-object p1
+ move-object/from16 v25, v3
+
+ check-cast v25, Ljava/lang/String;
+
+ move-object/from16 v3, v16
+
+ iget-object v3, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ move-object/from16 v26, v3
+
+ check-cast v26, Ljava/util/List;
+
+ move-object/from16 v18, v0
+
+ move-wide/from16 v23, v1
+
+ invoke-direct/range {v18 .. v26}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
+
+ return-object v0
:cond_1
invoke-static {}, Lj0/n/c/h;->throwNpe()V
+ const/4 v0, 0x0
+
throw v0
:cond_2
- const-string p1, "reader"
+ move-object v0, v10
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ const-string v1, "reader"
+
+ invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
throw v0
.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
index bcb585ea4d..3fc9d10916 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$customStatusActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
index 1b3756ee9f..2fa030908c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$listeningActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
index d6db40f9fd..02414ac01f 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$playingActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
index f384a030dd..bf5c62f53b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$primaryActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
index 47fb560c73..74f61f2e66 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$streamingActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali b/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
index 170a97d2f0..a559e1a4e9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$watchingActivity$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ value = Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/models/domain/ModelPresence.smali b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
index 00f091f35e..88f64360fe 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
@@ -32,10 +32,22 @@
.field public final listeningActivity$delegate:Lkotlin/Lazy;
+.field public final nick:Ljava/lang/String;
+
.field public final playingActivity$delegate:Lkotlin/Lazy;
.field public final primaryActivity$delegate:Lkotlin/Lazy;
+.field public final roles:Ljava/util/List;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+.end field
+
.field public final status:Lcom/discord/models/domain/ModelPresence$Status;
.field public final streamingActivity$delegate:Lkotlin/Lazy;
@@ -46,7 +58,7 @@
# direct methods
-.method public constructor (Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+.method public constructor (Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -58,7 +70,11 @@
">;",
"Lcom/discord/models/domain/ModelPresence$ClientStatuses;",
"Lcom/discord/models/domain/ModelUser;",
- "J)V"
+ "J",
+ "Ljava/lang/String;",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;)V"
}
.end annotation
@@ -80,6 +96,10 @@
iput-wide p5, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+ iput-object p7, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ iput-object p8, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
new-instance p1, Lcom/discord/models/domain/ModelPresence$playingActivity$2;
invoke-direct {p1, p0}, Lcom/discord/models/domain/ModelPresence$playingActivity$2;->(Lcom/discord/models/domain/ModelPresence;)V
@@ -157,47 +177,86 @@
throw v0
.end method
-.method public synthetic constructor (Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
- .locals 7
+.method public synthetic constructor (Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 10
- and-int/lit8 p8, p7, 0x4
+ and-int/lit8 v0, p9, 0x4
- if-eqz p8, :cond_0
+ if-eqz v0, :cond_0
- sget-object p3, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+ sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
- invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object p3
+ move-result-object v0
+
+ move-object v4, v0
+
+ goto :goto_0
:cond_0
- move-object v3, p3
+ move-object v4, p3
- and-int/lit8 p3, p7, 0x8
+ :goto_0
+ and-int/lit8 v0, p9, 0x8
- if-eqz p3, :cond_1
+ const/4 v1, 0x0
- const/4 p4, 0x0
+ if-eqz v0, :cond_1
+
+ move-object v5, v1
+
+ goto :goto_1
:cond_1
- move-object v4, p4
+ move-object v5, p4
- and-int/lit8 p3, p7, 0x10
+ :goto_1
+ and-int/lit8 v0, p9, 0x10
- if-eqz p3, :cond_2
+ if-eqz v0, :cond_2
- const-wide/16 p5, 0x0
+ const-wide/16 v2, 0x0
+
+ move-wide v6, v2
+
+ goto :goto_2
:cond_2
- move-wide v5, p5
+ move-wide v6, p5
- move-object v0, p0
+ :goto_2
+ and-int/lit8 v0, p9, 0x20
- move-object v1, p1
+ if-eqz v0, :cond_3
- move-object v2, p2
+ move-object v8, v1
- invoke-direct/range {v0 .. v6}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ goto :goto_3
+
+ :cond_3
+ move-object/from16 v8, p7
+
+ :goto_3
+ and-int/lit8 v0, p9, 0x40
+
+ if-eqz v0, :cond_4
+
+ move-object v9, v1
+
+ goto :goto_4
+
+ :cond_4
+ move-object/from16 v9, p8
+
+ :goto_4
+ move-object v1, p0
+
+ move-object v2, p1
+
+ move-object v3, p2
+
+ invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
return-void
.end method
@@ -212,69 +271,114 @@
return-object p0
.end method
-.method public static synthetic copy$default(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence;
- .locals 4
+.method public static synthetic copy$default(Lcom/discord/models/domain/ModelPresence;Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence;
+ .locals 9
- and-int/lit8 p8, p7, 0x1
+ move-object v0, p0
- if-eqz p8, :cond_0
+ and-int/lit8 v1, p9, 0x1
- iget-object p1, p0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
+ if-eqz v1, :cond_0
+
+ iget-object v1, v0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
+
+ goto :goto_0
:cond_0
- and-int/lit8 p8, p7, 0x2
+ move-object v1, p1
- if-eqz p8, :cond_1
+ :goto_0
+ and-int/lit8 v2, p9, 0x2
- iget-object p2, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
+ if-eqz v2, :cond_1
+
+ iget-object v2, v0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
+
+ goto :goto_1
:cond_1
- move-object p8, p2
+ move-object v2, p2
- and-int/lit8 p2, p7, 0x4
+ :goto_1
+ and-int/lit8 v3, p9, 0x4
- if-eqz p2, :cond_2
+ if-eqz v3, :cond_2
- iget-object p3, p0, Lcom/discord/models/domain/ModelPresence;->clientStatuses:Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ iget-object v3, v0, Lcom/discord/models/domain/ModelPresence;->clientStatuses:Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+
+ goto :goto_2
:cond_2
- move-object v0, p3
+ move-object v3, p3
- and-int/lit8 p2, p7, 0x8
+ :goto_2
+ and-int/lit8 v4, p9, 0x8
- if-eqz p2, :cond_3
+ if-eqz v4, :cond_3
- iget-object p4, p0, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
+ iget-object v4, v0, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
+
+ goto :goto_3
:cond_3
- move-object v1, p4
+ move-object v4, p4
- and-int/lit8 p2, p7, 0x10
+ :goto_3
+ and-int/lit8 v5, p9, 0x10
- if-eqz p2, :cond_4
+ if-eqz v5, :cond_4
- iget-wide p5, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+ iget-wide v5, v0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+
+ goto :goto_4
:cond_4
- move-wide v2, p5
+ move-wide v5, p5
- move-object p2, p0
+ :goto_4
+ and-int/lit8 v7, p9, 0x20
- move-object p3, p1
+ if-eqz v7, :cond_5
- move-object p4, p8
+ iget-object v7, v0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
- move-object p5, v0
+ goto :goto_5
- move-object p6, v1
+ :cond_5
+ move-object/from16 v7, p7
- move-wide p7, v2
+ :goto_5
+ and-int/lit8 v8, p9, 0x40
- invoke-virtual/range {p2 .. p8}, Lcom/discord/models/domain/ModelPresence;->copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)Lcom/discord/models/domain/ModelPresence;
+ if-eqz v8, :cond_6
- move-result-object p0
+ iget-object v8, v0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
- return-object p0
+ goto :goto_6
+
+ :cond_6
+ move-object/from16 v8, p8
+
+ :goto_6
+ move-object p1, v1
+
+ move-object p2, v2
+
+ move-object p3, v3
+
+ move-object p4, v4
+
+ move-wide p5, v5
+
+ move-object/from16 p7, v7
+
+ move-object/from16 p8, v8
+
+ invoke-virtual/range {p0 .. p8}, Lcom/discord/models/domain/ModelPresence;->copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)Lcom/discord/models/domain/ModelPresence;
+
+ move-result-object v0
+
+ return-object v0
.end method
.method private final getActivityByType(I)Lcom/discord/models/domain/activity/ModelActivity;
@@ -380,8 +484,32 @@
return-wide v0
.end method
-.method public final copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)Lcom/discord/models/domain/ModelPresence;
- .locals 8
+.method public final component6()Ljava/lang/String;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ return-object v0
+.end method
+
+.method public final component7()Ljava/util/List;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ return-object v0
+.end method
+
+.method public final copy(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)Lcom/discord/models/domain/ModelPresence;
+ .locals 10
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -392,7 +520,11 @@
">;",
"Lcom/discord/models/domain/ModelPresence$ClientStatuses;",
"Lcom/discord/models/domain/ModelUser;",
- "J)",
+ "J",
+ "Ljava/lang/String;",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;)",
"Lcom/discord/models/domain/ModelPresence;"
}
.end annotation
@@ -417,27 +549,31 @@
move-wide v6, p5
- invoke-direct/range {v1 .. v7}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;J)V
+ move-object/from16 v8, p7
+
+ move-object/from16 v9, p8
+
+ invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;)V
return-object v0
:cond_0
- const-string p1, "clientStatuses"
+ const-string v1, "clientStatuses"
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
throw v0
:cond_1
- const-string p1, "status"
+ const-string v1, "status"
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
throw v0
.end method
.method public equals(Ljava/lang/Object;)Z
- .locals 4
+ .locals 5
if-eq p0, p1, :cond_1
@@ -491,9 +627,29 @@
iget-wide v2, p1, Lcom/discord/models/domain/ModelPresence;->guildId:J
- cmp-long p1, v0, v2
+ cmp-long v4, v0, v2
- if-nez p1, :cond_0
+ if-nez v4, :cond_0
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ iget-object v1, p1, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ iget-object p1, p1, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
goto :goto_0
@@ -569,6 +725,14 @@
return-object v0
.end method
+.method public final getNick()Ljava/lang/String;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ return-object v0
+.end method
+
.method public final getPlayingActivity()Lcom/discord/models/domain/activity/ModelActivity;
.locals 1
@@ -597,6 +761,22 @@
return-object v0
.end method
+.method public final getRoles()Ljava/util/List;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Ljava/util/List<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ return-object v0
+.end method
+
.method public final getStatus()Lcom/discord/models/domain/ModelPresence$Status;
.locals 1
@@ -642,7 +822,7 @@
.end method
.method public hashCode()I
- .locals 5
+ .locals 6
iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
@@ -704,30 +884,66 @@
invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->hashCode()I
- move-result v1
+ move-result v2
+
+ goto :goto_3
:cond_3
- add-int/2addr v0, v1
+ const/4 v2, 0x0
+
+ :goto_3
+ add-int/2addr v0, v2
mul-int/lit8 v0, v0, 0x1f
- iget-wide v1, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+ iget-wide v2, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
- const/16 v3, 0x20
+ const/16 v4, 0x20
- ushr-long v3, v1, v3
+ ushr-long v4, v2, v4
- xor-long/2addr v1, v3
+ xor-long/2addr v2, v4
- long-to-int v2, v1
+ long-to-int v3, v2
+ add-int/2addr v0, v3
+
+ mul-int/lit8 v0, v0, 0x1f
+
+ iget-object v2, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ if-eqz v2, :cond_4
+
+ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+ move-result v2
+
+ goto :goto_4
+
+ :cond_4
+ const/4 v2, 0x0
+
+ :goto_4
add-int/2addr v0, v2
+ mul-int/lit8 v0, v0, 0x1f
+
+ iget-object v2, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ if-eqz v2, :cond_5
+
+ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+ move-result v1
+
+ :cond_5
+ add-int/2addr v0, v1
+
return v0
.end method
.method public toString()Ljava/lang/String;
- .locals 4
+ .locals 3
const-string v0, "ModelPresence(status="
@@ -769,9 +985,25 @@
iget-wide v1, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
- const-string v3, ")"
+ invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
- invoke-static {v0, v1, v2, v3}, Lf/e/b/a/a;->t(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
+ const-string v1, ", nick="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-object v1, p0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ const-string v1, ", roles="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-object v1, p0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+
+ const-string v2, ")"
+
+ invoke-static {v0, v1, v2}, Lf/e/b/a/a;->w(Ljava/lang/StringBuilder;Ljava/util/List;Ljava/lang/String;)Ljava/lang/String;
move-result-object v0
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
index 40c21c100e..0a0a59fd47 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
@@ -948,36 +948,6 @@
return v0
.end method
-.method public isMutedByAnySource()Z
- .locals 1
-
- iget-boolean v0, p0, Lcom/discord/models/domain/ModelVoice$State;->selfMute:Z
-
- if-nez v0, :cond_1
-
- iget-boolean v0, p0, Lcom/discord/models/domain/ModelVoice$State;->mute:Z
-
- if-nez v0, :cond_1
-
- iget-boolean v0, p0, Lcom/discord/models/domain/ModelVoice$State;->suppress:Z
-
- if-eqz v0, :cond_0
-
- goto :goto_0
-
- :cond_0
- const/4 v0, 0x0
-
- goto :goto_1
-
- :cond_1
- :goto_0
- const/4 v0, 0x1
-
- :goto_1
- return v0
-.end method
-
.method public isRemoveSignal()Z
.locals 1
diff --git a/com.discord/smali/com/discord/models/messages/LocalAttachment.smali b/com.discord/smali/com/discord/models/messages/LocalAttachment.smali
deleted file mode 100644
index b25ba73ff7..0000000000
--- a/com.discord/smali/com/discord/models/messages/LocalAttachment.smali
+++ /dev/null
@@ -1,296 +0,0 @@
-.class public final Lcom/discord/models/messages/LocalAttachment;
-.super Ljava/lang/Object;
-.source "LocalAttachment.kt"
-
-
-# instance fields
-.field public final displayName:Ljava/lang/String;
-
-.field public final id:J
-
-.field public final uriString:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor (JLjava/lang/String;Ljava/lang/String;)V
- .locals 1
-
- const/4 v0, 0x0
-
- if-eqz p3, :cond_1
-
- if-eqz p4, :cond_0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- iput-wide p1, p0, Lcom/discord/models/messages/LocalAttachment;->id:J
-
- iput-object p3, p0, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
-
- iput-object p4, p0, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
-
- return-void
-
- :cond_0
- const-string p1, "displayName"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-
- :cond_1
- const-string p1, "uriString"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-.end method
-
-.method public static synthetic copy$default(Lcom/discord/models/messages/LocalAttachment;JLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/models/messages/LocalAttachment;
- .locals 0
-
- and-int/lit8 p6, p5, 0x1
-
- if-eqz p6, :cond_0
-
- iget-wide p1, p0, Lcom/discord/models/messages/LocalAttachment;->id:J
-
- :cond_0
- and-int/lit8 p6, p5, 0x2
-
- if-eqz p6, :cond_1
-
- iget-object p3, p0, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
-
- :cond_1
- and-int/lit8 p5, p5, 0x4
-
- if-eqz p5, :cond_2
-
- iget-object p4, p0, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
-
- :cond_2
- invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/models/messages/LocalAttachment;->copy(JLjava/lang/String;Ljava/lang/String;)Lcom/discord/models/messages/LocalAttachment;
-
- move-result-object p0
-
- return-object p0
-.end method
-
-
-# virtual methods
-.method public final component1()J
- .locals 2
-
- iget-wide v0, p0, Lcom/discord/models/messages/LocalAttachment;->id:J
-
- return-wide v0
-.end method
-
-.method public final component2()Ljava/lang/String;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
-
- return-object v0
-.end method
-
-.method public final component3()Ljava/lang/String;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
-
- return-object v0
-.end method
-
-.method public final copy(JLjava/lang/String;Ljava/lang/String;)Lcom/discord/models/messages/LocalAttachment;
- .locals 1
-
- const/4 v0, 0x0
-
- if-eqz p3, :cond_1
-
- if-eqz p4, :cond_0
-
- new-instance v0, Lcom/discord/models/messages/LocalAttachment;
-
- invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/models/messages/LocalAttachment;->(JLjava/lang/String;Ljava/lang/String;)V
-
- return-object v0
-
- :cond_0
- const-string p1, "displayName"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-
- :cond_1
- const-string p1, "uriString"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
- .locals 5
-
- if-eq p0, p1, :cond_1
-
- instance-of v0, p1, Lcom/discord/models/messages/LocalAttachment;
-
- if-eqz v0, :cond_0
-
- check-cast p1, Lcom/discord/models/messages/LocalAttachment;
-
- iget-wide v0, p0, Lcom/discord/models/messages/LocalAttachment;->id:J
-
- iget-wide v2, p1, Lcom/discord/models/messages/LocalAttachment;->id:J
-
- cmp-long v4, v0, v2
-
- if-nez v4, :cond_0
-
- iget-object v0, p0, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
-
- iget-object v1, p1, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
-
- invoke-static {v0, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
- iget-object v0, p0, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
-
- iget-object p1, p1, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
-
- invoke-static {v0, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result p1
-
- if-eqz p1, :cond_0
-
- goto :goto_0
-
- :cond_0
- const/4 p1, 0x0
-
- return p1
-
- :cond_1
- :goto_0
- const/4 p1, 0x1
-
- return p1
-.end method
-
-.method public final getDisplayName()Ljava/lang/String;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
-
- return-object v0
-.end method
-
-.method public final getId()J
- .locals 2
-
- iget-wide v0, p0, Lcom/discord/models/messages/LocalAttachment;->id:J
-
- return-wide v0
-.end method
-
-.method public final getUriString()Ljava/lang/String;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
-
- return-object v0
-.end method
-
-.method public hashCode()I
- .locals 4
-
- iget-wide v0, p0, Lcom/discord/models/messages/LocalAttachment;->id:J
-
- const/16 v2, 0x20
-
- ushr-long v2, v0, v2
-
- xor-long/2addr v0, v2
-
- long-to-int v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- iget-object v0, p0, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
-
- const/4 v2, 0x0
-
- if-eqz v0, :cond_0
-
- invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
- move-result v0
-
- goto :goto_0
-
- :cond_0
- const/4 v0, 0x0
-
- :goto_0
- add-int/2addr v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- iget-object v0, p0, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
-
- if-eqz v0, :cond_1
-
- invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
- move-result v2
-
- :cond_1
- add-int/2addr v1, v2
-
- return v1
-.end method
-
-.method public toString()Ljava/lang/String;
- .locals 3
-
- const-string v0, "LocalAttachment(id="
-
- invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- move-result-object v0
-
- iget-wide v1, p0, Lcom/discord/models/messages/LocalAttachment;->id:J
-
- invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
- const-string v1, ", uriString="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/models/messages/LocalAttachment;->uriString:Ljava/lang/String;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- const-string v1, ", displayName="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/models/messages/LocalAttachment;->displayName:Ljava/lang/String;
-
- const-string v2, ")"
-
- invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object v0
-
- return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/overlay/R$d.smali b/com.discord/smali/com/discord/overlay/R$d.smali
index b929c4bbce..5bc7eb2d5f 100644
--- a/com.discord/smali/com/discord/overlay/R$d.smali
+++ b/com.discord/smali/com/discord/overlay/R$d.smali
@@ -128,181 +128,181 @@
.field public static final buttonPanel:I = 0x7f0a0124
-.field public static final checkbox:I = 0x7f0a025f
+.field public static final checkbox:I = 0x7f0a025a
-.field public static final checked:I = 0x7f0a0261
+.field public static final checked:I = 0x7f0a025c
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final content:I = 0x7f0a0289
+.field public static final content:I = 0x7f0a0284
-.field public static final contentPanel:I = 0x7f0a028a
+.field public static final contentPanel:I = 0x7f0a0285
-.field public static final custom:I = 0x7f0a02b4
+.field public static final custom:I = 0x7f0a02af
-.field public static final customPanel:I = 0x7f0a02b5
+.field public static final customPanel:I = 0x7f0a02b0
-.field public static final decor_content_parent:I = 0x7f0a02bd
+.field public static final decor_content_parent:I = 0x7f0a02b8
-.field public static final default_activity_button:I = 0x7f0a02be
+.field public static final default_activity_button:I = 0x7f0a02b9
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final edit_query:I = 0x7f0a031d
+.field public static final edit_query:I = 0x7f0a0317
-.field public static final expand_activities_button:I = 0x7f0a0367
+.field public static final expand_activities_button:I = 0x7f0a0361
-.field public static final expanded_menu:I = 0x7f0a0368
+.field public static final expanded_menu:I = 0x7f0a0362
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final group_divider:I = 0x7f0a0411
+.field public static final group_divider:I = 0x7f0a0409
-.field public static final home:I = 0x7f0a04c0
+.field public static final home:I = 0x7f0a04b8
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final image:I = 0x7f0a04de
+.field public static final image:I = 0x7f0a04d6
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final listMode:I = 0x7f0a0588
+.field public static final listMode:I = 0x7f0a0580
-.field public static final list_item:I = 0x7f0a0589
+.field public static final list_item:I = 0x7f0a0581
-.field public static final message:I = 0x7f0a05dc
+.field public static final message:I = 0x7f0a05d4
-.field public static final multiply:I = 0x7f0a05fe
+.field public static final multiply:I = 0x7f0a05f6
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final off:I = 0x7f0a0666
+.field public static final off:I = 0x7f0a065e
-.field public static final on:I = 0x7f0a066a
+.field public static final on:I = 0x7f0a0662
-.field public static final parentPanel:I = 0x7f0a067f
+.field public static final parentPanel:I = 0x7f0a0677
-.field public static final progress_circular:I = 0x7f0a072a
+.field public static final progress_circular:I = 0x7f0a0722
-.field public static final progress_horizontal:I = 0x7f0a072d
+.field public static final progress_horizontal:I = 0x7f0a0725
-.field public static final radio:I = 0x7f0a073b
+.field public static final radio:I = 0x7f0a0733
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final screen:I = 0x7f0a078f
+.field public static final screen:I = 0x7f0a0787
-.field public static final scrollIndicatorDown:I = 0x7f0a0793
+.field public static final scrollIndicatorDown:I = 0x7f0a078b
-.field public static final scrollIndicatorUp:I = 0x7f0a0794
+.field public static final scrollIndicatorUp:I = 0x7f0a078c
-.field public static final scrollView:I = 0x7f0a0795
+.field public static final scrollView:I = 0x7f0a078d
-.field public static final search_badge:I = 0x7f0a0798
+.field public static final search_badge:I = 0x7f0a0790
-.field public static final search_bar:I = 0x7f0a0799
+.field public static final search_bar:I = 0x7f0a0791
-.field public static final search_button:I = 0x7f0a079a
+.field public static final search_button:I = 0x7f0a0792
-.field public static final search_close_btn:I = 0x7f0a079b
+.field public static final search_close_btn:I = 0x7f0a0793
-.field public static final search_edit_frame:I = 0x7f0a079c
+.field public static final search_edit_frame:I = 0x7f0a0794
-.field public static final search_go_btn:I = 0x7f0a079e
+.field public static final search_go_btn:I = 0x7f0a0796
-.field public static final search_mag_icon:I = 0x7f0a079f
+.field public static final search_mag_icon:I = 0x7f0a0797
-.field public static final search_plate:I = 0x7f0a07a0
+.field public static final search_plate:I = 0x7f0a0798
-.field public static final search_src_text:I = 0x7f0a07a3
+.field public static final search_src_text:I = 0x7f0a079b
-.field public static final search_voice_btn:I = 0x7f0a07af
+.field public static final search_voice_btn:I = 0x7f0a07a7
-.field public static final select_dialog_listview:I = 0x7f0a07b2
+.field public static final select_dialog_listview:I = 0x7f0a07aa
-.field public static final shortcut:I = 0x7f0a090e
+.field public static final shortcut:I = 0x7f0a0906
-.field public static final spacer:I = 0x7f0a091d
+.field public static final spacer:I = 0x7f0a0915
-.field public static final split_action_bar:I = 0x7f0a0921
+.field public static final split_action_bar:I = 0x7f0a0919
-.field public static final src_atop:I = 0x7f0a0925
+.field public static final src_atop:I = 0x7f0a091d
-.field public static final src_in:I = 0x7f0a0926
+.field public static final src_in:I = 0x7f0a091e
-.field public static final src_over:I = 0x7f0a0927
+.field public static final src_over:I = 0x7f0a091f
-.field public static final submenuarrow:I = 0x7f0a0944
+.field public static final submenuarrow:I = 0x7f0a093c
-.field public static final submit_area:I = 0x7f0a0945
+.field public static final submit_area:I = 0x7f0a093d
-.field public static final tabMode:I = 0x7f0a0955
+.field public static final tabMode:I = 0x7f0a094c
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final textSpacerNoButtons:I = 0x7f0a0979
+.field public static final textSpacerNoButtons:I = 0x7f0a0970
-.field public static final textSpacerNoTitle:I = 0x7f0a097a
+.field public static final textSpacerNoTitle:I = 0x7f0a0971
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final titleDividerNoCustom:I = 0x7f0a098d
+.field public static final titleDividerNoCustom:I = 0x7f0a0984
-.field public static final title_template:I = 0x7f0a098e
+.field public static final title_template:I = 0x7f0a0985
-.field public static final topPanel:I = 0x7f0a0994
+.field public static final topPanel:I = 0x7f0a098b
-.field public static final trash_wrap_icon:I = 0x7f0a09a0
+.field public static final trash_wrap_icon:I = 0x7f0a0997
-.field public static final trash_wrap_target_container:I = 0x7f0a09a1
+.field public static final trash_wrap_target_container:I = 0x7f0a0998
-.field public static final trash_wrap_target_zone:I = 0x7f0a09a2
+.field public static final trash_wrap_target_zone:I = 0x7f0a0999
-.field public static final unchecked:I = 0x7f0a09aa
+.field public static final unchecked:I = 0x7f0a09a1
-.field public static final uniform:I = 0x7f0a09ad
+.field public static final uniform:I = 0x7f0a09a4
-.field public static final up:I = 0x7f0a09af
+.field public static final up:I = 0x7f0a09a6
-.field public static final wrap_content:I = 0x7f0a0aae
+.field public static final wrap_content:I = 0x7f0a0aa5
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali
index a9e1adee9f..3a39a2150e 100644
--- a/com.discord/smali/com/discord/restapi/R$drawable.smali
+++ b/com.discord/smali/com/discord/restapi/R$drawable.smali
@@ -262,9 +262,9 @@
.field public static final drawable_chip_delete:I = 0x7f08012c
-.field public static final googleg_disabled_color_18:I = 0x7f0801f8
+.field public static final googleg_disabled_color_18:I = 0x7f0801f9
-.field public static final googleg_standard_color_18:I = 0x7f0801f9
+.field public static final googleg_standard_color_18:I = 0x7f0801fa
.field public static final ic_arrow_down_24dp:I = 0x7f080221
diff --git a/com.discord/smali/com/discord/restapi/R$id.smali b/com.discord/smali/com/discord/restapi/R$id.smali
index fa6661b245..5d23ee1dc6 100644
--- a/com.discord/smali/com/discord/restapi/R$id.smali
+++ b/com.discord/smali/com/discord/restapi/R$id.smali
@@ -160,461 +160,461 @@
.field public static final centerInside:I = 0x7f0a0140
-.field public static final checkbox:I = 0x7f0a025f
+.field public static final checkbox:I = 0x7f0a025a
-.field public static final checked:I = 0x7f0a0261
+.field public static final checked:I = 0x7f0a025c
-.field public static final chip:I = 0x7f0a0262
+.field public static final chip:I = 0x7f0a025d
-.field public static final chip1:I = 0x7f0a0263
+.field public static final chip1:I = 0x7f0a025e
-.field public static final chip2:I = 0x7f0a0264
+.field public static final chip2:I = 0x7f0a025f
-.field public static final chip3:I = 0x7f0a0265
+.field public static final chip3:I = 0x7f0a0260
-.field public static final chip_group:I = 0x7f0a0266
+.field public static final chip_group:I = 0x7f0a0261
-.field public static final chip_image:I = 0x7f0a0267
+.field public static final chip_image:I = 0x7f0a0262
-.field public static final chip_text:I = 0x7f0a0268
+.field public static final chip_text:I = 0x7f0a0263
-.field public static final chronometer:I = 0x7f0a0269
+.field public static final chronometer:I = 0x7f0a0264
-.field public static final circular:I = 0x7f0a026b
+.field public static final circular:I = 0x7f0a0266
-.field public static final clear_text:I = 0x7f0a026c
+.field public static final clear_text:I = 0x7f0a0267
-.field public static final column:I = 0x7f0a0275
+.field public static final column:I = 0x7f0a0270
-.field public static final column_reverse:I = 0x7f0a0276
+.field public static final column_reverse:I = 0x7f0a0271
-.field public static final confirm_button:I = 0x7f0a0277
+.field public static final confirm_button:I = 0x7f0a0272
-.field public static final container:I = 0x7f0a0288
+.field public static final container:I = 0x7f0a0283
-.field public static final content:I = 0x7f0a0289
+.field public static final content:I = 0x7f0a0284
-.field public static final contentPanel:I = 0x7f0a028a
+.field public static final contentPanel:I = 0x7f0a0285
-.field public static final coordinator:I = 0x7f0a028e
+.field public static final coordinator:I = 0x7f0a0289
-.field public static final custom:I = 0x7f0a02b4
+.field public static final custom:I = 0x7f0a02af
-.field public static final customPanel:I = 0x7f0a02b5
+.field public static final customPanel:I = 0x7f0a02b0
-.field public static final cut:I = 0x7f0a02b6
+.field public static final cut:I = 0x7f0a02b1
-.field public static final dark:I = 0x7f0a02b7
+.field public static final dark:I = 0x7f0a02b2
-.field public static final date_picker_actions:I = 0x7f0a02b9
+.field public static final date_picker_actions:I = 0x7f0a02b4
-.field public static final decor_content_parent:I = 0x7f0a02bd
+.field public static final decor_content_parent:I = 0x7f0a02b8
-.field public static final default_activity_button:I = 0x7f0a02be
+.field public static final default_activity_button:I = 0x7f0a02b9
-.field public static final design_bottom_sheet:I = 0x7f0a02c2
+.field public static final design_bottom_sheet:I = 0x7f0a02bd
-.field public static final design_menu_item_action_area:I = 0x7f0a02c3
+.field public static final design_menu_item_action_area:I = 0x7f0a02be
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02bf
-.field public static final design_menu_item_text:I = 0x7f0a02c5
+.field public static final design_menu_item_text:I = 0x7f0a02c0
-.field public static final design_navigation_view:I = 0x7f0a02c6
+.field public static final design_navigation_view:I = 0x7f0a02c1
-.field public static final dialog_button:I = 0x7f0a02cc
+.field public static final dialog_button:I = 0x7f0a02c7
-.field public static final dropdown_menu:I = 0x7f0a02f8
+.field public static final dropdown_menu:I = 0x7f0a02f2
-.field public static final edit_query:I = 0x7f0a031d
+.field public static final edit_query:I = 0x7f0a0317
-.field public static final end:I = 0x7f0a034a
+.field public static final end:I = 0x7f0a0344
-.field public static final end_padder:I = 0x7f0a034b
+.field public static final end_padder:I = 0x7f0a0345
-.field public static final expand_activities_button:I = 0x7f0a0367
+.field public static final expand_activities_button:I = 0x7f0a0361
-.field public static final expanded_menu:I = 0x7f0a0368
+.field public static final expanded_menu:I = 0x7f0a0362
-.field public static final fade:I = 0x7f0a0386
+.field public static final fade:I = 0x7f0a0380
-.field public static final fill:I = 0x7f0a039d
+.field public static final fill:I = 0x7f0a0395
-.field public static final filled:I = 0x7f0a03a0
+.field public static final filled:I = 0x7f0a0398
-.field public static final fitBottomStart:I = 0x7f0a03a4
+.field public static final fitBottomStart:I = 0x7f0a039c
-.field public static final fitCenter:I = 0x7f0a03a5
+.field public static final fitCenter:I = 0x7f0a039d
-.field public static final fitEnd:I = 0x7f0a03a6
+.field public static final fitEnd:I = 0x7f0a039e
-.field public static final fitStart:I = 0x7f0a03a7
+.field public static final fitStart:I = 0x7f0a039f
-.field public static final fitXY:I = 0x7f0a03a9
+.field public static final fitXY:I = 0x7f0a03a1
-.field public static final fixed:I = 0x7f0a03aa
+.field public static final fixed:I = 0x7f0a03a2
-.field public static final flex_end:I = 0x7f0a03ad
+.field public static final flex_end:I = 0x7f0a03a5
-.field public static final flex_start:I = 0x7f0a03be
+.field public static final flex_start:I = 0x7f0a03b6
-.field public static final floating:I = 0x7f0a03bf
+.field public static final floating:I = 0x7f0a03b7
-.field public static final focusCrop:I = 0x7f0a03c1
+.field public static final focusCrop:I = 0x7f0a03b9
-.field public static final forever:I = 0x7f0a03c6
+.field public static final forever:I = 0x7f0a03be
-.field public static final fragment_container_view_tag:I = 0x7f0a03c7
+.field public static final fragment_container_view_tag:I = 0x7f0a03bf
-.field public static final ghost_view:I = 0x7f0a03e2
+.field public static final ghost_view:I = 0x7f0a03da
-.field public static final ghost_view_holder:I = 0x7f0a03e3
+.field public static final ghost_view_holder:I = 0x7f0a03db
-.field public static final gone:I = 0x7f0a040f
+.field public static final gone:I = 0x7f0a0407
-.field public static final group_divider:I = 0x7f0a0411
+.field public static final group_divider:I = 0x7f0a0409
-.field public static final home:I = 0x7f0a04c0
+.field public static final home:I = 0x7f0a04b8
-.field public static final icon:I = 0x7f0a04d2
+.field public static final icon:I = 0x7f0a04ca
-.field public static final icon_frame:I = 0x7f0a04d3
+.field public static final icon_frame:I = 0x7f0a04cb
-.field public static final icon_group:I = 0x7f0a04d4
+.field public static final icon_group:I = 0x7f0a04cc
-.field public static final icon_only:I = 0x7f0a04d5
+.field public static final icon_only:I = 0x7f0a04cd
-.field public static final image:I = 0x7f0a04de
+.field public static final image:I = 0x7f0a04d6
-.field public static final incoming:I = 0x7f0a04e6
+.field public static final incoming:I = 0x7f0a04de
-.field public static final info:I = 0x7f0a04f6
+.field public static final info:I = 0x7f0a04ee
-.field public static final italic:I = 0x7f0a052f
+.field public static final italic:I = 0x7f0a0527
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
-.field public static final labeled:I = 0x7f0a0575
+.field public static final labeled:I = 0x7f0a056d
-.field public static final largeLabel:I = 0x7f0a0577
+.field public static final largeLabel:I = 0x7f0a056f
-.field public static final left:I = 0x7f0a0582
+.field public static final left:I = 0x7f0a057a
-.field public static final light:I = 0x7f0a0583
+.field public static final light:I = 0x7f0a057b
-.field public static final line1:I = 0x7f0a0584
+.field public static final line1:I = 0x7f0a057c
-.field public static final line3:I = 0x7f0a0585
+.field public static final line3:I = 0x7f0a057d
-.field public static final linear:I = 0x7f0a0586
+.field public static final linear:I = 0x7f0a057e
-.field public static final listMode:I = 0x7f0a0588
+.field public static final listMode:I = 0x7f0a0580
-.field public static final list_item:I = 0x7f0a0589
+.field public static final list_item:I = 0x7f0a0581
-.field public static final masked:I = 0x7f0a0599
+.field public static final masked:I = 0x7f0a0591
-.field public static final media_actions:I = 0x7f0a059f
+.field public static final media_actions:I = 0x7f0a0597
-.field public static final message:I = 0x7f0a05dc
+.field public static final message:I = 0x7f0a05d4
-.field public static final mini:I = 0x7f0a05e1
+.field public static final mini:I = 0x7f0a05d9
-.field public static final month_grid:I = 0x7f0a05e3
+.field public static final month_grid:I = 0x7f0a05db
-.field public static final month_navigation_bar:I = 0x7f0a05e4
+.field public static final month_navigation_bar:I = 0x7f0a05dc
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e5
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05dd
-.field public static final month_navigation_next:I = 0x7f0a05e6
+.field public static final month_navigation_next:I = 0x7f0a05de
-.field public static final month_navigation_previous:I = 0x7f0a05e7
+.field public static final month_navigation_previous:I = 0x7f0a05df
-.field public static final month_title:I = 0x7f0a05e8
+.field public static final month_title:I = 0x7f0a05e0
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e9
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e1
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ea
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e2
-.field public static final mtrl_calendar_frame:I = 0x7f0a05eb
+.field public static final mtrl_calendar_frame:I = 0x7f0a05e3
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ec
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05e4
-.field public static final mtrl_calendar_months:I = 0x7f0a05ed
+.field public static final mtrl_calendar_months:I = 0x7f0a05e5
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ee
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05e6
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ef
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05e7
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f0
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05e8
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f1
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05e9
-.field public static final mtrl_child_content_container:I = 0x7f0a05f2
+.field public static final mtrl_child_content_container:I = 0x7f0a05ea
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f3
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05eb
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f4
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05ec
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f5
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05ed
-.field public static final mtrl_picker_header:I = 0x7f0a05f6
+.field public static final mtrl_picker_header:I = 0x7f0a05ee
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f7
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05ef
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f8
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f0
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f9
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f1
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fa
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f2
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fb
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f3
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fc
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05f4
-.field public static final mtrl_picker_title_text:I = 0x7f0a05fd
+.field public static final mtrl_picker_title_text:I = 0x7f0a05f5
-.field public static final multiply:I = 0x7f0a05fe
+.field public static final multiply:I = 0x7f0a05f6
-.field public static final navigation_header_container:I = 0x7f0a0610
+.field public static final navigation_header_container:I = 0x7f0a0608
-.field public static final none:I = 0x7f0a0625
+.field public static final none:I = 0x7f0a061d
-.field public static final normal:I = 0x7f0a0626
+.field public static final normal:I = 0x7f0a061e
-.field public static final notification_background:I = 0x7f0a0630
+.field public static final notification_background:I = 0x7f0a0628
-.field public static final notification_main_column:I = 0x7f0a0631
+.field public static final notification_main_column:I = 0x7f0a0629
-.field public static final notification_main_column_container:I = 0x7f0a0632
+.field public static final notification_main_column_container:I = 0x7f0a062a
-.field public static final nowrap:I = 0x7f0a0636
+.field public static final nowrap:I = 0x7f0a062e
-.field public static final off:I = 0x7f0a0666
+.field public static final off:I = 0x7f0a065e
-.field public static final on:I = 0x7f0a066a
+.field public static final on:I = 0x7f0a0662
-.field public static final outgoing:I = 0x7f0a066c
+.field public static final outgoing:I = 0x7f0a0664
-.field public static final outline:I = 0x7f0a066d
+.field public static final outline:I = 0x7f0a0665
-.field public static final parallax:I = 0x7f0a067d
+.field public static final parallax:I = 0x7f0a0675
-.field public static final parentPanel:I = 0x7f0a067f
+.field public static final parentPanel:I = 0x7f0a0677
-.field public static final parent_matrix:I = 0x7f0a0680
+.field public static final parent_matrix:I = 0x7f0a0678
-.field public static final password_toggle:I = 0x7f0a068e
+.field public static final password_toggle:I = 0x7f0a0686
-.field public static final pin:I = 0x7f0a06bb
+.field public static final pin:I = 0x7f0a06b3
-.field public static final progress_circular:I = 0x7f0a072a
+.field public static final progress_circular:I = 0x7f0a0722
-.field public static final progress_horizontal:I = 0x7f0a072d
+.field public static final progress_horizontal:I = 0x7f0a0725
-.field public static final radio:I = 0x7f0a073b
+.field public static final radio:I = 0x7f0a0733
-.field public static final recycler_view:I = 0x7f0a0741
+.field public static final recycler_view:I = 0x7f0a0739
-.field public static final right:I = 0x7f0a075d
+.field public static final right:I = 0x7f0a0755
-.field public static final right_icon:I = 0x7f0a075e
+.field public static final right_icon:I = 0x7f0a0756
-.field public static final right_side:I = 0x7f0a075f
+.field public static final right_side:I = 0x7f0a0757
-.field public static final rounded:I = 0x7f0a0787
+.field public static final rounded:I = 0x7f0a077f
-.field public static final row:I = 0x7f0a0788
+.field public static final row:I = 0x7f0a0780
-.field public static final row_index_key:I = 0x7f0a0789
+.field public static final row_index_key:I = 0x7f0a0781
-.field public static final row_reverse:I = 0x7f0a078a
+.field public static final row_reverse:I = 0x7f0a0782
-.field public static final save_non_transition_alpha:I = 0x7f0a078b
+.field public static final save_non_transition_alpha:I = 0x7f0a0783
-.field public static final save_overlay_view:I = 0x7f0a078c
+.field public static final save_overlay_view:I = 0x7f0a0784
-.field public static final scale:I = 0x7f0a078d
+.field public static final scale:I = 0x7f0a0785
-.field public static final screen:I = 0x7f0a078f
+.field public static final screen:I = 0x7f0a0787
-.field public static final scrollIndicatorDown:I = 0x7f0a0793
+.field public static final scrollIndicatorDown:I = 0x7f0a078b
-.field public static final scrollIndicatorUp:I = 0x7f0a0794
+.field public static final scrollIndicatorUp:I = 0x7f0a078c
-.field public static final scrollView:I = 0x7f0a0795
+.field public static final scrollView:I = 0x7f0a078d
-.field public static final scrollable:I = 0x7f0a0797
+.field public static final scrollable:I = 0x7f0a078f
-.field public static final search_badge:I = 0x7f0a0798
+.field public static final search_badge:I = 0x7f0a0790
-.field public static final search_bar:I = 0x7f0a0799
+.field public static final search_bar:I = 0x7f0a0791
-.field public static final search_button:I = 0x7f0a079a
+.field public static final search_button:I = 0x7f0a0792
-.field public static final search_close_btn:I = 0x7f0a079b
+.field public static final search_close_btn:I = 0x7f0a0793
-.field public static final search_edit_frame:I = 0x7f0a079c
+.field public static final search_edit_frame:I = 0x7f0a0794
-.field public static final search_go_btn:I = 0x7f0a079e
+.field public static final search_go_btn:I = 0x7f0a0796
-.field public static final search_mag_icon:I = 0x7f0a079f
+.field public static final search_mag_icon:I = 0x7f0a0797
-.field public static final search_plate:I = 0x7f0a07a0
+.field public static final search_plate:I = 0x7f0a0798
-.field public static final search_src_text:I = 0x7f0a07a3
+.field public static final search_src_text:I = 0x7f0a079b
-.field public static final search_voice_btn:I = 0x7f0a07af
+.field public static final search_voice_btn:I = 0x7f0a07a7
-.field public static final seekbar:I = 0x7f0a07b0
+.field public static final seekbar:I = 0x7f0a07a8
-.field public static final seekbar_value:I = 0x7f0a07b1
+.field public static final seekbar_value:I = 0x7f0a07a9
-.field public static final select_dialog_listview:I = 0x7f0a07b2
+.field public static final select_dialog_listview:I = 0x7f0a07aa
-.field public static final selected:I = 0x7f0a07b3
+.field public static final selected:I = 0x7f0a07ab
-.field public static final shortcut:I = 0x7f0a090e
+.field public static final shortcut:I = 0x7f0a0906
-.field public static final slide:I = 0x7f0a0913
+.field public static final slide:I = 0x7f0a090b
-.field public static final smallLabel:I = 0x7f0a0914
+.field public static final smallLabel:I = 0x7f0a090c
-.field public static final snackbar_action:I = 0x7f0a0915
+.field public static final snackbar_action:I = 0x7f0a090d
-.field public static final snackbar_text:I = 0x7f0a0916
+.field public static final snackbar_text:I = 0x7f0a090e
-.field public static final space_around:I = 0x7f0a091a
+.field public static final space_around:I = 0x7f0a0912
-.field public static final space_between:I = 0x7f0a091b
+.field public static final space_between:I = 0x7f0a0913
-.field public static final space_evenly:I = 0x7f0a091c
+.field public static final space_evenly:I = 0x7f0a0914
-.field public static final spacer:I = 0x7f0a091d
+.field public static final spacer:I = 0x7f0a0915
-.field public static final spinner:I = 0x7f0a0920
+.field public static final spinner:I = 0x7f0a0918
-.field public static final split_action_bar:I = 0x7f0a0921
+.field public static final split_action_bar:I = 0x7f0a0919
-.field public static final src_atop:I = 0x7f0a0925
+.field public static final src_atop:I = 0x7f0a091d
-.field public static final src_in:I = 0x7f0a0926
+.field public static final src_in:I = 0x7f0a091e
-.field public static final src_over:I = 0x7f0a0927
+.field public static final src_over:I = 0x7f0a091f
-.field public static final standard:I = 0x7f0a0929
+.field public static final standard:I = 0x7f0a0921
-.field public static final start:I = 0x7f0a092a
+.field public static final start:I = 0x7f0a0922
-.field public static final status_bar_latest_event_content:I = 0x7f0a092e
+.field public static final status_bar_latest_event_content:I = 0x7f0a0926
-.field public static final stretch:I = 0x7f0a0943
+.field public static final stretch:I = 0x7f0a093b
-.field public static final submenuarrow:I = 0x7f0a0944
+.field public static final submenuarrow:I = 0x7f0a093c
-.field public static final submit_area:I = 0x7f0a0945
+.field public static final submit_area:I = 0x7f0a093d
-.field public static final switchWidget:I = 0x7f0a0953
+.field public static final switchWidget:I = 0x7f0a094a
-.field public static final tabMode:I = 0x7f0a0955
+.field public static final tabMode:I = 0x7f0a094c
-.field public static final tag_accessibility_actions:I = 0x7f0a0963
+.field public static final tag_accessibility_actions:I = 0x7f0a095a
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
-.field public static final tag_accessibility_heading:I = 0x7f0a0965
+.field public static final tag_accessibility_heading:I = 0x7f0a095c
-.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
+.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
-.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
+.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
-.field public static final tag_transition_group:I = 0x7f0a0968
+.field public static final tag_transition_group:I = 0x7f0a095f
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0971
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a0968
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0972
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a0969
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0973
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a096a
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0974
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a096b
-.field public static final text:I = 0x7f0a0975
+.field public static final text:I = 0x7f0a096c
-.field public static final text2:I = 0x7f0a0977
+.field public static final text2:I = 0x7f0a096e
-.field public static final textSpacerNoButtons:I = 0x7f0a0979
+.field public static final textSpacerNoButtons:I = 0x7f0a0970
-.field public static final textSpacerNoTitle:I = 0x7f0a097a
+.field public static final textSpacerNoTitle:I = 0x7f0a0971
-.field public static final text_input_end_icon:I = 0x7f0a097c
+.field public static final text_input_end_icon:I = 0x7f0a0973
-.field public static final text_input_start_icon:I = 0x7f0a097d
+.field public static final text_input_start_icon:I = 0x7f0a0974
-.field public static final textinput_counter:I = 0x7f0a0980
+.field public static final textinput_counter:I = 0x7f0a0977
-.field public static final textinput_error:I = 0x7f0a0981
+.field public static final textinput_error:I = 0x7f0a0978
-.field public static final textinput_helper_text:I = 0x7f0a0982
+.field public static final textinput_helper_text:I = 0x7f0a0979
-.field public static final textinput_placeholder:I = 0x7f0a0983
+.field public static final textinput_placeholder:I = 0x7f0a097a
-.field public static final textinput_prefix_text:I = 0x7f0a0984
+.field public static final textinput_prefix_text:I = 0x7f0a097b
-.field public static final textinput_suffix_text:I = 0x7f0a0985
+.field public static final textinput_suffix_text:I = 0x7f0a097c
-.field public static final time:I = 0x7f0a098b
+.field public static final time:I = 0x7f0a0982
-.field public static final title:I = 0x7f0a098c
+.field public static final title:I = 0x7f0a0983
-.field public static final titleDividerNoCustom:I = 0x7f0a098d
+.field public static final titleDividerNoCustom:I = 0x7f0a0984
-.field public static final title_template:I = 0x7f0a098e
+.field public static final title_template:I = 0x7f0a0985
-.field public static final top:I = 0x7f0a0993
+.field public static final top:I = 0x7f0a098a
-.field public static final topPanel:I = 0x7f0a0994
+.field public static final topPanel:I = 0x7f0a098b
-.field public static final touch_outside:I = 0x7f0a0996
+.field public static final touch_outside:I = 0x7f0a098d
-.field public static final transition_current_scene:I = 0x7f0a0997
+.field public static final transition_current_scene:I = 0x7f0a098e
-.field public static final transition_layout_save:I = 0x7f0a0998
+.field public static final transition_layout_save:I = 0x7f0a098f
-.field public static final transition_position:I = 0x7f0a0999
+.field public static final transition_position:I = 0x7f0a0990
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a099a
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a0991
-.field public static final transition_transform:I = 0x7f0a099b
+.field public static final transition_transform:I = 0x7f0a0992
-.field public static final unchecked:I = 0x7f0a09aa
+.field public static final unchecked:I = 0x7f0a09a1
-.field public static final uniform:I = 0x7f0a09ad
+.field public static final uniform:I = 0x7f0a09a4
-.field public static final unlabeled:I = 0x7f0a09ae
+.field public static final unlabeled:I = 0x7f0a09a5
-.field public static final up:I = 0x7f0a09af
+.field public static final up:I = 0x7f0a09a6
-.field public static final view_offset_helper:I = 0x7f0a0a32
+.field public static final view_offset_helper:I = 0x7f0a0a29
-.field public static final visible:I = 0x7f0a0a46
+.field public static final visible:I = 0x7f0a0a3d
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a47
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
-.field public static final wide:I = 0x7f0a0a75
+.field public static final wide:I = 0x7f0a0a6c
-.field public static final withinBounds:I = 0x7f0a0aac
+.field public static final withinBounds:I = 0x7f0a0aa3
-.field public static final wrap:I = 0x7f0a0aad
+.field public static final wrap:I = 0x7f0a0aa4
-.field public static final wrap_content:I = 0x7f0a0aae
+.field public static final wrap_content:I = 0x7f0a0aa5
-.field public static final wrap_reverse:I = 0x7f0a0aaf
+.field public static final wrap_reverse:I = 0x7f0a0aa6
-.field public static final zero_corner_chip:I = 0x7f0a0ab4
+.field public static final zero_corner_chip:I = 0x7f0a0aab
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$layout.smali b/com.discord/smali/com/discord/restapi/R$layout.smali
index 532e3ccf10..b0a9733b17 100644
--- a/com.discord/smali/com/discord/restapi/R$layout.smali
+++ b/com.discord/smali/com/discord/restapi/R$layout.smali
@@ -260,7 +260,7 @@
.field public static final text_view_without_line_height:I = 0x7f0d00e0
-.field public static final view_chip_default:I = 0x7f0d0104
+.field public static final view_chip_default:I = 0x7f0d0102
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$plurals.smali b/com.discord/smali/com/discord/restapi/R$plurals.smali
index 5987fec8af..ca3eb0bf98 100644
--- a/com.discord/smali/com/discord/restapi/R$plurals.smali
+++ b/com.discord/smali/com/discord/restapi/R$plurals.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final mtrl_badge_content_description:I = 0x7f1000b3
+.field public static final mtrl_badge_content_description:I = 0x7f1000b2
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali
index da6f95fbf7..a77d290878 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -72,165 +72,165 @@
.field public static final bottom_sheet_behavior:I = 0x7f120354
-.field public static final character_counter_content_description:I = 0x7f120419
+.field public static final character_counter_content_description:I = 0x7f120417
-.field public static final character_counter_overflowed_content_description:I = 0x7f12041a
+.field public static final character_counter_overflowed_content_description:I = 0x7f120418
-.field public static final character_counter_pattern:I = 0x7f12041b
+.field public static final character_counter_pattern:I = 0x7f120419
-.field public static final chip_text:I = 0x7f120425
+.field public static final chip_text:I = 0x7f120423
-.field public static final clear_text_end_icon_content_description:I = 0x7f120432
+.field public static final clear_text_end_icon_content_description:I = 0x7f120430
-.field public static final common_google_play_services_enable_button:I = 0x7f120461
+.field public static final common_google_play_services_enable_button:I = 0x7f12045f
-.field public static final common_google_play_services_enable_text:I = 0x7f120462
+.field public static final common_google_play_services_enable_text:I = 0x7f120460
-.field public static final common_google_play_services_enable_title:I = 0x7f120463
+.field public static final common_google_play_services_enable_title:I = 0x7f120461
-.field public static final common_google_play_services_install_button:I = 0x7f120464
+.field public static final common_google_play_services_install_button:I = 0x7f120462
-.field public static final common_google_play_services_install_text:I = 0x7f120465
+.field public static final common_google_play_services_install_text:I = 0x7f120463
-.field public static final common_google_play_services_install_title:I = 0x7f120466
+.field public static final common_google_play_services_install_title:I = 0x7f120464
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120467
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120465
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120468
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120466
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120469
+.field public static final common_google_play_services_unknown_issue:I = 0x7f120467
-.field public static final common_google_play_services_unsupported_text:I = 0x7f12046a
+.field public static final common_google_play_services_unsupported_text:I = 0x7f120468
-.field public static final common_google_play_services_update_button:I = 0x7f12046b
+.field public static final common_google_play_services_update_button:I = 0x7f120469
-.field public static final common_google_play_services_update_text:I = 0x7f12046c
+.field public static final common_google_play_services_update_text:I = 0x7f12046a
-.field public static final common_google_play_services_update_title:I = 0x7f12046d
+.field public static final common_google_play_services_update_title:I = 0x7f12046b
-.field public static final common_google_play_services_updating_text:I = 0x7f12046e
+.field public static final common_google_play_services_updating_text:I = 0x7f12046c
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12046f
+.field public static final common_google_play_services_wear_update_text:I = 0x7f12046d
-.field public static final common_open_on_phone:I = 0x7f120470
+.field public static final common_open_on_phone:I = 0x7f12046e
-.field public static final common_signin_button_text:I = 0x7f120471
+.field public static final common_signin_button_text:I = 0x7f12046f
-.field public static final common_signin_button_text_long:I = 0x7f120472
+.field public static final common_signin_button_text_long:I = 0x7f120470
-.field public static final copy:I = 0x7f1204d0
+.field public static final copy:I = 0x7f1204ce
-.field public static final error_icon_content_description:I = 0x7f120647
+.field public static final error_icon_content_description:I = 0x7f120643
-.field public static final expand_button_title:I = 0x7f12067e
+.field public static final expand_button_title:I = 0x7f12067a
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068c
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f120688
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120695
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120691
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120696
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120692
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bcb
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bc0
-.field public static final icon_content_description:I = 0x7f120c58
+.field public static final icon_content_description:I = 0x7f120c4d
-.field public static final item_view_role_description:I = 0x7f120d7c
+.field public static final item_view_role_description:I = 0x7f120d6f
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120eff
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120eef
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f00
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120ef0
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f01
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120ef1
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f02
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120ef2
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f03
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120ef3
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f04
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120ef4
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f05
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120ef5
-.field public static final mtrl_picker_cancel:I = 0x7f120f06
+.field public static final mtrl_picker_cancel:I = 0x7f120ef6
-.field public static final mtrl_picker_confirm:I = 0x7f120f07
+.field public static final mtrl_picker_confirm:I = 0x7f120ef7
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120f08
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120ef8
-.field public static final mtrl_picker_date_header_title:I = 0x7f120f09
+.field public static final mtrl_picker_date_header_title:I = 0x7f120ef9
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f0a
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120efa
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f0b
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120efb
-.field public static final mtrl_picker_invalid_format:I = 0x7f120f0c
+.field public static final mtrl_picker_invalid_format:I = 0x7f120efc
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f0d
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120efd
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f0e
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120efe
-.field public static final mtrl_picker_invalid_range:I = 0x7f120f0f
+.field public static final mtrl_picker_invalid_range:I = 0x7f120eff
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f10
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f00
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f11
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f01
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f12
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f02
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f13
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f03
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f14
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f04
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f15
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f05
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f16
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f06
-.field public static final mtrl_picker_save:I = 0x7f120f17
+.field public static final mtrl_picker_save:I = 0x7f120f07
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f18
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f08
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f19
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f09
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f1a
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f0a
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f1b
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f0b
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f1c
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f0c
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f1d
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f0d
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f1e
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f0e
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f1f
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f0f
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f20
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f10
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f21
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f11
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f22
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f12
-.field public static final not_set:I = 0x7f120fa7
+.field public static final not_set:I = 0x7f120f95
-.field public static final password_toggle_content_description:I = 0x7f1210cc
+.field public static final password_toggle_content_description:I = 0x7f1210bc
-.field public static final path_password_eye:I = 0x7f1210ce
+.field public static final path_password_eye:I = 0x7f1210be
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210cf
+.field public static final path_password_eye_mask_strike_through:I = 0x7f1210bf
-.field public static final path_password_eye_mask_visible:I = 0x7f1210d0
+.field public static final path_password_eye_mask_visible:I = 0x7f1210c0
-.field public static final path_password_strike_through:I = 0x7f1210d1
+.field public static final path_password_strike_through:I = 0x7f1210c1
-.field public static final preference_copied:I = 0x7f121141
+.field public static final preference_copied:I = 0x7f121131
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f1213f4
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
-.field public static final summary_collapsed_preference_list:I = 0x7f121529
+.field public static final summary_collapsed_preference_list:I = 0x7f121515
-.field public static final v7_preference_off:I = 0x7f121753
+.field public static final v7_preference_off:I = 0x7f121741
-.field public static final v7_preference_on:I = 0x7f121754
+.field public static final v7_preference_on:I = 0x7f121742
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
index b7e331e949..48254aabb6 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
@@ -12,7 +12,7 @@
# static fields
-.field public static final API_VERSION:I = 0x8
+.field public static final API_VERSION:I = 0x6
.field public static final CONTENT_TYPE_JSON:Ljava/lang/String; = "application/json"
@@ -385,7 +385,7 @@
if-eqz p5, :cond_3
- const-string/jumbo v2, "v8/"
+ const-string/jumbo v2, "v6/"
move-object/from16 v6, p3
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
index fb0eb2e18c..58ecf72505 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
@@ -38,16 +38,12 @@
new-instance v6, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;
- const/4 v0, 0x1
-
- invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object v1
-
invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
move-result-object v2
+ const-string v1, "member"
+
const/4 v5, 0x0
move-object v0, v6
@@ -56,7 +52,7 @@
move-object v4, p4
- invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
return-object v6
.end method
@@ -66,16 +62,12 @@
new-instance v6, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;
- const/4 v0, 0x0
-
- invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object v1
-
invoke-static {p1, p2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
move-result-object v2
+ const-string v1, "role"
+
const/4 v5, 0x0
move-object v0, v6
@@ -84,7 +76,7 @@
move-object v4, p4
- invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v0 .. v5}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
return-object v6
.end method
diff --git a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
index 58c86f21c6..6b4c1b6631 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites.smali
@@ -31,7 +31,7 @@
.field public final id:Ljava/lang/String;
-.field public final type:Ljava/lang/Integer;
+.field public final type:Ljava/lang/String;
# direct methods
@@ -49,12 +49,12 @@
return-void
.end method
-.method public constructor (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
+.method public constructor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->type:Ljava/lang/Integer;
+ iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->type:Ljava/lang/String;
iput-object p2, p0, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->id:Ljava/lang/String;
@@ -65,10 +65,10 @@
return-void
.end method
-.method public synthetic constructor (Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public synthetic constructor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
.locals 0
- invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/Integer;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
+ invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
index c72aaec8cc..0db4d43077 100644
--- a/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
+++ b/com.discord/smali/com/discord/restapi/utils/CountingRequestBody.smali
@@ -206,7 +206,7 @@
invoke-direct {v0, p1, v1}, Lcom/discord/restapi/utils/CountingRequestBody$CountingSink;->(Lo0/u;Lkotlin/jvm/functions/Function1;)V
- invoke-static {v0}, Lf/n/a/k/a;->o(Lo0/u;)Lokio/BufferedSink;
+ invoke-static {v0}, Lf/n/a/k/a;->n(Lo0/u;)Lokio/BufferedSink;
move-result-object p1
diff --git a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
index 2897732d7f..6f2afa5ed4 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
@@ -49,6 +49,9 @@
.end annotation
.end method
+.method public abstract getType()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+.end method
+
.method public abstract h(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
index 251e584476..96dc11e090 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
@@ -311,7 +311,7 @@
goto :goto_1
:cond_1
- const v2, 0x7f1203da
+ const v2, 0x7f1203d8
:goto_1
const-string v3, "en"
@@ -343,7 +343,7 @@
:cond_2
const-string p4, "context.getString(R.string.change_log_md_date)"
- const v2, 0x7f1203db
+ const v2, 0x7f1203d9
if-eqz p5, :cond_3
@@ -618,19 +618,19 @@
const-string v4, "context.getString(R.string.change_log_md_body)"
- const v5, 0x7f1203da
+ const v5, 0x7f1203d8
const-string v6, "context.getString(R.string.change_log_md_video)"
- const v7, 0x7f1203de
+ const v7, 0x7f1203dc
const-string v8, "context.getString(R.string.change_log_md_revision)"
- const v9, 0x7f1203dd
+ const v9, 0x7f1203db
const-string v10, "context.getString(R.string.change_log_md_date)"
- const v11, 0x7f1203db
+ const v11, 0x7f1203d9
const/4 v12, 0x1
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator.smali
index da9f57ab30..51f003bf7a 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers$MemberListIdCalculator.smali
@@ -187,7 +187,7 @@
const/4 v2, 0x0
- invoke-static {p1, v2, v1, v2}, Lf/n/a/k/a;->P(Ljava/lang/CharSequence;III)I
+ invoke-static {p1, v2, v1, v2}, Lf/n/a/k/a;->O(Ljava/lang/CharSequence;III)I
move-result p1
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
index d1c61ce561..4374d02aa8 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
@@ -1052,7 +1052,7 @@
if-eqz v6, :cond_3
- const v6, 0x7f12154e
+ const v6, 0x7f12153a
goto :goto_2
diff --git a/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali b/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
index ae1ef7ff76..9a980f5c57 100644
--- a/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannels$delete$2.smali
@@ -79,12 +79,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f1203c8
+ const p1, 0x7f1203c6
goto :goto_0
:cond_0
- const p1, 0x7f1203f4
+ const p1, 0x7f1203f2
:goto_0
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index b40023ad47..545916d6e7 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, 0x4c5
+ const/16 v0, 0x4c6
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji.smali b/com.discord/smali/com/discord/stores/StoreEmoji.smali
index cae01a144a..c658a7a482 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji.smali
@@ -1067,7 +1067,7 @@
sget-object v0, Lj0/s/l;->d:Lj0/s/l;
- invoke-static {p1, v0}, Lf/n/a/k/a;->w(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+ invoke-static {p1, v0}, Lf/n/a/k/a;->v(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreGuildSelected.smali b/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
index df7d4e9c79..82a7781432 100644
--- a/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreGuildSelected.smali
@@ -355,7 +355,7 @@
const/4 p1, 0x1
- invoke-static {v1, v2, p1}, Lf/n/a/k/a;->v(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
+ invoke-static {v1, v2, p1}, Lf/n/a/k/a;->u(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
iput-boolean p1, p0, Lcom/discord/stores/StoreGuildSelected;->selectedGuildIdsDirty:Z
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali
similarity index 66%
rename from com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali
rename to com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali
index 0d9d513f7e..71c1df8120 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;
+.class public final Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;
.super Lj0/n/c/i;
.source "StoreMediaEngine.kt"
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaEngine;->handleVoiceChannelSelected(J)V
+ value = Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -29,14 +29,14 @@
# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreMediaEngine;
+.field public final synthetic this$0:Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
# direct methods
-.method public constructor (Lcom/discord/stores/StoreMediaEngine;)V
+.method public constructor (Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;)V
.locals 0
- iput-object p1, p0, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+ iput-object p1, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;->this$0:Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
const/4 p1, 0x1
@@ -52,7 +52,7 @@
check-cast p1, [Lco/discord/media_engine/VideoInputDeviceDescription;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
@@ -60,23 +60,25 @@
.end method
.method public final invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
- .locals 6
+ .locals 7
if-eqz p1, :cond_0
- iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;->this$0:Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
- const/4 v2, 0x0
+ iget-object v1, v0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
const/4 v3, 0x0
- const/4 v4, 0x4
+ const/4 v4, 0x0
- const/4 v5, 0x0
+ const/4 v5, 0x4
- move-object v1, p1
+ const/4 v6, 0x0
- invoke-static/range {v0 .. v5}, Lcom/discord/stores/StoreMediaEngine;->handleVideoInputDevices$default(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
+ move-object v2, p1
+
+ invoke-static/range {v1 .. v6}, Lcom/discord/stores/StoreMediaEngine;->handleVideoInputDevices$default(Lcom/discord/stores/StoreMediaEngine;[Lco/discord/media_engine/VideoInputDeviceDescription;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
return-void
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
index 749a8252c5..fe8429f054 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
@@ -17,9 +17,20 @@
.end annotation
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreMediaEngine;
+
+
# direct methods
-.method public constructor ()V
+.method public constructor (Lcom/discord/stores/StoreMediaEngine;)V
.locals 0
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()V"
+ }
+ .end annotation
+
+ iput-object p1, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -100,13 +111,30 @@
.end method
.method public onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
- .locals 0
+ .locals 1
- if-eqz p1, :cond_0
+ if-eqz p1, :cond_1
- return-void
+ invoke-interface {p1}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->getType()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+
+ move-result-object p1
+
+ sget-object v0, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;->DEFAULT:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$Type;
+
+ if-ne p1, v0, :cond_0
+
+ iget-object p1, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+
+ new-instance v0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;
+
+ invoke-direct {v0, p0}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;->(Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;)V
+
+ invoke-static {p1, v0}, Lcom/discord/stores/StoreMediaEngine;->access$getVideoInputDevicesNative(Lcom/discord/stores/StoreMediaEngine;Lkotlin/jvm/functions/Function1;)V
:cond_0
+ return-void
+
+ :cond_1
const-string p1, "connection"
invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
index 9eca9d826a..980e14db6a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
@@ -369,6 +369,14 @@
return-object p0
.end method
+.method public static final synthetic access$getVideoInputDevicesNative(Lcom/discord/stores/StoreMediaEngine;Lkotlin/jvm/functions/Function1;)V
+ .locals 0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaEngine;->getVideoInputDevicesNative(Lkotlin/jvm/functions/Function1;)V
+
+ return-void
+.end method
+
.method public static final synthetic access$handleNativeEngineInitialized(Lcom/discord/stores/StoreMediaEngine;)V
.locals 0
@@ -589,7 +597,7 @@
new-instance v0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
- invoke-direct {v0}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->()V
+ invoke-direct {v0, p0}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->(Lcom/discord/stores/StoreMediaEngine;)V
invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->f(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
@@ -1227,42 +1235,6 @@
throw p1
.end method
-.method public final declared-synchronized handleVoiceChannelSelected(J)V
- .locals 3
-
- monitor-enter p0
-
- const-wide/16 v0, 0x0
-
- cmp-long v2, p1, v0
-
- if-nez v2, :cond_0
-
- :try_start_0
- new-instance p1, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;
-
- invoke-direct {p1, p0}, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->(Lcom/discord/stores/StoreMediaEngine;)V
-
- invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaEngine;->getVideoInputDevicesNative(Lkotlin/jvm/functions/Function1;)V
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
- goto :goto_0
-
- :catchall_0
- move-exception p1
-
- monitor-exit p0
-
- throw p1
-
- :cond_0
- :goto_0
- monitor-exit p0
-
- return-void
-.end method
-
.method public init(Landroid/content/Context;)V
.locals 10
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
index 2d94a63840..5aa34f4403 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
@@ -57,7 +57,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f1204a7
+ const p1, 0x7f1204a5
goto :goto_0
@@ -70,7 +70,7 @@
if-eqz p2, :cond_1
- const p1, 0x7f1204a4
+ const p1, 0x7f1204a2
goto :goto_0
@@ -83,7 +83,7 @@
if-eqz p2, :cond_2
- const p1, 0x7f1204a3
+ const p1, 0x7f1204a1
goto :goto_0
@@ -96,7 +96,7 @@
if-eqz p2, :cond_3
- const p1, 0x7f1204a6
+ const p1, 0x7f1204a4
goto :goto_0
@@ -109,7 +109,7 @@
if-eqz p2, :cond_4
- const p1, 0x7f1204ab
+ const p1, 0x7f1204a9
goto :goto_0
@@ -122,7 +122,7 @@
if-eqz p2, :cond_5
- const p1, 0x7f1204aa
+ const p1, 0x7f1204a8
goto :goto_0
@@ -135,7 +135,7 @@
if-eqz p2, :cond_6
- const p1, 0x7f1204a5
+ const p1, 0x7f1204a3
goto :goto_0
@@ -148,7 +148,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1204a9
+ const p1, 0x7f1204a7
:goto_0
iput p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->stateString:I
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
index 7d7e581c68..301119831a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
@@ -76,7 +76,7 @@
iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context;
- const v1, 0x7f121756
+ const v1, 0x7f121744
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
index 61fde4e75c..428a905dc3 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$1.smali
@@ -27,7 +27,7 @@
# instance fields
-.field public final synthetic $invalidAttachmentsMessage:Lcom/discord/models/domain/ModelMessage;
+.field public final synthetic $localMessage:Lcom/discord/models/domain/ModelMessage;
.field public final synthetic this$0:Lcom/discord/stores/StoreMessages;
@@ -38,7 +38,7 @@
iput-object p1, p0, Lcom/discord/stores/StoreMessages$sendMessage$1;->this$0:Lcom/discord/stores/StoreMessages;
- iput-object p2, p0, Lcom/discord/stores/StoreMessages$sendMessage$1;->$invalidAttachmentsMessage:Lcom/discord/models/domain/ModelMessage;
+ iput-object p2, p0, Lcom/discord/stores/StoreMessages$sendMessage$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
const/4 p1, 0x0
@@ -64,9 +64,9 @@
iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$1;->this$0:Lcom/discord/stores/StoreMessages;
- iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$1;->$invalidAttachmentsMessage:Lcom/discord/models/domain/ModelMessage;
+ iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
- const-string v2, "invalidAttachmentsMessage"
+ const-string v2, "localMessage"
invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali
index 7b8bf2504c..f194bdeaeb 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali
@@ -29,26 +29,24 @@
.end annotation
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreMessages$sendMessage$2;
+# instance fields
+.field public final synthetic $channelId:J
+
+.field public final synthetic $request:Lkotlin/jvm/functions/Function1;
+
+.field public final synthetic this$0:Lcom/discord/stores/StoreMessages;
# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreMessages$sendMessage$2;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreMessages$sendMessage$2;->()V
-
- sput-object v0, Lcom/discord/stores/StoreMessages$sendMessage$2;->INSTANCE:Lcom/discord/stores/StoreMessages$sendMessage$2;
-
- return-void
-.end method
-
-.method public constructor ()V
+.method public constructor (Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
.locals 0
+ iput-object p1, p0, Lcom/discord/stores/StoreMessages$sendMessage$2;->this$0:Lcom/discord/stores/StoreMessages;
+
+ iput-wide p2, p0, Lcom/discord/stores/StoreMessages$sendMessage$2;->$channelId:J
+
+ iput-object p4, p0, Lcom/discord/stores/StoreMessages$sendMessage$2;->$request:Lkotlin/jvm/functions/Function1;
+
invoke-direct {p0}, Ljava/lang/Object;->()V
return-void
@@ -67,7 +65,7 @@
.end method
.method public final call(Lrx/Emitter;)V
- .locals 1
+ .locals 3
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -77,11 +75,27 @@
}
.end annotation
- sget-object v0, Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;->INSTANCE:Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
+ iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$2;->this$0:Lcom/discord/stores/StoreMessages;
- invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
+ iget-wide v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$2;->$channelId:J
- invoke-interface {p1}, Lr0/g;->onCompleted()V
+ invoke-static {v0, v1, v2}, Lcom/discord/stores/StoreMessages;->access$getMessageQueue(Lcom/discord/stores/StoreMessages;J)Lcom/discord/utilities/messagesend/MessageQueue;
+
+ move-result-object v0
+
+ iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$2;->$request:Lkotlin/jvm/functions/Function1;
+
+ const-string v2, "emitter"
+
+ invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-interface {v1, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Lcom/discord/utilities/messagesend/MessageRequest;
+
+ invoke-virtual {v0, p1}, Lcom/discord/utilities/messagesend/MessageQueue;->enqueue(Lcom/discord/utilities/messagesend/MessageRequest;)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$3.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$3.smali
deleted file mode 100644
index dc3111b814..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$3.smali
+++ /dev/null
@@ -1,76 +0,0 @@
-.class public final Lcom/discord/stores/StoreMessages$sendMessage$3;
-.super Lj0/n/c/i;
-.source "StoreMessages.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function0;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMessages;->sendMessage(JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelMessage$Activity;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Lj0/n/c/i;",
- "Lkotlin/jvm/functions/Function0<",
- "Lkotlin/Unit;",
- ">;"
- }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $localMessage:Lcom/discord/models/domain/ModelMessage;
-
-.field public final synthetic this$0:Lcom/discord/stores/StoreMessages;
-
-
-# direct methods
-.method public constructor (Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
- .locals 0
-
- iput-object p1, p0, Lcom/discord/stores/StoreMessages$sendMessage$3;->this$0:Lcom/discord/stores/StoreMessages;
-
- iput-object p2, p0, Lcom/discord/stores/StoreMessages$sendMessage$3;->$localMessage:Lcom/discord/models/domain/ModelMessage;
-
- const/4 p1, 0x0
-
- invoke-direct {p0, p1}, Lj0/n/c/i;->(I)V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke()Ljava/lang/Object;
- .locals 1
-
- invoke-virtual {p0}, Lcom/discord/stores/StoreMessages$sendMessage$3;->invoke()V
-
- sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
-
- return-object v0
-.end method
-
-.method public final invoke()V
- .locals 3
-
- iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$3;->this$0:Lcom/discord/stores/StoreMessages;
-
- iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$3;->$localMessage:Lcom/discord/models/domain/ModelMessage;
-
- const-string v2, "localMessage"
-
- invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-static {v0, v1}, Lcom/discord/stores/StoreMessages;->access$handleLocalMessageCreate(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$4.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$4.smali
deleted file mode 100644
index b14f178abd..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$4.smali
+++ /dev/null
@@ -1,101 +0,0 @@
-.class public final Lcom/discord/stores/StoreMessages$sendMessage$4;
-.super Ljava/lang/Object;
-.source "StoreMessages.kt"
-
-# interfaces
-.implements Lrx/functions/Action1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMessages;->sendMessage(JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelMessage$Activity;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "",
- "Ljava/lang/Object;",
- "Lrx/functions/Action1<",
- "Lrx/Emitter<",
- "TT;>;>;"
- }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $channelId:J
-
-.field public final synthetic $request:Lkotlin/jvm/functions/Function1;
-
-.field public final synthetic this$0:Lcom/discord/stores/StoreMessages;
-
-
-# direct methods
-.method public constructor (Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
- .locals 0
-
- iput-object p1, p0, Lcom/discord/stores/StoreMessages$sendMessage$4;->this$0:Lcom/discord/stores/StoreMessages;
-
- iput-wide p2, p0, Lcom/discord/stores/StoreMessages$sendMessage$4;->$channelId:J
-
- iput-object p4, p0, Lcom/discord/stores/StoreMessages$sendMessage$4;->$request:Lkotlin/jvm/functions/Function1;
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)V
- .locals 0
-
- check-cast p1, Lrx/Emitter;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages$sendMessage$4;->call(Lrx/Emitter;)V
-
- return-void
-.end method
-
-.method public final call(Lrx/Emitter;)V
- .locals 3
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Lrx/Emitter<",
- "Lcom/discord/utilities/messagesend/MessageResult;",
- ">;)V"
- }
- .end annotation
-
- iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$4;->this$0:Lcom/discord/stores/StoreMessages;
-
- iget-wide v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$4;->$channelId:J
-
- invoke-static {v0, v1, v2}, Lcom/discord/stores/StoreMessages;->access$getMessageQueue(Lcom/discord/stores/StoreMessages;J)Lcom/discord/utilities/messagesend/MessageQueue;
-
- move-result-object v0
-
- iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$4;->$request:Lkotlin/jvm/functions/Function1;
-
- const-string v2, "emitter"
-
- invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-interface {v1, p1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/utilities/messagesend/MessageRequest;
-
- invoke-virtual {v0, p1}, Lcom/discord/utilities/messagesend/MessageQueue;->enqueue(Lcom/discord/utilities/messagesend/MessageRequest;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali
index ac4a06e991..4d4cdc860a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1$1$1.smali
@@ -60,7 +60,7 @@
.end method
.method public final invoke()V
- .locals 5
+ .locals 7
iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1$1$1;->$result:Lcom/discord/utilities/messagesend/MessageResult;
@@ -189,14 +189,14 @@
invoke-virtual {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreSlowMode;->onCooldown(JJ)V
- goto :goto_1
+ goto/16 :goto_1
:cond_1
instance-of v1, v0, Lcom/discord/utilities/messagesend/MessageResult$RateLimited;
if-eqz v1, :cond_2
- goto :goto_1
+ goto/16 :goto_1
:cond_2
instance-of v1, v0, Lcom/discord/utilities/messagesend/MessageResult$UserCancelled;
@@ -209,11 +209,25 @@
iget-object v1, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->this$0:Lcom/discord/stores/StoreMessages;
+ iget-wide v3, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$channelId:J
+
iget-object v0, v0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
invoke-static {v0, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {v1, v0}, Lcom/discord/stores/StoreMessages;->access$handleLocalMessageDelete(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getId()J
+
+ move-result-wide v5
+
+ invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ invoke-static {v0}, Lf/n/a/k/a;->listOf(Ljava/lang/Object;)Ljava/util/List;
+
+ move-result-object v0
+
+ invoke-static {v1, v3, v4, v0}, Lcom/discord/stores/StoreMessages;->access$handleMessageDelete(Lcom/discord/stores/StoreMessages;JLjava/util/List;)V
goto :goto_1
@@ -273,7 +287,7 @@
goto :goto_0
:cond_4
- const v0, 0x7f120f44
+ const v0, 0x7f120f34
:goto_0
invoke-virtual {v2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
index ce6d4bdf46..cccedb071d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$request$1.smali
@@ -32,25 +32,29 @@
# instance fields
.field public final synthetic $activity:Lcom/discord/models/domain/activity/ModelActivity;
-.field public final synthetic $localMessage:Lcom/discord/models/domain/ModelMessage;
+.field public final synthetic $attachments:Ljava/util/List;
-.field public final synthetic $validAttachments:Lkotlin/jvm/internal/Ref$ObjectRef;
+.field public final synthetic $channelId:J
+
+.field public final synthetic $localMessage:Lcom/discord/models/domain/ModelMessage;
.field public final synthetic this$0:Lcom/discord/stores/StoreMessages;
# direct methods
-.method public constructor (Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/activity/ModelActivity;)V
+.method public constructor (Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Ljava/util/List;Lcom/discord/models/domain/activity/ModelActivity;J)V
.locals 0
iput-object p1, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->this$0:Lcom/discord/stores/StoreMessages;
iput-object p2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$localMessage:Lcom/discord/models/domain/ModelMessage;
- iput-object p3, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$validAttachments:Lkotlin/jvm/internal/Ref$ObjectRef;
+ iput-object p3, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$attachments:Ljava/util/List;
iput-object p4, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$activity:Lcom/discord/models/domain/activity/ModelActivity;
+ iput-wide p5, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$channelId:J
+
const/4 p1, 0x1
invoke-direct {p0, p1}, Lj0/n/c/i;->(I)V
@@ -82,13 +86,7 @@
invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$validAttachments:Lkotlin/jvm/internal/Ref$ObjectRef;
-
- iget-object v0, v0, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- move-object v3, v0
-
- check-cast v3, Ljava/util/List;
+ iget-object v3, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$attachments:Ljava/util/List;
iget-object v2, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$activity:Lcom/discord/models/domain/activity/ModelActivity;
diff --git a/com.discord/smali/com/discord/stores/StoreMessages.smali b/com.discord/smali/com/discord/stores/StoreMessages.smali
index dcafa0a087..adaa5f8a26 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages.smali
@@ -159,6 +159,14 @@
return-void
.end method
+.method public static final synthetic access$handleMessageDelete(Lcom/discord/stores/StoreMessages;JLjava/util/List;)V
+ .locals 0
+
+ invoke-direct {p0, p1, p2, p3}, Lcom/discord/stores/StoreMessages;->handleMessageDelete(JLjava/util/List;)V
+
+ return-void
+.end method
+
.method public static final synthetic access$handleSendMessageFailure(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;)V
.locals 0
@@ -452,7 +460,7 @@
.end method
.method private final handleSendMessageFailure(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;)V
- .locals 13
+ .locals 12
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -477,35 +485,14 @@
:cond_0
invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages;->deleteMessage(Lcom/discord/models/domain/ModelMessage;)V
- sget-object v0, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->Companion:Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion;
-
- invoke-virtual {v0}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion;->getINSTANCE()Lcom/discord/stores/PersistLocalMessagesFeatureFlag;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->isEnabled()Z
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->isHasLocalUploads()Z
move-result v0
const/4 v1, 0x0
- if-nez v0, :cond_2
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->isHasLocalUploads()Z
-
- move-result v0
-
if-nez v0, :cond_1
- goto :goto_0
-
- :cond_1
- move-object v0, v1
-
- goto :goto_1
-
- :cond_2
- :goto_0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
move-result-object v2
@@ -524,9 +511,7 @@
const/4 v7, 0x1
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->isHasLocalUploads()Z
-
- move-result v8
+ const/4 v8, 0x0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getApplication()Lcom/discord/models/domain/ModelApplication;
@@ -538,14 +523,17 @@
iget-object v11, p0, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
- iget-object v12, p1, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
-
- invoke-static/range {v2 .. v12}, Lcom/discord/models/domain/ModelMessage;->createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;Ljava/util/List;)Lcom/discord/models/domain/ModelMessage;
+ invoke-static/range {v2 .. v11}, Lcom/discord/models/domain/ModelMessage;->createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;)Lcom/discord/models/domain/ModelMessage;
move-result-object v0
- :goto_1
- if-eqz p2, :cond_3
+ goto :goto_0
+
+ :cond_1
+ move-object v0, v1
+
+ :goto_0
+ if-eqz p2, :cond_2
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
@@ -565,15 +553,13 @@
iget-object v11, p0, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
- const/4 v12, 0x0
-
move-object v2, p2
- invoke-static/range {v2 .. v12}, Lcom/discord/models/domain/ModelMessage;->createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;Ljava/util/List;)Lcom/discord/models/domain/ModelMessage;
+ invoke-static/range {v2 .. v11}, Lcom/discord/models/domain/ModelMessage;->createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;)Lcom/discord/models/domain/ModelMessage;
move-result-object v1
- :cond_3
+ :cond_2
sget-object p1, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->Companion:Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion;
invoke-virtual {p1}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion;->getINSTANCE()Lcom/discord/stores/PersistLocalMessagesFeatureFlag;
@@ -584,15 +570,15 @@
move-result p1
- if-eqz p1, :cond_4
+ if-eqz p1, :cond_3
- if-eqz v0, :cond_4
+ if-eqz v0, :cond_3
invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessages;->handleLocalMessageCreate(Lcom/discord/models/domain/ModelMessage;)V
- goto :goto_2
+ goto :goto_1
- :cond_4
+ :cond_3
const/4 p1, 0x2
new-array p1, p1, [Lcom/discord/models/domain/ModelMessage;
@@ -615,12 +601,12 @@
xor-int/2addr p2, v0
- if-eqz p2, :cond_5
+ if-eqz p2, :cond_4
invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages;->handleMessageCreate(Ljava/util/List;)V
- :cond_5
- :goto_2
+ :cond_4
+ :goto_1
return-void
.end method
@@ -1320,17 +1306,13 @@
.end method
.method public final resendMessage(Lcom/discord/models/domain/ModelMessage;)V
- .locals 20
+ .locals 13
- move-object/from16 v12, p0
+ const/4 v12, 0x0
- move-object/from16 v0, p1
+ if-eqz p1, :cond_1
- const/4 v13, 0x0
-
- if-eqz v0, :cond_3
-
- invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getType()I
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getType()I
move-result v1
@@ -1341,19 +1323,19 @@
return-void
:cond_0
- iget-object v1, v12, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iget-object v1, p0, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
new-instance v2, Lcom/discord/stores/StoreMessages$resendMessage$1;
- invoke-direct {v2, v12, v0}, Lcom/discord/stores/StoreMessages$resendMessage$1;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
+ invoke-direct {v2, p0, p1}, Lcom/discord/stores/StoreMessages$resendMessage$1;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
invoke-virtual {v1, v2}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
- invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
move-result-wide v1
- invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
move-result-object v3
@@ -1361,7 +1343,7 @@
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
move-result-object v4
@@ -1369,79 +1351,12 @@
invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getMentions()Ljava/util/List;
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getMentions()Ljava/util/List;
move-result-object v5
- iget-object v0, v0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
+ sget-object v6, Lj0/i/n;->d:Lj0/i/n;
- if-eqz v0, :cond_1
-
- new-instance v6, Ljava/util/ArrayList;
-
- const/16 v7, 0xa
-
- invoke-static {v0, v7}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
- move-result v7
-
- invoke-direct {v6, v7}, Ljava/util/ArrayList;->(I)V
-
- invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object v0
-
- :goto_0
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v7
-
- if-eqz v7, :cond_2
-
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v7
-
- check-cast v7, Lcom/discord/models/messages/LocalAttachment;
-
- invoke-virtual {v7}, Lcom/discord/models/messages/LocalAttachment;->getUriString()Ljava/lang/String;
-
- move-result-object v8
-
- invoke-static {v8}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
-
- move-result-object v8
-
- new-instance v9, Lcom/lytefast/flexinput/model/Attachment;
-
- invoke-virtual {v7}, Lcom/discord/models/messages/LocalAttachment;->getId()J
-
- move-result-wide v15
-
- const-string v10, "contentUri"
-
- invoke-static {v8, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {v7}, Lcom/discord/models/messages/LocalAttachment;->getDisplayName()Ljava/lang/String;
-
- move-result-object v18
-
- const/16 v19, 0x0
-
- move-object v14, v9
-
- move-object/from16 v17, v8
-
- invoke-direct/range {v14 .. v19}, Lcom/lytefast/flexinput/model/Attachment;->(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
-
- invoke-interface {v6, v9}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
- goto :goto_0
-
- :cond_1
- move-object v6, v13
-
- :cond_2
const/4 v7, 0x0
const/4 v8, 0x0
@@ -1452,7 +1367,7 @@
const/4 v11, 0x0
- move-object/from16 v0, p0
+ move-object v0, p0
invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMessages;->sendMessage$default(Lcom/discord/stores/StoreMessages;JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelMessage$Activity;ILjava/lang/Object;)Lrx/Observable;
@@ -1466,7 +1381,7 @@
const/4 v2, 0x2
- invoke-static {v1, v13, v2}, Lf/a/b/q;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
+ invoke-static {v1, v12, v2}, Lf/a/b/q;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
move-result-object v1
@@ -1474,12 +1389,12 @@
return-void
- :cond_3
+ :cond_1
const-string v0, "message"
invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- throw v13
+ throw v12
.end method
.method public final sendMessage(JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelMessage$Activity;)Lrx/Observable;
@@ -1508,339 +1423,112 @@
}
.end annotation
- move-object/from16 v0, p0
+ move-object/from16 v7, p0
- move-wide/from16 v12, p1
+ const/4 v0, 0x0
- move-object/from16 v4, p3
+ if-eqz p3, :cond_3
- move-object/from16 v1, p4
+ if-eqz p4, :cond_2
- move-object/from16 v2, p6
+ const/4 v13, 0x0
- sget-object v14, Lrx/Emitter$BackpressureMode;->e:Lrx/Emitter$BackpressureMode;
+ const/4 v0, 0x1
- const/4 v3, 0x0
-
- if-eqz v4, :cond_e
-
- if-eqz v1, :cond_d
-
- new-instance v15, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v15}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v2, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- sget-object v5, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->Companion:Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion;
-
- invoke-virtual {v5}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag$Companion;->getINSTANCE()Lcom/discord/stores/PersistLocalMessagesFeatureFlag;
-
- move-result-object v5
-
- invoke-virtual {v5}, Lcom/discord/stores/PersistLocalMessagesFeatureFlag;->isEnabled()Z
-
- move-result v5
-
- const-string v11, "Observable.create({ emit\u2026r.BackpressureMode.ERROR)"
-
- const/16 v6, 0xa
-
- const/4 v7, 0x0
-
- const/4 v8, 0x1
-
- if-eqz v5, :cond_8
-
- if-eqz v2, :cond_1
+ if-eqz p6, :cond_0
invoke-interface/range {p6 .. p6}, Ljava/util/Collection;->isEmpty()Z
- move-result v5
+ move-result v1
- if-eqz v5, :cond_0
+ xor-int/2addr v1, v0
+
+ if-ne v1, v0, :cond_0
+
+ const/4 v14, 0x1
goto :goto_0
:cond_0
- const/4 v5, 0x0
+ const/4 v0, 0x0
- goto :goto_1
+ const/4 v14, 0x0
+
+ :goto_0
+ iget-object v0, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
+
+ move-object/from16 v8, p4
+
+ move-wide/from16 v9, p1
+
+ move-object/from16 v11, p3
+
+ move-object/from16 v12, p5
+
+ move-object/from16 v15, p7
+
+ move-object/from16 v16, p9
+
+ move-object/from16 v17, v0
+
+ invoke-static/range {v8 .. v17}, Lcom/discord/models/domain/ModelMessage;->createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;)Lcom/discord/models/domain/ModelMessage;
+
+ move-result-object v2
+
+ if-nez p9, :cond_1
+
+ iget-object v0, v7, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ new-instance v1, Lcom/discord/stores/StoreMessages$sendMessage$1;
+
+ invoke-direct {v1, v7, v2}, Lcom/discord/stores/StoreMessages$sendMessage$1;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
+
+ invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
:cond_1
- :goto_0
- const/4 v5, 0x1
+ new-instance v8, Lcom/discord/stores/StoreMessages$sendMessage$request$1;
- :goto_1
- if-nez v5, :cond_8
+ move-object v0, v8
- sget-object v5, Lcom/discord/utilities/rest/ProcessedMessageContent;->Companion:Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;
+ move-object/from16 v1, p0
- iget-object v9, v0, Lcom/discord/stores/StoreMessages;->context:Landroid/content/Context;
+ move-object/from16 v3, p6
- if-eqz v9, :cond_7
+ move-object/from16 v4, p8
- invoke-virtual {v5, v2, v1, v9}, Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;->fromAttachments(Ljava/util/List;Ljava/lang/String;Landroid/content/Context;)Lcom/discord/utilities/rest/ProcessedMessageContent;
+ move-wide/from16 v5, p1
- move-result-object v1
+ invoke-direct/range {v0 .. v6}, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Ljava/util/List;Lcom/discord/models/domain/activity/ModelActivity;J)V
- invoke-virtual {v1}, Lcom/discord/utilities/rest/ProcessedMessageContent;->getInvalidAttachments()Ljava/util/List;
+ new-instance v0, Lcom/discord/stores/StoreMessages$sendMessage$2;
- move-result-object v2
+ move-wide/from16 v1, p1
- invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
+ invoke-direct {v0, v7, v1, v2, v8}, Lcom/discord/stores/StoreMessages$sendMessage$2;->(Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
- move-result v5
+ sget-object v1, Lrx/Emitter$BackpressureMode;->e:Lrx/Emitter$BackpressureMode;
- xor-int/2addr v5, v8
+ invoke-static {v0, v1}, Lrx/Observable;->n(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)Lrx/Observable;
- if-eqz v5, :cond_3
+ move-result-object v0
- iget-object v5, v0, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
+ const-string v1, "Observable.create({ emit\u2026r.BackpressureMode.ERROR)"
- new-instance v9, Ljava/util/ArrayList;
+ invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {v2, v6}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
- move-result v10
-
- invoke-direct {v9, v10}, Ljava/util/ArrayList;->(I)V
-
- invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object v2
-
- :goto_2
- invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v10
-
- if-eqz v10, :cond_2
-
- invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v10
-
- check-cast v10, Lcom/lytefast/flexinput/model/Attachment;
-
- invoke-static {v10}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toLocalAttachment(Lcom/lytefast/flexinput/model/Attachment;)Lcom/discord/models/messages/LocalAttachment;
-
- move-result-object v10
-
- invoke-interface {v9, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
- goto :goto_2
+ return-object v0
:cond_2
- invoke-static {v12, v13, v4, v5, v9}, Lcom/discord/models/domain/ModelMessage;->createInvalidAttachmentsMessage(JLcom/discord/models/domain/ModelUser;Lcom/discord/utilities/time/Clock;Ljava/util/List;)Lcom/discord/models/domain/ModelMessage;
-
- move-result-object v2
-
- iget-object v5, v0, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- new-instance v9, Lcom/discord/stores/StoreMessages$sendMessage$1;
-
- invoke-direct {v9, v0, v2}, Lcom/discord/stores/StoreMessages$sendMessage$1;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
-
- invoke-virtual {v5, v9}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
-
- :cond_3
- invoke-virtual {v1}, Lcom/discord/utilities/rest/ProcessedMessageContent;->getValidAttachments()Ljava/util/List;
-
- move-result-object v2
-
- iput-object v2, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- invoke-virtual {v1}, Lcom/discord/utilities/rest/ProcessedMessageContent;->getContent()Ljava/lang/String;
-
- move-result-object v1
-
- iget-object v2, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- check-cast v2, Ljava/util/List;
-
- if-eqz v2, :cond_5
-
- invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
-
- move-result v2
-
- if-eqz v2, :cond_4
-
- goto :goto_3
-
- :cond_4
- const/4 v2, 0x0
-
- goto :goto_4
-
- :cond_5
- :goto_3
- const/4 v2, 0x1
-
- :goto_4
- if-eqz v2, :cond_8
-
- invoke-interface {v1}, Ljava/lang/CharSequence;->length()I
-
- move-result v2
-
- if-nez v2, :cond_6
-
- const/4 v2, 0x1
-
- goto :goto_5
-
- :cond_6
- const/4 v2, 0x0
-
- :goto_5
- if-eqz v2, :cond_8
-
- sget-object v1, Lcom/discord/stores/StoreMessages$sendMessage$2;->INSTANCE:Lcom/discord/stores/StoreMessages$sendMessage$2;
-
- invoke-static {v1, v14}, Lrx/Observable;->n(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)Lrx/Observable;
-
- move-result-object v1
-
- invoke-static {v1, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-object v1
-
- :cond_7
- const-string v1, "context"
-
- invoke-static {v1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
- throw v3
-
- :cond_8
- const/4 v9, 0x0
-
- iget-object v2, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- check-cast v2, Ljava/util/List;
-
- if-eqz v2, :cond_9
-
- invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
-
- move-result v2
-
- if-eqz v2, :cond_a
-
- :cond_9
- const/4 v7, 0x1
-
- :cond_a
- xor-int/2addr v7, v8
-
- iget-object v10, v0, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
-
- iget-object v2, v15, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- check-cast v2, Ljava/util/List;
-
- if-eqz v2, :cond_b
-
- new-instance v3, Ljava/util/ArrayList;
-
- invoke-static {v2, v6}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
-
- move-result v5
-
- invoke-direct {v3, v5}, Ljava/util/ArrayList;->(I)V
-
- invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object v2
-
- :goto_6
- invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v5
-
- if-eqz v5, :cond_b
-
- invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v5
-
- check-cast v5, Lcom/lytefast/flexinput/model/Attachment;
-
- invoke-static {v5}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toLocalAttachment(Lcom/lytefast/flexinput/model/Attachment;)Lcom/discord/models/messages/LocalAttachment;
-
- move-result-object v5
-
- invoke-interface {v3, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
- goto :goto_6
-
- :cond_b
- move-object/from16 v16, v3
-
- move-wide/from16 v2, p1
-
- move-object/from16 v4, p3
-
- move-object/from16 v5, p5
-
- move v6, v9
-
- move-object/from16 v8, p7
-
- move-object/from16 v9, p9
-
- move-object/from16 v17, v11
-
- move-object/from16 v11, v16
-
- invoke-static/range {v1 .. v11}, Lcom/discord/models/domain/ModelMessage;->createLocalMessage(Ljava/lang/String;JLcom/discord/models/domain/ModelUser;Ljava/util/List;ZZLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/utilities/time/Clock;Ljava/util/List;)Lcom/discord/models/domain/ModelMessage;
-
- move-result-object v1
-
- if-nez p9, :cond_c
-
- iget-object v2, v0, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
-
- new-instance v3, Lcom/discord/stores/StoreMessages$sendMessage$3;
-
- invoke-direct {v3, v0, v1}, Lcom/discord/stores/StoreMessages$sendMessage$3;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
-
- invoke-virtual {v2, v3}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
-
- :cond_c
- new-instance v2, Lcom/discord/stores/StoreMessages$sendMessage$request$1;
-
- move-object/from16 v3, p8
-
- invoke-direct {v2, v0, v1, v15, v3}, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/activity/ModelActivity;)V
-
- new-instance v1, Lcom/discord/stores/StoreMessages$sendMessage$4;
-
- invoke-direct {v1, v0, v12, v13, v2}, Lcom/discord/stores/StoreMessages$sendMessage$4;->(Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
-
- invoke-static {v1, v14}, Lrx/Observable;->n(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)Lrx/Observable;
-
- move-result-object v1
-
- move-object/from16 v2, v17
-
- invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-object v1
-
- :cond_d
const-string v1, "content"
invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- throw v3
+ throw v0
- :cond_e
+ :cond_3
const-string v1, "author"
invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- throw v3
+ throw v0
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
index be6d667c26..5eb5362814 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
@@ -73,7 +73,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f12049e
+ const v0, 0x7f12049c
invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
index cf88d3107a..bf6a8634f5 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
@@ -61,7 +61,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f1204a2
+ const v0, 0x7f1204a0
const/4 v1, 0x2
@@ -69,7 +69,7 @@
const/4 v2, 0x0
- const v3, 0x7f1214cf
+ const v3, 0x7f1214bb
invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
@@ -79,7 +79,7 @@
const/4 v2, 0x1
- const v3, 0x7f1215fa
+ const v3, 0x7f1215e6
invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreNotifications.smali b/com.discord/smali/com/discord/stores/StoreNotifications.smali
index e6a046101f..f34d0a8a71 100644
--- a/com.discord/smali/com/discord/stores/StoreNotifications.smali
+++ b/com.discord/smali/com/discord/stores/StoreNotifications.smali
@@ -567,7 +567,7 @@
const/4 v6, 0x0
- invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->M(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+ invoke-static/range {v1 .. v6}, Lf/n/a/k/a;->L(Lkotlinx/coroutines/CoroutineScope;Lkotlin/coroutines/CoroutineContext;Lk0/a/z;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali
index 4a532cb52f..ea3c8fedf2 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -4345,10 +4345,55 @@
.end method
.method private final handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
- .locals 1
+ .locals 8
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getUser()Lcom/discord/models/domain/ModelUser;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
+
+ move-result-object v0
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v0, 0x0
+
+ :goto_0
+ if-eqz v0, :cond_1
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getGuildId()J
+
+ move-result-wide v0
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v3
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getUser()Lcom/discord/models/domain/ModelUser;
+
+ move-result-object v4
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getRoles()Ljava/util/List;
+
+ move-result-object v5
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelPresence;->getNick()Ljava/lang/String;
+
+ move-result-object v6
+
+ const/4 v7, 0x0
+
+ move-object v2, p0
+
+ invoke-direct/range {v2 .. v7}, Lcom/discord/stores/StoreStream;->synthesizeGuildMemberAdd(Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V
+
+ :cond_1
iget-object v0, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
invoke-virtual {v0, p3}, Lcom/discord/stores/StoreUser;->handlePresenceUpdate(Lcom/discord/models/domain/ModelPresence;)V
@@ -4698,10 +4743,6 @@
invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreCallsIncoming;->handleVoiceChannelSelected(J)V
- iget-object v0, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
-
- invoke-virtual {v0, p1, p2}, Lcom/discord/stores/StoreMediaEngine;->handleVoiceChannelSelected(J)V
-
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.smali
index 9be471337b..54ac5a90ed 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings$setChannelMuted$1.smali
@@ -94,16 +94,16 @@
if-eqz v1, :cond_0
- const v1, 0x7f120407
+ const v1, 0x7f120405
- const v7, 0x7f120407
+ const v7, 0x7f120405
goto :goto_0
:cond_0
- const v1, 0x7f1203cb
+ const v1, 0x7f1203c9
- const v7, 0x7f1203cb
+ const v7, 0x7f1203c9
:goto_0
iget-object v2, p0, Lcom/discord/stores/StoreUserGuildSettings$setChannelMuted$1;->this$0:Lcom/discord/stores/StoreUserGuildSettings;
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
index fb6d9f3254..e0211c65ad 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
@@ -942,7 +942,7 @@
invoke-direct {v6, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
- const v7, 0x7f120407
+ const v7, 0x7f120405
move-object v2, p0
@@ -1045,7 +1045,7 @@
invoke-direct {v7, v1, v2, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
- const v8, 0x7f120407
+ const v8, 0x7f120405
move-object v3, p0
@@ -1109,7 +1109,7 @@
invoke-direct/range {v5 .. v14}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- const v6, 0x7f121447
+ const v6, 0x7f121433
move-object v1, p0
@@ -1165,7 +1165,7 @@
invoke-direct/range {v0 .. v9}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- const v5, 0x7f121447
+ const v5, 0x7f121433
move-object v0, p0
@@ -1226,7 +1226,7 @@
invoke-direct/range {v5 .. v14}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- const v6, 0x7f121447
+ const v6, 0x7f121433
move-object v1, p0
diff --git a/com.discord/smali/com/discord/stores/StoreUserPresence.smali b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
index e6882408c1..1810ea7f79 100644
--- a/com.discord/smali/com/discord/stores/StoreUserPresence.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserPresence.smali
@@ -80,7 +80,7 @@
# direct methods
.method public constructor (Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreStream;)V
- .locals 9
+ .locals 11
const/4 v0, 0x0
@@ -136,13 +136,17 @@
const-wide/16 v5, 0x0
- const/16 v7, 0x1c
+ const/4 v7, 0x0
const/4 v8, 0x0
+ const/16 v9, 0x7c
+
+ const/4 v10, 0x0
+
move-object v0, p1
- invoke-direct/range {v0 .. v8}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v0 .. v10}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
@@ -285,285 +289,297 @@
.end method
.method private final flattenPresence(J)V
- .locals 13
+ .locals 16
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+ move-object/from16 v0, p0
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v2
+
+ invoke-virtual {v1, v2}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v1
- invoke-virtual {v0, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ check-cast v1, Ljava/util/Map;
- move-result-object v0
+ const/4 v2, 0x0
- check-cast v0, Ljava/util/Map;
+ if-eqz v1, :cond_4
- const/4 v1, 0x0
+ invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
- if-eqz v0, :cond_4
+ move-result-object v1
- invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
+ if-eqz v1, :cond_4
- move-result-object v0
+ invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
- if-eqz v0, :cond_4
+ move-result-object v1
- invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
- move-result-object v0
+ move-result v3
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+ if-nez v3, :cond_0
- move-result v2
-
- if-nez v2, :cond_0
-
- move-object v2, v1
+ move-object v3, v2
goto :goto_0
:cond_0
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
- move-result-object v2
+ move-result-object v3
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
- move-result v3
+ move-result v4
- if-nez v3, :cond_1
+ if-nez v4, :cond_1
goto :goto_0
:cond_1
- move-object v3, v2
+ move-object v4, v3
- check-cast v3, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+ check-cast v4, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
- invoke-virtual {v3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
+ invoke-virtual {v4}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
- move-result-wide v3
+ move-result-wide v4
:cond_2
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
- move-result-object v5
+ move-result-object v6
- move-object v6, v5
+ move-object v7, v6
- check-cast v6, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+ check-cast v7, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
- invoke-virtual {v6}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
+ invoke-virtual {v7}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
- move-result-wide v6
+ move-result-wide v7
- cmp-long v8, v3, v6
+ cmp-long v9, v4, v7
- if-gez v8, :cond_3
+ if-gez v9, :cond_3
- move-object v2, v5
+ move-object v3, v6
- move-wide v3, v6
+ move-wide v4, v7
:cond_3
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
- move-result v5
+ move-result v6
- if-nez v5, :cond_2
+ if-nez v6, :cond_2
:goto_0
- check-cast v2, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+ check-cast v3, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
- if-eqz v2, :cond_4
+ if-eqz v3, :cond_4
- invoke-virtual {v2}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
- move-result-object v0
+ move-result-object v1
goto :goto_1
:cond_4
- move-object v0, v1
+ move-object v1, v2
:goto_1
- if-eqz v0, :cond_5
+ if-eqz v1, :cond_5
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
- move-result-object v2
+ move-result-object v3
- if-eqz v2, :cond_5
+ if-eqz v3, :cond_5
goto :goto_2
:cond_5
- sget-object v2, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
+ sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
:goto_2
- move-object v4, v2
+ move-object v5, v3
- if-eqz v0, :cond_6
+ if-eqz v1, :cond_6
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object v2
-
- if-eqz v2, :cond_6
-
- sget-object v3, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
-
- invoke-virtual {v3}, Lcom/discord/utilities/presence/PresenceUtils;->getACTIVITY_COMPARATOR$app_productionDiscordExternalRelease()Ljava/util/Comparator;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
move-result-object v3
- invoke-static {v2, v3}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+ if-eqz v3, :cond_6
- move-result-object v2
+ sget-object v4, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
- invoke-static {v2}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+ invoke-virtual {v4}, Lcom/discord/utilities/presence/PresenceUtils;->getACTIVITY_COMPARATOR$app_productionDiscordExternalRelease()Ljava/util/Comparator;
- move-result-object v2
+ move-result-object v4
- move-object v5, v2
+ invoke-static {v3, v4}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
+
+ move-result-object v3
+
+ invoke-static {v3}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
+
+ move-result-object v3
+
+ move-object v6, v3
goto :goto_3
:cond_6
- move-object v5, v1
+ move-object v6, v2
:goto_3
- if-eqz v0, :cond_7
+ if-eqz v1, :cond_7
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v0
+ move-result-object v1
goto :goto_4
:cond_7
- move-object v0, v1
+ move-object v1, v2
:goto_4
- sget-object v2, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
+ sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
- const/4 v12, 0x1
+ const/4 v15, 0x1
- if-ne v4, v2, :cond_8
+ if-ne v5, v3, :cond_8
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v2
+
+ invoke-virtual {v1, v2}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v2
+
+ invoke-virtual {v1, v2}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v1
- invoke-virtual {v0, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
+ check-cast v1, Lcom/discord/models/domain/ModelPresence;
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ if-eqz v1, :cond_c
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object p1
-
- invoke-virtual {v0, p1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/models/domain/ModelPresence;
-
- if-eqz p1, :cond_c
-
- iput-boolean v12, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+ iput-boolean v15, v0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
goto :goto_6
:cond_8
- iget-object v2, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ iget-object v3, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v4
+
+ invoke-virtual {v3, v4}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object v3
- invoke-virtual {v2, v3}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ check-cast v3, Lcom/discord/models/domain/ModelPresence;
+
+ if-eqz v3, :cond_9
+
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
move-result-object v2
- check-cast v2, Lcom/discord/models/domain/ModelPresence;
-
- if-eqz v2, :cond_9
-
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
-
- move-result-object v1
-
:cond_9
- if-ne v1, v4, :cond_a
+ if-ne v2, v5, :cond_a
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
- move-result-object v1
+ move-result-object v2
- invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+ invoke-static {v2, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
- move-result v1
+ move-result v2
- xor-int/2addr v1, v12
+ xor-int/2addr v2, v15
- if-nez v1, :cond_a
+ if-nez v2, :cond_a
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v1
+ move-result-object v2
- invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+ invoke-static {v2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
- move-result v1
+ move-result v2
- xor-int/2addr v1, v12
+ xor-int/2addr v2, v15
- if-eqz v1, :cond_c
+ if-eqz v2, :cond_c
:cond_a
- iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object p1
+ move-result-object v3
- new-instance p2, Lcom/discord/models/domain/ModelPresence;
+ new-instance v14, Lcom/discord/models/domain/ModelPresence;
- if-eqz v0, :cond_b
+ if-eqz v1, :cond_b
goto :goto_5
:cond_b
- sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+ sget-object v1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v0
+ move-result-object v1
:goto_5
- move-object v6, v0
+ move-object v7, v1
- const/4 v7, 0x0
+ const/4 v8, 0x0
- const-wide/16 v8, 0x0
-
- const/16 v10, 0x18
+ const-wide/16 v9, 0x0
const/4 v11, 0x0
- move-object v3, p2
+ const/4 v12, 0x0
- invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ const/16 v13, 0x78
- invoke-interface {v1, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ const/4 v1, 0x0
- iput-boolean v12, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+ move-object v4, v14
+
+ move-object v15, v14
+
+ move-object v14, v1
+
+ invoke-direct/range {v4 .. v14}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ invoke-interface {v2, v3, v15}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ const/4 v1, 0x1
+
+ iput-boolean v1, v0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
:cond_c
:goto_6
@@ -871,7 +887,7 @@
.end method
.method private final updateSelfPresence(Lcom/discord/models/domain/ModelUserSettings;Ljava/util/List;Z)V
- .locals 12
+ .locals 17
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -886,251 +902,271 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
+ move-object/from16 v0, p0
- if-eqz v0, :cond_a
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+ if-eqz v1, :cond_a
- move-result-wide v0
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+ move-result-wide v1
if-eqz p1, :cond_0
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getPresenceStatus()Lcom/discord/models/domain/ModelPresence$Status;
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserSettings;->getPresenceStatus()Lcom/discord/models/domain/ModelPresence$Status;
- move-result-object v2
+ move-result-object v3
- if-eqz v2, :cond_0
+ if-eqz v3, :cond_0
goto :goto_0
:cond_0
- iget-object v2, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ iget-object v3, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+ invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
+
+ move-result-object v3
+
+ :goto_0
+ const-string v4, "userSettings?.presenceSt\u2026 ?: localPresence.status"
+
+ invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const/4 v4, 0x0
+
+ if-eqz p2, :cond_3
+
+ invoke-interface/range {p2 .. p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+
+ move-result-object v5
+
+ :cond_1
+ invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v6
+
+ if-eqz v6, :cond_2
+
+ invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v6
+
+ move-object v7, v6
+
+ check-cast v7, Lcom/discord/models/domain/ModelSession;
+
+ invoke-virtual {v7}, Lcom/discord/models/domain/ModelSession;->isActive()Z
+
+ move-result v7
+
+ if-eqz v7, :cond_1
+
+ goto :goto_1
+
+ :cond_2
+ move-object v6, v4
+
+ :goto_1
+ check-cast v6, Lcom/discord/models/domain/ModelSession;
+
+ if-eqz v6, :cond_3
+
+ invoke-virtual {v6}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
+
+ move-result-object v5
+
+ if-eqz v5, :cond_3
+
+ move-object v1, v5
+
+ goto :goto_2
+
+ :cond_3
+ iget-object v5, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+
+ invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v1
+
+ invoke-virtual {v5, v1}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object v1
+
+ check-cast v1, Lcom/discord/models/domain/ModelPresence;
+
+ if-eqz v1, :cond_4
+
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+ move-result-object v1
+
+ goto :goto_2
+
+ :cond_4
+ move-object v1, v4
+
+ :goto_2
+ if-eqz p1, :cond_5
+
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserSettings;->getCustomStatus()Lcom/discord/models/domain/ModelCustomStatusSetting;
+
+ move-result-object v4
+
+ :cond_5
+ if-eqz v4, :cond_7
+
+ invoke-direct {v0, v4}, Lcom/discord/stores/StoreUserPresence;->getCustomStatusActivityFromSetting(Lcom/discord/models/domain/ModelCustomStatusSetting;)Lcom/discord/models/domain/activity/ModelActivity;
+
+ move-result-object v2
+
+ if-eqz v2, :cond_6
+
+ iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+ invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+ move-result-object v4
+
+ invoke-direct {v0, v2, v4}, Lcom/discord/stores/StoreUserPresence;->replaceActivityInList(Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;)Ljava/util/List;
+
+ move-result-object v2
+
+ goto :goto_3
+
+ :cond_6
+ const/4 v2, 0x4
+
+ iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+ invoke-virtual {v4}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+ move-result-object v4
+
+ invoke-direct {v0, v2, v4}, Lcom/discord/stores/StoreUserPresence;->removeActivityInList(ILjava/util/List;)Ljava/util/List;
+
+ move-result-object v2
+
+ goto :goto_3
+
+ :cond_7
+ iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+
+ move-result-object v2
+
+ :goto_3
+ move-object v6, v2
+
+ iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
move-result-object v2
- :goto_0
- const-string v3, "userSettings?.presenceSt\u2026 ?: localPresence.status"
+ const/4 v15, 0x1
- invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ if-ne v3, v2, :cond_8
- const/4 v3, 0x0
+ iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
- if-eqz p2, :cond_3
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
- invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+ move-result-object v2
- move-result-object p2
+ invoke-static {v6, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
- :cond_1
- invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
+ move-result v2
- move-result v4
+ xor-int/2addr v2, v15
- if-eqz v4, :cond_2
-
- invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v4
-
- move-object v5, v4
-
- check-cast v5, Lcom/discord/models/domain/ModelSession;
-
- invoke-virtual {v5}, Lcom/discord/models/domain/ModelSession;->isActive()Z
-
- move-result v5
-
- if-eqz v5, :cond_1
-
- goto :goto_1
-
- :cond_2
- move-object v4, v3
-
- :goto_1
- check-cast v4, Lcom/discord/models/domain/ModelSession;
-
- if-eqz v4, :cond_3
-
- invoke-virtual {v4}, Lcom/discord/models/domain/ModelSession;->getActivities()Ljava/util/List;
-
- move-result-object p2
-
- if-eqz p2, :cond_3
-
- goto :goto_2
-
- :cond_3
- iget-object p2, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v0
-
- invoke-virtual {p2, v0}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p2
-
- check-cast p2, Lcom/discord/models/domain/ModelPresence;
-
- if-eqz p2, :cond_4
-
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object p2
-
- goto :goto_2
-
- :cond_4
- move-object p2, v3
-
- :goto_2
- if-eqz p1, :cond_5
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getCustomStatus()Lcom/discord/models/domain/ModelCustomStatusSetting;
-
- move-result-object v3
-
- :cond_5
- if-eqz v3, :cond_7
-
- invoke-direct {p0, v3}, Lcom/discord/stores/StoreUserPresence;->getCustomStatusActivityFromSetting(Lcom/discord/models/domain/ModelCustomStatusSetting;)Lcom/discord/models/domain/activity/ModelActivity;
-
- move-result-object p1
-
- if-eqz p1, :cond_6
-
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object v0
-
- invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreUserPresence;->replaceActivityInList(Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;)Ljava/util/List;
-
- move-result-object p1
-
- goto :goto_3
-
- :cond_6
- const/4 p1, 0x4
-
- iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object v0
-
- invoke-direct {p0, p1, v0}, Lcom/discord/stores/StoreUserPresence;->removeActivityInList(ILjava/util/List;)Ljava/util/List;
-
- move-result-object p1
-
- goto :goto_3
-
- :cond_7
- iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object p1
-
- :goto_3
- move-object v5, p1
-
- iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
-
- move-result-object p1
-
- const/4 v0, 0x1
-
- if-ne v2, p1, :cond_8
-
- iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
-
- move-result-object p1
-
- invoke-static {v5, p1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result p1
-
- xor-int/2addr p1, v0
-
- if-eqz p1, :cond_9
+ if-eqz v2, :cond_9
:cond_8
- new-instance p1, Lcom/discord/models/domain/ModelPresence;
-
- const/4 v6, 0x0
+ new-instance v2, Lcom/discord/models/domain/ModelPresence;
const/4 v7, 0x0
- const-wide/16 v8, 0x0
+ const/4 v8, 0x0
- const/16 v10, 0x1c
+ const-wide/16 v9, 0x0
const/4 v11, 0x0
- move-object v3, p1
+ const/4 v12, 0x0
+
+ const/16 v13, 0x7c
+
+ const/4 v14, 0x0
move-object v4, v2
- invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ move-object v5, v3
- iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ invoke-direct/range {v4 .. v14}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
+ iput-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
- iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+ iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
- invoke-virtual {v1, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+ iget-object v4, v4, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
- iput-boolean v0, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+ invoke-virtual {v4, v2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+
+ iput-boolean v15, v0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
:cond_9
- const-wide v0, 0x7fffffffffffffffL
+ const-wide v14, 0x7fffffffffffffffL
- new-instance p1, Lcom/discord/models/domain/ModelPresence;
+ new-instance v2, Lcom/discord/models/domain/ModelPresence;
- const/4 v6, 0x0
+ const/4 v7, 0x0
- iget-object v7, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
+ iget-object v8, v0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
- const-wide/16 v8, 0x0
-
- const/16 v10, 0x14
+ const-wide/16 v9, 0x0
const/4 v11, 0x0
- move-object v3, p1
+ const/4 v12, 0x0
+
+ const/16 v13, 0x74
+
+ const/16 v16, 0x0
move-object v4, v2
- move-object v5, p2
+ move-object v5, v3
- invoke-direct/range {v3 .. v11}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ move-object v6, v1
- invoke-virtual {p0, v0, v1, p1}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
+ move-wide v0, v14
+
+ move-object/from16 v14, v16
+
+ invoke-direct/range {v4 .. v14}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ move-wide v3, v0
+
+ move-object/from16 v0, p0
+
+ invoke-virtual {v0, v3, v4, v2}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
if-nez p3, :cond_a
- iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
- move-result-object p1
+ move-result-object v1
- if-nez p1, :cond_a
+ if-nez v1, :cond_a
- const/4 p1, 0x0
+ const/4 v1, 0x0
- iput-boolean p1, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+ iput-boolean v1, v0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
:cond_a
return-void
@@ -1509,7 +1545,7 @@
.end method
.method public final handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V
- .locals 12
+ .locals 14
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -1519,7 +1555,7 @@
move-result-wide v0
- new-instance v11, Lcom/discord/models/domain/ModelPresence;
+ new-instance v13, Lcom/discord/models/domain/ModelPresence;
sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
@@ -1533,15 +1569,19 @@
const-wide/16 v7, 0x0
- const/16 v9, 0x14
+ const/4 v9, 0x0
const/4 v10, 0x0
- move-object v2, v11
+ const/16 v11, 0x74
- invoke-direct/range {v2 .. v10}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ const/4 v12, 0x0
- invoke-virtual {p0, v0, v1, v11}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
+ move-object v2, v13
+
+ invoke-direct/range {v2 .. v12}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ invoke-virtual {p0, v0, v1, v13}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
return-void
@@ -1857,7 +1897,7 @@
.end method
.method public final updateActivity(ILcom/discord/models/domain/activity/ModelActivity;Z)V
- .locals 10
+ .locals 12
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -1978,13 +2018,17 @@
const-wide/16 v6, 0x0
- const/16 v8, 0x1c
+ const/4 v8, 0x0
const/4 v9, 0x0
+ const/16 v10, 0x7c
+
+ const/4 v11, 0x0
+
move-object v1, p1
- invoke-direct/range {v1 .. v9}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v1 .. v11}, Lcom/discord/models/domain/ModelPresence;->(Lcom/discord/models/domain/ModelPresence$Status;Ljava/util/List;Lcom/discord/models/domain/ModelPresence$ClientStatuses;Lcom/discord/models/domain/ModelUser;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index 38c7c09453..961f0f2546 100644
--- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
@@ -1750,7 +1750,7 @@
move-result-object v0
- const v1, 0x7f1215ac
+ const v1, 0x7f121598
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1865,7 +1865,7 @@
move-result-object p2
- const v0, 0x7f120dee
+ const v0, 0x7f120de1
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2262,7 +2262,7 @@
move-result-object v0
- const v1, 0x7f1215ac
+ const v1, 0x7f121598
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2293,7 +2293,7 @@
move-result-object v0
- const v1, 0x7f1215ab
+ const v1, 0x7f121597
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$Companion.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$Companion.smali
deleted file mode 100644
index b1a5b35f37..0000000000
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$Companion.smali
+++ /dev/null
@@ -1,32 +0,0 @@
-.class public final Lcom/discord/stores/StoreVoiceChannelSelected$Companion;
-.super Ljava/lang/Object;
-.source "StoreVoiceChannelSelected.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/stores/StoreVoiceChannelSelected;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = "Companion"
-.end annotation
-
-
-# direct methods
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V
- .locals 0
-
- invoke-direct {p0}, Lcom/discord/stores/StoreVoiceChannelSelected$Companion;->()V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
index ca415dd2b0..c136df89d3 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
@@ -9,18 +9,11 @@
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
value = {
- Lcom/discord/stores/StoreVoiceChannelSelected$JoinVoiceChannelResult;,
- Lcom/discord/stores/StoreVoiceChannelSelected$Companion;
+ Lcom/discord/stores/StoreVoiceChannelSelected$JoinVoiceChannelResult;
}
.end annotation
-# static fields
-.field public static final Companion:Lcom/discord/stores/StoreVoiceChannelSelected$Companion;
-
-.field public static final VOICE_CHANNEL_ID_NONE:J
-
-
# instance fields
.field public final clock:Lcom/discord/utilities/time/Clock;
@@ -80,20 +73,6 @@
# direct methods
-.method public static constructor ()V
- .locals 2
-
- new-instance v0, Lcom/discord/stores/StoreVoiceChannelSelected$Companion;
-
- const/4 v1, 0x0
-
- invoke-direct {v0, v1}, Lcom/discord/stores/StoreVoiceChannelSelected$Companion;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
- sput-object v0, Lcom/discord/stores/StoreVoiceChannelSelected;->Companion:Lcom/discord/stores/StoreVoiceChannelSelected$Companion;
-
- return-void
-.end method
-
.method public constructor (Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
.locals 1
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index d5e78c307d..369f21c5e1 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -177,7 +177,7 @@
const-string v3, "browser_user_agent"
- const-string v4, "Discord-Android/1221"
+ const-string v4, "Discord-Android/1222"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
@@ -185,7 +185,7 @@
const/4 v1, 0x2
- const/16 v2, 0x4c5
+ const/16 v2, 0x4c6
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -205,7 +205,7 @@
const-string v3, "client_version"
- const-string v4, "35.0"
+ const-string v4, "34.5"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
index c7bfb780f6..aa13ab92c0 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
@@ -2708,7 +2708,7 @@
.end method
.method private final toProperties(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
- .locals 4
+ .locals 2
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -2779,10 +2779,6 @@
sget-object v1, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Suppression:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
- const/4 v2, 0x1
-
- const/4 v3, 0x0
-
if-ne v0, v1, :cond_1
const/4 v0, 0x1
@@ -2801,28 +2797,6 @@
invoke-interface {p2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getNoiseProcessing()Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
- move-result-object v0
-
- sget-object v1, Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;->Cancellation:Lcom/discord/stores/StoreMediaSettings$NoiseProcessing;
-
- if-ne v0, v1, :cond_2
-
- goto :goto_1
-
- :cond_2
- const/4 v2, 0x0
-
- :goto_1
- invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object v0
-
- const-string v1, "noise_cancellation_enabled"
-
- invoke-interface {p2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getAutomaticGainControl()Z
move-result v0
@@ -3461,53 +3435,6 @@
throw p1
.end method
-.method public final appCrashed()V
- .locals 4
-
- sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
-
- const-string v1, "app_crashed"
-
- const/4 v2, 0x0
-
- const/4 v3, 0x2
-
- invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track$default(Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
-
- return-void
-.end method
-
-.method public final appExceptionThrown(Ljava/lang/String;)V
- .locals 2
-
- const-string v0, "stacktrace"
-
- if-eqz p1, :cond_0
-
- new-instance v1, Lkotlin/Pair;
-
- invoke-direct {v1, v0, p1}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
-
- invoke-static {v1}, Lf/n/a/k/a;->mapOf(Lkotlin/Pair;)Ljava/util/Map;
-
- move-result-object p1
-
- sget-object v0, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
-
- const-string v1, "app_exception_thrown"
-
- invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
-
- return-void
-
- :cond_0
- invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
-.end method
-
.method public final attributionChange(Lcom/adjust/sdk/AdjustAttribution;)V
.locals 6
@@ -4775,89 +4702,6 @@
throw v0
.end method
-.method public final fileUploadAlertViewed(Lcom/discord/utilities/rest/FileUploadAlertType;IIIZZZ)V
- .locals 2
-
- if-eqz p1, :cond_0
-
- new-instance v0, Ljava/util/LinkedHashMap;
-
- invoke-direct {v0}, Ljava/util/LinkedHashMap;->()V
-
- invoke-virtual {p1}, Lcom/discord/utilities/rest/FileUploadAlertType;->getAnalyticsValue()Ljava/lang/String;
-
- move-result-object p1
-
- const-string v1, "alert_type"
-
- invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object p1
-
- const-string p2, "num_attachments"
-
- invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-static {p3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object p1
-
- const-string p2, "max_attachment_size"
-
- invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-static {p4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
-
- move-result-object p1
-
- const-string p2, "total_attachment_size"
-
- invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-static {p5}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object p1
-
- const-string p2, "has_image"
-
- invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-static {p6}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object p1
-
- const-string p2, "has_video"
-
- invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- invoke-static {p7}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object p1
-
- const-string p2, "is_premium"
-
- invoke-interface {v0, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
-
- const-string p2, "file_upload_upsell_viewed"
-
- invoke-virtual {p1, p2, v0}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
-
- return-void
-
- :cond_0
- const-string p1, "alertType"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
-.end method
-
.method public final friendAddViewed(Ljava/lang/String;)V
.locals 2
@@ -7082,6 +6926,124 @@
return-void
.end method
+.method public final reportStreamProblem(Lcom/discord/models/domain/ModelApplicationStream;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/String;Ljava/lang/String;)V
+ .locals 4
+
+ const/4 v0, 0x0
+
+ if-eqz p1, :cond_6
+
+ new-instance v1, Ljava/util/HashMap;
+
+ invoke-direct {v1}, Ljava/util/HashMap;->()V
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getOwnerId()J
+
+ move-result-wide v2
+
+ invoke-static {v2, v3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+ move-result-object v2
+
+ const-string v3, "streamer_user_id"
+
+ invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream;->getChannelId()J
+
+ move-result-wide v2
+
+ invoke-static {v2, v3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+ move-result-object v2
+
+ const-string v3, "stream_channel_id"
+
+ invoke-interface {v1, v3, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ instance-of v2, p1, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
+
+ if-eqz v2, :cond_0
+
+ check-cast p1, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelApplicationStream$GuildStream;->getGuildId()J
+
+ move-result-wide v2
+
+ invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ goto :goto_0
+
+ :cond_0
+ instance-of p1, p1, Lcom/discord/models/domain/ModelApplicationStream$CallStream;
+
+ if-eqz p1, :cond_5
+
+ :goto_0
+ if-eqz v0, :cond_1
+
+ invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+
+ invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ const-string v0, "guild_id"
+
+ invoke-interface {v1, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ :cond_1
+ if-eqz p2, :cond_2
+
+ invoke-virtual {p2}, Lcom/discord/widgets/voice/feedback/FeedbackRating;->getAnalyticsValue()Ljava/lang/String;
+
+ move-result-object p1
+
+ const-string p2, "rating"
+
+ invoke-interface {v1, p2, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ :cond_2
+ if-eqz p4, :cond_3
+
+ const-string p1, "media_session_id"
+
+ invoke-interface {v1, p1, p4}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ :cond_3
+ if-eqz p3, :cond_4
+
+ const-string p1, "reason"
+
+ invoke-interface {v1, p1, p3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
+ :cond_4
+ sget-object p1, Lcom/discord/utilities/analytics/AnalyticsTracker;->tracker:Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;
+
+ const-string p2, "stream_report_problem"
+
+ invoke-virtual {p1, p2, v1}, Lcom/discord/utilities/analytics/AnalyticsUtils$Tracker;->track(Ljava/lang/String;Ljava/util/Map;)V
+
+ return-void
+
+ :cond_5
+ new-instance p1, Lkotlin/NoWhenBranchMatchedException;
+
+ invoke-direct {p1}, Lkotlin/NoWhenBranchMatchedException;->()V
+
+ throw p1
+
+ :cond_6
+ const-string p1, "stream"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
.method public final reviewRequestAccepted()V
.locals 3
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1.smali
deleted file mode 100644
index 948061f10a..0000000000
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1.smali
+++ /dev/null
@@ -1,122 +0,0 @@
-.class public final Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;
-.super Lj0/n/c/i;
-.source "AttachmentUtils.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/attachments/AttachmentUtilsKt;->appendLinks(Ljava/lang/String;Ljava/util/List;)Ljava/lang/String;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Lj0/n/c/i;",
- "Lkotlin/jvm/functions/Function1<",
- "Lcom/lytefast/flexinput/model/Attachment<",
- "*>;",
- "Ljava/lang/String;",
- ">;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;
-
- invoke-direct {v0}, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;->()V
-
- sput-object v0, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;->INSTANCE:Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;
-
- return-void
-.end method
-
-.method public constructor ()V
- .locals 1
-
- const/4 v0, 0x1
-
- invoke-direct {p0, v0}, Lj0/n/c/i;->(I)V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Lcom/lytefast/flexinput/model/Attachment;
-
- invoke-virtual {p0, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;->invoke(Lcom/lytefast/flexinput/model/Attachment;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final invoke(Lcom/lytefast/flexinput/model/Attachment;)Ljava/lang/String;
- .locals 1
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Lcom/lytefast/flexinput/model/Attachment<",
- "*>;)",
- "Ljava/lang/String;"
- }
- .end annotation
-
- if-eqz p1, :cond_1
-
- invoke-virtual {p1}, Lcom/lytefast/flexinput/model/Attachment;->getData()Ljava/lang/Object;
-
- move-result-object p1
-
- if-eqz p1, :cond_0
-
- check-cast p1, Landroidx/core/view/inputmethod/InputContentInfoCompat;
-
- invoke-virtual {p1}, Landroidx/core/view/inputmethod/InputContentInfoCompat;->getLinkUri()Landroid/net/Uri;
-
- move-result-object v0
-
- invoke-static {v0}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object v0
-
- invoke-virtual {p1}, Landroidx/core/view/inputmethod/InputContentInfoCompat;->releasePermission()V
-
- return-object v0
-
- :cond_0
- new-instance p1, Lkotlin/TypeCastException;
-
- const-string v0, "null cannot be cast to non-null type androidx.core.view.inputmethod.InputContentInfoCompat"
-
- invoke-direct {p1, v0}, Lkotlin/TypeCastException;->(Ljava/lang/String;)V
-
- throw p1
-
- :cond_1
- const-string p1, "it"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
index 5f459a6aff..95d34f6663 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
@@ -48,187 +48,6 @@
return-object v0
.end method
-.method public static final appendLinks(Ljava/lang/String;Ljava/util/List;)Ljava/lang/String;
- .locals 8
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/lang/String;",
- "Ljava/util/List<",
- "+",
- "Lcom/lytefast/flexinput/model/Attachment<",
- "*>;>;)",
- "Ljava/lang/String;"
- }
- .end annotation
-
- const/4 v0, 0x0
-
- if-eqz p0, :cond_1
-
- if-eqz p1, :cond_0
-
- const-string v0, "\n"
-
- invoke-static {p0, v0}, Lf/e/b/a/a;->H(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- move-result-object p0
-
- const/4 v2, 0x0
-
- const/4 v3, 0x0
-
- const/4 v4, 0x0
-
- const/4 v5, 0x0
-
- sget-object v6, Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;->INSTANCE:Lcom/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1;
-
- const/16 v7, 0x1e
-
- const-string v1, "\n"
-
- move-object v0, p1
-
- invoke-static/range {v0 .. v7}, Lj0/i/l;->joinToString$default(Ljava/lang/Iterable;Ljava/lang/CharSequence;Ljava/lang/CharSequence;Ljava/lang/CharSequence;ILjava/lang/CharSequence;Lkotlin/jvm/functions/Function1;I)Ljava/lang/String;
-
- move-result-object p1
-
- invoke-virtual {p0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {p0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
- move-result-object p0
-
- return-object p0
-
- :cond_0
- const-string p0, "links"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-
- :cond_1
- const-string p0, "content"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-.end method
-
-.method public static final extractLinks(Ljava/util/List;Landroid/content/ContentResolver;)Ljava/util/List;
- .locals 6
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/util/List<",
- "+",
- "Lcom/lytefast/flexinput/model/Attachment<",
- "*>;>;",
- "Landroid/content/ContentResolver;",
- ")",
- "Ljava/util/List<",
- "Lcom/lytefast/flexinput/model/Attachment<",
- "*>;>;"
- }
- .end annotation
-
- const/4 v0, 0x0
-
- if-eqz p0, :cond_5
-
- if-eqz p1, :cond_4
-
- new-instance v1, Ljava/util/ArrayList;
-
- invoke-direct {v1}, Ljava/util/ArrayList;->()V
-
- invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object p0
-
- :cond_0
- :goto_0
- invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v2
-
- if-eqz v2, :cond_3
-
- invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v2
-
- move-object v3, v2
-
- check-cast v3, Lcom/lytefast/flexinput/model/Attachment;
-
- invoke-virtual {v3}, Lcom/lytefast/flexinput/model/Attachment;->getData()Ljava/lang/Object;
-
- move-result-object v4
-
- instance-of v5, v4, Landroidx/core/view/inputmethod/InputContentInfoCompat;
-
- if-nez v5, :cond_1
-
- move-object v4, v0
-
- :cond_1
- check-cast v4, Landroidx/core/view/inputmethod/InputContentInfoCompat;
-
- const/4 v5, 0x1
-
- if-eqz v4, :cond_2
-
- invoke-virtual {v4}, Landroidx/core/view/inputmethod/InputContentInfoCompat;->getLinkUri()Landroid/net/Uri;
-
- move-result-object v4
-
- if-eqz v4, :cond_2
-
- invoke-static {v3, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
-
- move-result-object v3
-
- const-string v4, "image/gif"
-
- invoke-static {v3, v4}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v3
-
- if-ne v3, v5, :cond_2
-
- goto :goto_1
-
- :cond_2
- const/4 v5, 0x0
-
- :goto_1
- if-eqz v5, :cond_0
-
- invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
-
- goto :goto_0
-
- :cond_3
- return-object v1
-
- :cond_4
- const-string p0, "contentResolver"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-
- :cond_5
- const-string p0, "$this$extractLinks"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-.end method
-
.method public static final getExtension(Landroid/graphics/Bitmap$CompressFormat;)Ljava/lang/String;
.locals 2
@@ -520,227 +339,6 @@
throw p0
.end method
-.method public static final isImage(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Z
- .locals 1
-
- if-eqz p1, :cond_0
-
- invoke-static {p0, p1, p2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object p0
-
- const/4 p1, 0x0
-
- const/4 p2, 0x2
-
- const-string v0, "image"
-
- invoke-static {p0, v0, p1, p2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
- move-result p0
-
- return p0
-
- :cond_0
- const-string p0, "uri"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p0, 0x0
-
- throw p0
-.end method
-
-.method public static final isImage(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Z
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Lcom/lytefast/flexinput/model/Attachment<",
- "*>;",
- "Landroid/content/ContentResolver;",
- ")Z"
- }
- .end annotation
-
- if-eqz p0, :cond_0
-
- invoke-static {p0, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
-
- move-result-object p0
-
- const/4 p1, 0x0
-
- const/4 v0, 0x2
-
- const-string v1, "image"
-
- invoke-static {p0, v1, p1, v0}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
- move-result p0
-
- return p0
-
- :cond_0
- const-string p0, "$this$isImage"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p0, 0x0
-
- throw p0
-.end method
-
-.method public static synthetic isImage$default(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;ILjava/lang/Object;)Z
- .locals 0
-
- and-int/lit8 p3, p3, 0x4
-
- if-eqz p3, :cond_0
-
- const/4 p2, 0x0
-
- :cond_0
- invoke-static {p0, p1, p2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->isImage(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Z
-
- move-result p0
-
- return p0
-.end method
-
-.method public static final isVideo(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Z
- .locals 1
-
- if-eqz p1, :cond_0
-
- invoke-static {p0, p1, p2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object p0
-
- const/4 p1, 0x0
-
- const/4 p2, 0x2
-
- const-string/jumbo v0, "video"
-
- invoke-static {p0, v0, p1, p2}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
- move-result p0
-
- return p0
-
- :cond_0
- const-string p0, "uri"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p0, 0x0
-
- throw p0
-.end method
-
-.method public static final isVideo(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Z
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Lcom/lytefast/flexinput/model/Attachment<",
- "*>;",
- "Landroid/content/ContentResolver;",
- ")Z"
- }
- .end annotation
-
- if-eqz p0, :cond_0
-
- invoke-static {p0, p1}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->getMimeType(Lcom/lytefast/flexinput/model/Attachment;Landroid/content/ContentResolver;)Ljava/lang/String;
-
- move-result-object p0
-
- const/4 p1, 0x0
-
- const/4 v0, 0x2
-
- const-string/jumbo v1, "video"
-
- invoke-static {p0, v1, p1, v0}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
- move-result p0
-
- return p0
-
- :cond_0
- const-string p0, "$this$isVideo"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p0, 0x0
-
- throw p0
-.end method
-
-.method public static synthetic isVideo$default(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;ILjava/lang/Object;)Z
- .locals 0
-
- and-int/lit8 p3, p3, 0x4
-
- if-eqz p3, :cond_0
-
- const/4 p2, 0x0
-
- :cond_0
- invoke-static {p0, p1, p2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->isVideo(Landroid/content/ContentResolver;Landroid/net/Uri;Ljava/lang/String;)Z
-
- move-result p0
-
- return p0
-.end method
-
-.method public static final toAttachment(Lcom/discord/models/messages/LocalAttachment;)Lcom/lytefast/flexinput/model/Attachment;
- .locals 7
-
- if-eqz p0, :cond_0
-
- new-instance v6, Lcom/lytefast/flexinput/model/Attachment;
-
- invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getId()J
-
- move-result-wide v1
-
- invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getUriString()Ljava/lang/String;
-
- move-result-object v0
-
- invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
-
- move-result-object v3
-
- const-string v0, "Uri.parse(uriString)"
-
- invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {p0}, Lcom/discord/models/messages/LocalAttachment;->getDisplayName()Ljava/lang/String;
-
- move-result-object v4
-
- const/4 v5, 0x0
-
- move-object v0, v6
-
- invoke-direct/range {v0 .. v5}, Lcom/lytefast/flexinput/model/Attachment;->(JLandroid/net/Uri;Ljava/lang/String;Ljava/lang/Object;)V
-
- return-object v6
-
- :cond_0
- const-string p0, "$this$toAttachment"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p0, 0x0
-
- throw p0
-.end method
-
.method public static final toHumanReadableAscii(Ljava/lang/String;)Ljava/lang/String;
.locals 4
@@ -827,52 +425,3 @@
:cond_3
return-object p0
.end method
-
-.method public static final toLocalAttachment(Lcom/lytefast/flexinput/model/Attachment;)Lcom/discord/models/messages/LocalAttachment;
- .locals 5
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Lcom/lytefast/flexinput/model/Attachment<",
- "*>;)",
- "Lcom/discord/models/messages/LocalAttachment;"
- }
- .end annotation
-
- if-eqz p0, :cond_0
-
- new-instance v0, Lcom/discord/models/messages/LocalAttachment;
-
- invoke-virtual {p0}, Lcom/lytefast/flexinput/model/Attachment;->getId()J
-
- move-result-wide v1
-
- invoke-virtual {p0}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
-
- move-result-object v3
-
- invoke-virtual {v3}, Landroid/net/Uri;->toString()Ljava/lang/String;
-
- move-result-object v3
-
- const-string v4, "uri.toString()"
-
- invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {p0}, Lcom/lytefast/flexinput/model/Attachment;->getDisplayName()Ljava/lang/String;
-
- move-result-object p0
-
- invoke-direct {v0, v1, v2, v3, p0}, Lcom/discord/models/messages/LocalAttachment;->(JLjava/lang/String;Ljava/lang/String;)V
-
- return-object v0
-
- :cond_0
- const-string p0, "$this$toLocalAttachment"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p0, 0x0
-
- throw p0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali
index 372539e163..1ea831ed88 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali
@@ -7,10 +7,12 @@
.field public static final synthetic $EnumSwitchMapping$1:[I
+.field public static final synthetic $EnumSwitchMapping$2:[I
+
# direct methods
.method public static synthetic constructor ()V
- .locals 6
+ .locals 7
invoke-static {}, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->values()[Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
@@ -32,67 +34,67 @@
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v1, 0x2
+ const/4 v3, 0x2
- aput v1, v0, v2
+ aput v3, v0, v2
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v3, 0x3
-
- aput v3, v0, v1
-
- sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
-
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
-
- const/4 v4, 0x4
+ const/4 v4, 0x3
aput v4, v0, v3
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v5, 0x5
+ const/4 v5, 0x4
aput v5, v0, v4
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INVITE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v4, 0x6
+ const/4 v6, 0x5
- aput v4, v0, v5
+ aput v6, v0, v5
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INVITE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v5, 0x7
+ const/4 v5, 0x6
- aput v5, v0, v4
+ aput v5, v0, v6
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->EMOJI:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/16 v4, 0x8
+ const/4 v6, 0x7
- aput v4, v0, v5
+ aput v6, v0, v5
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INTEGRATION:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->EMOJI:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/16 v5, 0x9
+ const/16 v5, 0x8
- aput v5, v0, v4
+ aput v5, v0, v6
+
+ sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
+
+ sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INTEGRATION:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+
+ const/16 v6, 0x9
+
+ aput v6, v0, v5
invoke-static {}, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->values()[Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
@@ -104,21 +106,41 @@
sput-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->CREATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->CREATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
aput v2, v0, v2
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
- sget-object v2, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->UPDATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
-
- aput v1, v0, v1
-
- sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
-
- sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->DELETE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->UPDATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
aput v3, v0, v3
+ sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
+
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->DELETE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
+
+ aput v4, v0, v4
+
+ invoke-static {}, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->values()[Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ move-result-object v0
+
+ array-length v0, v0
+
+ new-array v0, v0, [I
+
+ sput-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$2:[I
+
+ sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->MEMBER:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ aput v2, v0, v1
+
+ sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$2:[I
+
+ sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+
+ aput v3, v0, v2
+
return-void
.end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index f393767482..9982d26b51 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -1456,9 +1456,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f1209a1
+ const v0, 0x7f12099b
- const v1, 0x7f1209a0
+ const v1, 0x7f12099a
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1475,9 +1475,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f12099f
+ const v0, 0x7f120999
- const v1, 0x7f12099e
+ const v1, 0x7f120998
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1494,9 +1494,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f1209a4
+ const v0, 0x7f12099e
- const v1, 0x7f1209a3
+ const v1, 0x7f12099d
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1513,7 +1513,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f12099d
+ const p1, 0x7f120997
goto/16 :goto_1
@@ -1540,7 +1540,7 @@
if-nez p1, :cond_1
- const p1, 0x7f120997
+ const p1, 0x7f120991
goto :goto_1
@@ -1549,7 +1549,7 @@
if-ne p1, v0, :cond_2
- const p1, 0x7f120998
+ const p1, 0x7f120992
goto :goto_1
@@ -1578,9 +1578,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f120996
+ const v0, 0x7f120990
- const v1, 0x7f120995
+ const v1, 0x7f12098f
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1597,7 +1597,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f12099c
+ const p1, 0x7f120996
goto :goto_1
@@ -1610,9 +1610,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f120992
+ const v0, 0x7f12098c
- const v1, 0x7f120991
+ const v1, 0x7f12098b
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1629,7 +1629,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f1209a9
+ const p1, 0x7f1209a3
goto :goto_1
@@ -1693,9 +1693,9 @@
if-eqz v0, :cond_3
- const v0, 0x7f1209ad
+ const v0, 0x7f1209a7
- const v1, 0x7f1209ac
+ const v1, 0x7f1209a6
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1712,7 +1712,7 @@
if-eqz p1, :cond_3
- const p1, 0x7f1209a9
+ const p1, 0x7f1209a3
goto :goto_1
@@ -1877,7 +1877,7 @@
goto :goto_0
:cond_5
- const p1, 0x7f120f96
+ const p1, 0x7f120f86
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1944,14 +1944,14 @@
if-ne p1, v5, :cond_1
- const v1, 0x7f1209d4
+ const v1, 0x7f1209ce
goto/16 :goto_0
:cond_1
if-nez p1, :cond_2
- const v1, 0x7f1209d3
+ const v1, 0x7f1209cd
goto/16 :goto_0
@@ -1980,7 +1980,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209bf
+ const v1, 0x7f1209b9
goto/16 :goto_0
@@ -1993,9 +1993,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209d2
+ const v0, 0x7f1209cc
- const v1, 0x7f1209d1
+ const v1, 0x7f1209cb
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -2012,9 +2012,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209cb
+ const v0, 0x7f1209c5
- const v1, 0x7f1209ca
+ const v1, 0x7f1209c4
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -2052,12 +2052,12 @@
goto/16 :goto_0
:cond_4
- const v1, 0x7f1209b4
+ const v1, 0x7f1209ae
goto/16 :goto_0
:cond_5
- const v1, 0x7f1209b3
+ const v1, 0x7f1209ad
goto/16 :goto_0
@@ -2077,9 +2077,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209c9
+ const v0, 0x7f1209c3
- const v1, 0x7f1209c8
+ const v1, 0x7f1209c2
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -2117,12 +2117,12 @@
goto/16 :goto_0
:cond_7
- const v1, 0x7f1209bd
+ const v1, 0x7f1209b7
goto/16 :goto_0
:cond_8
- const v1, 0x7f1209bc
+ const v1, 0x7f1209b6
goto/16 :goto_0
@@ -2142,9 +2142,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209c3
+ const v0, 0x7f1209bd
- const v1, 0x7f1209c2
+ const v1, 0x7f1209bc
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -2161,7 +2161,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209c4
+ const v1, 0x7f1209be
goto/16 :goto_0
@@ -2174,7 +2174,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209be
+ const v1, 0x7f1209b8
goto/16 :goto_0
@@ -2187,7 +2187,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209b1
+ const v1, 0x7f1209ab
goto/16 :goto_0
@@ -2231,27 +2231,27 @@
goto/16 :goto_0
:cond_a
- const v1, 0x7f1209d0
+ const v1, 0x7f1209ca
goto/16 :goto_0
:cond_b
- const v1, 0x7f1209cc
+ const v1, 0x7f1209c6
goto/16 :goto_0
:cond_c
- const v1, 0x7f1209ce
+ const v1, 0x7f1209c8
goto/16 :goto_0
:cond_d
- const v1, 0x7f1209cd
+ const v1, 0x7f1209c7
goto/16 :goto_0
:cond_e
- const v1, 0x7f1209cf
+ const v1, 0x7f1209c9
goto/16 :goto_0
@@ -2271,7 +2271,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209c1
+ const v1, 0x7f1209bb
goto/16 :goto_0
@@ -2284,7 +2284,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209a9
+ const v1, 0x7f1209a3
goto/16 :goto_0
@@ -2297,9 +2297,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209c6
+ const v0, 0x7f1209c0
- const v1, 0x7f1209c5
+ const v1, 0x7f1209bf
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -2316,7 +2316,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209bb
+ const v1, 0x7f1209b5
goto :goto_0
@@ -2329,9 +2329,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209b0
+ const v0, 0x7f1209aa
- const v1, 0x7f1209af
+ const v1, 0x7f1209a9
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -2371,17 +2371,17 @@
goto :goto_0
:cond_10
- const v1, 0x7f1209b8
+ const v1, 0x7f1209b2
goto :goto_0
:cond_11
- const v1, 0x7f1209ba
+ const v1, 0x7f1209b4
goto :goto_0
:cond_12
- const v1, 0x7f1209b9
+ const v1, 0x7f1209b3
goto :goto_0
@@ -2401,7 +2401,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209b2
+ const v1, 0x7f1209ac
:cond_14
:goto_0
@@ -2476,7 +2476,7 @@
if-eqz p1, :cond_a
- const v1, 0x7f1209db
+ const v1, 0x7f1209d5
goto :goto_0
@@ -2510,12 +2510,12 @@
goto :goto_0
:cond_3
- const v1, 0x7f1209d9
+ const v1, 0x7f1209d3
goto :goto_0
:cond_4
- const v1, 0x7f1209da
+ const v1, 0x7f1209d4
goto :goto_0
@@ -2551,14 +2551,14 @@
if-ne p1, v4, :cond_7
- const v1, 0x7f1209d8
+ const v1, 0x7f1209d2
goto :goto_0
:cond_7
if-nez p1, :cond_8
- const v1, 0x7f1209d7
+ const v1, 0x7f1209d1
goto :goto_0
@@ -2632,14 +2632,14 @@
if-ne p1, v0, :cond_1
- const p1, 0x7f1209e6
+ const p1, 0x7f1209e0
goto/16 :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1209e5
+ const p1, 0x7f1209df
goto/16 :goto_1
@@ -2684,12 +2684,12 @@
if-eqz p1, :cond_4
- const p1, 0x7f1209e1
+ const p1, 0x7f1209db
goto :goto_1
:cond_4
- const p1, 0x7f1209e2
+ const p1, 0x7f1209dc
goto :goto_1
@@ -2725,12 +2725,12 @@
if-eqz p1, :cond_6
- const p1, 0x7f1209e3
+ const p1, 0x7f1209dd
goto :goto_1
:cond_6
- const p1, 0x7f1209e4
+ const p1, 0x7f1209de
goto :goto_1
@@ -2750,7 +2750,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209de
+ const p1, 0x7f1209d8
goto :goto_1
@@ -2763,7 +2763,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209a9
+ const p1, 0x7f1209a3
goto :goto_1
@@ -2776,7 +2776,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209dd
+ const p1, 0x7f1209d7
goto :goto_1
@@ -3011,7 +3011,7 @@
move-result-object v0
- if-eqz v0, :cond_b
+ if-eqz v0, :cond_a
check-cast v0, Ljava/util/Collection;
@@ -3023,11 +3023,7 @@
if-eqz v1, :cond_0
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
-
- move-result v1
-
- invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
move-result-object v1
@@ -3046,12 +3042,33 @@
goto :goto_1
:cond_1
- invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
+ invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
- move-result v5
+ move-result v1
- if-ne v5, v4, :cond_3
+ if-eqz v1, :cond_3
+ if-eq v1, v4, :cond_2
+
+ :goto_1
+ move-object v2, v3
+
+ goto :goto_2
+
+ :cond_2
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
+
+ move-result-object p3
+
+ if-eqz p3, :cond_5
+
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getRoleName()Ljava/lang/String;
+
+ move-result-object v2
+
+ goto :goto_2
+
+ :cond_3
sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
invoke-interface {p4, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
@@ -3060,13 +3077,13 @@
check-cast p4, Ljava/util/Map;
- if-eqz p4, :cond_6
+ if-eqz p4, :cond_5
invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
move-result-object p3
- if-eqz p3, :cond_2
+ if-eqz p3, :cond_4
invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
@@ -3076,7 +3093,7 @@
move-result-object v2
- :cond_2
+ :cond_4
invoke-interface {p4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p3
@@ -3085,48 +3102,17 @@
check-cast v2, Ljava/lang/String;
- goto :goto_3
-
- :cond_3
- :goto_1
- if-nez v1, :cond_4
-
- goto :goto_2
-
- :cond_4
- invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
-
- move-result p4
-
- if-nez p4, :cond_5
-
- invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
-
- move-result-object p3
-
- if-eqz p3, :cond_6
-
- invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getRoleName()Ljava/lang/String;
-
- move-result-object v2
-
- goto :goto_3
-
:cond_5
:goto_2
- move-object v2, v3
-
- :cond_6
- :goto_3
invoke-virtual {p2}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getKey()Ljava/lang/String;
move-result-object p2
- if-nez p2, :cond_7
+ if-nez p2, :cond_6
- goto/16 :goto_4
+ goto/16 :goto_3
- :cond_7
+ :cond_6
invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
move-result p3
@@ -3141,24 +3127,24 @@
const/4 v7, 0x0
- if-eq p3, p4, :cond_9
+ if-eq p3, p4, :cond_8
const p4, 0x589a349
- if-eq p3, p4, :cond_8
+ if-eq p3, p4, :cond_7
- goto :goto_4
+ goto :goto_3
- :cond_8
+ :cond_7
const-string p3, "allow"
invoke-virtual {p2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p2
- if-eqz p2, :cond_a
+ if-eqz p2, :cond_9
- const p2, 0x7f12099d
+ const p2, 0x7f120997
new-array p3, v6, [Ljava/lang/Object;
@@ -3200,18 +3186,18 @@
invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- goto :goto_4
+ goto :goto_3
- :cond_9
+ :cond_8
const-string p3, "deny"
invoke-virtual {p2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p2
- if-eqz p2, :cond_a
+ if-eqz p2, :cond_9
- const p2, 0x7f12099c
+ const p2, 0x7f120996
new-array p3, v6, [Ljava/lang/Object;
@@ -3253,11 +3239,11 @@
invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- :cond_a
- :goto_4
+ :cond_9
+ :goto_3
return-object v3
- :cond_b
+ :cond_a
new-instance p1, Lkotlin/TypeCastException;
const-string p2, "null cannot be cast to non-null type kotlin.collections.Collection<*>"
@@ -3267,13 +3253,13 @@
throw p1
.end method
-.method private final getPermissionBits(J)Ljava/util/HashSet;
- .locals 7
+.method private final getPermissionBits(I)Ljava/util/HashSet;
+ .locals 4
.annotation system Ldalvik/annotation/Signature;
value = {
- "(J)",
+ "(I)",
"Ljava/util/HashSet<",
- "Ljava/lang/Long;",
+ "Ljava/lang/Integer;",
">;"
}
.end annotation
@@ -3285,21 +3271,19 @@
const/4 v1, 0x0
:goto_0
- const/16 v2, 0x3f
+ const/16 v2, 0x1f
if-gt v1, v2, :cond_1
- const-wide/16 v2, 0x1
+ const/4 v2, 0x1
- shl-long/2addr v2, v1
+ shl-int/2addr v2, v1
- and-long v4, p1, v2
+ and-int v3, p1, v2
- cmp-long v6, v4, v2
+ if-ne v3, v2, :cond_0
- if-nez v6, :cond_0
-
- invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v2
@@ -3580,14 +3564,14 @@
if-ne p1, v3, :cond_1
- const p1, 0x7f120a05
+ const p1, 0x7f1209ff
goto/16 :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f120a04
+ const p1, 0x7f1209fe
goto/16 :goto_1
@@ -3632,12 +3616,12 @@
if-nez p1, :cond_4
- const p1, 0x7f120a01
+ const p1, 0x7f1209fb
goto/16 :goto_1
:cond_4
- const p1, 0x7f1209ff
+ const p1, 0x7f1209f9
goto/16 :goto_1
@@ -3659,7 +3643,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f120a0b
+ const p1, 0x7f120a05
goto :goto_1
@@ -3686,14 +3670,14 @@
if-ne p1, v3, :cond_6
- const p1, 0x7f120a07
+ const p1, 0x7f120a01
goto :goto_1
:cond_6
if-nez p1, :cond_7
- const p1, 0x7f120a06
+ const p1, 0x7f120a00
goto :goto_1
@@ -3720,9 +3704,9 @@
if-eqz v0, :cond_9
- const v0, 0x7f120a09
+ const v0, 0x7f120a03
- const v1, 0x7f120a08
+ const v1, 0x7f120a02
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -3739,7 +3723,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f120a0a
+ const p1, 0x7f120a04
goto :goto_1
@@ -3752,7 +3736,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f1209a9
+ const p1, 0x7f1209a3
goto :goto_1
@@ -3788,7 +3772,7 @@
if-nez v2, :cond_0
- const p1, 0x7f1204f8
+ const p1, 0x7f1204f5
goto/16 :goto_0
@@ -3799,7 +3783,7 @@
if-nez v2, :cond_1
- const p1, 0x7f120de2
+ const p1, 0x7f120dd5
goto/16 :goto_0
@@ -3840,12 +3824,12 @@
if-ne p1, p2, :cond_4
- const p1, 0x7f120e69
+ const p1, 0x7f120e5c
goto/16 :goto_0
:cond_4
- const p1, 0x7f120e6b
+ const p1, 0x7f120e5e
goto/16 :goto_0
@@ -3856,7 +3840,7 @@
if-nez p3, :cond_6
- const p1, 0x7f120e77
+ const p1, 0x7f120e6a
goto/16 :goto_0
@@ -3867,7 +3851,7 @@
if-nez p3, :cond_7
- const p1, 0x7f1203df
+ const p1, 0x7f1203dd
goto/16 :goto_0
@@ -3878,7 +3862,7 @@
if-nez p3, :cond_8
- const p1, 0x7f120e71
+ const p1, 0x7f120e64
goto/16 :goto_0
@@ -3889,7 +3873,7 @@
if-nez p3, :cond_9
- const p1, 0x7f120e75
+ const p1, 0x7f120e68
goto/16 :goto_0
@@ -3900,7 +3884,7 @@
if-nez p3, :cond_a
- const p1, 0x7f120e7b
+ const p1, 0x7f120e6e
goto/16 :goto_0
@@ -3911,7 +3895,7 @@
if-nez p3, :cond_b
- const p1, 0x7f120e6d
+ const p1, 0x7f120e60
goto/16 :goto_0
@@ -3922,7 +3906,7 @@
if-nez p3, :cond_c
- const p1, 0x7f121799
+ const p1, 0x7f121787
goto/16 :goto_0
@@ -3933,7 +3917,7 @@
if-nez p3, :cond_d
- const p1, 0x7f1212fa
+ const p1, 0x7f1212eb
goto/16 :goto_0
@@ -3944,7 +3928,7 @@
if-nez p3, :cond_e
- const p1, 0x7f12142f
+ const p1, 0x7f12141f
goto/16 :goto_0
@@ -3955,7 +3939,7 @@
if-nez p3, :cond_f
- const p1, 0x7f121431
+ const p1, 0x7f121421
goto/16 :goto_0
@@ -3966,7 +3950,7 @@
if-nez p3, :cond_10
- const p1, 0x7f120e6e
+ const p1, 0x7f120e61
goto/16 :goto_0
@@ -3977,7 +3961,7 @@
if-nez p3, :cond_11
- const p1, 0x7f1205ee
+ const p1, 0x7f1205ea
goto/16 :goto_0
@@ -3999,7 +3983,7 @@
if-nez p3, :cond_13
- const p1, 0x7f1212f9
+ const p1, 0x7f1212ea
goto/16 :goto_0
@@ -4010,7 +3994,7 @@
if-nez p3, :cond_14
- const p1, 0x7f120eb3
+ const p1, 0x7f120ea6
goto/16 :goto_0
@@ -4021,7 +4005,7 @@
if-nez p3, :cond_15
- const p1, 0x7f121697
+ const p1, 0x7f121685
goto :goto_0
@@ -4043,7 +4027,7 @@
if-nez p3, :cond_17
- const p1, 0x7f120486
+ const p1, 0x7f120484
goto :goto_0
@@ -4054,7 +4038,7 @@
if-nez p3, :cond_18
- const p1, 0x7f1214a8
+ const p1, 0x7f121494
goto :goto_0
@@ -4065,7 +4049,7 @@
if-nez p3, :cond_19
- const p1, 0x7f120f2e
+ const p1, 0x7f120f1e
goto :goto_0
@@ -4076,7 +4060,7 @@
if-nez p3, :cond_1a
- const p1, 0x7f120556
+ const p1, 0x7f120553
goto :goto_0
@@ -4087,7 +4071,7 @@
if-nez p3, :cond_1b
- const p1, 0x7f120efb
+ const p1, 0x7f120eeb
goto :goto_0
@@ -4098,7 +4082,7 @@
if-nez p3, :cond_1c
- const p1, 0x7f12169b
+ const p1, 0x7f121689
goto :goto_0
@@ -4109,7 +4093,7 @@
if-nez p3, :cond_1d
- const p1, 0x7f121290
+ const p1, 0x7f121280
goto :goto_0
@@ -4120,7 +4104,7 @@
if-nez p3, :cond_1e
- const p1, 0x7f121789
+ const p1, 0x7f121777
goto :goto_0
@@ -4232,7 +4216,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209f9
+ const p1, 0x7f1209f3
goto/16 :goto_1
@@ -4245,19 +4229,19 @@
if-eqz v0, :cond_7
- const v0, 0x7f1209f2
+ const v0, 0x7f1209ec
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v3
- const v0, 0x7f1209f3
+ const v0, 0x7f1209ed
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v4
- const v0, 0x7f1209f4
+ const v0, 0x7f1209ee
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -4302,14 +4286,14 @@
if-ne p1, v3, :cond_1
- const p1, 0x7f1209f1
+ const p1, 0x7f1209eb
goto :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1209f0
+ const p1, 0x7f1209ea
goto :goto_1
@@ -4350,14 +4334,14 @@
if-ne p1, v3, :cond_4
- const p1, 0x7f1209ec
+ const p1, 0x7f1209e6
goto :goto_1
:cond_4
if-nez p1, :cond_5
- const p1, 0x7f1209eb
+ const p1, 0x7f1209e5
goto :goto_1
@@ -4384,7 +4368,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209f8
+ const p1, 0x7f1209f2
goto :goto_1
@@ -4397,7 +4381,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209a9
+ const p1, 0x7f1209a3
goto :goto_1
@@ -4410,7 +4394,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209f6
+ const p1, 0x7f1209f0
goto :goto_1
@@ -4464,7 +4448,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f120a0f
+ const p1, 0x7f120a09
goto :goto_1
@@ -4477,9 +4461,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120a15
+ const v0, 0x7f120a0f
- const v1, 0x7f120a14
+ const v1, 0x7f120a0e
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -4496,7 +4480,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f1209a9
+ const p1, 0x7f1209a3
goto :goto_1
@@ -4509,9 +4493,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120a11
+ const v0, 0x7f120a0b
- const v1, 0x7f120a10
+ const v1, 0x7f120a0a
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -5137,7 +5121,7 @@
.end method
.method private final transformPermissionChange(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Ljava/util/List;
- .locals 13
+ .locals 8
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -5153,7 +5137,7 @@
move-result-object v0
- instance-of v1, v0, Ljava/lang/String;
+ instance-of v1, v0, Ljava/lang/Long;
const/4 v2, 0x0
@@ -5162,139 +5146,142 @@
move-object v0, v2
:cond_0
- check-cast v0, Ljava/lang/String;
+ check-cast v0, Ljava/lang/Long;
- const-wide/16 v3, 0x0
+ const/4 v1, 0x0
if-eqz v0, :cond_1
- invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
- move-result-wide v0
+ move-result-wide v3
+
+ long-to-int v0, v3
goto :goto_0
:cond_1
- move-wide v0, v3
+ const/4 v0, 0x0
:goto_0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
move-result-object p1
- instance-of v5, p1, Ljava/lang/String;
+ instance-of v3, p1, Ljava/lang/Long;
- if-nez v5, :cond_2
+ if-nez v3, :cond_2
move-object p1, v2
:cond_2
- check-cast p1, Ljava/lang/String;
+ check-cast p1, Ljava/lang/Long;
if-eqz p1, :cond_3
- invoke-static {p1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
move-result-wide v3
- :cond_3
- not-long v5, v0
-
- and-long/2addr v5, v3
-
- not-long v3, v3
-
- and-long/2addr v0, v3
-
- new-instance p1, Ljava/util/HashSet;
-
- invoke-direct {p1}, Ljava/util/HashSet;->()V
-
- new-instance v3, Ljava/util/HashSet;
-
- invoke-direct {v3}, Ljava/util/HashSet;->()V
-
- const/4 v4, 0x0
-
- const/16 v7, 0x3f
-
- :goto_1
- if-gt v4, v7, :cond_6
-
- const-wide/16 v8, 0x1
-
- shl-long/2addr v8, v4
-
- and-long v10, v5, v8
-
- cmp-long v12, v10, v8
-
- if-nez v12, :cond_4
-
- invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v10
-
- invoke-virtual {p1, v10}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
-
- :cond_4
- and-long v10, v0, v8
-
- cmp-long v12, v10, v8
-
- if-nez v12, :cond_5
-
- invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v8
-
- invoke-virtual {v3, v8}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
-
- :cond_5
- add-int/lit8 v4, v4, 0x1
+ long-to-int p1, v3
goto :goto_1
+ :cond_3
+ const/4 p1, 0x0
+
+ :goto_1
+ not-int v3, v0
+
+ and-int/2addr v3, p1
+
+ not-int p1, p1
+
+ and-int/2addr p1, v0
+
+ new-instance v0, Ljava/util/HashSet;
+
+ invoke-direct {v0}, Ljava/util/HashSet;->()V
+
+ new-instance v4, Ljava/util/HashSet;
+
+ invoke-direct {v4}, Ljava/util/HashSet;->()V
+
+ const/16 v5, 0x1f
+
+ :goto_2
+ const/4 v6, 0x1
+
+ if-gt v1, v5, :cond_6
+
+ shl-int/2addr v6, v1
+
+ and-int v7, v3, v6
+
+ if-ne v7, v6, :cond_4
+
+ invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v7
+
+ invoke-virtual {v0, v7}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+ :cond_4
+ and-int v7, p1, v6
+
+ if-ne v7, v6, :cond_5
+
+ invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v6
+
+ invoke-virtual {v4, v6}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
+
+ :cond_5
+ add-int/lit8 v1, v1, 0x1
+
+ goto :goto_2
+
:cond_6
- new-instance v0, Ljava/util/ArrayList;
+ new-instance p1, Ljava/util/ArrayList;
- invoke-direct {v0}, Ljava/util/ArrayList;->()V
+ invoke-direct {p1}, Ljava/util/ArrayList;->()V
- invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
+ invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
move-result v1
- xor-int/lit8 v1, v1, 0x1
+ xor-int/2addr v1, v6
if-eqz v1, :cond_7
new-instance v1, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
- const-string v4, "allow"
+ const-string v3, "allow"
- invoke-direct {v1, v4, v2, p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+ invoke-direct {v1, v3, v2, v0}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
- invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
:cond_7
- invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
+ invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
- move-result p1
+ move-result v0
- xor-int/lit8 p1, p1, 0x1
+ xor-int/2addr v0, v6
- if-eqz p1, :cond_8
+ if-eqz v0, :cond_8
- new-instance p1, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
+ new-instance v0, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
const-string v1, "deny"
- invoke-direct {p1, v1, v2, v3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+ invoke-direct {v0, v1, v2, v4}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
- invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {p1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
:cond_8
- return-object v0
+ return-object p1
.end method
.method private final transformPermissionOverride(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Ljava/util/List;
@@ -5314,7 +5301,7 @@
move-result-object v0
- instance-of v1, v0, Ljava/lang/String;
+ instance-of v1, v0, Ljava/lang/Long;
const/4 v2, 0x0
@@ -5323,56 +5310,58 @@
move-object v0, v2
:cond_0
- check-cast v0, Ljava/lang/String;
+ check-cast v0, Ljava/lang/Long;
- const-string v1, "0"
+ const-wide/16 v3, 0x0
if-eqz v0, :cond_1
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v0
+
goto :goto_0
:cond_1
- move-object v0, v1
+ move-wide v0, v3
:goto_0
- sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
+ sget-object v5, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
- invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+ long-to-int v1, v0
- move-result-wide v4
-
- invoke-direct {v3, v4, v5}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(J)Ljava/util/HashSet;
+ invoke-direct {v5, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(I)Ljava/util/HashSet;
move-result-object v0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
- move-result-object v3
+ move-result-object v1
- instance-of v4, v3, Ljava/lang/String;
+ instance-of v5, v1, Ljava/lang/Long;
- if-nez v4, :cond_2
+ if-nez v5, :cond_2
goto :goto_1
:cond_2
- move-object v2, v3
+ move-object v2, v1
:goto_1
- check-cast v2, Ljava/lang/String;
+ check-cast v2, Ljava/lang/Long;
if-eqz v2, :cond_3
- move-object v1, v2
-
- :cond_3
- sget-object v2, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
-
- invoke-static {v1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
+ invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
move-result-wide v3
- invoke-direct {v2, v3, v4}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(J)Ljava/util/HashSet;
+ :cond_3
+ sget-object v1, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
+
+ long-to-int v2, v3
+
+ invoke-direct {v1, v2}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(I)Ljava/util/HashSet;
move-result-object v1
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
index e7faa4b78a..80c00bdc4a 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
@@ -95,32 +95,32 @@
invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
- const p1, 0x7f120a0e
+ const p1, 0x7f120a08
goto/16 :goto_0
:pswitch_0
- const p1, 0x7f12099a
-
- goto/16 :goto_0
-
- :pswitch_1
- const p1, 0x7f12099b
-
- goto/16 :goto_0
-
- :pswitch_2
- const p1, 0x7f120999
-
- goto/16 :goto_0
-
- :pswitch_3
const p1, 0x7f120994
goto/16 :goto_0
+ :pswitch_1
+ const p1, 0x7f120995
+
+ goto/16 :goto_0
+
+ :pswitch_2
+ const p1, 0x7f120993
+
+ goto/16 :goto_0
+
+ :pswitch_3
+ const p1, 0x7f12098e
+
+ goto/16 :goto_0
+
:pswitch_4
- const p1, 0x7f1209a7
+ const p1, 0x7f1209a1
goto/16 :goto_0
@@ -203,17 +203,17 @@
if-eq p1, v0, :cond_4
- const p1, 0x7f1209a2
+ const p1, 0x7f12099c
goto/16 :goto_0
:cond_4
- const p1, 0x7f120993
+ const p1, 0x7f12098d
goto/16 :goto_0
:cond_5
- const p1, 0x7f1209a8
+ const p1, 0x7f1209a2
goto/16 :goto_0
@@ -227,147 +227,147 @@
throw p1
:pswitch_6
- const p1, 0x7f120990
+ const p1, 0x7f12098a
goto/16 :goto_0
:pswitch_7
- const p1, 0x7f1209ed
+ const p1, 0x7f1209e7
goto/16 :goto_0
:pswitch_8
- const p1, 0x7f1209ef
-
- goto/16 :goto_0
-
- :pswitch_9
- const p1, 0x7f1209f7
-
- goto/16 :goto_0
-
- :pswitch_a
- const p1, 0x7f1209fa
-
- goto/16 :goto_0
-
- :pswitch_b
- const p1, 0x7f1209ea
-
- goto/16 :goto_0
-
- :pswitch_c
const p1, 0x7f1209e9
goto/16 :goto_0
+ :pswitch_9
+ const p1, 0x7f1209f1
+
+ goto/16 :goto_0
+
+ :pswitch_a
+ const p1, 0x7f1209f4
+
+ goto/16 :goto_0
+
+ :pswitch_b
+ const p1, 0x7f1209e4
+
+ goto/16 :goto_0
+
+ :pswitch_c
+ const p1, 0x7f1209e3
+
+ goto/16 :goto_0
+
:pswitch_d
- const p1, 0x7f1209f5
+ const p1, 0x7f1209ef
goto :goto_0
:pswitch_e
- const p1, 0x7f1209ee
+ const p1, 0x7f1209e8
goto :goto_0
:pswitch_f
- const p1, 0x7f120a03
-
- goto :goto_0
-
- :pswitch_10
- const p1, 0x7f120a0c
-
- goto :goto_0
-
- :pswitch_11
- const p1, 0x7f120a02
-
- goto :goto_0
-
- :pswitch_12
- const p1, 0x7f1209e0
-
- goto :goto_0
-
- :pswitch_13
- const p1, 0x7f1209e7
-
- goto :goto_0
-
- :pswitch_14
- const p1, 0x7f1209df
-
- goto :goto_0
-
- :pswitch_15
- const p1, 0x7f120a13
-
- goto :goto_0
-
- :pswitch_16
- const p1, 0x7f120a16
-
- goto :goto_0
-
- :pswitch_17
- const p1, 0x7f120a12
-
- goto :goto_0
-
- :pswitch_18
- const p1, 0x7f1209ab
-
- goto :goto_0
-
- :pswitch_19
- const p1, 0x7f1209ae
-
- goto :goto_0
-
- :pswitch_1a
- const p1, 0x7f1209aa
-
- goto :goto_0
-
- :pswitch_1b
- const p1, 0x7f1209fe
-
- goto :goto_0
-
- :pswitch_1c
const p1, 0x7f1209fd
goto :goto_0
- :pswitch_1d
- const p1, 0x7f1209fb
+ :pswitch_10
+ const p1, 0x7f120a06
goto :goto_0
- :pswitch_1e
+ :pswitch_11
const p1, 0x7f1209fc
goto :goto_0
+ :pswitch_12
+ const p1, 0x7f1209da
+
+ goto :goto_0
+
+ :pswitch_13
+ const p1, 0x7f1209e1
+
+ goto :goto_0
+
+ :pswitch_14
+ const p1, 0x7f1209d9
+
+ goto :goto_0
+
+ :pswitch_15
+ const p1, 0x7f120a0d
+
+ goto :goto_0
+
+ :pswitch_16
+ const p1, 0x7f120a10
+
+ goto :goto_0
+
+ :pswitch_17
+ const p1, 0x7f120a0c
+
+ goto :goto_0
+
+ :pswitch_18
+ const p1, 0x7f1209a5
+
+ goto :goto_0
+
+ :pswitch_19
+ const p1, 0x7f1209a8
+
+ goto :goto_0
+
+ :pswitch_1a
+ const p1, 0x7f1209a4
+
+ goto :goto_0
+
+ :pswitch_1b
+ const p1, 0x7f1209f8
+
+ goto :goto_0
+
+ :pswitch_1c
+ const p1, 0x7f1209f7
+
+ goto :goto_0
+
+ :pswitch_1d
+ const p1, 0x7f1209f5
+
+ goto :goto_0
+
+ :pswitch_1e
+ const p1, 0x7f1209f6
+
+ goto :goto_0
+
:pswitch_1f
- const p1, 0x7f1209d6
+ const p1, 0x7f1209d0
goto :goto_0
:pswitch_20
- const p1, 0x7f1209dc
+ const p1, 0x7f1209d6
goto :goto_0
:pswitch_21
- const p1, 0x7f1209d5
+ const p1, 0x7f1209cf
goto :goto_0
:cond_7
- const p1, 0x7f1209c7
+ const p1, 0x7f1209c1
:goto_0
return p1
@@ -1133,7 +1133,7 @@
if-gez v5, :cond_0
- const v1, 0x7f120a0d
+ const v1, 0x7f120a07
const/4 v2, 0x2
@@ -1226,182 +1226,182 @@
goto/16 :goto_0
:pswitch_0
- const p1, 0x7f120979
+ const p1, 0x7f120973
goto/16 :goto_0
:pswitch_1
- const p1, 0x7f12097a
-
- goto/16 :goto_0
-
- :pswitch_2
- const p1, 0x7f120978
-
- goto/16 :goto_0
-
- :pswitch_3
- const p1, 0x7f120989
-
- goto/16 :goto_0
-
- :pswitch_4
- const p1, 0x7f120988
-
- goto/16 :goto_0
-
- :pswitch_5
- const p1, 0x7f120986
-
- goto/16 :goto_0
-
- :pswitch_6
- const p1, 0x7f120987
-
- goto/16 :goto_0
-
- :pswitch_7
- const p1, 0x7f120975
-
- goto/16 :goto_0
-
- :pswitch_8
- const p1, 0x7f120976
-
- goto/16 :goto_0
-
- :pswitch_9
const p1, 0x7f120974
goto/16 :goto_0
+ :pswitch_2
+ const p1, 0x7f120972
+
+ goto/16 :goto_0
+
+ :pswitch_3
+ const p1, 0x7f120983
+
+ goto/16 :goto_0
+
+ :pswitch_4
+ const p1, 0x7f120982
+
+ goto/16 :goto_0
+
+ :pswitch_5
+ const p1, 0x7f120980
+
+ goto/16 :goto_0
+
+ :pswitch_6
+ const p1, 0x7f120981
+
+ goto/16 :goto_0
+
+ :pswitch_7
+ const p1, 0x7f12096f
+
+ goto/16 :goto_0
+
+ :pswitch_8
+ const p1, 0x7f120970
+
+ goto/16 :goto_0
+
+ :pswitch_9
+ const p1, 0x7f12096e
+
+ goto/16 :goto_0
+
:pswitch_a
- const p1, 0x7f12098e
+ const p1, 0x7f120988
goto/16 :goto_0
:pswitch_b
- const p1, 0x7f12098f
+ const p1, 0x7f120989
goto/16 :goto_0
:pswitch_c
- const p1, 0x7f12098d
+ const p1, 0x7f120987
goto/16 :goto_0
:pswitch_d
- const p1, 0x7f12097c
+ const p1, 0x7f120976
goto/16 :goto_0
:pswitch_e
- const p1, 0x7f12097d
-
- goto :goto_0
-
- :pswitch_f
- const p1, 0x7f12097b
-
- goto :goto_0
-
- :pswitch_10
- const p1, 0x7f12098b
-
- goto :goto_0
-
- :pswitch_11
- const p1, 0x7f12098c
-
- goto :goto_0
-
- :pswitch_12
- const p1, 0x7f12098a
-
- goto :goto_0
-
- :pswitch_13
- const p1, 0x7f12096d
-
- goto :goto_0
-
- :pswitch_14
- const p1, 0x7f120980
-
- goto :goto_0
-
- :pswitch_15
- const p1, 0x7f120982
-
- goto :goto_0
-
- :pswitch_16
- const p1, 0x7f120984
-
- goto :goto_0
-
- :pswitch_17
- const p1, 0x7f120985
-
- goto :goto_0
-
- :pswitch_18
- const p1, 0x7f12097f
-
- goto :goto_0
-
- :pswitch_19
- const p1, 0x7f12097e
-
- goto :goto_0
-
- :pswitch_1a
- const p1, 0x7f120983
-
- goto :goto_0
-
- :pswitch_1b
- const p1, 0x7f120981
-
- goto :goto_0
-
- :pswitch_1c
- const p1, 0x7f120971
-
- goto :goto_0
-
- :pswitch_1d
- const p1, 0x7f120972
-
- goto :goto_0
-
- :pswitch_1e
- const p1, 0x7f120970
-
- goto :goto_0
-
- :pswitch_1f
- const p1, 0x7f12096f
-
- goto :goto_0
-
- :pswitch_20
- const p1, 0x7f120973
-
- goto :goto_0
-
- :pswitch_21
- const p1, 0x7f12096e
-
- goto :goto_0
-
- :cond_0
const p1, 0x7f120977
goto :goto_0
+ :pswitch_f
+ const p1, 0x7f120975
+
+ goto :goto_0
+
+ :pswitch_10
+ const p1, 0x7f120985
+
+ goto :goto_0
+
+ :pswitch_11
+ const p1, 0x7f120986
+
+ goto :goto_0
+
+ :pswitch_12
+ const p1, 0x7f120984
+
+ goto :goto_0
+
+ :pswitch_13
+ const p1, 0x7f120967
+
+ goto :goto_0
+
+ :pswitch_14
+ const p1, 0x7f12097a
+
+ goto :goto_0
+
+ :pswitch_15
+ const p1, 0x7f12097c
+
+ goto :goto_0
+
+ :pswitch_16
+ const p1, 0x7f12097e
+
+ goto :goto_0
+
+ :pswitch_17
+ const p1, 0x7f12097f
+
+ goto :goto_0
+
+ :pswitch_18
+ const p1, 0x7f120979
+
+ goto :goto_0
+
+ :pswitch_19
+ const p1, 0x7f120978
+
+ goto :goto_0
+
+ :pswitch_1a
+ const p1, 0x7f12097d
+
+ goto :goto_0
+
+ :pswitch_1b
+ const p1, 0x7f12097b
+
+ goto :goto_0
+
+ :pswitch_1c
+ const p1, 0x7f12096b
+
+ goto :goto_0
+
+ :pswitch_1d
+ const p1, 0x7f12096c
+
+ goto :goto_0
+
+ :pswitch_1e
+ const p1, 0x7f12096a
+
+ goto :goto_0
+
+ :pswitch_1f
+ const p1, 0x7f120969
+
+ goto :goto_0
+
+ :pswitch_20
+ const p1, 0x7f12096d
+
+ goto :goto_0
+
+ :pswitch_21
+ const p1, 0x7f120968
+
+ goto :goto_0
+
+ :cond_0
+ const p1, 0x7f120971
+
+ goto :goto_0
+
:cond_1
- const p1, 0x7f120a8f
+ const p1, 0x7f120a88
:goto_0
return p1
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali
index 3f07d49b36..fbb1a955b1 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali
@@ -43,7 +43,7 @@
new-instance v0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
- const v1, 0x7f1203be
+ const v1, 0x7f1203bc
const-string v2, "missing_dependencies"
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali
index 73d3099423..ffb21d0bc8 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali
@@ -43,7 +43,7 @@
new-instance v0, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
- const v1, 0x7f1203bd
+ const v1, 0x7f1203bb
const-string v2, "expired"
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
index 13f1e48310..745db073ab 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
@@ -137,7 +137,7 @@
:cond_2
new-instance p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
- const p2, 0x7f1203bf
+ const p2, 0x7f1203bd
const-string p3, "unsupported_device"
@@ -298,19 +298,19 @@
invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v2, 0x7f1203c2
+ const v2, 0x7f1203c0
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f1203c3
+ const v2, 0x7f1203c1
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f1203c1
+ const v2, 0x7f1203bf
new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
@@ -320,7 +320,7 @@
move-result-object p1
- const p2, 0x7f1203b3
+ const p2, 0x7f1203b1
const/4 v1, 0x2
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
index 96dc7338da..06a46dfe08 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
@@ -394,7 +394,7 @@
:cond_0
if-eqz v0, :cond_6
- const p2, 0x7f121650
+ const p2, 0x7f12163f
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -405,7 +405,7 @@
:cond_1
if-eqz v0, :cond_6
- const p2, 0x7f120cea
+ const p2, 0x7f120cde
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -416,7 +416,7 @@
:cond_2
if-eqz v0, :cond_3
- const p2, 0x7f12058f
+ const p2, 0x7f12058c
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -436,7 +436,7 @@
:cond_4
if-eqz v0, :cond_5
- const p2, 0x7f120ce9
+ const p2, 0x7f120cdd
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/dsti/DstiUtils.smali b/com.discord/smali/com/discord/utilities/dsti/DstiUtils.smali
index 0d24dca112..ad5cff6001 100644
--- a/com.discord/smali/com/discord/utilities/dsti/DstiUtils.smali
+++ b/com.discord/smali/com/discord/utilities/dsti/DstiUtils.smali
@@ -41,7 +41,7 @@
"Lcom/discord/models/dsti/dto/ModelDsti;",
")",
"Lrx/Observable<",
- "Lcom/discord/utilities/file/DownloadUtils$DownloadState;",
+ "Lcom/discord/utilities/file/FileUtils$DownloadState;",
">;"
}
.end annotation
@@ -60,7 +60,7 @@
if-eq v0, v1, :cond_0
- new-instance p1, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;
+ new-instance p1, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;
new-instance v0, Ljava/lang/Exception;
@@ -82,7 +82,7 @@
invoke-direct {v0, p2}, Ljava/lang/Exception;->(Ljava/lang/String;)V
- invoke-direct {p1, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;->(Ljava/lang/Exception;)V
+ invoke-direct {p1, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;->(Ljava/lang/Exception;)V
new-instance p2, Lr0/l/e/j;
@@ -113,15 +113,15 @@
if-eqz v1, :cond_1
- new-instance p1, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;
+ new-instance p1, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;
- invoke-direct {p1, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;->(Ljava/io/File;)V
+ invoke-direct {p1, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;->(Ljava/io/File;)V
new-instance p2, Lr0/l/e/j;
invoke-direct {p2, p1}, Lr0/l/e/j;->(Ljava/lang/Object;)V
- const-string p1, "Observable.just(Download\u2026oadState.Completed(file))"
+ const-string p1, "Observable.just(FileUtil\u2026oadState.Completed(file))"
invoke-static {p2, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
@@ -144,7 +144,7 @@
invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {p1, v0, p2, v1}, Lcom/discord/utilities/file/DownloadUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
+ invoke-static {p1, v0, p2, v1}, Lcom/discord/utilities/file/FileUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
move-result-object p2
diff --git a/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali b/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali
index d612ffb379..0a14e9f883 100644
--- a/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali
@@ -23,7 +23,7 @@
if-gtz v3, :cond_0
- const p1, 0x7f120bd9
+ const p1, 0x7f120bce
invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -48,11 +48,11 @@
if-gtz v5, :cond_1
- const v1, 0x7f120bdd
+ const v1, 0x7f120bd2
new-array v2, v4, [Ljava/lang/Object;
- const v5, 0x7f10009b
+ const v5, 0x7f10009a
const-wide/16 v6, 0x3e8
@@ -92,11 +92,11 @@
if-gtz v7, :cond_2
- const v5, 0x7f120bdc
+ const v5, 0x7f120bd1
new-array v6, v4, [Ljava/lang/Object;
- const v7, 0x7f10009a
+ const v7, 0x7f100099
div-long/2addr p1, v1
@@ -131,11 +131,11 @@
if-gtz v7, :cond_3
- const v1, 0x7f120bdb
+ const v1, 0x7f120bd0
new-array v2, v4, [Ljava/lang/Object;
- const v7, 0x7f100099
+ const v7, 0x7f100098
div-long/2addr p1, v5
@@ -164,11 +164,11 @@
goto :goto_0
:cond_3
- const v5, 0x7f120bda
+ const v5, 0x7f120bcf
new-array v6, v4, [Ljava/lang/Object;
- const v7, 0x7f100098
+ const v7, 0x7f100097
div-long/2addr p1, v1
diff --git a/com.discord/smali/com/discord/utilities/error/Error$Response.smali b/com.discord/smali/com/discord/utilities/error/Error$Response.smali
index 73b03610c5..cd921462e9 100644
--- a/com.discord/smali/com/discord/utilities/error/Error$Response.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error$Response.smali
@@ -44,11 +44,6 @@
.field public retryAfter:I
-.field public skemaError:Lcom/discord/utilities/error/Error$SkemaError;
- .annotation build Landroidx/annotation/Nullable;
- .end annotation
-.end field
-
# direct methods
.method public constructor (Ljava/lang/String;)V
@@ -122,7 +117,7 @@
.end method
.method private getMessageToast(Landroid/content/Context;I)Ljava/lang/String;
- .locals 4
+ .locals 3
.param p2 # I
.annotation build Landroidx/annotation/StringRes;
.end annotation
@@ -152,46 +147,14 @@
return-object p1
:cond_0
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
+ iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
- if-eqz v0, :cond_3
+ if-eqz v0, :cond_1
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v0
-
- invoke-interface {v0}, Ljava/util/List;->isEmpty()Z
-
- move-result v0
-
- const/4 v1, 0x0
-
- if-nez v0, :cond_1
-
- iget-object p1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object p1
-
- invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
+ return-object v0
:cond_1
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$600(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/Map;
-
- move-result-object v0
+ iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
@@ -204,66 +167,9 @@
:cond_2
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
- move-result v2
-
- if-eqz v2, :cond_3
-
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v2
-
- check-cast v2, Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {v2}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v3
-
- invoke-interface {v3}, Ljava/util/List;->isEmpty()Z
-
- move-result v3
-
- if-nez v3, :cond_2
-
- invoke-static {v2}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object p1
-
- invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- :cond_3
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
-
- if-eqz v0, :cond_4
-
- return-object v0
-
- :cond_4
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
-
- invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
-
- move-result-object v0
-
- invoke-interface {v0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator;
-
- move-result-object v0
-
- :cond_5
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
move-result v1
- if-eqz v1, :cond_7
+ if-eqz v1, :cond_4
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -275,12 +181,12 @@
move-result-object v1
- :cond_6
+ :cond_3
invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
move-result v2
- if-eqz v2, :cond_5
+ if-eqz v2, :cond_2
invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -288,11 +194,11 @@
check-cast v2, Ljava/lang/String;
- if-eqz v2, :cond_6
+ if-eqz v2, :cond_3
return-object v2
- :cond_7
+ :cond_4
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object p1
@@ -303,7 +209,7 @@
# virtual methods
.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
- .locals 6
+ .locals 5
.annotation system Ldalvik/annotation/Throws;
value = {
Ljava/io/IOException;
@@ -318,13 +224,11 @@
move-result v1
- const/4 v2, 0x4
+ const/4 v2, 0x3
- const/4 v3, 0x3
+ const/4 v3, 0x2
- const/4 v4, 0x2
-
- const/4 v5, 0x1
+ const/4 v4, 0x1
sparse-switch v1, :sswitch_data_0
@@ -382,31 +286,16 @@
goto :goto_1
- :sswitch_4
- const-string v1, "errors"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-eqz v1, :cond_0
-
- const/4 v1, 0x4
-
- goto :goto_1
-
:cond_0
:goto_0
const/4 v1, -0x1
:goto_1
- if-eqz v1, :cond_8
+ if-eqz v1, :cond_4
- if-eq v1, v5, :cond_7
+ if-eq v1, v4, :cond_3
- if-eq v1, v4, :cond_6
-
- if-eq v1, v3, :cond_5
+ if-eq v1, v3, :cond_2
if-eq v1, v2, :cond_1
@@ -422,176 +311,9 @@
invoke-interface {v1, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- goto/16 :goto_5
-
- :cond_1
- new-instance v0, Lcom/discord/utilities/error/Error$SkemaError;
-
- const/4 v1, 0x0
-
- invoke-direct {v0, v1}, Lcom/discord/utilities/error/Error$SkemaError;->(Lcom/discord/utilities/error/Error$1;)V
-
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
-
- move-result-object p1
-
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaError;
-
- iput-object p1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object p1
-
- invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
-
- move-result p1
-
- if-nez p1, :cond_3
-
- new-instance p1, Ljava/util/ArrayList;
-
- invoke-direct {p1}, Ljava/util/ArrayList;->()V
-
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v0
-
- invoke-interface {v0}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
- move-result-object v0
-
- :goto_2
- invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v1
-
- if-eqz v1, :cond_2
-
- invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v1
-
- check-cast v1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-static {v1}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
-
- move-result-object v1
-
- invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
goto :goto_2
- :cond_2
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
-
- const-string v1, "_misc"
-
- invoke-interface {v0, v1, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- :cond_3
- iget-object p1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {p1}, Lcom/discord/utilities/error/Error$SkemaError;->access$600(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/Map;
-
- move-result-object p1
-
- invoke-interface {p1}, Ljava/util/Map;->entrySet()Ljava/util/Set;
-
- move-result-object p1
-
- invoke-interface {p1}, Ljava/util/Set;->iterator()Ljava/util/Iterator;
-
- move-result-object p1
-
- :goto_3
- invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v0
-
- if-eqz v0, :cond_9
-
- invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Ljava/util/Map$Entry;
-
- new-instance v1, Ljava/util/ArrayList;
-
- invoke-direct {v1}, Ljava/util/ArrayList;->()V
-
- invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object;
-
- move-result-object v2
-
- check-cast v2, Ljava/lang/String;
-
- invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v3
-
- invoke-interface {v3}, Ljava/util/List;->isEmpty()Z
-
- move-result v3
-
- if-nez v3, :cond_4
-
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
-
- move-result-object v3
-
- invoke-interface {v3}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
- move-result-object v3
-
- :goto_4
- invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v4
-
- if-eqz v4, :cond_4
-
- invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v4
-
- check-cast v4, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-static {v4}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
-
- move-result-object v4
-
- invoke-virtual {v1, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
- goto :goto_4
-
- :cond_4
- invoke-static {v0}, Lcom/discord/utilities/error/Error$SkemaError;->access$600(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/Map;
-
- move-result-object v0
-
- invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set;
-
- move-result-object v0
-
- invoke-virtual {v1, v0}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
-
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
-
- invoke-interface {v0, v2, v1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- goto :goto_3
-
- :cond_5
+ :cond_1
iget-boolean v0, p0, Lcom/discord/utilities/error/Error$Response;->global:Z
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z
@@ -600,9 +322,9 @@
iput-boolean p1, p0, Lcom/discord/utilities/error/Error$Response;->global:Z
- goto :goto_5
+ goto :goto_2
- :cond_6
+ :cond_2
iget v0, p0, Lcom/discord/utilities/error/Error$Response;->retryAfter:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -611,9 +333,9 @@
iput p1, p0, Lcom/discord/utilities/error/Error$Response;->retryAfter:I
- goto :goto_5
+ goto :goto_2
- :cond_7
+ :cond_3
iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -622,9 +344,9 @@
iput-object p1, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
- goto :goto_5
+ goto :goto_2
- :cond_8
+ :cond_4
iget v0, p0, Lcom/discord/utilities/error/Error$Response;->code:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -633,15 +355,13 @@
iput p1, p0, Lcom/discord/utilities/error/Error$Response;->code:I
- :cond_9
- :goto_5
+ :goto_2
return-void
nop
:sswitch_data_0
.sparse-switch
- -0x4d2a9095 -> :sswitch_4
-0x4a16fc5d -> :sswitch_3
-0x3771127b -> :sswitch_2
0x2eaded -> :sswitch_1
@@ -734,9 +454,13 @@
return v2
:cond_6
- iget-object v1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
+ invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
- iget-object v3, p1, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
+
+ move-result-object v3
if-nez v1, :cond_7
@@ -745,7 +469,7 @@
goto :goto_1
:cond_7
- invoke-virtual {v1, v3}, Lcom/discord/utilities/error/Error$SkemaError;->equals(Ljava/lang/Object;)Z
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result v1
@@ -755,31 +479,6 @@
return v2
:cond_8
- invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
-
- move-result-object v1
-
- invoke-virtual {p1}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
-
- move-result-object v3
-
- if-nez v1, :cond_9
-
- if-eqz v3, :cond_a
-
- goto :goto_2
-
- :cond_9
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_a
-
- :goto_2
- return v2
-
- :cond_a
invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
move-result-object v1
@@ -788,23 +487,23 @@
move-result-object p1
- if-nez v1, :cond_b
+ if-nez v1, :cond_9
- if-eqz p1, :cond_c
+ if-eqz p1, :cond_a
- goto :goto_3
+ goto :goto_2
- :cond_b
+ :cond_9
invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result p1
- if-nez p1, :cond_c
+ if-nez p1, :cond_a
- :goto_3
+ :goto_2
return v2
- :cond_c
+ :cond_a
return v0
.end method
@@ -916,7 +615,9 @@
:goto_1
add-int/2addr v0, v1
- iget-object v1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
+ invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
+
+ move-result-object v1
mul-int/lit8 v0, v0, 0x3b
@@ -927,31 +628,11 @@
goto :goto_2
:cond_2
- invoke-virtual {v1}, Lcom/discord/utilities/error/Error$SkemaError;->hashCode()I
-
- move-result v1
-
- :goto_2
- add-int/2addr v0, v1
-
- invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
-
- move-result-object v1
-
- mul-int/lit8 v0, v0, 0x3b
-
- if-nez v1, :cond_3
-
- const/16 v1, 0x2b
-
- goto :goto_3
-
- :cond_3
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
move-result v1
- :goto_3
+ :goto_2
add-int/2addr v0, v1
invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
@@ -960,16 +641,16 @@
mul-int/lit8 v0, v0, 0x3b
- if-nez v1, :cond_4
+ if-nez v1, :cond_3
- goto :goto_4
+ goto :goto_3
- :cond_4
+ :cond_3
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
move-result v2
- :goto_4
+ :goto_3
add-int/2addr v0, v2
return v0
@@ -1038,14 +719,6 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
- const-string v1, ", skemaError="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
const-string v1, ", messages="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/utilities/error/Error$SkemaError.smali b/com.discord/smali/com/discord/utilities/error/Error$SkemaError.smali
deleted file mode 100644
index d2e5ddd806..0000000000
--- a/com.discord/smali/com/discord/utilities/error/Error$SkemaError.smali
+++ /dev/null
@@ -1,319 +0,0 @@
-.class public Lcom/discord/utilities/error/Error$SkemaError;
-.super Ljava/lang/Object;
-.source "Error.java"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/error/Error;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x9
- name = "SkemaError"
-.end annotation
-
-
-# instance fields
-.field public errors:Ljava/util/List;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
-
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/util/List<",
- "Lcom/discord/utilities/error/Error$SkemaErrorItem;",
- ">;"
- }
- .end annotation
-.end field
-
-.field public subErrors:Ljava/util/Map;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
-
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/util/Map<",
- "Ljava/lang/String;",
- "Lcom/discord/utilities/error/Error$SkemaError;",
- ">;"
- }
- .end annotation
-.end field
-
-
-# direct methods
-.method public constructor ()V
- .locals 1
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- invoke-static {}, Ljava/util/Collections;->emptyList()Ljava/util/List;
-
- move-result-object v0
-
- iput-object v0, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- new-instance v0, Ljava/util/HashMap;
-
- invoke-direct {v0}, Ljava/util/HashMap;->()V
-
- iput-object v0, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- return-void
-.end method
-
-.method public synthetic constructor (Lcom/discord/utilities/error/Error$1;)V
- .locals 0
-
- invoke-direct {p0}, Lcom/discord/utilities/error/Error$SkemaError;->()V
-
- return-void
-.end method
-
-.method public static synthetic a(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/utilities/error/Error$SkemaErrorItem;
- .locals 2
- .annotation system Ldalvik/annotation/Throws;
- value = {
- Ljava/io/IOException;
- }
- .end annotation
-
- new-instance v0, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- const/4 v1, 0x0
-
- invoke-direct {v0, v1}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->(Lcom/discord/utilities/error/Error$1;)V
-
- invoke-virtual {p0, v0}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
-
- move-result-object p0
-
- check-cast p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- return-object p0
-.end method
-
-.method public static synthetic access$400(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/List;
- .locals 0
-
- iget-object p0, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- return-object p0
-.end method
-
-.method public static synthetic access$600(Lcom/discord/utilities/error/Error$SkemaError;)Ljava/util/Map;
- .locals 0
-
- iget-object p0, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- return-object p0
-.end method
-
-
-# virtual methods
-.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
- .locals 3
- .annotation system Ldalvik/annotation/Throws;
- value = {
- Ljava/io/IOException;
- }
- .end annotation
-
- invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextName()Ljava/lang/String;
-
- move-result-object v0
-
- const-string v1, "_errors"
-
- invoke-virtual {v1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-eqz v1, :cond_0
-
- new-instance v0, Lf/a/m/a/b;
-
- invoke-direct {v0, p1}, Lf/a/m/a/b;->(Lcom/discord/models/domain/Model$JsonReader;)V
-
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextList(Lcom/discord/models/domain/Model$JsonReader$ItemFactory;)Ljava/util/List;
-
- move-result-object p1
-
- iput-object p1, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- goto :goto_0
-
- :cond_0
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- new-instance v2, Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-direct {v2}, Lcom/discord/utilities/error/Error$SkemaError;->()V
-
- invoke-virtual {p1, v2}, Lcom/discord/models/domain/Model$JsonReader;->parse(Lcom/discord/models/domain/Model;)Lcom/discord/models/domain/Model;
-
- move-result-object p1
-
- invoke-interface {v1, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
- :goto_0
- return-void
-.end method
-
-.method public canEqual(Ljava/lang/Object;)Z
- .locals 0
-
- instance-of p1, p1, Lcom/discord/utilities/error/Error$SkemaError;
-
- return p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
- .locals 4
-
- const/4 v0, 0x1
-
- if-ne p1, p0, :cond_0
-
- return v0
-
- :cond_0
- instance-of v1, p1, Lcom/discord/utilities/error/Error$SkemaError;
-
- const/4 v2, 0x0
-
- if-nez v1, :cond_1
-
- return v2
-
- :cond_1
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaError;
-
- invoke-virtual {p1, p0}, Lcom/discord/utilities/error/Error$SkemaError;->canEqual(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_2
-
- return v2
-
- :cond_2
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- iget-object v3, p1, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- if-nez v1, :cond_3
-
- if-eqz v3, :cond_4
-
- goto :goto_0
-
- :cond_3
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_4
-
- :goto_0
- return v2
-
- :cond_4
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- iget-object p1, p1, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- if-nez v1, :cond_5
-
- if-eqz p1, :cond_6
-
- goto :goto_1
-
- :cond_5
- invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result p1
-
- if-nez p1, :cond_6
-
- :goto_1
- return v2
-
- :cond_6
- return v0
-.end method
-
-.method public hashCode()I
- .locals 4
-
- iget-object v0, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- const/16 v1, 0x2b
-
- if-nez v0, :cond_0
-
- const/16 v0, 0x2b
-
- goto :goto_0
-
- :cond_0
- invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
- move-result v0
-
- :goto_0
- const/16 v2, 0x3b
-
- add-int/2addr v0, v2
-
- iget-object v3, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- mul-int/lit8 v0, v0, 0x3b
-
- if-nez v3, :cond_1
-
- goto :goto_1
-
- :cond_1
- invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
-
- move-result v1
-
- :goto_1
- add-int/2addr v0, v1
-
- return v0
-.end method
-
-.method public toString()Ljava/lang/String;
- .locals 3
-
- const-string v0, "Error.SkemaError(errors="
-
- invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- move-result-object v0
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->errors:Ljava/util/List;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
- const-string v1, ", subErrors="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaError;->subErrors:Ljava/util/Map;
-
- const-string v2, ")"
-
- invoke-static {v0, v1, v2}, Lf/e/b/a/a;->y(Ljava/lang/StringBuilder;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object v0
-
- return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/error/Error$SkemaErrorItem.smali b/com.discord/smali/com/discord/utilities/error/Error$SkemaErrorItem.smali
deleted file mode 100644
index d4246ea9e3..0000000000
--- a/com.discord/smali/com/discord/utilities/error/Error$SkemaErrorItem.smali
+++ /dev/null
@@ -1,293 +0,0 @@
-.class public Lcom/discord/utilities/error/Error$SkemaErrorItem;
-.super Ljava/lang/Object;
-.source "Error.java"
-
-# interfaces
-.implements Lcom/discord/models/domain/Model;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/error/Error;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x9
- name = "SkemaErrorItem"
-.end annotation
-
-
-# instance fields
-.field public code:Ljava/lang/String;
-
-.field public message:Ljava/lang/String;
-
-
-# direct methods
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-.method public synthetic constructor (Lcom/discord/utilities/error/Error$1;)V
- .locals 0
-
- invoke-direct {p0}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->()V
-
- return-void
-.end method
-
-.method public static synthetic access$500(Lcom/discord/utilities/error/Error$SkemaErrorItem;)Ljava/lang/String;
- .locals 0
-
- iget-object p0, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- return-object p0
-.end method
-
-
-# virtual methods
-.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
- .locals 4
- .annotation system Ldalvik/annotation/Throws;
- value = {
- Ljava/io/IOException;
- }
- .end annotation
-
- invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextName()Ljava/lang/String;
-
- move-result-object v0
-
- invoke-virtual {v0}, Ljava/lang/String;->hashCode()I
-
- move-result v1
-
- const v2, 0x2eaded
-
- const/4 v3, 0x1
-
- if-eq v1, v2, :cond_1
-
- const v2, 0x38eb0007
-
- if-eq v1, v2, :cond_0
-
- goto :goto_0
-
- :cond_0
- const-string v1, "message"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_2
-
- const/4 v0, 0x1
-
- goto :goto_1
-
- :cond_1
- const-string v1, "code"
-
- invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_2
-
- const/4 v0, 0x0
-
- goto :goto_1
-
- :cond_2
- :goto_0
- const/4 v0, -0x1
-
- :goto_1
- const/4 v1, 0x0
-
- if-eqz v0, :cond_4
-
- if-eq v0, v3, :cond_3
-
- invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->skipValue()V
-
- goto :goto_2
-
- :cond_3
- invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object p1
-
- iput-object p1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- goto :goto_2
-
- :cond_4
- invoke-virtual {p1, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object p1
-
- iput-object p1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- :goto_2
- return-void
-.end method
-
-.method public canEqual(Ljava/lang/Object;)Z
- .locals 0
-
- instance-of p1, p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- return p1
-.end method
-
-.method public equals(Ljava/lang/Object;)Z
- .locals 4
-
- const/4 v0, 0x1
-
- if-ne p1, p0, :cond_0
-
- return v0
-
- :cond_0
- instance-of v1, p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- const/4 v2, 0x0
-
- if-nez v1, :cond_1
-
- return v2
-
- :cond_1
- check-cast p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;
-
- invoke-virtual {p1, p0}, Lcom/discord/utilities/error/Error$SkemaErrorItem;->canEqual(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_2
-
- return v2
-
- :cond_2
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- iget-object v3, p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- if-nez v1, :cond_3
-
- if-eqz v3, :cond_4
-
- goto :goto_0
-
- :cond_3
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_4
-
- :goto_0
- return v2
-
- :cond_4
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- iget-object p1, p1, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- if-nez v1, :cond_5
-
- if-eqz p1, :cond_6
-
- goto :goto_1
-
- :cond_5
- invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result p1
-
- if-nez p1, :cond_6
-
- :goto_1
- return v2
-
- :cond_6
- return v0
-.end method
-
-.method public hashCode()I
- .locals 4
-
- iget-object v0, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- const/16 v1, 0x2b
-
- if-nez v0, :cond_0
-
- const/16 v0, 0x2b
-
- goto :goto_0
-
- :cond_0
- invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
- move-result v0
-
- :goto_0
- const/16 v2, 0x3b
-
- add-int/2addr v0, v2
-
- iget-object v3, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- mul-int/lit8 v0, v0, 0x3b
-
- if-nez v3, :cond_1
-
- goto :goto_1
-
- :cond_1
- invoke-virtual {v3}, Ljava/lang/Object;->hashCode()I
-
- move-result v1
-
- :goto_1
- add-int/2addr v0, v1
-
- return v0
-.end method
-
-.method public toString()Ljava/lang/String;
- .locals 3
-
- const-string v0, "Error.SkemaErrorItem(code="
-
- invoke-static {v0}, Lf/e/b/a/a;->D(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- move-result-object v0
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->code:Ljava/lang/String;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- const-string v1, ", message="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/utilities/error/Error$SkemaErrorItem;->message:Ljava/lang/String;
-
- const-string v2, ")"
-
- invoke-static {v0, v1, v2}, Lf/e/b/a/a;->v(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object v0
-
- return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index a9630965f5..926d8370f2 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -7,8 +7,6 @@
.annotation system Ldalvik/annotation/MemberClasses;
value = {
Lcom/discord/utilities/error/Error$Response;,
- Lcom/discord/utilities/error/Error$SkemaError;,
- Lcom/discord/utilities/error/Error$SkemaErrorItem;,
Lcom/discord/utilities/error/Error$Type;
}
.end annotation
@@ -671,7 +669,7 @@
packed-switch v0, :pswitch_data_0
:pswitch_0
- const v0, 0x7f120f44
+ const v0, 0x7f120f34
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -684,7 +682,7 @@
return-object p1
:pswitch_1
- const v0, 0x7f120ce2
+ const v0, 0x7f120cd7
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -697,7 +695,7 @@
return-object p1
:pswitch_2
- const v0, 0x7f120f43
+ const v0, 0x7f120f33
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -710,7 +708,7 @@
return-object p1
:pswitch_3
- const v0, 0x7f120f40
+ const v0, 0x7f120f30
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -723,7 +721,7 @@
return-object p1
:pswitch_4
- const v0, 0x7f1215b8
+ const v0, 0x7f1215a4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -736,7 +734,7 @@
return-object p1
:pswitch_5
- const v0, 0x7f120f42
+ const v0, 0x7f120f32
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -749,7 +747,7 @@
return-object p1
:pswitch_6
- const v0, 0x7f120f3e
+ const v0, 0x7f120f2e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -764,7 +762,7 @@
:pswitch_7
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f3b
+ const v1, 0x7f120f2b
invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
@@ -779,7 +777,7 @@
:pswitch_8
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f3f
+ const v1, 0x7f120f2f
invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
@@ -792,7 +790,7 @@
return-object p1
:pswitch_9
- const v0, 0x7f1212ec
+ const v0, 0x7f1212dd
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -805,7 +803,7 @@
return-object p1
:pswitch_a
- const v0, 0x7f120f3d
+ const v0, 0x7f120f2d
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -818,7 +816,7 @@
return-object p1
:pswitch_b
- const v0, 0x7f120f3c
+ const v0, 0x7f120f2c
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -833,7 +831,7 @@
:pswitch_c
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f41
+ const v1, 0x7f120f31
invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.smali b/com.discord/smali/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.smali
index 151b0c62c9..7683821b67 100644
--- a/com.discord/smali/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.smali
+++ b/com.discord/smali/com/discord/utilities/extensions/SimpleDraweeViewExtensionsKt.smali
@@ -56,7 +56,7 @@
if-eqz p1, :cond_1
- const p2, 0x7f120bd5
+ const p2, 0x7f120bca
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index 653272e471..b0857ce8f1 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -1408,7 +1408,7 @@
if-eqz p2, :cond_1
- const v1, 0x7f120d80
+ const v1, 0x7f120d73
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1427,7 +1427,7 @@
goto :goto_0
:cond_1
- const v1, 0x7f12055b
+ const v1, 0x7f120558
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1572,7 +1572,7 @@
if-eqz v0, :cond_c
- const v0, 0x7f121091
+ const v0, 0x7f121081
new-array v1, v7, [Ljava/lang/Object;
@@ -1632,7 +1632,7 @@
if-ne v1, v5, :cond_1
- const v0, 0x7f120fe6
+ const v0, 0x7f120fd5
new-array v1, v5, [Ljava/lang/Object;
@@ -1653,7 +1653,7 @@
:cond_1
if-ne v1, v7, :cond_2
- const v0, 0x7f120fe4
+ const v0, 0x7f120fd3
new-array v1, v5, [Ljava/lang/Object;
@@ -1723,7 +1723,7 @@
if-ne v1, v5, :cond_6
- const v0, 0x7f120fec
+ const v0, 0x7f120fdb
new-array v1, v5, [Ljava/lang/Object;
@@ -1744,7 +1744,7 @@
:cond_6
if-ne v1, v7, :cond_7
- const v0, 0x7f120fea
+ const v0, 0x7f120fd9
new-array v1, v5, [Ljava/lang/Object;
@@ -1801,7 +1801,7 @@
if-nez v0, :cond_c
- const v0, 0x7f120fe2
+ const v0, 0x7f120fd0
new-array v1, v5, [Ljava/lang/Object;
@@ -1828,7 +1828,7 @@
if-eqz v0, :cond_c
- const v0, 0x7f120819
+ const v0, 0x7f120815
new-array v1, v7, [Ljava/lang/Object;
@@ -1860,7 +1860,7 @@
goto :goto_2
:cond_a
- const v0, 0x7f120fef
+ const v0, 0x7f120fde
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1869,7 +1869,7 @@
goto :goto_1
:cond_b
- const v0, 0x7f120fe0
+ const v0, 0x7f120fce
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2208,7 +2208,7 @@
invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;->(Ljava/lang/String;)V
- const v0, 0x7f12142d
+ const v0, 0x7f12141d
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2256,7 +2256,7 @@
const v3, 0x7f0803e9
- const v4, 0x7f120ff0
+ const v4, 0x7f120fdf
invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2726,7 +2726,7 @@
const v2, 0x7f080286
- const v3, 0x7f120e7e
+ const v3, 0x7f120e71
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3141,7 +3141,7 @@
goto :goto_0
:cond_0
- const v1, 0x7f1205aa
+ const v1, 0x7f1205a5
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3509,7 +3509,7 @@
const v0, 0x7f08038a
- const v1, 0x7f120fed
+ const v1, 0x7f120fdc
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3579,7 +3579,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120c64
+ const v0, 0x7f120c59
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3701,7 +3701,7 @@
if-nez v0, :cond_4
- const v0, 0x7f120ff5
+ const v0, 0x7f120fe4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3718,7 +3718,7 @@
if-eqz v0, :cond_4
- const v0, 0x7f12081a
+ const v0, 0x7f120816
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
index 94a8e85e41..d32814e5a7 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -798,7 +798,7 @@
invoke-direct {v0}, Landroidx/core/app/Person$Builder;->()V
- const v1, 0x7f120ea7
+ const v1, 0x7f120e9a
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1167,12 +1167,12 @@
if-eqz p5, :cond_0
- const v2, 0x7f120ff2
+ const v2, 0x7f120fe1
goto :goto_0
:cond_0
- const v2, 0x7f120ff1
+ const v2, 0x7f120fe0
:goto_0
sget-object v3, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
@@ -1314,7 +1314,7 @@
new-instance v2, Landroid/app/NotificationChannel;
- const v3, 0x7f1217a4
+ const v3, 0x7f121792
invoke-virtual {p1, v3}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1328,7 +1328,7 @@
new-instance v3, Landroid/app/NotificationChannel;
- const v5, 0x7f120ed7
+ const v5, 0x7f120ec8
invoke-virtual {p1, v5}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1340,7 +1340,7 @@
new-instance v5, Landroid/app/NotificationChannel;
- const v7, 0x7f120592
+ const v7, 0x7f12058d
invoke-virtual {p1, v7}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1352,7 +1352,7 @@
new-instance v7, Landroid/app/NotificationChannel;
- const v8, 0x7f1207b0
+ const v8, 0x7f1207ac
invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1364,7 +1364,7 @@
new-instance v8, Landroid/app/NotificationChannel;
- const v9, 0x7f1207f9
+ const v9, 0x7f1207f5
invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$InProgress.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$InProgress.smali
deleted file mode 100644
index 3dbe004f47..0000000000
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$InProgress.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;
-.super Lcom/discord/utilities/file/DownloadUtils$DownloadState;
-.source "DownloadUtils.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/file/DownloadUtils$DownloadState;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = "InProgress"
-.end annotation
-
-
-# instance fields
-.field public final progress:F
-
-
-# direct methods
-.method public constructor (F)V
- .locals 1
-
- const/4 v0, 0x0
-
- invoke-direct {p0, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
- iput p1, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;->progress:F
-
- return-void
-.end method
-
-
-# virtual methods
-.method public final getProgress()F
- .locals 1
-
- iget v0, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;->progress:F
-
- return v0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Completed.smali
similarity index 51%
rename from com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali
rename to com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Completed.smali
index d01b831b97..1450f4144a 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali
+++ b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Completed.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;
-.super Lcom/discord/utilities/file/DownloadUtils$DownloadState;
-.source "DownloadUtils.kt"
+.class public final Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;
+.super Lcom/discord/utilities/file/FileUtils$DownloadState;
+.source "FileUtils.kt"
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/file/DownloadUtils$DownloadState;
+ value = Lcom/discord/utilities/file/FileUtils$DownloadState;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -26,9 +26,9 @@
if-eqz p1, :cond_0
- invoke-direct {p0, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct {p0, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
- iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;->file:Ljava/io/File;
+ iput-object p1, p0, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;->file:Ljava/io/File;
return-void
@@ -45,7 +45,7 @@
.method public final getFile()Ljava/io/File;
.locals 1
- iget-object v0, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;->file:Ljava/io/File;
+ iget-object v0, p0, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;->file:Ljava/io/File;
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Failure.smali
similarity index 51%
rename from com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali
rename to com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Failure.smali
index 1e0f05109d..04cb8ebca6 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali
+++ b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Failure.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;
-.super Lcom/discord/utilities/file/DownloadUtils$DownloadState;
-.source "DownloadUtils.kt"
+.class public final Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;
+.super Lcom/discord/utilities/file/FileUtils$DownloadState;
+.source "FileUtils.kt"
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/file/DownloadUtils$DownloadState;
+ value = Lcom/discord/utilities/file/FileUtils$DownloadState;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -26,9 +26,9 @@
if-eqz p1, :cond_0
- invoke-direct {p0, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct {p0, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
- iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;->exception:Ljava/lang/Exception;
+ iput-object p1, p0, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;->exception:Ljava/lang/Exception;
return-void
@@ -45,7 +45,7 @@
.method public final getException()Ljava/lang/Exception;
.locals 1
- iget-object v0, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;->exception:Ljava/lang/Exception;
+ iget-object v0, p0, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;->exception:Ljava/lang/Exception;
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$InProgress.smali b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$InProgress.smali
new file mode 100644
index 0000000000..d643d40a67
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$InProgress.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;
+.super Lcom/discord/utilities/file/FileUtils$DownloadState;
+.source "FileUtils.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/utilities/file/FileUtils$DownloadState;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "InProgress"
+.end annotation
+
+
+# instance fields
+.field public final progress:F
+
+
+# direct methods
+.method public constructor (F)V
+ .locals 1
+
+ const/4 v0, 0x0
+
+ invoke-direct {p0, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ iput p1, p0, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;->progress:F
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final getProgress()F
+ .locals 1
+
+ iget v0, p0, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;->progress:F
+
+ return v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState.smali b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState.smali
similarity index 56%
rename from com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState.smali
rename to com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState.smali
index fafd890a20..756af936de 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState.smali
+++ b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState.smali
@@ -1,11 +1,11 @@
-.class public abstract Lcom/discord/utilities/file/DownloadUtils$DownloadState;
+.class public abstract Lcom/discord/utilities/file/FileUtils$DownloadState;
.super Ljava/lang/Object;
-.source "DownloadUtils.kt"
+.source "FileUtils.kt"
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/file/DownloadUtils;
+ value = Lcom/discord/utilities/file/FileUtils;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -15,9 +15,9 @@
.annotation system Ldalvik/annotation/MemberClasses;
value = {
- Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;,
- Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;,
- Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;
+ Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;,
+ Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;,
+ Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;
}
.end annotation
@@ -34,7 +34,7 @@
.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V
.locals 0
- invoke-direct {p0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;->()V
+ invoke-direct {p0}, Lcom/discord/utilities/file/FileUtils$DownloadState;->()V
return-void
.end method
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali b/com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1$1.smali
similarity index 55%
rename from com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali
rename to com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1$1.smali
index 724c408bc7..746ca151b0 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1$1.smali
@@ -1,6 +1,6 @@
-.class public final Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;
+.class public final Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;
.super Ljava/lang/Object;
-.source "DownloadUtils.kt"
+.source "FileUtils.kt"
# interfaces
.implements Lrx/functions/Action1;
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->call(Lrx/Emitter;)V
+ value = Lcom/discord/utilities/file/FileUtils$downloadFile$1;->call(Lrx/Emitter;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -32,16 +32,16 @@
# instance fields
.field public final synthetic $emitter:Lrx/Emitter;
-.field public final synthetic this$0:Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
+.field public final synthetic this$0:Lcom/discord/utilities/file/FileUtils$downloadFile$1;
# direct methods
-.method public constructor (Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;Lrx/Emitter;)V
+.method public constructor (Lcom/discord/utilities/file/FileUtils$downloadFile$1;Lrx/Emitter;)V
.locals 0
- iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
+ iput-object p1, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/FileUtils$downloadFile$1;
- iput-object p2, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iput-object p2, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -55,7 +55,7 @@
check-cast p1, Lokhttp3/ResponseBody;
- invoke-virtual {p0, p1}, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->call(Lokhttp3/ResponseBody;)V
+ invoke-virtual {p0, p1}, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->call(Lokhttp3/ResponseBody;)V
return-void
.end method
@@ -66,13 +66,13 @@
:try_start_0
new-instance v0, Ljava/io/File;
- iget-object v1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
+ iget-object v1, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/FileUtils$downloadFile$1;
- iget-object v1, v1, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$downloadDirectory:Ljava/io/File;
+ iget-object v1, v1, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$downloadDirectory:Ljava/io/File;
- iget-object v2, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
+ iget-object v2, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/FileUtils$downloadFile$1;
- iget-object v2, v2, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$fileName:Ljava/lang/String;
+ iget-object v2, v2, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$fileName:Ljava/lang/String;
invoke-direct {v0, v1, v2}, Ljava/io/File;->(Ljava/io/File;Ljava/lang/String;)V
@@ -111,15 +111,15 @@
if-ne v6, v7, :cond_0
- iget-object v1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iget-object v1, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
- new-instance v2, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;
+ new-instance v2, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;
- invoke-direct {v2, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;->(Ljava/io/File;)V
+ invoke-direct {v2, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;->(Ljava/io/File;)V
invoke-interface {v1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
- iget-object v0, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iget-object v0, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
invoke-interface {v0}, Lr0/g;->onCompleted()V
@@ -128,15 +128,15 @@
:cond_0
add-int/2addr v5, v6
- iget-object v7, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iget-object v7, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
- new-instance v8, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;
+ new-instance v8, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;
int-to-float v9, v5
div-float/2addr v9, v3
- invoke-direct {v8, v9}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;->(F)V
+ invoke-direct {v8, v9}, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;->(F)V
invoke-interface {v7, v8}, Lr0/g;->onNext(Ljava/lang/Object;)V
@@ -158,11 +158,11 @@
:try_start_1
invoke-virtual {v0}, Ljava/io/IOException;->printStackTrace()V
- iget-object v1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iget-object v1, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
- new-instance v2, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;
+ new-instance v2, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;
- invoke-direct {v2, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;->(Ljava/lang/Exception;)V
+ invoke-direct {v2, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;->(Ljava/lang/Exception;)V
invoke-interface {v1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
:try_end_1
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali b/com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1.smali
similarity index 60%
rename from com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali
rename to com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1.smali
index 6932112d21..bd86bc745a 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali
+++ b/com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1.smali
@@ -1,6 +1,6 @@
-.class public final Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
+.class public final Lcom/discord/utilities/file/FileUtils$downloadFile$1;
.super Ljava/lang/Object;
-.source "DownloadUtils.kt"
+.source "FileUtils.kt"
# interfaces
.implements Lrx/functions/Action1;
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/file/DownloadUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
+ value = Lcom/discord/utilities/file/FileUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -41,11 +41,11 @@
.method public constructor (Ljava/lang/String;Ljava/io/File;Ljava/lang/String;)V
.locals 0
- iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$fileUrl:Ljava/lang/String;
+ iput-object p1, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$fileUrl:Ljava/lang/String;
- iput-object p2, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$downloadDirectory:Ljava/io/File;
+ iput-object p2, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$downloadDirectory:Ljava/io/File;
- iput-object p3, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$fileName:Ljava/lang/String;
+ iput-object p3, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$fileName:Ljava/lang/String;
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -59,7 +59,7 @@
check-cast p1, Lrx/Emitter;
- invoke-virtual {p0, p1}, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->call(Lrx/Emitter;)V
+ invoke-virtual {p0, p1}, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->call(Lrx/Emitter;)V
return-void
.end method
@@ -70,18 +70,18 @@
value = {
"(",
"Lrx/Emitter<",
- "Lcom/discord/utilities/file/DownloadUtils$DownloadState;",
+ "Lcom/discord/utilities/file/FileUtils$DownloadState;",
">;)V"
}
.end annotation
if-eqz p1, :cond_0
- new-instance v0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;
+ new-instance v0, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;
const/4 v1, 0x0
- invoke-direct {v0, v1}, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;->(F)V
+ invoke-direct {v0, v1}, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;->(F)V
invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)V
@@ -91,15 +91,15 @@
move-result-object v0
- iget-object v1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$fileUrl:Ljava/lang/String;
+ iget-object v1, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$fileUrl:Ljava/lang/String;
invoke-interface {v0, v1}, Lcom/discord/restapi/RestAPIInterface$Files;->getFile(Ljava/lang/String;)Lrx/Observable;
move-result-object v0
- new-instance v1, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;
+ new-instance v1, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;
- invoke-direct {v1, p0, p1}, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->(Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;Lrx/Emitter;)V
+ invoke-direct {v1, p0, p1}, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->(Lcom/discord/utilities/file/FileUtils$downloadFile$1;Lrx/Emitter;)V
invoke-virtual {v0, v1}, Lrx/Observable;->R(Lrx/functions/Action1;)Lrx/Subscription;
diff --git a/com.discord/smali/com/discord/utilities/file/DownloadUtils.smali b/com.discord/smali/com/discord/utilities/file/FileUtils.smali
similarity index 78%
rename from com.discord/smali/com/discord/utilities/file/DownloadUtils.smali
rename to com.discord/smali/com/discord/utilities/file/FileUtils.smali
index 8074338ced..7efc49113f 100644
--- a/com.discord/smali/com/discord/utilities/file/DownloadUtils.smali
+++ b/com.discord/smali/com/discord/utilities/file/FileUtils.smali
@@ -1,29 +1,29 @@
-.class public final Lcom/discord/utilities/file/DownloadUtils;
+.class public final Lcom/discord/utilities/file/FileUtils;
.super Ljava/lang/Object;
-.source "DownloadUtils.kt"
+.source "FileUtils.kt"
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
value = {
- Lcom/discord/utilities/file/DownloadUtils$DownloadState;
+ Lcom/discord/utilities/file/FileUtils$DownloadState;
}
.end annotation
# static fields
-.field public static final INSTANCE:Lcom/discord/utilities/file/DownloadUtils;
+.field public static final INSTANCE:Lcom/discord/utilities/file/FileUtils;
# direct methods
.method public static constructor ()V
.locals 1
- new-instance v0, Lcom/discord/utilities/file/DownloadUtils;
+ new-instance v0, Lcom/discord/utilities/file/FileUtils;
- invoke-direct {v0}, Lcom/discord/utilities/file/DownloadUtils;->()V
+ invoke-direct {v0}, Lcom/discord/utilities/file/FileUtils;->()V
- sput-object v0, Lcom/discord/utilities/file/DownloadUtils;->INSTANCE:Lcom/discord/utilities/file/DownloadUtils;
+ sput-object v0, Lcom/discord/utilities/file/FileUtils;->INSTANCE:Lcom/discord/utilities/file/FileUtils;
return-void
.end method
@@ -52,7 +52,7 @@
"Ljava/io/File;",
")",
"Lrx/Observable<",
- "Lcom/discord/utilities/file/DownloadUtils$DownloadState;",
+ "Lcom/discord/utilities/file/FileUtils$DownloadState;",
">;"
}
.end annotation
@@ -67,9 +67,9 @@
if-eqz p3, :cond_0
- new-instance p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
+ new-instance p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1;
- invoke-direct {p0, p1, p3, p2}, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->(Ljava/lang/String;Ljava/io/File;Ljava/lang/String;)V
+ invoke-direct {p0, p1, p3, p2}, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->(Ljava/lang/String;Ljava/io/File;Ljava/lang/String;)V
sget-object p1, Lrx/Emitter$BackpressureMode;->f:Lrx/Emitter$BackpressureMode;
@@ -128,7 +128,7 @@
invoke-static {p3, p4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
:cond_0
- invoke-static {p0, p1, p2, p3}, Lcom/discord/utilities/file/DownloadUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
+ invoke-static {p0, p1, p2, p3}, Lcom/discord/utilities/file/FileUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
move-result-object p0
diff --git a/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali b/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali
deleted file mode 100644
index f1b08984d9..0000000000
--- a/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali
+++ /dev/null
@@ -1,183 +0,0 @@
-.class public final Lcom/discord/utilities/file/FileUtilsKt;
-.super Ljava/lang/Object;
-.source "FileUtils.kt"
-
-
-# direct methods
-.method public static final getHumanReadableByteCount(J)Ljava/lang/String;
- .locals 9
-
- const/16 v0, 0x400
-
- int-to-long v1, v0
-
- cmp-long v3, p0, v1
-
- if-gez v3, :cond_0
-
- new-instance v0, Ljava/lang/StringBuilder;
-
- invoke-direct {v0}, Ljava/lang/StringBuilder;->()V
-
- invoke-virtual {v0, p0, p1}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
-
- const-string p0, " B"
-
- invoke-virtual {v0, p0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
- move-result-object p0
-
- return-object p0
-
- :cond_0
- long-to-double p0, p0
-
- invoke-static {p0, p1}, Ljava/lang/Math;->log(D)D
-
- move-result-wide v1
-
- int-to-double v3, v0
-
- invoke-static {v3, v4}, Ljava/lang/Math;->log(D)D
-
- move-result-wide v5
-
- div-double/2addr v1, v5
-
- double-to-int v0, v1
-
- add-int/lit8 v1, v0, -0x1
-
- const-string v2, "KMGTPE"
-
- invoke-virtual {v2, v1}, Ljava/lang/String;->charAt(I)C
-
- move-result v1
-
- const/4 v2, 0x2
-
- new-array v5, v2, [Ljava/lang/Object;
-
- const/4 v6, 0x0
-
- int-to-double v7, v0
-
- invoke-static {v3, v4, v7, v8}, Ljava/lang/Math;->pow(DD)D
-
- move-result-wide v3
-
- div-double/2addr p0, v3
-
- invoke-static {p0, p1}, Ljava/lang/Double;->valueOf(D)Ljava/lang/Double;
-
- move-result-object p0
-
- aput-object p0, v5, v6
-
- invoke-static {v1}, Ljava/lang/Character;->valueOf(C)Ljava/lang/Character;
-
- move-result-object p0
-
- const/4 p1, 0x1
-
- aput-object p0, v5, p1
-
- const-string p0, "%.1f %sB"
-
- const-string p1, "java.lang.String.format(format, *args)"
-
- invoke-static {v5, v2, p0, p1}, Lf/e/b/a/a;->A([Ljava/lang/Object;ILjava/lang/String;Ljava/lang/String;)Ljava/lang/String;
-
- move-result-object p0
-
- return-object p0
-.end method
-
-.method public static final getIconForFiletype(Landroid/content/Context;Ljava/lang/String;)I
- .locals 4
- .annotation build Landroidx/annotation/DrawableRes;
- .end annotation
-
- const/4 v0, 0x0
-
- if-eqz p0, :cond_3
-
- if-eqz p1, :cond_2
-
- const-string v1, "image"
-
- const/4 v2, 0x0
-
- const/4 v3, 0x2
-
- invoke-static {p1, v1, v2, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
- move-result v1
-
- if-eqz v1, :cond_0
-
- const p1, 0x7f0402d6
-
- goto :goto_0
-
- :cond_0
- const-string/jumbo v1, "video"
-
- invoke-static {p1, v1, v2, v3}, Lj0/t/k;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z
-
- move-result p1
-
- if-eqz p1, :cond_1
-
- const p1, 0x7f0402d7
-
- goto :goto_0
-
- :cond_1
- const p1, 0x7f0402d4
-
- :goto_0
- invoke-static {p0, p1, v2, v3, v0}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I
-
- move-result p0
-
- return p0
-
- :cond_2
- const-string p0, "mimeType"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-
- :cond_3
- const-string p0, "context"
-
- invoke-static {p0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
-.end method
-
-.method public static final getSizeSubtitle(J)Ljava/lang/String;
- .locals 3
-
- const-wide/16 v0, -0x1
-
- cmp-long v2, p0, v0
-
- if-eqz v2, :cond_0
-
- invoke-static {p0, p1}, Lcom/discord/utilities/file/FileUtilsKt;->getHumanReadableByteCount(J)Ljava/lang/String;
-
- move-result-object p0
-
- goto :goto_0
-
- :cond_0
- const/4 p0, 0x0
-
- :goto_0
- return-object p0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
index f046c64b77..55e2716fe6 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
@@ -112,7 +112,7 @@
move-result-object v2
- const v3, 0x7f1205aa
+ const v3, 0x7f1205a5
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -124,7 +124,7 @@
if-nez p2, :cond_0
- const p2, 0x7f1207f9
+ const p2, 0x7f1207f5
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -133,7 +133,7 @@
goto :goto_0
:cond_0
- const v3, 0x7f1207f6
+ const v3, 0x7f1207f2
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
index b82380468d..8ae151ea30 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
@@ -45,7 +45,7 @@
if-eqz v0, :cond_0
- const v3, 0x7f121639
+ const v3, 0x7f121625
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
index 2dc4f2bda8..77cb575dad 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
@@ -607,7 +607,7 @@
if-eqz p3, :cond_0
- const p2, 0x7f121476
+ const p2, 0x7f121462
invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$NoValidContent.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$NoValidContent.smali
deleted file mode 100644
index a1fe1df8a7..0000000000
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult$NoValidContent.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.class public final Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
-.super Lcom/discord/utilities/messagesend/MessageResult;
-.source "MessageQueue.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/messagesend/MessageResult;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = "NoValidContent"
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
-
- invoke-direct {v0}, Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;->()V
-
- sput-object v0, Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;->INSTANCE:Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
-
- return-void
-.end method
-
-.method public constructor ()V
- .locals 1
-
- const/4 v0, 0x0
-
- invoke-direct {p0, v0}, Lcom/discord/utilities/messagesend/MessageResult;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali b/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali
index ce3a68cce7..10f4a6f28d 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali
@@ -11,8 +11,7 @@
Lcom/discord/utilities/messagesend/MessageResult$RateLimited;,
Lcom/discord/utilities/messagesend/MessageResult$UserCancelled;,
Lcom/discord/utilities/messagesend/MessageResult$UnknownFailure;,
- Lcom/discord/utilities/messagesend/MessageResult$ValidationError;,
- Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
+ Lcom/discord/utilities/messagesend/MessageResult$ValidationError;
}
.end annotation
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
index 277cda82a5..3463d44db3 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
@@ -142,7 +142,7 @@
aput-object v1, v0, v2
- const v1, 0x7f1205a7
+ const v1, 0x7f1205a2
invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -160,7 +160,7 @@
invoke-static {v3, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f1205a6
+ const v0, 0x7f1205a1
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -170,7 +170,7 @@
invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f0a062e
+ const v0, 0x7f0a0626
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -188,13 +188,13 @@
move-result-object v7
- const p2, 0x7f1203b3
+ const p2, 0x7f1203b1
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v6
- const p2, 0x7f1205a4
+ const p2, 0x7f12059f
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -220,7 +220,7 @@
new-instance p2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
- const v0, 0x7f1212ee
+ const v0, 0x7f1212df
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -230,7 +230,7 @@
invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f1212ed
+ const v0, 0x7f1212de
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -240,7 +240,7 @@
invoke-static {v2, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f0d0127
+ const v0, 0x7f0d0125
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -266,7 +266,7 @@
const/4 v3, 0x1
- const v4, 0x7f0a062e
+ const v4, 0x7f0a0626
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -282,7 +282,7 @@
const/4 v3, 0x2
- const v4, 0x7f0a0629
+ const v4, 0x7f0a0621
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -300,13 +300,13 @@
move-result-object v5
- const v0, 0x7f121070
+ const v0, 0x7f121060
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v3
- const v0, 0x7f120f95
+ const v0, 0x7f120f85
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/permissions/PermissionsManager.smali b/com.discord/smali/com/discord/utilities/permissions/PermissionsManager.smali
deleted file mode 100644
index 2ad1378a42..0000000000
--- a/com.discord/smali/com/discord/utilities/permissions/PermissionsManager.smali
+++ /dev/null
@@ -1,25 +0,0 @@
-.class public final Lcom/discord/utilities/permissions/PermissionsManager;
-.super Ljava/lang/Object;
-.source "PermissionsManager.kt"
-
-
-# direct methods
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public final can(JLjava/lang/Long;)Z
- .locals 0
-
- invoke-static {p1, p2, p3}, Lcom/discord/utilities/permissions/PermissionUtils;->can(JLjava/lang/Long;)Z
-
- move-result p1
-
- return p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/permissions/VideoPermissionsManager.smali b/com.discord/smali/com/discord/utilities/permissions/VideoPermissionsManager.smali
deleted file mode 100644
index b38eaa6459..0000000000
--- a/com.discord/smali/com/discord/utilities/permissions/VideoPermissionsManager.smali
+++ /dev/null
@@ -1,110 +0,0 @@
-.class public final Lcom/discord/utilities/permissions/VideoPermissionsManager;
-.super Ljava/lang/Object;
-.source "VideoPermissionsManager.kt"
-
-
-# instance fields
-.field public final permissionsManager:Lcom/discord/utilities/permissions/PermissionsManager;
-
-
-# direct methods
-.method public constructor ()V
- .locals 2
-
- const/4 v0, 0x0
-
- const/4 v1, 0x1
-
- invoke-direct {p0, v0, v1, v0}, Lcom/discord/utilities/permissions/VideoPermissionsManager;->(Lcom/discord/utilities/permissions/PermissionsManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-
- return-void
-.end method
-
-.method public constructor (Lcom/discord/utilities/permissions/PermissionsManager;)V
- .locals 0
-
- if-eqz p1, :cond_0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- iput-object p1, p0, Lcom/discord/utilities/permissions/VideoPermissionsManager;->permissionsManager:Lcom/discord/utilities/permissions/PermissionsManager;
-
- return-void
-
- :cond_0
- const-string p1, "permissionsManager"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
-.end method
-
-.method public synthetic constructor (Lcom/discord/utilities/permissions/PermissionsManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- .locals 0
-
- and-int/lit8 p2, p2, 0x1
-
- if-eqz p2, :cond_0
-
- new-instance p1, Lcom/discord/utilities/permissions/PermissionsManager;
-
- invoke-direct {p1}, Lcom/discord/utilities/permissions/PermissionsManager;->()V
-
- :cond_0
- invoke-direct {p0, p1}, Lcom/discord/utilities/permissions/VideoPermissionsManager;->(Lcom/discord/utilities/permissions/PermissionsManager;)V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public final hasVideoPermission(Lcom/discord/models/domain/ModelChannel;J)Z
- .locals 2
-
- if-eqz p1, :cond_2
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->isPrivate()Z
-
- move-result p1
-
- if-nez p1, :cond_1
-
- iget-object p1, p0, Lcom/discord/utilities/permissions/VideoPermissionsManager;->permissionsManager:Lcom/discord/utilities/permissions/PermissionsManager;
-
- const-wide/16 v0, 0x200
-
- invoke-static {p2, p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object p2
-
- invoke-virtual {p1, v0, v1, p2}, Lcom/discord/utilities/permissions/PermissionsManager;->can(JLjava/lang/Long;)Z
-
- move-result p1
-
- if-eqz p1, :cond_0
-
- goto :goto_0
-
- :cond_0
- const/4 p1, 0x0
-
- goto :goto_1
-
- :cond_1
- :goto_0
- const/4 p1, 0x1
-
- :goto_1
- return p1
-
- :cond_2
- const-string p1, "channel"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali
index 96b17cc864..a64d6442c7 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali
@@ -95,7 +95,7 @@
move-result-object v5
- const v1, 0x7f08020c
+ const v1, 0x7f08020d
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -141,7 +141,7 @@
move-result-object v18
- const v2, 0x7f0801fa
+ const v2, 0x7f0801fb
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -187,7 +187,7 @@
move-result-object v7
- const v2, 0x7f0801ff
+ const v2, 0x7f080200
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -231,7 +231,7 @@
move-result-object v7
- const v2, 0x7f080201
+ const v2, 0x7f080202
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -273,7 +273,7 @@
move-result-object v7
- const v2, 0x7f080202
+ const v2, 0x7f080203
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -303,7 +303,7 @@
new-instance v1, Lcom/discord/utilities/platform/Platform;
- const v2, 0x7f080204
+ const v2, 0x7f080205
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -333,7 +333,7 @@
new-instance v1, Lcom/discord/utilities/platform/Platform;
- const v2, 0x7f080205
+ const v2, 0x7f080206
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -363,7 +363,7 @@
move-result-object v7
- const v2, 0x7f080206
+ const v2, 0x7f080207
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -433,7 +433,7 @@
move-result-object v7
- const v2, 0x7f080207
+ const v2, 0x7f080208
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -473,7 +473,7 @@
move-result-object v7
- const v2, 0x7f080208
+ const v2, 0x7f080209
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -515,7 +515,7 @@
move-result-object v7
- const v2, 0x7f080209
+ const v2, 0x7f08020a
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -555,7 +555,7 @@
move-result-object v7
- const v2, 0x7f08020a
+ const v2, 0x7f08020b
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -591,7 +591,7 @@
move-result-object v7
- const v2, 0x7f08020b
+ const v2, 0x7f08020c
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -621,7 +621,7 @@
new-instance v1, Lcom/discord/utilities/platform/Platform;
- const v2, 0x7f08020d
+ const v2, 0x7f08020e
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -659,7 +659,7 @@
move-result-object v7
- const v2, 0x7f08020e
+ const v2, 0x7f08020f
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -699,7 +699,7 @@
move-result-object v7
- const v2, 0x7f080200
+ const v2, 0x7f080201
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index 47a9544b28..26eb356af0 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
@@ -79,7 +79,7 @@
move-result v0
- const v1, 0x7f1216b6
+ const v1, 0x7f1216a4
const/4 v2, 0x0
@@ -104,7 +104,7 @@
goto :goto_1
:cond_0
- const v0, 0x7f1216b9
+ const v0, 0x7f1216a7
new-array v1, v3, [Ljava/lang/Object;
@@ -121,7 +121,7 @@
goto :goto_1
:cond_1
- const v0, 0x7f1216b4
+ const v0, 0x7f1216a2
new-array v1, v3, [Ljava/lang/Object;
@@ -138,7 +138,7 @@
goto :goto_1
:cond_2
- const v0, 0x7f1216b5
+ const v0, 0x7f1216a3
new-array v1, v3, [Ljava/lang/Object;
@@ -185,7 +185,7 @@
:goto_0
if-eqz p1, :cond_5
- const v0, 0x7f1216b7
+ const v0, 0x7f1216a5
new-array v3, v3, [Ljava/lang/Object;
@@ -267,7 +267,7 @@
goto :goto_2
:cond_1
- const v1, 0x7f1217c1
+ const v1, 0x7f1217af
new-array v3, v3, [Ljava/lang/Object;
@@ -294,7 +294,7 @@
goto :goto_2
:cond_3
- const v1, 0x7f120e0f
+ const v1, 0x7f120e02
new-array v3, v3, [Ljava/lang/Object;
@@ -311,7 +311,7 @@
goto :goto_2
:cond_4
- const v1, 0x7f121521
+ const v1, 0x7f12150d
new-array v3, v3, [Ljava/lang/Object;
@@ -338,7 +338,7 @@
goto :goto_2
:cond_6
- const v1, 0x7f12113b
+ const v1, 0x7f12112b
new-array v3, v3, [Ljava/lang/Object;
@@ -376,7 +376,7 @@
if-eqz p2, :cond_0
- const v0, 0x7f121521
+ const v0, 0x7f12150d
const/4 v1, 0x1
@@ -399,7 +399,7 @@
goto :goto_0
:cond_0
- const p2, 0x7f121522
+ const p2, 0x7f12150e
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -562,22 +562,22 @@
if-eq p1, v0, :cond_2
:goto_1
- const p1, 0x7f1214cc
+ const p1, 0x7f1214b8
goto :goto_2
:cond_2
- const p1, 0x7f1214c7
+ const p1, 0x7f1214b3
goto :goto_2
:cond_3
- const p1, 0x7f1214c9
+ const p1, 0x7f1214b5
goto :goto_2
:cond_4
- const p1, 0x7f1214cd
+ const p1, 0x7f1214b9
:goto_2
return p1
diff --git a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
index 7e0dfb6450..e116305e7c 100644
--- a/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
+++ b/com.discord/smali/com/discord/utilities/rest/AttachmentRequestBody.smali
@@ -163,7 +163,7 @@
invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {v1}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
+ invoke-static {v1}, Lf/n/a/k/a;->W(Ljava/io/InputStream;)Lo0/w;
move-result-object v2
:try_end_1
diff --git a/com.discord/smali/com/discord/utilities/rest/FileUploadAlertType.smali b/com.discord/smali/com/discord/utilities/rest/FileUploadAlertType.smali
deleted file mode 100644
index 82be2eed85..0000000000
--- a/com.discord/smali/com/discord/utilities/rest/FileUploadAlertType.smali
+++ /dev/null
@@ -1,122 +0,0 @@
-.class public final enum Lcom/discord/utilities/rest/FileUploadAlertType;
-.super Ljava/lang/Enum;
-.source "SendUtils.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/lang/Enum<",
- "Lcom/discord/utilities/rest/FileUploadAlertType;",
- ">;"
- }
-.end annotation
-
-
-# static fields
-.field public static final synthetic $VALUES:[Lcom/discord/utilities/rest/FileUploadAlertType;
-
-.field public static final enum NITRO_UPSELL:Lcom/discord/utilities/rest/FileUploadAlertType;
-
-.field public static final enum OVER_MAX_SIZE:Lcom/discord/utilities/rest/FileUploadAlertType;
-
-
-# instance fields
-.field public final analyticsValue:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 5
-
- const/4 v0, 0x2
-
- new-array v0, v0, [Lcom/discord/utilities/rest/FileUploadAlertType;
-
- new-instance v1, Lcom/discord/utilities/rest/FileUploadAlertType;
-
- const-string v2, "NITRO_UPSELL"
-
- const/4 v3, 0x0
-
- const-string v4, "Nitro Upsell"
-
- invoke-direct {v1, v2, v3, v4}, Lcom/discord/utilities/rest/FileUploadAlertType;->(Ljava/lang/String;ILjava/lang/String;)V
-
- sput-object v1, Lcom/discord/utilities/rest/FileUploadAlertType;->NITRO_UPSELL:Lcom/discord/utilities/rest/FileUploadAlertType;
-
- aput-object v1, v0, v3
-
- new-instance v1, Lcom/discord/utilities/rest/FileUploadAlertType;
-
- const-string v2, "OVER_MAX_SIZE"
-
- const/4 v3, 0x1
-
- const-string v4, "Over Max Size"
-
- invoke-direct {v1, v2, v3, v4}, Lcom/discord/utilities/rest/FileUploadAlertType;->(Ljava/lang/String;ILjava/lang/String;)V
-
- sput-object v1, Lcom/discord/utilities/rest/FileUploadAlertType;->OVER_MAX_SIZE:Lcom/discord/utilities/rest/FileUploadAlertType;
-
- aput-object v1, v0, v3
-
- sput-object v0, Lcom/discord/utilities/rest/FileUploadAlertType;->$VALUES:[Lcom/discord/utilities/rest/FileUploadAlertType;
-
- return-void
-.end method
-
-.method public constructor (Ljava/lang/String;ILjava/lang/String;)V
- .locals 0
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/lang/String;",
- ")V"
- }
- .end annotation
-
- invoke-direct {p0, p1, p2}, Ljava/lang/Enum;->(Ljava/lang/String;I)V
-
- iput-object p3, p0, Lcom/discord/utilities/rest/FileUploadAlertType;->analyticsValue:Ljava/lang/String;
-
- return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lcom/discord/utilities/rest/FileUploadAlertType;
- .locals 1
-
- const-class v0, Lcom/discord/utilities/rest/FileUploadAlertType;
-
- invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
- move-result-object p0
-
- check-cast p0, Lcom/discord/utilities/rest/FileUploadAlertType;
-
- return-object p0
-.end method
-
-.method public static values()[Lcom/discord/utilities/rest/FileUploadAlertType;
- .locals 1
-
- sget-object v0, Lcom/discord/utilities/rest/FileUploadAlertType;->$VALUES:[Lcom/discord/utilities/rest/FileUploadAlertType;
-
- invoke-virtual {v0}, [Lcom/discord/utilities/rest/FileUploadAlertType;->clone()Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, [Lcom/discord/utilities/rest/FileUploadAlertType;
-
- return-object v0
-.end method
-
-
-# virtual methods
-.method public final getAnalyticsValue()Ljava/lang/String;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/utilities/rest/FileUploadAlertType;->analyticsValue:Ljava/lang/String;
-
- return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali
deleted file mode 100644
index 1985972883..0000000000
--- a/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali
+++ /dev/null
@@ -1,185 +0,0 @@
-.class public final Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;
-.super Ljava/lang/Object;
-.source "SendUtils.kt"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/rest/ProcessedMessageContent;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = "Companion"
-.end annotation
-
-
-# direct methods
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->